From 63dac0843ea21d9cc27a56be4790f5444a81e5aa Mon Sep 17 00:00:00 2001 From: kalaba howard Date: Wed, 26 Jan 2022 15:29:42 +0200 Subject: [PATCH] Wed Jan 26 2022 15:29:41 GMT+0200 (South Africa Standard Time) --- 24/07.txt | 6 +----- 24/08.txt | 6 +----- 24/09.txt | 6 +----- 24/10.txt | 6 +----- 24/12.txt | 6 +----- 24/15.txt | 6 +----- 24/17.txt | 6 +----- 24/18.txt | 6 +----- 24/20.txt | 6 +----- manifest.json | 7 +++++++ 10 files changed, 16 insertions(+), 45 deletions(-) diff --git a/24/07.txt b/24/07.txt index c25ab7c..1b08f67 100644 --- a/24/07.txt +++ b/24/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Amenshi yakalongoloka ukufuma mufitapo fya bo, kabili imbuto shabo shikaba na menshiayengi. Imfumu yabo ikasumbuka ukucila agag, kabili ubufumu bukaba ubwa sansabala. -======= -\v 7 Amenshi yaketuluka ukufuma mumbeketi shabo, elo nembuto shabo shikakwata amenshi ayengi. Nemfumu yabo ikaba iikulu ukucila Agagi, elo nobufumu bwabo buli nokucindikwa. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 7 Amenshi yakalongoloka ukufuma mufitapo fya bo, kabili imbuto shabo shikaba na menshiayengi. Imfumu yabo ikasumbuka ukucila agag, kabili ubufumu bukaba ubwa sansabala. \ No newline at end of file diff --git a/24/08.txt b/24/08.txt index 2e1dd34..6a9bca2 100644 --- a/24/08.txt +++ b/24/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Lesa akamuleta ukfuma mu Egypto. Ikaba namaka kwati cinama campanga. Akalya umutundu onse uyo ukalwa nankwe. Akashonaula amafunde yabo mutupimfya. Akabalasa ne mifwi. -======= -\v 8 Lesa alinokumuleta ukumufumya mu Egypto. Alinokukwata amaka kwati ya mboo yamu mpanga. Ali nokulwisha umushobo uyo mulwisha. Alinokukontola amaufpa yabo mutupimfya. Alinokubalasa kumifwi yakwe. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 8 Lesa akamuleta ukfuma mu Egypto. Ikaba namaka kwati cinama campanga. Akalya umutundu onse uyo ukalwa nankwe. Akashonaula amafunde yabo mutupimfya. Akabalasa ne mifwi. \ No newline at end of file diff --git a/24/09.txt b/24/09.txt index 7c3ee77..935fe74 100644 --- a/24/09.txt +++ b/24/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Naikala panshi nge nkalamo, kwati ninkalamo ikota. ninani uwingamucilinganya ena? Uyo onse ukamupala ena akapalwa; uyo onse ukamukunga ena akaba uwakungwa.'' -======= -\v 9 Afukamina panshi kwati nimkalamo, kwati ninkalamo nkota. Ninani uwingamicilinganya? Noyo onse uukamipala akapalwa; Noyoonse uukamitpa akaba uwatipwa.'' ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 9 Naikala panshi nge nkalamo, kwati ninkalamo ikota. ninani uwingamucilinganya ena? Uyo onse ukamupala ena akapalwa; uyo onse ukamukunga ena akaba uwakungwa.'' \ No newline at end of file diff --git a/24/10.txt b/24/10.txt index 2fb262a..d05d66e 100644 --- a/24/10.txt +++ b/24/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Balaki ubukali bwaimine BAlaam kabili amumine aamaboko yakwe pamo mubukali. Balaki asosele kuli Balaam, ''Ine nakwitile iwe ukwisa ntipila abalewani bandi nomba mona, iwe wabapala bena imiku itatu. \v 11 Eco insha nombaline kabili kabiye ku mushi. ine nasosele ine ndi no kukulipila apakalamba iwe, nomba Yaweh akufumya iwe ukufuma mu ku kupela conse icilambu.'' -======= -\v 10 Ubukali bwakwa Balaki bwaimine Balamu elo alatobanya namapi yakwe mubukali bwakwe. Balaki alandile kuli Balamu, ''Nebo nakukutile mukutipa abalwani bandi, lelo bona, ulibapalile bena amiku itatu. \v 11 Nomba kabuuye ililine unshe nebo kabiye nakunganda yobe. Nebo nacilanda ukuti nkokulambula apakulu webo, lelo Yahweh akusunga ukukufumya mukupoka icilambu icili conse.'' ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 10 Balaki ubukali bwaimine BAlaam kabili amumine aamaboko yakwe pamo mubukali. Balaki asosele kuli Balaam, ''Ine nakwitile iwe ukwisa ntipila abalewani bandi nomba mona, iwe wabapala bena imiku itatu. \v 11 Eco insha nombaline kabili kabiye ku mushi. ine nasosele ine ndi no kukulipila apakalamba iwe, nomba Yaweh akufumya iwe ukufuma mu ku kupela conse icilambu.'' \ No newline at end of file diff --git a/24/12.txt b/24/12.txt index 29f0825..f3382f7 100644 --- a/24/12.txt +++ b/24/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Ilyo Balaamu ayaswike kuli balaki, '''Ine nasosele kuli o uwantumine ati iwe'wantumine kuli ine, \v 13 ''nangufye ing Balaki ampele ine isano iyakwe ukwisula sululu kapotwe na golide, ine tekuti inje kunuma yakwa Yaweh amashiwi kabili na fimbi ifibi nangu ifisuma, nangu ifintu fimbi ifyo ningatemwa ukucita. Ine kuti nalanda ifyo Yaweh anjebele ukulanda! Nshalandile ifi kuli bena? \v 14 Eco nomba, mona ine ndi no kubwelela ku bantu ifyo bakacita ku bantu bobe kunshiku sha kuntanshi ishileisa.'' -======= -\v 12 Eluntu Balamu aishilekwasuka kuli Balaki, ''Nebo nacilanda kuntumi isho webo wacituma kuli nebo, \v 13 'Nangu nga Balaki ampelaisano lyakwe umwaisula silfere na golide, nebo nshaye ncishe pacebo cakwa Yahweh napali conse icabubi nagu icabune, nangu icintu icili conse ico nebo ningafwaya ukucita. Nebo kuti nalanda ico Yahweh anjebele ukulanda. Bushe nshilandile ifi fyonse kulibo? \v 14 Kanshi nomba, bona, nebo nkobwelelamo ku bantu bandi. Lelo kankusopesheko ifyo ababantu bali nokucita kubantu bobe munshiku ishileisa kuntanshi.'' ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 12 Ilyo Balaamu ayaswike kuli balaki, '''Ine nasosele kuli o uwantumine ati iwe'wantumine kuli ine, \v 13 ''nangufye ing Balaki ampele ine isano iyakwe ukwisula sululu kapotwe na golide, ine tekuti inje kunuma yakwa Yaweh amashiwi kabili na fimbi ifibi nangu ifisuma, nangu ifintu fimbi ifyo ningatemwa ukucita. Ine kuti nalanda ifyo Yaweh anjebele ukulanda! Nshalandile ifi kuli bena? \v 14 Eco nomba, mona ine ndi no kubwelela ku bantu ifyo bakacita ku bantu bobe kunshiku sha kuntanshi ishileisa.'' \ No newline at end of file diff --git a/24/15.txt b/24/15.txt index a637fda..b167e6d 100644 --- a/24/15.txt +++ b/24/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Balamu aambile ubu sesemo. Asosele, ''Balamu mwana Beo kolanda, umuntu uo amenso yaisuka. \v 16 Ubu ebusesemo kuli uyo uufwa amashiwi ukufuma kuli Lesa, uyo ukwata amano ukufuma ku wa pulamo uwamaka,uwalala na menso aya isuka. -======= -\v 15 Balamu atampile ubusesemo. Alandile ati, ''Balamu umwana mwaume wakwa Beore alanda ati, umuntu uyo amenso yaba ayaisukisha. \v 16 Ubu busesemo ubwa muntu umo uumfwa ukufuma kucebo cakwa Lesa, uwakwatako ubwishibilo ukufuma kuwapulamo, uwaba nefimonwa ukufuma ku wamaka yonse, uuwako anshi namenso ayaisuka. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 15 Balamu aambile ubu sesemo. Asosele, ''Balamu mwana Beo kolanda, umuntu uo amenso yaisuka. \v 16 Ubu ebusesemo kuli uyo uufwa amashiwi ukufuma kuli Lesa, uyo ukwata amano ukufuma ku wa pulamo uwamaka,uwalala na menso aya isuka. \ No newline at end of file diff --git a/24/17.txt b/24/17.txt index b3b5b09..371bbd3 100644 --- a/24/17.txt +++ b/24/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Ine nimona, nomba tabalipano nomba. Nkololesha ena, nomba ena, tali mupepi. Ulutanda luli nokwisa ukufuma muli Yakobo kabili ulutanda lukatula ukufuma mu Isreali. Ikesalila abena Moabu intungulushi kabili inkonaula bonse ulupwa lwakwa Seti. -======= -\v 17 Nebo ndimubwene, lelo talipano nomba. nkololesha paliye, lelo talimupepi. Ulutanda lukesa ukufuma muli Yakobo, elo inkonto ikema ukufuma muli Israeli. Alinokutoba intungululushi shakwa Moab elo akonaula nolupwa lwakwa Sethe. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 17 Ine nimona, nomba tabalipano nomba. Nkololesha ena, nomba ena, tali mupepi. Ulutanda luli nokwisa ukufuma muli Yakobo kabili ulutanda lukatula ukufuma mu Isreali. Ikesalila abena Moabu intungulushi kabili inkonaula bonse ulupwa lwakwa Seti. \ No newline at end of file diff --git a/24/18.txt b/24/18.txt index fb8231d..b2be1e5 100644 --- a/24/18.txt +++ b/24/18.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 18 Elyo Edomu akoba uwaikatwa kuli Isreali, kabili Seir nao akaba icikwatwa, abalwani bakwa Isreali, uo Isreali ukukosa kukaba nonaka. \v 19 Muli Yakobo imfumu ikoisa ikakwata bukateka, kabili ikonaula abakapusuka mumusumba wabo.'' -======= -\v 18 Edomu akesakuba icikwatwa cakwa Israeli, na Seiri nao akesakuba icikwatwa cakwe, umulwani wakwa Israeli, uyo Israeli akacimfya namaka. \v 19 Ukufuma muli Yakoba imfumu ikesa iili nokukwata amaka, elo ili nokonaula abakausuka mu musumba wabo.'' ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 18 Elyo Edomu akoba uwaikatwa kuli Isreali, kabili Seir nao akaba icikwatwa, abalwani bakwa Isreali, uo Isreali ukukosa kukaba nonaka. \v 19 Muli Yakobo imfumu ikoisa ikakwata bukateka, kabili ikonaula abakapusuka mumusumba wabo.'' \ No newline at end of file diff --git a/24/20.txt b/24/20.txt index 01faf43..91160d6 100644 --- a/24/20.txt +++ b/24/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Elyo Balam aloleshe pali Amaleki kabili aambile umwine ukusesema. Asosee, ''Amaleki umo uwali uwakosa pa mitundu yonse, nomba ukulekelesha kumpela ukuloba.'' -======= -\v 20 Eluntu Balamu aloleshe pali Amaleki elo atampile ubusesemo bwakwe. Alandile ati, ''Amaleki walipo limo uwa munko ishicindami, lelo ukulekelesha kwampela yakwe bakaba bonaushi.'' ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 20 Elyo Balam aloleshe pali Amaleki kabili aambile umwine ukusesema. Asosee, ''Amaleki umo uwali uwakosa pa mitundu yonse, nomba ukulekelesha kumpela ukuloba.'' \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7407a82..a63816f 100644 --- a/manifest.json +++ b/manifest.json @@ -328,6 +328,13 @@ "24-02", "24-04", "24-06", + "24-07", + "24-10", + "24-12", + "24-15", + "24-17", + "24-18", + "24-20", "26-title", "26-01", "26-03",