From 194a943fe39b79c0eb3290b4102cf65ad739a332 Mon Sep 17 00:00:00 2001 From: kalaba howard Date: Wed, 26 Jan 2022 16:30:14 +0200 Subject: [PATCH] Wed Jan 26 2022 16:30:14 GMT+0200 (South Africa Standard Time) --- 22/01.txt | 6 +----- 22/02.txt | 6 +----- 22/05.txt | 6 +----- 22/07.txt | 6 +----- 22/09.txt | 6 +----- 22/12.txt | 6 +----- 22/15.txt | 6 +----- manifest.json | 7 +++++++ 8 files changed, 14 insertions(+), 35 deletions(-) diff --git a/22/01.txt b/22/01.txt index 7c736ae..29a9cde 100644 --- a/22/01.txt +++ b/22/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 22 \v 1 Abantu ba kwa Isreali balikwenda ukufika naku kutubilisha mu mawanga ya ku Moabu mupepi na Yeriko, lubali lwa mumana wa Yodani, ukufuma mu musumba. -======= -\c 22 \v 1 Abantu ba Israeli balyendele mpakafye baya kupanga inkambi mu malaungu ya Moab mupepi na Jeriko, kwishilya lya mumana wa Jodani ukufuma mu musumba. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\c 22 \v 1 Abantu ba kwa Isreali balikwenda ukufika naku kutubilisha mu mawanga ya ku Moabu mupepi na Yeriko, lubali lwa mumana wa Yodani, ukufuma mu musumba. \ No newline at end of file diff --git a/22/02.txt b/22/02.txt index bebb0ef..3a67081 100644 --- a/22/02.txt +++ b/22/02.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 2 Balaki mwana Zippore alimwene fyonse efyo Isreali acitile ku bena Amori. \v 3 Moabu alyomfwile umwenso apakalamba pamulandu wa bantu pantu balifulile, kabili Moabu ali ngecakutakanya ku bantu ba kwa Isreali. \v 4 Imfumu yakwa Moabu ya landile kufilolo fya Midaini, ''impuka ikalya fyonse ifintu ifitushingulwike kwati kabalwe fintu alya icani mu mabala.'' Nomba Balaki mwana Zippore ali ni mfumu yakwa Moabu muli ilya nshita. -======= -\v 2 Barak umwana mwaume wakwa Zippa alibwene fyonse ifyo Israeli alilile kubena Amoriti. \v 3 Moab alyumfwile umwenso nganshi kubantu pantu balifulile, elo Moab alikutinisha abantu baku Israeli. \v 4 Imfumu yaku Moab yalilandile kubakulu baku Midian, ''Aya mabumba yakalya fyonse ifitushingulukile kubati ningombe iikolya icani.'' Nomba Baraki umwana mwaume wakwa Zippa alimfumu ku Moab ilyanshita. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 2 Balaki mwana Zippore alimwene fyonse efyo Isreali acitile ku bena Amori. \v 3 Moabu alyomfwile umwenso apakalamba pamulandu wa bantu pantu balifulile, kabili Moabu ali ngecakutakanya ku bantu ba kwa Isreali. \v 4 Imfumu yakwa Moabu ya landile kufilolo fya Midaini, ''impuka ikalya fyonse ifintu ifitushingulwike kwati kabalwe fintu alya icani mu mabala.'' Nomba Balaki mwana Zippore ali ni mfumu yakwa Moabu muli ilya nshita. \ No newline at end of file diff --git a/22/05.txt b/22/05.txt index 1fad15f..8ccb0ab 100644 --- a/22/05.txt +++ b/22/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Atumine intumi kuli Balaamu mwana Beore, ku Pethore ku mumana wa Euphrati, mu ncende ya luko lwa bantu bakwe. Alimwitile kabili alandile, ''Lolesha uluko lukoisa ukufuma ku Egypito. Bali swile isonde kabili ililine bali fye mupepi na nebo. \v 6 Napapata isa nombaline kabili untipileko uluko ulu nebo. Pantu bali kosele ukuncila. Epali nkobakwanisha ukuboma no kubatamfya mu ncende. Ndi shibile ukuti ewo wapala ninshi akopalwa, kabili ewo watipa ninshi akotipwa.'' -======= -\v 5 Alitumine intumi kuli Balaamu umwana mwaume wakwa Beor, ku Petho ukuli nikumulonga wa Euphrati, mumpanga yacifyalilwa cakwe elo kabili mubantu bakwe. Alimwitile elo alandile ati, ''Bona, uluko lulishile ukufuma ku Egiputo. Balifimbile icalo conse apa nomba nine balakukonka. \v 6 Napapata isa ililine untipileko uyu mushobo, pantu balikosele nganshi paline. Pakuti limbi naikoseleshako ukubataasha elo nokubafunisha kunse yacalo. Ndishibile ukuti abo wapala bakaba abakupalwa, abowatipa bakaba abakutipwa.'' ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 5 Atumine intumi kuli Balaamu mwana Beore, ku Pethore ku mumana wa Euphrati, mu ncende ya luko lwa bantu bakwe. Alimwitile kabili alandile, ''Lolesha uluko lukoisa ukufuma ku Egypito. Bali swile isonde kabili ililine bali fye mupepi na nebo. \v 6 Napapata isa nombaline kabili untipileko uluko ulu nebo. Pantu bali kosele ukuncila. Epali nkobakwanisha ukuboma no kubatamfya mu ncende. Ndi shibile ukuti ewo wapala ninshi akopalwa, kabili ewo watipa ninshi akotipwa.'' \ No newline at end of file diff --git a/22/07.txt b/22/07.txt index 4f216ae..404a729 100644 --- a/22/07.txt +++ b/22/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Eico ifilolo fya Moabu ne filolo fya Midiani fyafumine, no kusenda amalipilo ya lubuko. Bafikile kuli Balaamu no kuya kusosa amashiwi ya kwa Balaki. \v 8 Balaamu alandile kuli bo, ''Ikaleni pano buno bushiku. Nkomiletela ifyo Yahweh akososa kuli ne.'' Eico intungulushi sha Moabu shalikele kuli Balaamu bulya bushiku. -======= -\v 7 Elo abakulu babena Moab elo nabakulu babena Midian baile, balipitile namalipilo yakubukisha. Balishile kuli Balaam elo balilandile amashiwi yakwa Baraki. \v 8 Balaam alandile kulibo ati, ''Laleni buno bushiku. Nkamuletela ifyo Yahweh alelanda kuli nebo.'' Elo intungulushi shabena Moab shalikele bulya bushiku na Balaam. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 7 Eico ifilolo fya Moabu ne filolo fya Midiani fyafumine, no kusenda amalipilo ya lubuko. Bafikile kuli Balaamu no kuya kusosa amashiwi ya kwa Balaki. \v 8 Balaamu alandile kuli bo, ''Ikaleni pano buno bushiku. Nkomiletela ifyo Yahweh akososa kuli ne.'' Eico intungulushi sha Moabu shalikele kuli Balaamu bulya bushiku. \ No newline at end of file diff --git a/22/09.txt b/22/09.txt index 9812fdf..628ed3c 100644 --- a/22/09.txt +++ b/22/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Lesa alishile kuli Balaamu nokulanda, ''Nibani aba bantu beshile kuli we?'' \v 10 Balaamu alyasukile Lesa, ''Balaki mwana Zippore imfumu ya Moabu , abatumine kuli ne. Alandile, \v 11 'Lolesha abantu bakofuma ku Egypito beswele panga yonse mu ncende yandi. Nomba isa nokuba ntipilako nebo. Epali Nkokwanisha ukuba lwisha kabili noku batamfisha kunse.''' -======= -\v 9 Lesa alishile kui Balaam elo alandile ati, ''Ngabo abaume abaishile kuli webo?'' \v 10 Balaam alyasukile Lesa, ''Baraki umwana mwaume wakwa Zippa, imfumu yaku Moab, alibatumine kuli nebo. Alilandile ati, \v 11 'Bona, abantu abafumine ku Egipto balifimbile icalo candifye. Nomba isa elo untipileko aba. Limbi kuti naikoseleshako ukulwisha elo nokubafunisha kunse.''' ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 9 Lesa alishile kuli Balaamu nokulanda, ''Nibani aba bantu beshile kuli we?'' \v 10 Balaamu alyasukile Lesa, ''Balaki mwana Zippore imfumu ya Moabu , abatumine kuli ne. Alandile, \v 11 'Lolesha abantu bakofuma ku Egypito beswele panga yonse mu ncende yandi. Nomba isa nokuba ntipilako nebo. Epali Nkokwanisha ukuba lwisha kabili noku batamfisha kunse.''' \ No newline at end of file diff --git a/22/12.txt b/22/12.txt index afd698e..2360ec8 100644 --- a/22/12.txt +++ b/22/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Lesa alimwaswike Balaamu, ''Wiya naba bantu Witipa abantu bakwa Isreali pantu bali palwa.'' \v 13 Balaamu alimine mulucelo nokulanda ku ntungulushi shakwa Balaki, ''Bwekelenimo ku ncende pantu Yahweh alinkanishe ukuya nenu.'' \v 14 Eco intungulushi shaku Moabu shalile nokubwekelamo kuli Balaki. Balandile, ''Balaamu alikene ukwisa nafwebo.'' -======= -\v 12 Lewa alyasukile Balaam, ''Taufiwile ukuya nabo abaume. Taufwile ukutipa abena Israeli pantu balipalilwe.'' \v 13 Balaam alimine mulucelo elo alandile kuntungulushi shakwa Baraki, ''Kabiyeni bweklelenimo kumpanga yenu pantu Yahweh alikene ukunsuminisha ukuya namwe.'' \v 14 Elo intungulushi sha bena Moab shaile elo shalibwekelemo kuli Baraki. Shalandile ati, ''Balaam alikene ukwisa nafwebo.'' ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 12 Lesa alimwaswike Balaamu, ''Wiya naba bantu Witipa abantu bakwa Isreali pantu bali palwa.'' \v 13 Balaamu alimine mulucelo nokulanda ku ntungulushi shakwa Balaki, ''Bwekelenimo ku ncende pantu Yahweh alinkanishe ukuya nenu.'' \v 14 Eco intungulushi shaku Moabu shalile nokubwekelamo kuli Balaki. Balandile, ''Balaamu alikene ukwisa nafwebo.'' \ No newline at end of file diff --git a/22/15.txt b/22/15.txt index cb8520c..6d80891 100644 --- a/22/15.txt +++ b/22/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Balaki alitumine nakabili intungulushi ishingi isho isha cindama ukucila ibumba lya kubalilapo. \v 16 Balishile kuli Balaamu nokulandakuli wo, ''Balaki mwana Zippore akolanda ifi, 'Napapata wileka icintu nangu cimo cikuleshe ukwisa kuli nebo, \v 17 Pantu nkokupa ifisuma ifyacimo kabili nokukuoela umucinshi uukalamba, kabili nkacita conse ukanjeba ukucita/ Eco nkopapata isa noku ntipilako aba bantu.''' -======= -\v 15 Baraki nakabili alitumine intungulushi ishingi ishakucindama nganshi ukucila pebumba lyatamilepo. \v 16 Balishile kuli Balaam elo balandile ati kuliye. ''Baraki mwana Zippo alandile ifi, 'Npapata kwiba nangu cimo icakukulesha ukwisa kuli nebo, \v 17 pantu nkakulipila bunebune elo nokukupela umucinshi uukulu, elo nkacita conse ico ukanjeba ukucita. Kanshi napapata isa untipileko ababantu.'' ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 15 Balaki alitumine nakabili intungulushi ishingi isho isha cindama ukucila ibumba lya kubalilapo. \v 16 Balishile kuli Balaamu nokulandakuli wo, ''Balaki mwana Zippore akolanda ifi, 'Napapata wileka icintu nangu cimo cikuleshe ukwisa kuli nebo, \v 17 Pantu nkokupa ifisuma ifyacimo kabili nokukuoela umucinshi uukalamba, kabili nkacita conse ukanjeba ukucita/ Eco nkopapata isa noku ntipilako aba bantu.''' \ No newline at end of file diff --git a/manifest.json b/manifest.json index 0c7148c..d897fba 100644 --- a/manifest.json +++ b/manifest.json @@ -392,6 +392,13 @@ "21-31", "21-33", "22-title", + "22-01", + "22-02", + "22-05", + "22-07", + "22-09", + "22-12", + "22-15", "22-18", "22-21", "22-24",