Fri May 17 2019 18:24:44 GMT+0200 (Afrique du Sud)

01/01.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 1 Yewa niwa muntu mulegele, intu muntu ukeba kulama musimamizi, upenda kazi ilegele. \v 2 kwa nebya nisimanizi walame na lawama, ni bibyele kalama na mulume yimo ibyebya walame na kiyasi ? bebe wi muntu mulengele ina utaratibu muntu wa kambisha bantu, ni lazima uwe muntu wakufundisha.
-=======
-\v 1 Paulo nduma kristu yesu, kudinana na saamba ya Filenyambe na mookozi wiitu yesu kristu udi na bibi wiitu,\v 2 kwa timotheo mwana woobe na kweli musengi imani: neema, rehema na amani kuva kwa Filenyambe.
->>>>>>> 5336ff8ab5094eaa2e5562bd0511eda1758fbab4
+\c 1 \v 1 Yewa niwa muntu mulegele, intu muntu ukeba kulama musimamizi, upenda kazi ilegele. \v 2 kwa nebya nisimanizi walame na lawama, ni bibyele kalama na mulume yimo ibyebya walame na kiyasi ? bebe wi muntu mulengele ina utaratibu muntu wa kambisha bantu, ni lazima uwe muntu wakufundisha.

01/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-Pulukoo 3
-=======
-pulukoo
->>>>>>> 5336ff8ab5094eaa2e5562bd0511eda1758fbab4
+Pulukoo 3

front/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-1 Timoteo
-=======
-timotheo
->>>>>>> 5336ff8ab5094eaa2e5562bd0511eda1758fbab4
+1 Timoteo

manifest.json

@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "1ti",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "132"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Kwange",
 		"direction": "ltr",
@@ -20,13 +13,17 @@
 		"is_gateway_language": false,
 		"id": "zmb-x-kwange"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "1ti",
+		"name": "1 Timothy"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"Georges"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
@@ -36,22 +33,25 @@
 			"version": "9"
 		}
 	],
+	"translators": [
+		"Georges",
+		"Faustin Azaza Banyungu"
+	],
 	"finished_chunks": [
-		"06-01",
-		"06-03",
-		"06-06",
-		"06-09",
-		"06-11",
-		"06-13",
-		"06-15",
-		"06-17",
-		"06-20",
+		"front-title",
+		"01-title",
+		"01-01",
 		"01-03",
 		"01-05",
 		"01-09",
 		"01-12",
 		"01-15",
 		"01-18",
+		"02-01",
+		"02-05",
+		"02-08",
+		"02-11",
+		"02-13",
 		"03-01",
 		"03-04",
 		"03-06",
@@ -76,10 +76,14 @@
 		"05-19",
 		"05-21",
 		"05-23",
-		"02-01",
-		"02-05",
-		"02-08",
-		"02-11",
-		"02-13"
+		"06-01",
+		"06-03",
+		"06-06",
+		"06-09",
+		"06-11",
+		"06-13",
+		"06-15",
+		"06-17",
+		"06-20"
 	]
 }