Sat Apr 27 2024 11:47:03 GMT+0200 (heure d’été d’Europe centrale)

01/01.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 1 mo wandele,ka Gaiusa,mo namobha,nobha ka kadhimba solo.Mo\v 2  namobha, ana bha bhe wangbaka ka bhao bhe kpe pe wika na nzolo yanza,sika ke lilimo tako angbaka.\v 3 Nikako na legiagia tapolopolo na kako, dheli ye bha nemasu bha deni pe bha wanisaniko mabelu me wanau,si mbotia ye wa songia ka kadhimba mabelu manza.\v 4 Kaleme gua na legiagia tikina  lagwa noke bhe bha kwame abha ngbaka ka sopia mabelu me manza.
-=======
-\v 1 Mo wandele, ka Kasahusa, mo na moba, nobha ka kandimba solo. \v 2 Mona mobha, ana bhabhe wangbake ka bhao bhekpe mpe wika na nzolo yanza, sika kelilimo tako angbaka. \v 3 Nikako na legiagia ta polopolo na kako, dheli ye bhanemasu badeni mpe bha wanisako mabelu me solo. \v 4 Kale megwa na legiagia tikina tagwe noki bhe bhakiame abangbaka kasupa mabelu solo.
->>>>>>> refs/heads/new
+\v 1 Mo wandele, ka Gaius, mo na moba, nobha ka kandimba solo. \v 2 Mona mobha, ana bhabhe wangbake ka bhao bhekpe mpe wika na nzolo yanza, sika kelilimo tako angbaka. \v 3 Nikako na legiagia ta polopolo na kako, dheli ye bhanemasu badeni mpe bha wanisako mabelu me solo. \v 4 Kale megwa na legiagia tikina tagwe noki bhe bhakiame abangbaka kasupa mabelu solo.

01/09.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 9 Nadhinganiko bha mabelu magiologiolo na ka ndabho ika Aba;kasi Diotrefa,mo abha  ike molo mambolaya kakadhimba bhu,kanategwa.\v10 Mabelumia nimo,ka na bha bhe naduku nanomonde,nange bha mabelu bhekpe me nagiagi,kovagi bha nemake na kake,bhe bhande me wagi,okaya pe bhe kandabho ika Aba.
-=======
-\v 9 Nadhinganiko ka mabelu ma giologiolo naka ndabo ika Abba; kasi diotrefa, mo abba ike molo mambola ya kakadhimba bhu, kanateva. \v 10 Mabelu mia nimo, bana bha bhe nadaku nanomonde, nanyo bha mabelu bekpe me egiagi na kasu me maliboto; me manye, kovagi bhanemake na kake, bhe bhande bhebagi okaya mpe obhe kandabo ika Abba.
->>>>>>> refs/heads/new
+\v 9 Nadhinganiko bha mabelu magiologiolo na ka ndabho ika Aba;kasi Diotrefa,mo abha  ike molo mambolaya kakadhimba bhu,kanategwa.\v 10 Mabelumia nimo,ka na bha bhe naduku nanomonde,nange bha mabelu bhekpe me nagiagi,kovagi bha nemake na kake,bhe bhande me wagi,okaya pe bhe kandabho ika Aba.

01/11.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 11 Menabha,kawagie bhele mabelu malibhoto,kasi me manza, Mo agia manza,muka Aba nio;mo agia malibhoto kamomene Abasu.\v 12 Bhekpe ,pe na me ambekanagi ,giani simanza na kaDemitrius; bha su si bho,tamogameliake ,pe wayibi bhe  me tabengia asibho.
-=======
-\v 11 Mo nabha, awagiebele mabelu malibhoto, kasi me manza. Mo agia manza muka Abba nio; moagia maliboto kamene Abba. \v 12 Bhekpe, mpe na bosembo, giani manza na ka Demertrus; bhasu sibho, tamogameliake, mpe wahibi me tabingia a solo.
->>>>>>> refs/heads/new

01/13.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 13 Nana mabelu mubua nanga bhe nobengilie, kasi kanabha bhe nodhingilie na le bhisa lakidhingili.\v 14 Anabha bhe nomene bhe galagala takiekie na ye miso na miso.\v15 Ate bhe bhodedede ike na we,bha nemako bho mugiagi to pe omugiaga go sibho kabhu ka lina mokomoko.
-=======
-please\v 13 Nana mabelu mubwa nodingelia. \v 14 Naba bhe nomene sikande sikande, takekia monoko no monoko kula kimia ike na yewe! banemaye tomugiage. tomogiage ba nemai amoti si akulake. \v 15 Akula mabulu manza ike na yewe tomugigie bha molo na molo ka nde mwake
->>>>>>> refs/heads/new
+\v 13 Nana mabelu mubua nanga bhe nobengilie, kasi kanabha bhe nodhingilie na le bhisa lakidhingili.\v 14 Anabha bhe nomene bhe galagala takiekie na ye miso na miso.\v 15 Ate bhe bhodedede ike na we,bha nemako bho mugiagi to pe omugiaga go sibho kabhu ka lina mokomoko.

01/title.txt

@@ -1 +1 @@
-Tepili 1
+Tekpoli 1

front/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-Kekpoli 3
-=======
 3 Y oaini
->>>>>>> refs/heads/new

manifest.json

@@ -1 +1,49 @@
-{"project":{"id":"3jn","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":5},"package_version":7,"target_language":{"name":"Kango (Bas-Uélé District)","direction":"ltr","anglicized_name":"Kango","region":"Africa","is_gateway_language":false,"id":"kty"},"format":"usfm","resource":{"id":"reg"},"translators":["faustin_azaza","faustin-azaza"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["01-01","01-09","01-11","01-13","front-title","01-05"]}
+{
+	"package_version": 7,
+	"format": "usfm",
+	"generator": {
+		"name": "ts-desktop",
+		"build": "83"
+	},
+	"target_language": {
+		"name": "Kango (Bas-Uélé District)",
+		"direction": "ltr",
+		"anglicized_name": "Kango",
+		"region": "Africa",
+		"is_gateway_language": false,
+		"id": "kty"
+	},
+	"project": {
+		"id": "3jn",
+		"name": "3 John"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
+	"resource": {
+		"id": "reg"
+	},
+	"source_translations": [
+		{
+			"language_id": "en",
+			"resource_id": "ulb",
+			"checking_level": "3",
+			"date_modified": "2022-03-24T15:58:30.8014398+00:00",
+			"version": "21-05"
+		}
+	],
+	"translators": [
+		"faustin_azaza",
+		"faustin-azaza"
+	],
+	"finished_chunks": [
+		"front-title",
+		"01-title",
+		"01-01",
+		"01-05",
+		"01-09",
+		"01-11",
+		"01-13"
+	]
+}