diff --git a/04/03.txt b/04/03.txt index 52a4c7a..1316f2f 100644 --- a/04/03.txt +++ b/04/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Obo aboobo, noywali bana, takali angilwe amilawo yanyika. \v 4 Pele kuzulila kwa ciindi nokwakahika, Leza wakatuma mwana wakwe, wakazhyalwa kumukaintu, wakazhyalwa kunhyi amulawo. \v 5 Wakacita boobo kununa baabo bali kunhi amulawo, kutewa tutambule kutolwa mbuli bana bakwe. -======= -\v 3 Mbubona obo, notwakacili bana, twakali ba hyike kubweendelehyi amilawo ya nyika. \v 4 Pele ciindi cizulile nocakahika, Leza wakatuma mwana wakwe, kuhyalwa ku mukaintu, kuhyalwa kunhyi amulawo. \v 5 Kutewa ahutule abo balikunhyi amulawo, kutewa tukouzhye kutambula buhyale mbuli bana. ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +\v 3 Obo aboobo, noywali bana, takali angilwe amilawo yanyika. \v 4 Pele kuzulila kwa ciindi nokwakahika, Leza wakatuma mwana wakwe, wakazhyalwa kumukaintu, wakazhyalwa kunhyi amulawo. \v 5 Wakacita boobo kununa baabo bali kunhi amulawo, kutewa tutambule kutolwa mbuli bana bakwe. \ No newline at end of file diff --git a/04/06.txt b/04/06.txt index 18d637d..2ba9b8a 100644 --- a/04/06.txt +++ b/04/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Alimwi nkaambo muli bana, Leza watuma moza wa mwana wakwe mumyoyo yesu, baita kuti, ''Abba, taata.'' \v 7 Aboobo tamucili bazhyike, pele mwana, alimwi naa mwana, nkokuti muli bakoni kwiinda muli Leza. -======= -\v 6 Nkaambo mwakaba bana bakwe, Leza wakatuma moza wa mwana wakwe mumyooyo yesu, notuongolola kuti, ''Abba, Taata.'' \v 7 Ono tocili muhyike, pele mwana wakuhyala, aboobo mbuli mwana wakuhyala. Uleelele kukona kwiinda muli Leza. ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +\v 6 Alimwi nkaambo muli bana, Leza watuma moza wa mwana wakwe mumyoyo yesu, baita kuti, ''Abba, taata.'' \v 7 Aboobo tamucili bazhyike, pele mwana, alimwi naa mwana, nkokuti muli bakoni kwiinda muli Leza. \ No newline at end of file diff --git a/04/08.txt b/04/08.txt index 606db0a..79989ea 100644 --- a/04/08.txt +++ b/04/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Pele muciindi eco, nomwakamuzhyi Leza mwakali batwanga, kwiinda munsana zyabo, kutali ba Leza pe. \v 9 Pele ono mukuti mwamuzhyiba Leza, naa kuti muli zhyibilwe a Leza, caba buti kuti mwapiluka kubatembwani alimwi akubula mulawo. muyanda mube bazhyike alimwi? -======= -\v 8 Pele ku ciindi eco, nomwatakaninga hyika Leza, mwakali kubambilwe buhyike kuli baabo, kwiinda munsana hyabube bwabo, kutali hya Leza pe. \v 9 Pele ono mbomwahyiba Leza, akuhyibwa kuli Leza, nunhyi ncomwatalika kupilukula ku mulawo abweendelezyi bwa ba byaabi ahyintu zhyamanimani? muyanda kuba bahyike lyoonse alimwi? ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +\v 8 Pele muciindi eco, nomwakamuzhyi Leza mwakali batwanga, kwiinda munsana zyabo, kutali ba Leza pe. \v 9 Pele ono mukuti mwamuzhyiba Leza, naa kuti muli zhyibilwe a Leza, caba buti kuti mwapiluka kubatembwani alimwi akubula mulawo. muyanda mube bazhyike alimwi? \ No newline at end of file diff --git a/04/10.txt b/04/10.txt index 2bbca37..ebccdec 100644 --- a/04/10.txt +++ b/04/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Mulanganya mazuba, alimwi amwezhyi mupya alimwi azhyiindi alimwi amyaka! \v 11 Ndayoowa andimwe kuti bumi mulimo wangu andimwe ndizza waba wabuyo. -======= -\v 10 Amwaalangihihe mazuba amyehi mipya a hiindi a myaka! \v 11 Ndayoowa a ndinwe kuti ambweni kubeleka kwangu andinwe inga kakuya kuba kwabuyo. ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +\v 10 Amwaalangihihe mazuba amyehi mipya a hiindi a myaka! \v 11 Ndayoowa a ndinwe kuti ambweni kubeleka kwangu andinwe inga kakuya kuba kwabuyo. \ No newline at end of file diff --git a/04/12.txt b/04/12.txt index 5145753..f1db89b 100644 --- a/04/12.txt +++ b/04/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Ndamulomba, bakwesu, amube mbuli ndime, nkaambo ambebo ndaba mbuli ndimwe. Kunyina nomwaka ndilubizhyila. \v 13 Pele mulizhyi kuti kwakali kucisa kwamubili kuti ndakanana mulumbe kuli ndimwe ciindi cakutaanguna. \v 14 Nokuba kuti ciimo camubili wangu cakamubika mukusolwa, kunyina nomwakandicimwa nokuba kundikaka. mwakanditambula mbulikuti ndakali mungele wa Leza, mbuli kuti ndakali Jesu Kilisitu lwakwe. -======= -\v 12 Ndamulomba, nobakwesu, mube mbuli ndime, nkaambo ambebo ndaba mbuli ndinwe. Kuuyina cibyaabi nco mwakandicitila. \v 13 Pele mulihyi kuti nkaambo ka bulwahi bwanyama nindakakambauka mulumbe kuli ndinwe ciindi akutaanguna. \v 14 No kuba kuti bulwahyi bwanyama yangu bwakamubika musunko, tiimwakandinanama. Mwakanditambula mbuli kuti ndi mungelo uhwa kuli Leza, nokuba mbuli Jeso Kilisito lwakwe mwini. ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +\v 12 Ndamulomba, nobakwesu, mube mbuli ndime, nkaambo ambebo ndaba mbuli ndinwe. Kuuyina cibyaabi nco mwakandicitila. \v 13 Pele mulihyi kuti nkaambo ka bulwahi bwanyama nindakakambauka mulumbe kuli ndinwe ciindi akutaanguna. \v 14 No kuba kuti bulwahyi bwanyama yangu bwakamubika musunko, tiimwakandinanama. Mwakanditambula mbuli kuti ndi mungelo uhwa kuli Leza, nokuba mbuli Jeso Kilisito lwakwe mwini. \ No newline at end of file diff --git a/04/15.txt b/04/15.txt index 69b2f59..f9099c1 100644 --- a/04/15.txt +++ b/04/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Ncili ino cileleko cenu ono? Nkaambo ndati kuli ndimwe ono, kuti kacikozhyeka, nomwa guhya meso enu alimwi mwaape ndime. \v 16 Aboobo, ndaba hinkondonyoko nkaambo ndamwaambila kahimpe? -======= -\v 15 Hena ono hyili kuli hyileleko hyenu? nkaambo ndaamba kuli ndinwe kuti, nocali cubauba, nomwa zapaula meso enu akwaapa kuli ndime. \v 16 Hena ono, ndaba hinkondonyoko nkaambo ndamwambila kahimpe? ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +\v 15 Hena ono hyili kuli hyileleko hyenu? nkaambo ndaamba kuli ndinwe kuti, nocali cubauba, nomwa zapaula meso enu akwaapa kuli ndime. \v 16 Hena ono, ndaba hinkondonyoko nkaambo ndamwambila kahimpe? \ No newline at end of file diff --git a/04/17.txt b/04/17.txt index 0388dec..146ca30 100644 --- a/04/17.txt +++ b/04/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Balayandihyihya kumuzunda, pele kunyina bubotu buyanda kumujalila, kutewa mubayandihyihye. \v 18 Lyoonse ncubotu kuyandihyihya bubotu, alimwi buyo neli andimwe. -======= -\v 17 Balihinunhye kuyanda kumuzunda, pele kutali mububotu. Bayanda kumuumunzhya kutegwa mubelekele mbabo. \v 18 Nchibotu kuyandihihya kucita cibotu, kutali buy nili andinwe. ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +\v 17 Balihinunhye kuyanda kumuzunda, pele kutali mububotu. Bayanda kumuumunzhya kutegwa mubelekele mbabo. \v 18 Nchibotu kuyandihihya kucita cibotu, kutali buy nili andinwe. \ No newline at end of file diff --git a/04/19.txt b/04/19.txt index 425d4f1..ce7a311 100644 --- a/04/19.txt +++ b/04/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 Nobana bangu bahyoonto, alimwi ndimukuciswa ntumbukila nkaambo kenu kuhikila Kilisitu akabe muli ndimwe. \v 20 Ndalombozhya nindali andimwe ono alimwi akucinca mwaambo wangu, nkaambo ndapengehya andimwe. -======= -\v 19 Nobana bangu basyoonto, ndapenga kucisa kwakuzhyala kaambo kenu kuhika Kilisito abe muli ndinwe. \v 20 Ndalikuyandihihya kuba andinwe ono. Akucinca mulaka nkaambo ndipengele andinwe. ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +\v 19 Nobana bangu basyoonto, ndapenga kucisa kwakuzhyala kaambo kenu kuhika Kilisito abe muli ndinwe. \v 20 Ndalikuyandihihya kuba andinwe ono. Akucinca mulaka nkaambo ndipengele andinwe. \ No newline at end of file diff --git a/04/21.txt b/04/21.txt index 7060f9d..26fd455 100644 --- a/04/21.txt +++ b/04/21.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 21 Mungambile mwebo nomulombozhya kuba kunhyi amulawo, hena tamuteeleli kumulawo. \v 22 Kulilembele kuti Abraham wakakwete bana bobile, umwi kukahimbi kazhyike, umwi kumukaintu mulubuhyi. \v 23 Umwi wakazhyalwa aka himbi kazhyike kweendelaana akubuyani amukaintu mulubuhyi kweendelana aluhyomo. -======= -\v 21 Amungambile, nwebo nomuyanda kuba kunhi amulawo, hena tamuswiilili mulawo? \v 22 Nkaambo kulilembelwe kuti Abalahamu wakalikwete bana basankwa bobile, omwe kuhwa kumuhimbi muhyke alimwi omwe kumukaintu musele. \v 23 Omwe wakahyalwa kumuhimbi muhyike kwiinda mu buntu, pele umwi wakahyalwa kumukaintu musele kwiinda mu cihyomyo. ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +\v 21 Mungambile mwebo nomulombozhya kuba kunhyi amulawo, hena tamuteeleli kumulawo. \v 22 Kulilembele kuti Abraham wakakwete bana bobile, umwi kukahimbi kazhyike, umwi kumukaintu mulubuhyi. \v 23 Umwi wakazhyalwa aka himbi kazhyike kweendelaana akubuyani amukaintu mulubuhyi kweendelana aluhyomo. \ No newline at end of file diff --git a/04/24.txt b/04/24.txt index d573dc0..e8c4351 100644 --- a/04/24.txt +++ b/04/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Ezhyi zhyintu inga zhyapandululwa kuti zhyilikonzhyene mukuti bamakaintu abaiminina zhyinhuminano zhyobile. cimwi cazhyo cinhwa amulundu wa sinai alimwi wa zhyala bana ba zhyike. Oyu ngu Hagar. \v 25 Ono Hagar wiiminina mulundu wa Sinai mu Arabia, alimwi wiiminina Jerusalema wasunu, nkaambo uli mubuzhyike abana bakwe. -======= -\v 24 Aya makani alasandululwa mbuli hyehyaninhyo, nkaambo aba bamakaintu baiminina hyizuminano hyobile. Omwe uhwa kumulundu wa Sinai akuhyala bana mubuhyike. Oyu ngo Hagar. \v 25 Ono Hagar uyiminina mulundu wa Sinai mu Arabia; nkaambo uli mubuhyike abana bakwe. ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +\v 24 Ezhyi zhyintu inga zhyapandululwa kuti zhyilikonzhyene mukuti bamakaintu abaiminina zhyinhuminano zhyobile. cimwi cazhyo cinhwa amulundu wa sinai alimwi wa zhyala bana ba zhyike. Oyu ngu Hagar. \v 25 Ono Hagar wiiminina mulundu wa Sinai mu Arabia, alimwi wiiminina Jerusalema wasunu, nkaambo uli mubuzhyike abana bakwe. \ No newline at end of file diff --git a/04/26.txt b/04/26.txt index e07d9ed..221b5d6 100644 --- a/04/26.txt +++ b/04/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 26 Pele Jelusalema oyu uli atala mulubuhi, alimwi ngo baama wesu. \v 27 Nkaambo kuli lembelwe, ''Amukomane, mwebo nonsundi nomutazhyali, lila alimwi ongolola ku komana, webo oota pengi zhyicisa zhyakuzhyala bana, nkaambo bana bamukaintu mutande mbanji kwiinda baabo bamukaintu ukwete mulumi.'' -======= -\v 26 Pele Jelusalema uli kujulu uliangulukile, alimwi ngo baama wesu. \v 27 Nkaambo kulilembelwe, ''Amusekelele nwebo no nsundi nomutahyali, amulile akuyoba kwakukomana, nwebo nomwatapenga akucisa kwakuzhyala; nkaambo bana ba mukaintu uyingaila mbanji kwiinda ba mukaintu ukwete mulumi.'' ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +\v 26 Pele Jelusalema uli kujulu uliangulukile, alimwi ngo baama wesu. \v 27 Nkaambo kulilembelwe, ''Amusekelele nwebo no nsundi nomutahyali, amulile akuyoba kwakukomana, nwebo nomwatapenga akucisa kwakuzhyala; nkaambo bana ba mukaintu uyingaila mbanji kwiinda ba mukaintu ukwete mulumi.'' \ No newline at end of file diff --git a/04/28.txt b/04/28.txt index c238f87..1cb802e 100644 --- a/04/28.txt +++ b/04/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Pele nwebo, bakwesu, mbuli Isaka, mbana ba cihyomyo. \v 29 Kuciindi eco oyo wakazhyalwa kweendelana abuyani wakapezhya yooyo wakazhyalwa kweendelana amoza. Cilikonzhyene awono. -======= -\v 28 Pele nwebo, nobakwesu, mbuli Isaac, muli bana ba cisyomyo. \v 29 Muciindi eco oyo wakahyalwa mu mu buntu wakapenhya oyo wakahyalwa kwiinda mu muuya. Ciliko hyeye a sunu. ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +\v 28 Pele nwebo, bakwesu, mbuli Isaka, mbana ba cihyomyo. \v 29 Kuciindi eco oyo wakazhyalwa kweendelana abuyani wakapezhya yooyo wakazhyalwa kweendelana amoza. Cilikonzhyene awono. \ No newline at end of file diff --git a/04/30.txt b/04/30.txt index 7078591..51f5004 100644 --- a/04/30.txt +++ b/04/30.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 30 Pele hena mangwalo aamba buti? ''Tanda mwana muhimbi mzhyike amwana wakwe. Mwana wamuhimbi muzhyike takaabani mulukonoamwan wa mukaintu mulubuhi.'' \v 31 Aboobo, bakwesu, tatuli bana bamuhimbi muzhyike, pele ba mukaintu mulubuhi. -======= -\v 30 Pele ino malembo aamba buti? ''Komutanda muhimbi muhyike a mwana wakwe. Nkaambo mwana wa mu himbi muhyike takanzhyi kwaabana lukono abana wa mukaintu musele.'' \v 31 Mulikooko, nobakwesu, tatuli bana ba muhimbi muhyike, pele ba mukaintu musele. ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +\v 30 Pele hena mangwalo aamba buti? ''Tanda mwana muhimbi mzhyike amwana wakwe. Mwana wamuhimbi muzhyike takaabani mulukonoamwan wa mukaintu mulubuhi.'' \v 31 Aboobo, bakwesu, tatuli bana bamuhimbi muzhyike, pele ba mukaintu mulubuhi. \ No newline at end of file diff --git a/05/title.txt b/05/title.txt index 4c35ab9..824be68 100644 --- a/05/title.txt +++ b/05/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Cikando 5 -======= -Caandano 5 ->>>>>>> 00daf3ca118d2b42e2364f64a1797c83d4f95a28 +Cikando 5 \ No newline at end of file diff --git a/manifest.json b/manifest.json index df98f70..5929900 100644 --- a/manifest.json +++ b/manifest.json @@ -71,6 +71,19 @@ "03-23", "03-27", "04-title", - "04-01" + "04-01", + "04-03", + "04-06", + "04-08", + "04-10", + "04-12", + "04-15", + "04-17", + "04-19", + "04-21", + "04-24", + "04-26", + "04-28", + "04-30" ] } \ No newline at end of file