diff --git a/11/15.txt b/11/15.txt index 02a117f..faa7d02 100644 --- a/11/15.txt +++ b/11/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Yaweh arandire kuri nebo, "Na kabiri, bura ikipe kyakyemi imburwa mano we mwine, \v 16 pantu bona, nebo ndesungamina ukubikapo umukyemi mu kyaro. Oo takasakamane impanga ishiburira, nagura ukuposha isharemana. Oo takarishe impanga ishitunturu, rero akarya iminofu ya mpanga ishaina no kusotora amabondo yashiko. -======= -\v 15 Yahweh ashile kulanda kuli nebo ati, ''Nakabili, bula ifyanso fyakwa kacema icipuba webo we mwie, \v 16 pantu bona, nkofwaya ukubikamo kacema mu calo. Takasakamane impanga ishikale kucula. Takasemakamen impanga ishikale kuluba, nangula ukunda impanga ishiale kusunta. Takalekulisha impnga ishili no bumi ubwa bune, lelo akalya umunofu wa mpanga ishakwina elo akashisotaula amabondo. ->>>>>>> d392e7811afd8562f79defd8149081f0fe3f5b22 +\v 15 Yaweh arandire kuri nebo, "Na kabiri, bura ikipe kyakyemi imburwa mano we mwine, \v 16 pantu bona, nebo ndesungamina ukubikapo umukyemi mu kyaro. Oo takasakamane impanga ishiburira, nagura ukuposha isharemana. Oo takarishe impanga ishitunturu, rero akarya iminofu ya mpanga ishaina no kusotora amabondo yashiko. \ No newline at end of file diff --git a/11/17.txt b/11/17.txt index 9f7e12a..9889f2b 100644 --- a/11/17.txt +++ b/11/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Akaranda ku mukyemi umungwa oo uusha umukuni! Rekeni urupanga rube pakuboko kwakwe na parinso ryakwe irya ku kuryo! Rekeni ukuboko kwakwe kume no kureka irinso ryakwe irya ku kuryo ukupofura!" -======= -\v 17 Cabulanda kuli kacema umupuka uulekelsha umukuni! Uluoanga ka lwise kumukoma pakuboko kwakwe elo napa linso lyakwe ilya kukulyo! Ukuboko kwakwe ka kume elo ne linso lyakwe ilya kukuso lipofule!'' ->>>>>>> d392e7811afd8562f79defd8149081f0fe3f5b22 +\v 17 Akaranda ku mukyemi umungwa oo uusha umukuni! Rekeni urupanga rube pakuboko kwakwe na parinso ryakwe irya ku kuryo! Rekeni ukuboko kwakwe kume no kureka irinso ryakwe irya ku kuryo ukupofura!" \ No newline at end of file diff --git a/12/01.txt b/12/01.txt index 2408771..2346999 100644 --- a/12/01.txt +++ b/12/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 12 \v 1 Yaweh arisobere ishiwi ryakwe pa rwa kyaro kyakwa Israeri. Ifi efyasosa Yaweh, uwa andarika umuru kabiri uwabumba ne sonde, uwapanga no mupashi wa muntu munda yakwe, \v 2 "Boneni, nkorwnga Yerusaremu ngo rukombo rwafikora iyakurenga abantu bonse abashingurukako ukutekaira pamo nga Yuda nao nakamushinga, na Yerusaremu. \v 3 Pari burya bushiku, nkarenga Yerusaremu ukuba ikiribwe ikyafina pa bantu na bantu bonse. Bonse abakakimya imisana yana ikafunika nganshi. -======= -\c 12 \v 1 Uku ekulanda kwe shiwi lyakwa Yahweh palwa kwa Israeli-ukulanda kwakwa Yahweh, utambulwile imyulu elo no kubika umufula wa calo, uwapangile umupashi wa muntunse mu muntu, \v 2 ''Bona, ndi palwa kupanga Yerusalemu mu mulukombo ukulenga bonse abantu abamushinguluka ukupapa. Cikaba kwati limbi cakwa Yuda panshita ya bulwi na Yurusalemu. \v 3 Pali bulya bushiku, nkapanga Yerusalemu ilibwe lya kufina pa bantu bonse. Onse uyo uwaesha ukwimya akaicena sana umwine, ne nko shonse isha pa calo shikalongana pali ye. ->>>>>>> d392e7811afd8562f79defd8149081f0fe3f5b22 +\c 12 \v 1 Yaweh arisobere ishiwi ryakwe pa rwa kyaro kyakwa Israeri. Ifi efyasosa Yaweh, uwa andarika umuru kabiri uwabumba ne sonde, uwapanga no mupashi wa muntu munda yakwe, \v 2 "Boneni, nkorwnga Yerusaremu ngo rukombo rwafikora iyakurenga abantu bonse abashingurukako ukutekaira pamo nga Yuda nao nakamushinga, na Yerusaremu. \v 3 Pari burya bushiku, nkarenga Yerusaremu ukuba ikiribwe ikyafina pa bantu na bantu bonse. Bonse abakakimya imisana yana ikafunika nganshi. \ No newline at end of file diff --git a/12/04.txt b/12/04.txt index eedb99e..687be9f 100644 --- a/12/04.txt +++ b/12/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Pari burya bushiku ne Yaweh nkapupanya bakabarwe babo bonse, nkapera na bonse abakaraendapo. efysosa Yaweh, Aba ng'anda yakwa Yuda nkarabarinda, rero bakabarwe babarwani babo bena ne nkabapofusha amenso. \v 5 Eryo intungurushi sha bena Yuda shikaraebana mu mitima ashiti, 'Ara ni Yaweh umwine wa fita eukotukosha fwe bantu bakwe, fwebaikra muno Yerusaremu. -======= -\v 4 Pali bulya bushiku- uku ekulanda kwakwa Yahweh-nkoma onse punda ne cimfulunganya elo noumwensha no kupena. Pang'anda yakwa Yuda nkesula amenso yandi, lelo onse punda wa bantu nkamupofwisha. \v 5 Eluntu intungulushi shakwa Yuda bakes kulanda mu mitima shabo ati, 'Abekashi bakwa Yerusalemu bukose bwesu pamulandu kwa Yahweh wa milalo, Lesa wabo.' ->>>>>>> d392e7811afd8562f79defd8149081f0fe3f5b22 +\v 4 Pari burya bushiku ne Yaweh nkapupanya bakabarwe babo bonse, nkapera na bonse abakaraendapo. efysosa Yaweh, Aba ng'anda yakwa Yuda nkarabarinda, rero bakabarwe babarwani babo bena ne nkabapofusha amenso. \v 5 Eryo intungurushi sha bena Yuda shikaraebana mu mitima ashiti, 'Ara ni Yaweh umwine wa fita eukotukosha fwe bantu bakwe, fwebaikra muno Yerusaremu. \ No newline at end of file diff --git a/12/06.txt b/12/06.txt index 058069f..b41f660 100644 --- a/12/06.txt +++ b/12/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Pari burya bushiku ne nkakita ndupwa sha bena Yuda shikabe ngo muriro uureyaka mu mutengo umo, nangu mwibara rimo umuri imyangashi ya ng'anu iirepya. Abena Yuda ebakarofya abantu ba smitundu yonse iyaba mupepi ku kyaro na ku kuso. Nomba abena Yerusaremu bena bakashara na bekaririra pa nkyende yabo." -======= -\v 6 Pali bulya bushiku nkapanga intungulushi shakwa Yuda nge ponto shapa mulilo mu nkuni elo lubuto lukoshinguluka ulutalemu nseke, pantu bakoca bonse abantu abashinguluka ku kukulyo elo na kukuso kwbo. Yerusalemu akekala nakabili mu ncende yakwe.'' ->>>>>>> d392e7811afd8562f79defd8149081f0fe3f5b22 +\v 6 Pari burya bushiku ne nkakita ndupwa sha bena Yuda shikabe ngo muriro uureyaka mu mutengo umo, nangu mwibara rimo umuri imyangashi ya ng'anu iirepya. Abena Yuda ebakarofya abantu ba smitundu yonse iyaba mupepi ku kyaro na ku kuso. Nomba abena Yerusaremu bena bakashara na bekaririra pa nkyende yabo." \ No newline at end of file diff --git a/12/07.txt b/12/07.txt index a3c1684..15d0873 100644 --- a/12/07.txt +++ b/12/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Yaweh akapususha amatenti yakwa Yuda pakwamba, pakuti ubusuma bwabekashi ba mu Yerusaremu bwikira sana pari Yuda. \v 8 Muryo bushiku Yaweh akaba ikyakukingirira ukushinguruka abekashi ba mu Yerusaremu, kabiri uureipununa muri burya bushiku akaba uwakosa nga Dabidi, na bang'anda yakwa Dabidi bakaba abakosa nge fyakosa Resa, na maraika wakwa Yaweh pantanshi yabo. \v 9 "Pari burya bushiku. Nkamba ukonaura inko shonse ishitemina Yerusaremu. -======= -\v 7 Yahweh akapususha amatenti yakwa Yuda pakubala, pakweba ati ubucindami bwa ng'anda yakwa Davidi elo no bucindami bwa abo abekala mu Yerusalemu bwikaba ubukulu ukucila abashala kuli Yuda. \v 8 Pali bulya bushiku Yahweh akaba kacingilila wa bekashi bakwa Yerusalemu, elo pali bulya bushiku abo abanaka muli bo bakaba kwati ni Davidi, ulo ing'anda yakwa Davidi ikaba kwati ni Lesa, nga malaika wakwa Yahweh mu ntanshi ya bo. \v 9 ''Pali bulya bushiku nkatampa ukuonaula shonse inko ishimina Yerusalemu. ->>>>>>> d392e7811afd8562f79defd8149081f0fe3f5b22 +\v 7 Yaweh akapususha amatenti yakwa Yuda pakwamba, pakuti ubusuma bwabekashi ba mu Yerusaremu bwikira sana pari Yuda. \v 8 Muryo bushiku Yaweh akaba ikyakukingirira ukushinguruka abekashi ba mu Yerusaremu, kabiri uureipununa muri burya bushiku akaba uwakosa nga Dabidi, na bang'anda yakwa Dabidi bakaba abakosa nge fyakosa Resa, na maraika wakwa Yaweh pantanshi yabo. \v 9 "Pari burya bushiku. Nkamba ukonaura inko shonse ishitemina Yerusaremu. \ No newline at end of file diff --git a/12/10.txt b/12/10.txt index 926c451..ea23975 100644 --- a/12/10.txt +++ b/12/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 "Nomba nkapongorwerapo umupashi wa kukwatisha uruse no wa kupapapta pa bang'anda yakwa Dabidi na bana bonse abaikara mu Yerusaremu, bakndoresha, pari uyo bapurinkanya ikyanso, bakamuroosha nga firya fine baroosha umwana mwaume uwabafye umo mpo. Bakamuroosha kwati bantu bafwirirwe umwana wabo umwaume beri. \v 11 Pari burya bushiku mukaba imisowa iikaramba mu Yerusaremu, ngo kurosha kwari mwirungu rua Medigo, iryo abantu baroosha Hadadi Rimoni -======= -\v 10 Lelo nkapongolwela umupashi wa nkumbu elo ukupapata pa ng'anda yakwa Davidi elo abekashi bakwa Yerusalemu, eico bakalolesha pli nebo, uyo eo balashile. Bakalosha pali nebo, nga uyo uukolosha pa mwana mwaume wakwe fye; bakacushiwa apakalamba pali ye nga abo abacushiwa pa mfwa ye beli lya mwana mwaume wakwe. \v 11 Pali bulya bushiku ubucushi mu Yerusalemu bukaba kwati bucushi pa Hadadi Rimoni mu mwatambala mwa kwa Megido. ->>>>>>> d392e7811afd8562f79defd8149081f0fe3f5b22 +\v 10 "Nomba nkapongorwerapo umupashi wa kukwatisha uruse no wa kupapapta pa bang'anda yakwa Dabidi na bana bonse abaikara mu Yerusaremu, bakndoresha, pari uyo bapurinkanya ikyanso, bakamuroosha nga firya fine baroosha umwana mwaume uwabafye umo mpo. Bakamuroosha kwati bantu bafwirirwe umwana wabo umwaume beri. \v 11 Pari burya bushiku mukaba imisowa iikaramba mu Yerusaremu, ngo kurosha kwari mwirungu rua Medigo, iryo abantu baroosha Hadadi Rimoni \ No newline at end of file diff --git a/12/12.txt b/12/12.txt index 6530dc8..317da44 100644 --- a/12/12.txt +++ b/12/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Ikyaro kikaroosha, indupwa shonse uru rweka, uru rweka. Urupwa rwa bang'anda yakwa Dabidi abaume bakararoosha beka, abakashi babo nabo beka. Urupwa rwakwa Natani abaume bakararoosha beka, abakashi babo nabo beka. \v 13 Urupwa rwa bang'anda yakwa Rebi abaume bakarakuroosha beka, abakashi babo nabo beka. Urupwa rwabena Ishmeri abaume abakarakuroosha beka, abakashi nabo beka. \v 14 Na mu ndupwa shimbi rumo-rumo ishashara, abaume bakarakuroosha beka, abakashi babo nabo beka." -======= -\v 12 Icalo cikalosha, cila mukowa ukapatuka ukufum kumikowa shimbi. Umukowa wa ng'anda yakwa Davidi ukapatuka elo na bakashi babo bakapatuka ukufuma ku baume. Umukowa wa ng'anda yakwa Natani ukapatuka elo abakashi babo bakapatuka ukufuma ku baume. \v 13 Umukowa wa ng'anda yakwa Lebi ukupatuka elo na bakashi babo bakapatuka ukufuma ku baume. \v 14 Umukowa wa bena Shimei ukupatuka elo na bakashi babo bakapatuka ukufuma ku baume. Onse umukowa wa mikowa shashala-cila mukowa ukapatuka elo na bakashi babo bakapatuka ukufuma ku baume.'' ->>>>>>> d392e7811afd8562f79defd8149081f0fe3f5b22 +\v 12 Ikyaro kikaroosha, indupwa shonse uru rweka, uru rweka. Urupwa rwa bang'anda yakwa Dabidi abaume bakararoosha beka, abakashi babo nabo beka. Urupwa rwakwa Natani abaume bakararoosha beka, abakashi babo nabo beka. \v 13 Urupwa rwa bang'anda yakwa Rebi abaume bakarakuroosha beka, abakashi babo nabo beka. Urupwa rwabena Ishmeri abaume abakarakuroosha beka, abakashi nabo beka. \v 14 Na mu ndupwa shimbi rumo-rumo ishashara, abaume bakarakuroosha beka, abakashi babo nabo beka." \ No newline at end of file diff --git a/12/title.txt b/12/title.txt index 37b269e..b759c94 100644 --- a/12/title.txt +++ b/12/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Ikipande 12 -======= -Icipandwa 12 ->>>>>>> d392e7811afd8562f79defd8149081f0fe3f5b22 +Ikipande 12 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 39020b4..db16b17 100644 --- a/manifest.json +++ b/manifest.json @@ -123,6 +123,15 @@ "11-01", "11-04", "11-07", - "11-10" + "11-10", + "11-13", + "11-15", + "12-title", + "12-01", + "12-04", + "12-06", + "12-07", + "12-10", + "12-12" ] } \ No newline at end of file