From 9a63e8830c500b75a75cc8419f3395ec989a08a1 Mon Sep 17 00:00:00 2001 From: LIKE___SIMAKANDO Date: Wed, 16 Nov 2022 19:50:54 +0200 Subject: [PATCH] Wed Nov 16 2022 19:50:54 GMT+0200 (South Africa Standard Time) --- 05/01.txt | 6 +----- 05/04.txt | 6 +----- 05/08.txt | 6 +----- 05/12.txt | 6 +----- 05/15.txt | 6 +----- 05/19.txt | 6 +----- 05/23.txt | 6 +----- manifest.json | 19 +++++++++++++------ 8 files changed, 20 insertions(+), 41 deletions(-) diff --git a/05/01.txt b/05/01.txt index 1a0f378..134e3be 100644 --- a/05/01.txt +++ b/05/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 5 \v 1 Kutha mu nako na myaka,apange,Njeko tutho tha kumin'olela inu yoshe. \v 2 Kakuli omwe shemwa mwalimuka thiana ngao eliiwa lya Mulena lya wiya shinani mbuyi wa kwitha usiku. \v 3 Apa amba ngao, ''Kotho na wiketo,'' apobene osinyeho thi awiyela. Mukuikala shinani mukathi wa ku funguluka. Kamba panduka kao. -======= -\c 5 \v 1 Kutha mu nako na myaka, mwakwange, njeko tutho tha kumin'olela inu yoshe. \v 2 Kakuli omwe shemwa mwalimuka thiwana ngao e liiwa lya Mulena lya wiya shinani mbuyi wa kwitha usiku. \v 3 Apa amba ngao, "Kotho na wiketo," apo bene osinyeho thi a wiyela. Mukuikala shinani mukathi wa ku funguluka. Kamba panduka kao. ->>>>>>> 9b8f4d10f3fc658633fb9aad546d2be4299aa5da +\c 5 \v 1 Kutha mu nako na myaka, mwakwange, njeko tutho tha kumin'olela inu yoshe. \v 2 Kakuli omwe shemwa mwalimuka thiwana ngao e liiwa lya Mulena lya wiya shinani mbuyi wa kwitha usiku. \v 3 Apa amba ngao, "Kotho na wiketo," apo bene osinyeho thi a wiyela. Mukuikala shinani mukathi wa ku funguluka. Kamba panduka kao. \ No newline at end of file diff --git a/05/04.txt b/05/04.txt index e9fba84..0c1f69c 100644 --- a/05/04.txt +++ b/05/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Kono omwe,apange,komwashiikala mulififi kao nga liiwa limikele shinani mbuyi. \v 5 Kakuli moshe mwa ana amuliseli na mushinonga. otwe katwana a usiku na lififi kao. \v 6 Cwale eini,kotuna lala shinani oshe mwa tendela. Cwale eni,tutone na kukuteka. \v 7 kwao alala alalange usiku,nao anwanga atendanga eyo usiku. -======= -\v 4 Kono mwe, mwakwange, ko mwashi kala mulififi kao nga liiwa limiikele shinani mbuyi. \v 5 Kakuli moshe mwa ana a muliseli na mushinonga. Otwe ko twaana a usiku na lififi kao. \v 6 Cwale eni, kotuna lala shinani oshe mwa tendela. Konakuli, tutone na ku kuteka. \v 7 Kwao alala alalanga usiku, nao a nwanga atende ngeyo usiku. ->>>>>>> 9b8f4d10f3fc658633fb9aad546d2be4299aa5da +\v 4 Kono mwe, mwakwange, ko mwashi kala mulififi kao nga liiwa limiikele shinani mbuyi. \v 5 Kakuli moshe mwa ana a muliseli na mushinonga. Otwe ko twaana a usiku na lififi kao. \v 6 Cwale eni, kotuna lala shinani oshe mwa tendela. Konakuli, tutone na ku kuteka. \v 7 Kwao alala alalanga usiku, nao a nwanga atende ngeyo usiku. \ No newline at end of file diff --git a/05/08.txt b/05/08.txt index 8e4b955..97cac36 100644 --- a/05/08.txt +++ b/05/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Kono kakuli twaana aliseli,twa swanela kuku kuteka mutumelo na mu ku wapela shinani waku yamwa,na thepo tha ku yoyithiwa kwa thikoko thetu. \v 9 Mulimu nashimwa kutukatelo uhali,kono kuwana puluso kwa Mulena wetu Jesu Kilesite. \v 10 Yonyiko no tufela keo ngao, shiwandi twatona kapa tu na lala,tuyoye naye pamweya. \v 11 Cwale eni muku ombaombe na kuku ongotha munu na munu,shinani omu mutendelanga. -======= -\v 8 Kono kakuli twaana a liseli, twa swanela ku ku kuteka naku kwata tumelo na lilato shinani waku yamwa, na thepo tha ku yoyithiwa kwa mitwi thetu. \v 9 Mulimu nashimwa kutuketela uhali, kono ngao tuwane puluso kwa Mulena wetu Jesu Kelesite. \v 10 Yonyiko no tufela keo ngao, shiwandi twa tona kapa ku na lala, tu yoye naye pa mweya. \v 11 Cwale eni mukuomba ombe na kuku ongotha munu na munu, shinani omu mutendelanga. ->>>>>>> 9b8f4d10f3fc658633fb9aad546d2be4299aa5da +\v 8 Kono kakuli twaana a liseli, twa swanela ku ku kuteka naku kwata tumelo na lilato shinani waku yamwa, na thepo tha ku yoyithiwa kwa mitwi thetu. \v 9 Mulimu nashimwa kutuketela uhali, kono ngao tuwane puluso kwa Mulena wetu Jesu Kelesite. \v 10 Yonyiko no tufela keo ngao, shiwandi twa tona kapa ku na lala, tu yoye naye pa mweya. \v 11 Cwale eni mukuomba ombe na kuku ongotha munu na munu, shinani omu mutendelanga. \ No newline at end of file diff --git a/05/12.txt b/05/12.txt index 15cff4c..b4ead2d 100644 --- a/05/12.txt +++ b/05/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Twamipa liyanga likulu,apange,kulimuka a sebetha mu kachikenu na amibabalela kwa Mulena wetu oyu minangitha. \v 13 Twamilomba ngao mwakatithe onene mu lilato mulibaka no mu sebethi woo. Muikale mu kotho mukachi kenu. \v 14 Twami kutatha,apange; ope mamela kwaa no uba,o susuethe ano ma pilaelo, o tuthe ana bapa,kame mutateele kwinu yoshe. -======= -\v 12 Twa mipa liyanga likulu, mwakwange, kulimuka o sebetha mukachi kenu naami babalela kwa Mulena wetu oyu minangisa. \v 13 Twamilomba kame ngao mua kutithe onene mu lilato mulibaka no musebethi woo. Muikale mu kotho mukachi kenu. \v 14 Twami kutatha, mwakwange: Mwenyanise ao no uba, o susuethe ano ma pilaelo, o tuthe ana bapa, kame mutateele kwinu yoshe. ->>>>>>> 9b8f4d10f3fc658633fb9aad546d2be4299aa5da +\v 12 Twa mipa liyanga likulu, mwakwange, kulimuka o sebetha mukachi kenu naami babalela kwa Mulena wetu oyu minangisa. \v 13 Twamilomba kame ngao mua kutithe onene mu lilato mulibaka no musebethi woo. Muikale mu kotho mukachi kenu. \v 14 Twami kutatha, mwakwange: Mwenyanise ao no uba, o susuethe ano ma pilaelo, o tuthe ana bapa, kame mutateele kwinu yoshe. \ No newline at end of file diff --git a/05/15.txt b/05/15.txt index 687f189..9e928fc 100644 --- a/05/15.txt +++ b/05/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Omone ngawa njeko uyu usetha uyi kwa uyi ku munu yoshe. keo eni, osusuethe eyi wa ku munu na munu na kwaanu oshe. \v 16 Muwapele nako thoshe. \v 17 Mulapele kokwambula kuteneka. \v 18 Mukutumele kuinu yoshe.Kakuli wo mulelo wa Mulimu kwa Kelesite Jesu okwenu. -======= -\v 15 Omone ngawa njeko uyu usetha uyi kwa uyi ku munu yoshe. Keo eni, o susuete eyi wa ku munu na munu na kwanu oshe. \v 16 Muwapele nako thoshe. \v 17 Mulapele ko muna teneka. \v 18 Mukutumele kuinu yoshe. Kakuli wo mulelo wa Mulimu kwa Kelesite Jesu okwenu. ->>>>>>> 9b8f4d10f3fc658633fb9aad546d2be4299aa5da +\v 15 Omone ngawa njeko uyu usetha uyi kwa uyi ku munu yoshe. Keo eni, o susuete eyi wa ku munu na munu na kwanu oshe. \v 16 Muwapele nako thoshe. \v 17 Mulapele ko muna teneka. \v 18 Mukutumele kuinu yoshe. Kakuli wo mulelo wa Mulimu kwa Kelesite Jesu okwenu. \ No newline at end of file diff --git a/05/19.txt b/05/19.txt index 35a8350..1a6bacf 100644 --- a/05/19.txt +++ b/05/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 Komuna lwanisa mepo. \v 20 Komuna itana ya mapolofita. \v 21 Mulike inu yoshe. Mukwatelele iwa. \v 22 Mutunde ku mikwa tho uyii. -======= -\v 19 Komuna thima Mepo thikenu. \v 20 Komuna itana ya mapolofita. \v 21 Mulike inu yoshe. Mukwateele kweyo iwaiwa. \v 22 Mutunde ku mikwa tho wuyi. ->>>>>>> 9b8f4d10f3fc658633fb9aad546d2be4299aa5da +\v 19 Komuna thima Mepo thikenu. \v 20 Komuna itana ya mapolofita. \v 21 Mulike inu yoshe. Mukwateele kweyo iwaiwa. \v 22 Mutunde ku mikwa tho wuyi. \ No newline at end of file diff --git a/05/23.txt b/05/23.txt index eb066f3..33ebb96 100644 --- a/05/23.txt +++ b/05/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Onga Mulimu no kotho akukenithe kumaneena. Onga omepo thoye thoshe,moyo na lutu ipatiwe kwanambula kunyasiwa mu kuwiya kwa Mulena wetu Jesu Kilesite. \v 24 Kusepahala yonyiko ona miisana,oyu mbo utenda. -======= -\v 23 Mulimu no kotho a mikenithe ku maneena. O Mepo thenu thoshe, moyo na lutu ipakiwe kwanambula kunyasiwa mu kuwiya kwa Mulena wetu Jesu Kelesite. \v 24 Ku sepaala yonyiko ona miisana, oyu mbo utenda. ->>>>>>> 9b8f4d10f3fc658633fb9aad546d2be4299aa5da +\v 23 Mulimu no kotho a mikenithe ku maneena. O Mepo thenu thoshe, moyo na lutu ipakiwe kwanambula kunyasiwa mu kuwiya kwa Mulena wetu Jesu Kelesite. \v 24 Ku sepaala yonyiko ona miisana, oyu mbo utenda. \ No newline at end of file diff --git a/manifest.json b/manifest.json index bf45e6b..6e62466 100644 --- a/manifest.json +++ b/manifest.json @@ -44,6 +44,12 @@ "01-04", "01-06", "01-08", + "03-title", + "03-01", + "03-04", + "03-06", + "03-08", + "03-11", "04-title", "04-01", "04-03", @@ -52,11 +58,12 @@ "04-13", "04-16", "05-title", - "03-title", - "03-01", - "03-04", - "03-06", - "03-08", - "03-11" + "05-01", + "05-04", + "05-08", + "05-12", + "05-15", + "05-19", + "05-23" ] } \ No newline at end of file