Fri Jun 14 2024 11:40:14 GMT+0200 (South Africa Standard Time)

04/13.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 13 Bapera amarambo pa muru wa mpiri no kokya ifyakyena kisuma mu tupiri, mwisamba rya muoke no murini no muterebenti, pantu ikintererwe kyaiko kyariwama. Efyo bakita ubukyende abana benu, na bana bwingi benu efyo bakita ubukyende. \v 14 Nkapanika aban nga basara ukukita ubukyende, nangu ni bana bwingi benu nga bapanga ubukyende. Ikyo abaume benu baya pamo na bakirende, no kupera amarambo pamo na bakirende ba mwashira. Efyo aba bantu abasharuka bakawishiwa.
-=======
-\v 13 Pamulu wa mpili epo bapelela ifya malambo elo na pa tupili epo bocela ifya mutulo, munshi ya fimuti fya muoke, umupolasi no muterebinti, pantu fya kwata ifinfute ifya une. Eico abana banakashi benu bacita ubucende, na balokashi benu nabo bacita ubucende. \v 14 Ntakakande abana banakashi benu nga basalapo ukucita ubucende nangula balokashi benu nga bacita ubucende. Pantu na baume babo balaya mu kukumana na bacilende, elyo bapela ifya malambo pakuti bacite imbela sha bubifi na bacilende bashila.  Eico aba bantu aba shikutuluka bakalofiwa.
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+\v 13 Bapera amarambo pa muru wa mpiri no kokya ifyakyena kisuma mu tupiri, mwisamba rya muoke no murini no muterebenti, pantu ikintererwe kyaiko kyariwama. Efyo bakita ubukyende abana benu, na bana bwingi benu efyo bakita ubukyende. \v 14 Nkapanika aban nga basara ukukita ubukyende, nangu ni bana bwingi benu nga bapanga ubukyende. Ikyo abaume benu baya pamo na bakirende, no kupera amarambo pamo na bakirende ba mwashira. Efyo aba bantu abasharuka bakawishiwa.

04/15.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 15 Nangura we, Israeri, naukita ubukyende, reka Yuda eba uwa mwenso. Wiya ku Girugari, mwe bantu; wiya na ku Beti Aveni, na kabiri wirapa, auti, "Ngefyo Yaweh aikara." \v 16 Pantu Israeri ari uwa umarara, ngo waumarara nge ng'ombe. Nomba Resa kuti amukema shani ngo mwana wa mpanga apapabuka?
-=======
-\v 15 Nangu webo, Israeli, walicita ubucende, kanshi Yuda epelwa umulandu. Mwiya na ku Giligali, mwebo mwe bantu; mwininika naku Beta Aveni, kabili mwilapa ati, ''Na pali Yahweh.'' \v 16 Pantu Israeli aumalala, nge ng'ombe iikota yakumalala. Bushe Yahweh kuti amicemena ku mulemfwe ngo mwana wa mpanga umwa kupabuka?
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+\v 15 Nangura we, Israeri, naukita ubukyende, reka Yuda eba uwa mwenso. Wiya ku Girugari, mwe bantu; wiya na ku Beti Aveni, na kabiri wirapa, auti, "Ngefyo Yaweh aikara." \v 16 Pantu Israeri ari uwa umarara, ngo waumarara nge ng'ombe. Nomba Resa kuti amukema shani ngo mwana wa mpanga apapabuka?

04/17.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 17 Efremu aba pamo no turubi; musheni eka. \v 18 Na ikyakunwa kyakwe kyaruba, bakonkanyapo ukupanga ubukyende; intungurushi shakwe batemwa ifya nsoni. \v 19 Umwera wafimba zmu mapindo ya uko; eryo bakaba abansoni kufyamarambo fyabo.
-=======
-\v 17 Efulemu alambatila ku tulubi; mulekeni abe umwine. \v 18 Nelyo fye ifikoshi fyabo tapali, bena batwalilila fye ubulalelale; pantu ba kateka babo batemwisha insoni shabo. \v 19 No mwela ukabapombanya pa mulu wa mapindo ya uko; kabili bakalengwa insnoni pa mulandu wa malambo yabo.
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+\v 17 Efremu aba pamo no turubi; musheni eka. \v 18 Na ikyakunwa kyakwe kyaruba, bakonkanyapo ukupanga ubukyende; intungurushi shakwe batemwa ifya nsoni. \v 19 Umwera wafimba zmu mapindo ya uko; eryo bakaba abansoni kufyamarambo fyabo.

05/01.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 5 \v 1 'Umfweni ifi, bashimapepo! Umfwikisheni, we ng'anda yakwa Israeri! Kutikeni, we ng'anda ya mufumu! Pantu ubupingushi buremishira bonse pantu mwari risumbu ryatewa ku Tabore. \v 2 Bakyisanguka beminine mukwipayaura kwasuka, rero nebo kakanda bonse.
-=======
-\c 5 \v 1 ''Umfweni ici, mwe bashipapeo! Kutikeni, we ng'anda yakwa Israeli! Tesha, we ng'anda ya mfumu. pantu ubupingushi buli pali mwebo bonse. pantu uli akakose pa Misipa elo ne sumbu lyateyelwe pa Tabore. \v 2 Bacisanguka bapitilila mukwipaya, nomba ndi nokubakanda bonse.
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+\c 5 \v 1 'Umfweni ifi, bashimapepo! Umfwikisheni, we ng'anda yakwa Israeri! Kutikeni, we ng'anda ya mufumu! Pantu ubupingushi buremishira bonse pantu mwari risumbu ryatewa ku Tabore. \v 2 Bakyisanguka beminine mukwipayaura kwasuka, rero nebo kakanda bonse.

05/03.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 3 Nebo ninkwishiba Efremu, na Israeri tafisama kuri nebo, Efremu, nomba waba nga kirende; Israeri nokoweshiwa. \v 4 Imikitire yabo tayakabasuminishe ukubwera kuri Resa, pantyu amano ya bukirende yari muri bo, kabiri tabamwishibe Yaweh.
-=======
-\v 3 Nali mwishiba Efulemu, elo na Israeli tafisama kuli nebo; Efulemu, nomba wasanguka nga cilende; Israeli yali kowela. \v 4 Ificitwa fyabo tafyakabaleke ukubwelela kuli Lesa, pantu amano ya bucilende yali muli bo, elo tabamwishiba Yahweh.
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+\v 3 Nebo ninkwishiba Efremu, na Israeri tafisama kuri nebo, Efremu, nomba waba nga kirende; Israeri nokoweshiwa. \v 4 Imikitire yabo tayakabasuminishe ukubwera kuri Resa, pantyu amano ya bukirende yari muri bo, kabiri tabamwishibe Yaweh.

05/05.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 5 Ikirambu kyakwa Israeri kiremushinina; eikyo Israeri na Efremu bakaipununa napa mampuru yabo. \v 6 Bakaya ne mikuni shabo ne ng'ombe shabo ku kufwaya Yaweh, rero tabakamusange. Pantu arifuma kuri bo. \v 7 Tabari abakishinka kuri Yaweh, nabafyara na bana bakintomfwa. Nomba umweshi umo ukabarya ne firimwa fyabo.
-=======
-\v 5 Icilumba cakwa Israeli cishininkisha umwine; eico Israeli elo na Efulemu bakaipununa mu mampulu yabo; na Yuda naye akaipunwina pamo nabo. \v 6 Bakaya ne mikuni yabo nefi maombe mu kufwaya Yahweh, nomba tabakamusange, pantu aliitalwishemo umwine muli bena. \v 7 Bafutuka kuli Yahweh, pantu balifyele abana bamu bulalelale. Nomba imitebeto yakusefya umweshi uupya ikesa kubonaula kumo kwine na mabala yabo.
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+\v 5 Ikirambu kyakwa Israeri kiremushinina; eikyo Israeri na Efremu bakaipununa napa mampuru yabo. \v 6 Bakaya ne mikuni shabo ne ng'ombe shabo ku kufwaya Yaweh, rero tabakamusange. Pantu arifuma kuri bo. \v 7 Tabari abakishinka kuri Yaweh, nabafyara na bana bakintomfwa. Nomba umweshi umo ukabarya ne firimwa fyabo.

05/08.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 8 Risheni intandara mu Gibiya, ne mporiro mu Rama. Ne kiunda kya burwi pa Beti Avani: Tukamikoka, Benjamini.' \v 9 Efremu akaba uwasarwa pa bushiku bwa ku musjoba. Pa mikowa iya mu Israeri nebo naranda ifintu ifiri no kukitika.
-=======
-\v 8 Lisheni isengo mu Gibea, elo ne ntandala mu Rama. Kuteni inkuta ya nkondo ku Beti Afeni: 'Tukakukonka webo, Benjamini!' \v 9 Efulemu akasunga icibolya pa bushiku bwa ku kandwa. Pa mitundu ya bena Israeli nkosobeka ifili nokwisa kucitika.
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+\v 8 Risheni intandara mu Gibiya, ne mporiro mu Rama. Ne kiunda kya burwi pa Beti Avani: Tukamikoka, Benjamini.' \v 9 Efremu akaba uwasarwa pa bushiku bwa ku musjoba. Pa mikowa iya mu Israeri nebo naranda ifintu ifiri no kukitika.

05/10.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 10 Mwentungurushi bakwa Yuda bari ngabo abakesha umwarerera nebo keturwa ubukari bwandi pari bo nga menshi. \v 11 Efremu natitikishiwa; nashinaurwa mufyabupingushi, pantu areenda uwaiperesha mu turubi.
-=======
-\v 10 Intungulushi sha ba Yuda shili kwati ni balya abatesha ilibwe lya mipaka. Nkapongolwela ubukali bwandi pali bo nge lyenshi. \v 11 Efulemu anyantililwa; kabili acushiwa mu bupingushi, pantu afwaisha ukukonka ifya buwelewele.
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+\v 10 Mwentungurushi bakwa Yuda bari ngabo abakesha umwarerera nebo keturwa ubukari bwandi pari bo nga menshi. \v 11 Efremu natitikishiwa; nashinaurwa mufyabupingushi, pantu areenda uwaiperesha mu turubi.

05/12.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 12 Eikyo nkaba nge kipepere kuri Efremu, kabiri ngo kubora ku bang'anda yakwa Yuda. \v 13 Eryo Efremu ubuwere bwakwe, na Yuda abona ikironda kyakwe, eryo Efremu aya ku Asirya, na Yuda atuma intumi ku mfumu ikaramba. Rero afirirwe ukundapa mwe bantu nangura ukuposa ikironda kyobe.
-=======
-\v 12 Eico Efulemu naba nge cipelebesha, kabili ngaicakubola ku ba ng'anda yakwa Yuda. \v 13 Uluntu Efulemu aishile kubona akulwala kwakwe na Yuda naye aishile kubona icilonda cakwe, Eluntu aishile kuya kuli Assyria, elo Yuda aishile kutuma intumi ku mfumu nkalamba. Lelo naye yalifililwe ukuposha mwe mwe bantu nangu kunapa ifilonda fyakwe.
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+\v 12 Eikyo nkaba nge kipepere kuri Efremu, kabiri ngo kubora ku bang'anda yakwa Yuda. \v 13 Eryo Efremu ubuwere bwakwe, na Yuda abona ikironda kyakwe, eryo Efremu aya ku Asirya, na Yuda atuma intumi ku mfumu ikaramba. Rero afirirwe ukundapa mwe bantu nangura ukuposa ikironda kyobe.

05/14.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 14 Nomba nkaba nge nkaramo kuri Efremu, no kuba ngo mwana wa nkaramo mu ng'nada yakwa Yuda. Nebo, ngu nebo, nkabapaturako no kuya; nkasenda tapari nowakupokorora, tapakabe no wakubaposha. \v 15 Nkoya no kubwesesha inkyende yangi, mpaka bakeshibe ububi no kufwaya ikinso kyandi, kabiri bakafwirikisha mu kukyura kwabo."
-=======
-\v 14 Eico nebo nkaba nge nkalamo kuli Efulemu, elo ngo musepela wa nkalamo ku ng'anda yakwa Yuda. Nebofye, nebo, nkabalepulamo mufiimfya no kuya; nkabapita, elo takwabe nangu umo uwakubapokolako. \v 15 Nkaya no kubwelela ku cifulo candi, mpakafye bakasumine ku bubifi bwabo no kufwaya icinso candi, mukucucutika kwabo baka mfwaya ne mitima yabo yonse.''
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+\v 14 Nomba nkaba nge nkaramo kuri Efremu, no kuba ngo mwana wa nkaramo mu ng'nada yakwa Yuda. Nebo, ngu nebo, nkabapaturako no kuya; nkasenda tapari nowakupokorora, tapakabe no wakubaposha. \v 15 Nkoya no kubwesesha inkyende yangi, mpaka bakeshibe ububi no kufwaya ikinso kyandi, kabiri bakafwirikisha mu kukyura kwabo."

05/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-Ikipande 5
-=======
-Icipandwa 5
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+Ikipande 5

06/01.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 6 \v 1 "Iseni, natubwekere kuri Yaweh, pantu ye narepura, rero akatuposha; natukyena, rero akatukaka pakironda. \v 2 Eryo papita inshiku shibiri akatubukurura; akatubusha pa bushiku bwa butatu, tukekara pamo na ye. \v 3 Natwishibe Yaweh; natupose amano pari Yaweh. Ukwishiba kwakwe kuri nge mibengerere ya ku rukyero; kabiri akesa kuri fwebo nge mfura yakubarirapo, nge mfura ya numa iitapirisha umushiri."
-=======
-\c 6 \v 1 ''Iseni, tubwelele kuli Yahweh. Pantu ena natusantaula, nomba akatuposha; natucenaula, nomba akatukakilila ifilonda fyesu. \v 2 Munshiku shibili akatupuputula; mu bushiku bwa lenga shitatu akatwalamusha, kabili tukesa kwikata abaomi ku cinso cakwe. \v 3 Ntumwishibe Yahweh; natutonte imitima pa kwishiba Yahweh. Ukwisa kwakwe kwa fuma kwa cine nga filya fitula akasuba; akatwishila nge mfula yatusansa balimi iiloka pa calo.''
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+\c 6 \v 1 "Iseni, natubwekere kuri Yaweh, pantu ye narepura, rero akatuposha; natukyena, rero akatukaka pakironda. \v 2 Eryo papita inshiku shibiri akatubukurura; akatubusha pa bushiku bwa butatu, tukekara pamo na ye. \v 3 Natwishibe Yaweh; natupose amano pari Yaweh. Ukwishiba kwakwe kuri nge mibengerere ya ku rukyero; kabiri akesa kuri fwebo nge mfura yakubarirapo, nge mfura ya numa iitapirisha umushiri."

06/04.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 4 Efremu, kinshi ndekukitira? Yuda, kinshi ndekukitira? Ikitemwiko kyobe nge kumbi rya rukyero, ngo mume uuya bwangu. \v 5 Eikyo ndibaputawire kuri bakasesema; ni mbepaya kwishiwi ryandi mukanwa kandi. Ubupingushi bobe buri ngo rubuto urureaka.
-=======
-\v 4 Efulemu, nindo nkocita na webo? Yuda, nindo nkocita na webo? Icishinka cobe cili nge kumbi lya lu celo, kabili nga icime icikuntika ulucelo. \v 5 Eico nabakomawila mufipimfya kuli bakasesema; nabepaya ku fyebo fya mukanwa kandi. Nama bupingushi yobe yasanika ngo lubuto.
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+\v 4 Efremu, kinshi ndekukitira? Yuda, kinshi ndekukitira? Ikitemwiko kyobe nge kumbi rya rukyero, ngo mume uuya bwangu. \v 5 Eikyo ndibaputawire kuri bakasesema; ni mbepaya kwishiwi ryandi mukanwa kandi. Ubupingushi bobe buri ngo rubuto urureaka.

06/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-Ikipande 6
-=======
-Icipandwa 6
->>>>>>> 274575473d3b8053e213a5a14eef3b1a2a7a8017
+Ikipande 6

manifest.json

@@ -71,6 +71,20 @@
 		"04-06",
 		"04-08",
 		"04-10",
+		"04-11",
+		"04-13",
+		"04-15",
+		"04-17",
+		"05-title",
+		"05-01",
+		"05-03",
+		"05-05",
+		"05-08",
+		"05-10",
+		"05-12",
+		"05-14",
+		"06-title",
+		"06-01",
 		"07-title",
 		"07-01",
 		"07-03",