Thu Aug 29 2019 15:05:07 GMT+0200 (heure normale d’Afrique méridionale)

01/16.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 18 \v 16 Kangue besu kebe obilieno, ekani ndianzi kangua loki inde bitotikanu kangua kula ngufu na piki kia mangese masu Yeso Klisto. Kangue besu bibi bitoti loki pipalake. \v 17 Eye apokei pipa lake na bondo toka kea Akodola Epa abeli sonde ekikani tuka suba pipa angbo ng
-=======
 \v 16 Kangue kebe obilieno ekani ndianzi kanga loki inde bitoti kanu kanga kula ngufu na piki kia mangese masu Yeso Klisto, kange besu bibi bitoti loki pipa lake. \v 17 Eye apokei pipa lake na bondo toka kea Akodola Epa abeli sonde ekikani tuka suba pipa angbo ngo aluhu, ''Munde ndulu Miki mamo, munde mekundi nde me kundi eye.'' \v 18 Bekiliso indo nge katuka na kupa abe kumande bibi naye abe ka mamba apu.
->>>>>>> e2330f12be11b6e9ecafcf8ac6736a515b3b5f1d

front/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
 2 Petelo
-=======
-Petelo
->>>>>>> e2330f12be11b6e9ecafcf8ac6736a515b3b5f1d

manifest.json

@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "2pe",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "140"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Kaiku",
 		"direction": "ltr",
@@ -20,25 +13,34 @@
 		"is_gateway_language": false,
 		"id": "kkq"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "2pe",
+		"name": "2 Peter"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"Faustin azaza",
-		"faustin azaza",
-		"faustin-azaza"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
 			"resource_id": "ulb",
 			"checking_level": "3",
-			"date_modified": 20170329,
-			"version": "9"
+			"date_modified": "2017-11-29T00:00:00+00:00",
+			"version": "12"
 		}
 	],
+	"translators": [
+		"Faustin azaza",
+		"faustin azaza",
+		"faustin-azaza",
+		"Faustin Azaza Banyungu"
+	],
 	"finished_chunks": [
+		"front-title",
 		"01-title",
 		"01-01",
 		"01-03",
@@ -46,15 +48,8 @@
 		"01-08",
 		"01-10",
 		"01-12",
-		"03-title",
-		"03-01",
-		"03-03",
-		"03-05",
-		"03-08",
-		"03-10",
-		"03-11",
-		"03-14",
-		"03-17",
+		"01-16",
+		"01-19",
 		"02-title",
 		"02-01",
 		"02-04",
@@ -64,6 +59,14 @@
 		"02-15",
 		"02-17",
 		"02-20",
-		"01-19"
+		"03-title",
+		"03-01",
+		"03-03",
+		"03-05",
+		"03-08",
+		"03-10",
+		"03-11",
+		"03-14",
+		"03-17"
 	]
 }