diff --git a/12/11.txt b/12/11.txt index 8fa5d2a..6ea8fc3 100644 --- a/12/11.txt +++ b/12/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Aoni alandile kuli mose, ''Alale, wemfumu yandi, mukwai mwituleka twikalilile neli isambi. Tulisosele mubupub, kabli natubifya. \v 12 Mukwai mwileka abe nga akapopo akafyalilwa mwifumo lyakwa nyina no mubili uwalikwa lubali luumo mumala muli nyna. -======= -\v 11 Aaron aishilekulanda kuli Mose ati, ''Yangu, shikulu wandi, twapapata mwiikata ulu lubembu pali fwebo. Tululandile kutumpa kutumpa, elo tulibifishe. \v 12 Napapata mwimuleka abe nga uwakufwa icipya uyo umubili wakwe onaike citika uuntu cafuma mumala muli Nyina.'' ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 11 Aoni alandile kuli mose, ''Alale, wemfumu yandi, mukwai mwituleka twikalilile neli isambi. Tulisosele mubupub, kabli natubifya. \v 12 Mukwai mwileka abe nga akapopo akafyalilwa mwifumo lyakwa nyina no mubili uwalikwa lubali luumo mumala muli nyna. \ No newline at end of file diff --git a/12/13.txt b/12/13.txt index d312dcb..87e3a29 100644 --- a/12/13.txt +++ b/12/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Eco Mose akutile kuli Yaaweh. Alandile, ''Mukwai mundapeni, Lesa muwai.'' \v 14 Yaweh alandile kuli Mose, ''Nga cakuti wishi amusaka amate pamenso yakwe, nga tasebene inshiku cine lubali. Mwisalileni kunse yankambi panshiku cine lubali. panuma yaico mumwingishe nakabili.'' \v 15 Eico Mirriambalimwisalile kunse ya nkambi panshiku cine lubali. Abantu tabaendele mpafye bamubwesha mu nkambi. -======= -\v 13 Eico Mose aishilekukuta kuli Yahweh. Aishilekulanda ati, ''Napapata muposheni, Lesa, napapata.'' \v 14 Yahweh aishilekulanda kuli Mose ati, ''Ngacakwebati wishi alimusakile amate pamenso yakwe, ngakuti asebana panshiku cine lubali. Mwisalile kunse yansakwe panshiku cine lubali. Panuma yaifi umubweshe mukati nakambi.'' \v 15 Eico Miriam alisalilwe kunse yansakwe panshiku cine lubali. Abantu tabaendele mpaka ulo abwelele kunsakwe. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 13 Eco Mose akutile kuli Yaaweh. Alandile, ''Mukwai mundapeni, Lesa muwai.'' \v 14 Yaweh alandile kuli Mose, ''Nga cakuti wishi amusaka amate pamenso yakwe, nga tasebene inshiku cine lubali. Mwisalileni kunse yankambi panshiku cine lubali. panuma yaico mumwingishe nakabili.'' \v 15 Eico Mirriambalimwisalile kunse ya nkambi panshiku cine lubali. Abantu tabaendele mpafye bamubwesha mu nkambi. \ No newline at end of file diff --git a/12/16.txt b/12/16.txt index 9199c6f..db08be4 100644 --- a/12/16.txt +++ b/12/16.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 16 Panuma yaico, abantu balyendele ukufuma ku Hazeroti bapangile nkambi mu ciswebebe ca Parani. -======= -\v 16 Panuma yaifi, abantu baendele ukufuma mu Haserote elo nokuyakwikala mumatololo ya Parani. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 16 Panuma yaico, abantu balyendele ukufuma ku Hazeroti bapangile nkambi mu ciswebebe ca Parani. \ No newline at end of file diff --git a/13/01.txt b/13/01.txt index 7af58c3..d985bb8 100644 --- a/13/01.txt +++ b/13/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 13 \v 1 Elyo Mose alandile kuli Mose. Alandile, \v 2 ''Tuma abaume bamo bamo ku kuyalengula icalo ca Kenani, ico ndinokupela kubena Isreali. Tuma umwaume umo ukufuma mu mikowa ya fikolwe fyabo. Cila mwaume alingile ukuba intungulushi pali bo.'' -======= -\c 13 \v 1 Eluntu Yahwe ayebele Mose , ati , \v 2 ''Tumeni abaume baye icalo caku kennani , ico mpele abana ba Israeli . Tumeni umwana umo ukufuma cila mukowa iya kuba wishibo , Nacila muntu abe entungulushi ya cila mukowa wabo . ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\c 13 \v 1 Elyo Mose alandile kuli Mose. Alandile, \v 2 ''Tuma abaume bamo bamo ku kuyalengula icalo ca Kenani, ico ndinokupela kubena Isreali. Tuma umwaume umo ukufuma mu mikowa ya fikolwe fyabo. Cila mwaume alingile ukuba intungulushi pali bo.'' \ No newline at end of file diff --git a/13/03.txt b/13/03.txt index 19b6eeb..2725b6d 100644 --- a/13/03.txt +++ b/13/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Mose alibatumine ukufuma mu ciswebebe ca parani, pakuti bofwile amafunde yakwa Yaweh. Bonse fye bali nintungulushi sha bena isreali. \v 4 Naya emashina yabo: ukufuma mu mukowa wakwa Reubeni, Shammua umwana mwaume wakwa Sakuri; -======= -\v 3 Efyo Mose abatumine ukufuma muma tololo yaku paran , pakuti bakonke kucikokomesho cakwa Yahwe . Bonse fye bali ni ntungulushi sha bena Israeli . \v 4 Ifi efyali amashina yabo ;Ukufuma mumukowa wakwa Reuben , Shammua , umwana mwaume wakwa Zaccur; ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 3 Mose alibatumine ukufuma mu ciswebebe ca parani, pakuti bofwile amafunde yakwa Yaweh. Bonse fye bali nintungulushi sha bena isreali. \v 4 Naya emashina yabo: ukufuma mu mukowa wakwa Reubeni, Shammua umwana mwaume wakwa Sakuri; \ No newline at end of file diff --git a/13/05.txt b/13/05.txt index 1eb0d8f..d1359d4 100644 --- a/13/05.txt +++ b/13/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 ukufuma mumukowa wakwa Simeoni, Shafati umwana mwaume wakwa Hori; \v 6 ukufuma mu mukowa wakwa Yuda, Calebu umwana mwaume wakwa Yufune; \v 7 ukufuma mu mukowa wakwa Isaki, Igali umwana mwaumewakwa Yusufu; \v 8 ukufuma mu mukowa wakwa Ephraim , Hosea umwana mwaume wakwa Nuni; -======= -\v 5 uwa mukowa wakwa Simeon ,Shaphat ,umwana mwaume wakwa Hori \v 6 ,Ukufuma mumukowa kwa Yudah ,caleb umwana mwaume wakwa Jephunneh ; \v 7 Ukufuma mumukowa wakwa Issachar , Igal umwana mwaume wakwa Yosefe ; \v 8 Ukufuma mumukowa wakwa Ephraim ,Hoshea umwana mwaume wakwa Nun ; ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 5 ukufuma mumukowa wakwa Simeoni, Shafati umwana mwaume wakwa Hori; \v 6 ukufuma mu mukowa wakwa Yuda, Calebu umwana mwaume wakwa Yufune; \v 7 ukufuma mu mukowa wakwa Isaki, Igali umwana mwaumewakwa Yusufu; \v 8 ukufuma mu mukowa wakwa Ephraim , Hosea umwana mwaume wakwa Nuni; \ No newline at end of file diff --git a/13/09.txt b/13/09.txt index 83bfce5..fe605ba 100644 --- a/13/09.txt +++ b/13/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Ukufuma mu mukowa wakwa Benjamin, Pelti umwana mwaume wakwa Rafu; \v 10 ukufuma mu mukowa wakwa Sebuloni, Gadieli umwana mwaumewakwa Sodi; \v 11 ukufuma mu mukowa wakwa Yusufu (Ico ekulanda ati ukufuma mu mukowa wakwa Mannaseh), Gadi umwana mwaume wakwa Susi; \v 12 ukufma mu mukowa wakwa Dani, Amieli umwana mwaume wakwa Gemali; -======= -\v 9 Ukufuma mumukowa wakwa Benjamin , Palti umwana mwaume wakwa Raphu ; \v 10 Ukufu ku mukowa wakwa Zebulun ,Gaddiel umwana mwaume wakwa sodi ; \v 11 ukufuma kumukowa wakwa Yosefe , (nangula uwamumukowa , wabena Manase ) , Gaddi umwana mwaume wakwa Susi ; \v 12 Uwa mumukowa wakwa Dani , Ammiel umwana mwaume wakwa Gemalli ; ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 9 Ukufuma mu mukowa wakwa Benjamin, Pelti umwana mwaume wakwa Rafu; \v 10 ukufuma mu mukowa wakwa Sebuloni, Gadieli umwana mwaumewakwa Sodi; \v 11 ukufuma mu mukowa wakwa Yusufu (Ico ekulanda ati ukufuma mu mukowa wakwa Mannaseh), Gadi umwana mwaume wakwa Susi; \v 12 ukufma mu mukowa wakwa Dani, Amieli umwana mwaume wakwa Gemali; \ No newline at end of file diff --git a/13/13.txt b/13/13.txt index 6442789..5f44826 100644 --- a/13/13.txt +++ b/13/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 ukufuma mu mukowa wakwa Ashere, Seturi umwana mwaume wakwa Mikaeli; \v 14 ukufuma mu mukowa wakwa Nafutali, Nabi umwana mwaume wakwa Vofisi; \v 15 ukufma mu mukowa wakwa Gadi, Geueli umwana mwaume wakwa Maki. \v 16 Aya emashina yabaume abo Moseatumine kukuyalengula icalo. Mose akutile Hosea umwana mwaume wakwa Nuni ishina ukutini Yoshua. -======= -\v 13 Ukufuma mumukowa wakwa Asha , Sethur umwana mwaume wakwa Mikaili ; \v 14 Wa mumukowa wakwa Nafutali , Nabi umwana mwaume wakwa Vofisi ; \v 15 Wa mumukowa wakwa Gadi , Gewe umwana mwaume wakwa Maki , \v 16 Aya emashina ya baume Mose atumine ukuya kulengula icalo ,Na Mose akutile Hoshea umwana mwaume wakwa Nuni mwishina lya Yoshua . ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 13 ukufuma mu mukowa wakwa Ashere, Seturi umwana mwaume wakwa Mikaeli; \v 14 ukufuma mu mukowa wakwa Nafutali, Nabi umwana mwaume wakwa Vofisi; \v 15 ukufma mu mukowa wakwa Gadi, Geueli umwana mwaume wakwa Maki. \v 16 Aya emashina yabaume abo Moseatumine kukuyalengula icalo. Mose akutile Hosea umwana mwaume wakwa Nuni ishina ukutini Yoshua. \ No newline at end of file diff --git a/13/17.txt b/13/17.txt index 10d8eba..5ad5f48 100644 --- a/13/17.txt +++ b/13/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Mose abatumine ukuya lengula icalo ca Kenani. Alandile kuli bo, ''Muye mwingile ku Negebu kabili muye nina na mucalo campili. \v 18 Ukulengula icalo nokumona ifyo capalana na co. Ukumona na bantu abekalmo nga bakukosa nagu bakunaka, kabili nga bengi nangu banono. \v 19 Ukumona ifyo icalo caba uko bekala. Nga cabune nangu cabubi? Bushe misumba nshi yabamo? Yaba nge nkambi, nangula misumba iya malinga. \v 20 Ukumona ifyo icalo caba, nga cabune mukulimamo ifinsabwansabwa nangu iyo, kabli nga mwalibamo ifimuti mulya nangu iyo. Mube abashipa fye kabli mukaleteko nefinsabwansabwa fya mu calo ncilya ifyakumwenako.'' Nomba iyi yali nipanshita ifisabo fyantashi ifyamyangashi fyalekupilapo. -======= -\v 17 Na mose alibatumine ukuya kulengula icalo ca kenani , Abebele nokuti , Mutampile mu negefu no kuninika mucalo campili . \v 18 Lenguleni icalo nokumona ifyo cilemoneka . Kabili mumwensekeshe efyo abantu bekalapo bakomoneka , nga bakukosa nangu ukunaka , nangula bengi nangu banono \v 19 .Mumwensekeshe efyo abantu baikala , bushe cabune nangula cibi ? bushe mulipo Imisumba ? Kuti shaba ninkambi , nangula misumba iyafye ? \v 20 Mumwensekeshe icalo ifyo caba , nga cabune mukukusha ifilimwa nangula iyoo , nakabili ngapalba ifimuti nangula iyoo .Mukose elo mukaleteko ne fisabo fimo fimo ifya calo .'' Nomba pali aka kashita kali ekashita kafisabo fya ntashi . ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 17 Mose abatumine ukuya lengula icalo ca Kenani. Alandile kuli bo, ''Muye mwingile ku Negebu kabili muye nina na mucalo campili. \v 18 Ukulengula icalo nokumona ifyo capalana na co. Ukumona na bantu abekalmo nga bakukosa nagu bakunaka, kabili nga bengi nangu banono. \v 19 Ukumona ifyo icalo caba uko bekala. Nga cabune nangu cabubi? Bushe misumba nshi yabamo? Yaba nge nkambi, nangula misumba iya malinga. \v 20 Ukumona ifyo icalo caba, nga cabune mukulimamo ifinsabwansabwa nangu iyo, kabli nga mwalibamo ifimuti mulya nangu iyo. Mube abashipa fye kabli mukaleteko nefinsabwansabwa fya mu calo ncilya ifyakumwenako.'' Nomba iyi yali nipanshita ifisabo fyantashi ifyamyangashi fyalekupilapo. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 79f62c4..935cf36 100644 --- a/manifest.json +++ b/manifest.json @@ -255,7 +255,15 @@ "12-04", "12-06", "12-09", + "12-11", + "12-13", + "12-16", "13-title", + "13-01", + "13-03", + "13-05", + "13-09", + "13-13", "14-title", "15-title", "15-01",