From 4e99c8c7d873e6fb422376af1cd5a0c9d2c108b2 Mon Sep 17 00:00:00 2001
From: faustin-azaza <faustin-azaza@noreply.door43.org>
Date: Fri, 17 May 2019 17:56:45 +0200
Subject: [PATCH] Fri May 17 2019 17:56:45 GMT+0200 (Afrique du Sud)

---
 01/title.txt  |   6 +-
 02/13.txt     |   6 +-
 02/16.txt     |   7 +-
 02/17.txt     |   6 +-
 02/19.txt     |   6 +-
 02/22.txt     |   6 +-
 manifest.json | 627 +++++++++++++++++++++++++-------------------------
 7 files changed, 323 insertions(+), 341 deletions(-)

diff --git a/01/title.txt b/01/title.txt
index 6b2e58a..75ba36e 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Pulukoo 1
-=======
-pulukoo 1
->>>>>>> 66703863f3de10e9e0e89935d7caf82e6fa569bf
+Pulukoo 1
\ No newline at end of file
diff --git a/02/13.txt b/02/13.txt
index 6be6bab..0c9283e 100644
--- a/02/13.txt
+++ b/02/13.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 13 bakuva kwenda malaika kwa bwanaa ,kumutokeya yojofu wikela wa ndooto umugaza kuchaa kumuambilaa mwana na mamaa yobe mukibila ku muzige wa misri ugaye ugo idikiteneza kwa maana ya diemo herode uganza mididi kwela kwela uyu mwana kumuyaga.\v 14 wabebia ubuka wa kwenda kumuyowa mwana bawage bufuku baile misri.\v 15 ulama kakwe mpaka herode intu wakufwa,basi itimiya nenoo ubozaa bwaana kugegwela kwa yaandumwa nilikumuita mwanawondi ku misri.
-=======
-\v 13 Bakuva kwinda malaika kwa bwana, kumulokeya yozefu wikala wa ndoolo umugoza kuchaa kumwambiya mwana na mamaa yoobe mukibila ku muzinge wa misri ugae ugo udikiteneza kya manana ya diemo Herode. Uganza mididi kwelakwela uyu mwana kimuyaga.\v 14 Wabebia ubuka wa kwenda kumuyewa,Mwana na baba wage bufuku, baile misri,\v 15 ulama kakwe mpakaa Herode untu wakufa,basi iitimiga,mianda ubozaa bwaana ku gwela kwa yandumwa nilikumuita mwana wonde ku misri.
->>>>>>> 66703863f3de10e9e0e89935d7caf82e6fa569bf
+\v 13 bakuva kwenda malaika kwa bwanaa ,kumutokeya yojofu wikela wa ndooto umugaza kuchaa kumuambilaa mwana na mamaa yobe mukibila ku muzige wa misri ugaye ugo idikiteneza kwa maana ya diemo herode uganza mididi kwela kwela uyu mwana kumuyaga. \v 14 wabebia ubuka wa kwenda kumuyowa mwana bawage bufuku baile misri. \v 15 ulama kakwe mpaka herode intu wakufwa,basi itimiya nenoo ubozaa bwaana kugegwela kwa yaandumwa nilikumuita mwanawondi ku misri.
\ No newline at end of file
diff --git a/02/16.txt b/02/16.txt
index 24f4293..434a0de 100644
--- a/02/16.txt
+++ b/02/16.txt
@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 16 herode umonaa diemo umunga ,aligangala sana utma bantu kuyo banaa balume myaka ibili kwenda kwini musengi musenge kwa Betlehemu na kitenyi kyonson kiaba jirani,kwabidisha ule mudaa olobee wa balee wa diemo wabidi kumuambikisha.
-=======
-\v 16 Herode umonaa diemo,umunga,oligangala sana utuma nbatu kuya banaa balume myaka ubili kwenda kwini musenge kwa betlehemu, na kiteny kwoonson kiaba jirani,
-kwadibisha ule mudaa olobee wa balee wa diemo wabidi kumuabikisha,
->>>>>>> 66703863f3de10e9e0e89935d7caf82e6fa569bf
+\v 16 herode umonaa diemo umunga ,aligangala sana utma bantu kuyo banaa balume myaka ibili kwenda kwini musengi musenge kwa Betlehemu na kitenyi kyonson kiaba jirani,kwabidisha ule mudaa olobee wa balee wa diemo wabidi kumuambikisha.
\ No newline at end of file
diff --git a/02/17.txt b/02/17.txt
index 34715dc..9eb2362 100644
--- a/02/17.txt
+++ b/02/17.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 17  didii myanda woza yeremiya ya timiya adikuacha.\v 18 iyuka ku rama,kule kwauchungu na maombi raheli ushikulela baana bage hakukubaliyaa kuvwa kwababu wa kuvwa.
-=======
-\v 17 didii mianda woza yeremiya ya timiaa adikwa.\v 18 uyuka ku rama,kule kwauchungu na maombolezo raheli  ushikulela baana baage, hakukubaliya kufa kwa babu wakufaa.
->>>>>>> 66703863f3de10e9e0e89935d7caf82e6fa569bf
+\v 17  didii myanda woza yeremiya ya timiya adikuacha. \v 18 iyuka ku rama,kule kwauchungu na maombi raheli ushikulela baana bage hakukubaliyaa kuvwa kwababu wa kuvwa.
\ No newline at end of file
diff --git a/02/19.txt b/02/19.txt
index 9bc907b..4508f88 100644
--- a/02/19.txt
+++ b/02/19.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 19 lagini herode wa kuvwa,malaika wa bwaana katuka yosefu idimundotoo ku Misri.\v 20 kugoza nage kubuka mwana na mamaa yobe kuva musenge musengi wa Israeli,kwasababuu baage ba file kumuvua mwana wa didi kuvua.\v 21 lekaa yosefu ubuka ku kwata mwana na mama yobe wakuva musenge wa Israeli
-=======
-\v 19 Obebya Herode wa guvwa, malaika wa bwaana kaluka yosefu idimundoto ku misri.\v 20 Kugoza naage, kubuka mwana na mama yoobe kuva musengi musengi wa Israel. kwasababu baage ba file kumuva mwana wa did kuvua.\v 21 yekaa yosefu ubuka ku kwata mwana na mama yoobe wa kuva musenge wa israeli.
->>>>>>> 66703863f3de10e9e0e89935d7caf82e6fa569bf
+\v 19 lagini herode wa kuvwa,malaika wa bwaana katuka yosefu idimundotoo ku Misri. \v 20 kugoza nage kubuka mwana na mamaa yobe kuva musenge musengi wa Israeli,kwasababuu baage ba file kumuvua mwana wa didi kuvua. \v 21 lekaa yosefu ubuka ku kwata mwana na mama yobe wakuva musenge wa Israeli
\ No newline at end of file
diff --git a/02/22.txt b/02/22.txt
index 5d34a54..5607d42 100644
--- a/02/22.txt
+++ b/02/22.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 22 ilimukupata diaabari ankelaa wakuwa umidikiwa yudea baba yobe herode ulenge na baba kwenda kwenda hukoo baada ya kuonela tena musengi ndotoo kugandukaa wilaya ya galilaya.\v 23 kugenda kuishi musengi musenge kuitwa nazareti na hivioo yakatimiya idikuocha ndumwa kumbwa bamuite mwana zareti.
-=======
-\v 22 ulimukupata dioabari ankelaa wa kuwa umidili wa yudea baba yoobe Herode ilenge na baba kwenda hukoo baada ya kumuanela tena musengi ndotoo kuganduka wilaya ya galilaya,\v 23 Kugenda kuishi musengi musenge kwiitwa nazareti na hivyo yakatimia iidi kuacha ndumwa kwamba ba mwiite mwanazareti.
->>>>>>> 66703863f3de10e9e0e89935d7caf82e6fa569bf
+\v 22 ilimukupata diaabari ankelaa wakuwa umidikiwa yudea baba yobe herode ulenge na baba kwenda kwenda hukoo baada ya kuonela tena musengi ndotoo kugandukaa wilaya ya galilaya. \v 23 kugenda kuishi musengi musenge kuitwa nazareti na hivioo yakatimiya idikuocha ndumwa kumbwa bamuite mwana zareti.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index f157147..8808f51 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "mat",
-		"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": "mat",
+		"name": "Matthew"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"Georges"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
@@ -36,183 +33,52 @@
 			"version": "9"
 		}
 	],
+	"translators": [
+		"Georges",
+		"Faustin Azaza Banyungu"
+	],
 	"finished_chunks": [
-		"12-01",
-		"12-03",
-		"12-05",
-		"12-07",
-		"12-09",
-		"12-11",
-		"12-13",
-		"12-title",
-		"11-title",
-		"12-15",
-		"12-18",
-		"12-19",
-		"24-01",
-		"24-03",
-		"24-06",
-		"24-12",
-		"24-09",
-		"24-15",
-		"24-19",
-		"24-23",
-		"24-26",
-		"24-29",
-		"24-30",
-		"24-32",
-		"24-36",
-		"24-34",
-		"24-37",
-		"24-40",
-		"24-43",
-		"24-45",
-		"24-48",
-		"26-01",
-		"26-03",
-		"26-10",
-		"26-06",
-		"26-12",
-		"26-14",
-		"26-17",
-		"26-20",
-		"26-23",
-		"26-26",
-		"26-30",
-		"26-33",
-		"26-36",
-		"26-39",
-		"26-45",
-		"26-47",
-		"26-51",
-		"26-42",
-		"26-55",
-		"26-57",
-		"26-59",
-		"26-62",
-		"26-65",
-		"26-67",
-		"26-69",
-		"26-71",
-		"26-73",
-		"26-49",
-		"12-22",
-		"12-24",
-		"12-26",
-		"12-28",
-		"12-31",
-		"12-33",
-		"12-36",
-		"12-38",
-		"12-41",
-		"12-42",
-		"12-43",
-		"12-48",
-		"12-46",
-		"18-07",
-		"18-09",
-		"18-10",
-		"18-12",
-		"18-15",
-		"18-17",
-		"18-18",
-		"18-21",
-		"18-23",
-		"18-26",
-		"18-28",
-		"18-30",
-		"18-32",
-		"18-34",
-		"07-01",
-		"07-03",
-		"07-06",
-		"07-07",
-		"07-11",
-		"07-13",
-		"14-01",
-		"14-03",
-		"14-06",
-		"14-08",
-		"14-10",
-		"14-15",
-		"14-16",
-		"14-19",
-		"14-13",
-		"25-01",
-		"25-05",
-		"25-10",
 		"front-title",
-		"07-title",
-		"14-title",
-		"25-title",
-		"25-14",
-		"25-17",
-		"25-19",
-		"25-22",
+		"01-title",
+		"01-01",
+		"01-04",
+		"01-07",
+		"01-09",
+		"01-12",
+		"01-15",
+		"01-18",
+		"01-20",
+		"01-22",
+		"01-24",
+		"02-title",
+		"02-01",
+		"02-04",
+		"02-07",
+		"02-09",
+		"02-11",
+		"02-13",
+		"02-16",
+		"02-17",
+		"02-19",
+		"02-22",
 		"03-title",
 		"03-01",
 		"03-04",
 		"03-07",
-		"25-07",
-		"17-title",
-		"17-01",
-		"17-03",
-		"17-05",
-		"17-09",
-		"17-11",
-		"07-15",
-		"07-18",
-		"07-21",
-		"07-24",
-		"07-26",
-		"07-28",
-		"16-title",
-		"16-01",
-		"16-03",
-		"16-05",
-		"16-09",
-		"16-11",
-		"16-13",
-		"16-17",
-		"16-19",
-		"21-title",
-		"21-01",
-		"21-04",
-		"21-06",
-		"21-09",
-		"21-12",
-		"21-15",
-		"21-18",
-		"27-title",
-		"27-01",
-		"27-06",
-		"27-09",
-		"27-11",
-		"27-15",
-		"27-17",
-		"15-24",
-		"15-27",
-		"15-29",
-		"15-36",
-		"16-21",
-		"16-24",
-		"16-27",
-		"20-20",
-		"20-22",
-		"20-25",
-		"20-29",
-		"20-32",
-		"08-21",
-		"08-23",
-		"08-26",
-		"08-28",
-		"08-30",
-		"08-33",
+		"03-10",
+		"03-13",
+		"03-16",
 		"04-title",
 		"04-01",
 		"04-05",
 		"04-07",
 		"04-10",
+		"04-12",
+		"04-14",
+		"04-17",
+		"04-18",
+		"04-21",
+		"04-23",
 		"05-title",
 		"05-01",
 		"05-05",
@@ -225,15 +91,6 @@
 		"05-21",
 		"05-23",
 		"05-25",
-		"04-12",
-		"04-14",
-		"04-17",
-		"04-18",
-		"04-21",
-		"04-23",
-		"03-10",
-		"03-13",
-		"03-16",
 		"05-27",
 		"05-29",
 		"05-31",
@@ -243,111 +100,33 @@
 		"05-40",
 		"05-43",
 		"05-46",
-		"17-14",
-		"17-17",
-		"17-19",
-		"17-22",
-		"17-24",
-		"17-26",
-		"20-title",
-		"20-01",
-		"20-03",
-		"20-05",
-		"20-08",
-		"20-11",
-		"20-13",
-		"20-15",
-		"20-17",
-		"21-20",
-		"21-23",
-		"21-25",
-		"21-28",
-		"21-31",
-		"21-33",
-		"21-35",
-		"21-38",
-		"21-40",
-		"21-42",
-		"21-43",
-		"21-45",
-		"15-title",
-		"15-01",
-		"15-04",
-		"15-07",
-		"15-10",
-		"15-12",
-		"15-15",
-		"15-18",
-		"15-21",
-		"25-24",
-		"25-26",
-		"25-28",
-		"25-31",
-		"25-34",
-		"25-37",
-		"25-44",
-		"27-03",
-		"27-20",
-		"27-23",
-		"27-25",
-		"27-27",
-		"27-30",
-		"27-32",
-		"27-35",
-		"27-38",
-		"27-41",
-		"27-43",
-		"01-01",
-		"01-04",
-		"01-07",
-		"01-09",
-		"01-12",
-		"11-01",
-		"11-04",
-		"11-07",
-		"11-09",
-		"11-11",
-		"11-13",
-		"11-16",
-		"11-18",
-		"11-20",
-		"11-23",
-		"11-25",
-		"11-28",
-		"02-04",
-		"02-07",
-		"02-title",
-		"02-09",
-		"13-24",
-		"13-27",
-		"13-29",
-		"13-34",
-		"13-33",
-		"13-31",
-		"13-36",
-		"13-40",
-		"13-44",
-		"13-47",
-		"13-49",
-		"13-51",
-		"13-54",
-		"01-18",
-		"01-20",
-		"01-22",
-		"01-15",
-		"01-24",
-		"02-01",
-		"02-11",
-		"13-01",
-		"13-03",
-		"13-07",
-		"13-10",
-		"13-13",
-		"13-15",
-		"13-16",
-		"13-18",
-		"13-20",
-		"13-22",
+		"07-title",
+		"07-01",
+		"07-03",
+		"07-06",
+		"07-07",
+		"07-11",
+		"07-13",
+		"07-15",
+		"07-18",
+		"07-21",
+		"07-24",
+		"07-26",
+		"07-28",
+		"08-21",
+		"08-23",
+		"08-26",
+		"08-28",
+		"08-30",
+		"08-33",
+		"09-01",
+		"09-03",
+		"09-07",
+		"09-10",
+		"09-12",
+		"09-14",
+		"09-16",
+		"09-17",
 		"09-18",
 		"09-20",
 		"09-23",
@@ -357,8 +136,6 @@
 		"09-32",
 		"09-35",
 		"09-37",
-		"09-01",
-		"09-03",
 		"10-01",
 		"10-02",
 		"10-05",
@@ -373,23 +150,166 @@
 		"10-32",
 		"10-34",
 		"10-37",
-		"09-07",
-		"09-10",
-		"09-12",
-		"09-16",
-		"09-17",
-		"10-42",
 		"10-40",
-		"23-23",
-		"23-25",
-		"23-27",
-		"23-29",
-		"23-32",
-		"23-34",
-		"23-37",
+		"10-42",
+		"11-title",
+		"11-01",
+		"11-04",
+		"11-07",
+		"11-09",
+		"11-11",
+		"11-13",
+		"11-16",
+		"11-18",
+		"11-20",
+		"11-23",
+		"11-25",
+		"11-28",
+		"12-title",
+		"12-01",
+		"12-03",
+		"12-05",
+		"12-07",
+		"12-09",
+		"12-11",
+		"12-13",
+		"12-15",
+		"12-18",
+		"12-19",
+		"12-22",
+		"12-24",
+		"12-26",
+		"12-28",
+		"12-31",
+		"12-33",
+		"12-36",
+		"12-38",
+		"12-41",
+		"12-42",
+		"12-43",
+		"12-46",
+		"12-48",
+		"13-01",
+		"13-03",
+		"13-07",
+		"13-10",
+		"13-13",
+		"13-15",
+		"13-16",
+		"13-18",
+		"13-20",
+		"13-22",
+		"13-24",
+		"13-27",
+		"13-29",
+		"13-31",
+		"13-33",
+		"13-34",
+		"13-36",
+		"13-40",
+		"13-44",
+		"13-47",
+		"13-49",
+		"13-51",
+		"13-54",
+		"13-57",
+		"14-title",
+		"14-01",
+		"14-03",
+		"14-06",
+		"14-08",
+		"14-10",
+		"14-13",
+		"14-15",
+		"14-16",
+		"14-19",
+		"15-title",
+		"15-01",
+		"15-04",
+		"15-07",
+		"15-10",
+		"15-12",
+		"15-15",
+		"15-18",
+		"15-21",
+		"15-24",
+		"15-27",
+		"15-29",
+		"15-36",
+		"16-title",
+		"16-01",
+		"16-03",
+		"16-05",
+		"16-09",
+		"16-11",
+		"16-13",
+		"16-17",
+		"16-19",
+		"16-21",
+		"16-24",
+		"16-27",
+		"17-title",
+		"17-01",
+		"17-03",
+		"17-05",
+		"17-09",
+		"17-11",
+		"17-14",
+		"17-17",
+		"17-19",
+		"17-22",
+		"17-24",
+		"17-26",
+		"18-07",
+		"18-09",
+		"18-10",
+		"18-12",
+		"18-15",
+		"18-17",
+		"18-18",
+		"18-21",
+		"18-23",
+		"18-26",
+		"18-28",
+		"18-30",
+		"18-32",
+		"18-34",
+		"20-title",
+		"20-01",
+		"20-03",
+		"20-05",
+		"20-08",
+		"20-11",
+		"20-13",
+		"20-15",
+		"20-17",
+		"20-20",
+		"20-22",
+		"20-25",
+		"20-29",
+		"20-32",
+		"21-title",
+		"21-01",
+		"21-04",
+		"21-06",
+		"21-09",
+		"21-12",
+		"21-15",
+		"21-18",
+		"21-20",
+		"21-23",
+		"21-25",
+		"21-28",
+		"21-31",
+		"21-33",
+		"21-35",
+		"21-38",
+		"21-40",
+		"21-42",
+		"21-43",
+		"21-45",
 		"23-01",
 		"23-04",
-		"09-14",
 		"23-06",
 		"23-08",
 		"23-11",
@@ -397,6 +317,93 @@
 		"23-16",
 		"23-18",
 		"23-20",
-		"13-57"
+		"23-23",
+		"23-25",
+		"23-27",
+		"23-29",
+		"23-32",
+		"23-34",
+		"23-37",
+		"24-01",
+		"24-03",
+		"24-06",
+		"24-09",
+		"24-12",
+		"24-15",
+		"24-19",
+		"24-23",
+		"24-26",
+		"24-29",
+		"24-30",
+		"24-32",
+		"24-34",
+		"24-36",
+		"24-37",
+		"24-40",
+		"24-43",
+		"24-45",
+		"24-48",
+		"25-title",
+		"25-01",
+		"25-05",
+		"25-07",
+		"25-10",
+		"25-14",
+		"25-17",
+		"25-19",
+		"25-22",
+		"25-24",
+		"25-26",
+		"25-28",
+		"25-31",
+		"25-34",
+		"25-37",
+		"25-44",
+		"26-01",
+		"26-03",
+		"26-06",
+		"26-10",
+		"26-12",
+		"26-14",
+		"26-17",
+		"26-20",
+		"26-23",
+		"26-26",
+		"26-30",
+		"26-33",
+		"26-36",
+		"26-39",
+		"26-42",
+		"26-45",
+		"26-47",
+		"26-49",
+		"26-51",
+		"26-55",
+		"26-57",
+		"26-59",
+		"26-62",
+		"26-65",
+		"26-67",
+		"26-69",
+		"26-71",
+		"26-73",
+		"27-title",
+		"27-01",
+		"27-03",
+		"27-06",
+		"27-09",
+		"27-11",
+		"27-15",
+		"27-17",
+		"27-20",
+		"27-23",
+		"27-25",
+		"27-27",
+		"27-30",
+		"27-32",
+		"27-35",
+		"27-38",
+		"27-41",
+		"27-43"
 	]
 }
\ No newline at end of file