From 5cc4f676df419c5deffeac7b4d267020a05d60d4 Mon Sep 17 00:00:00 2001 From: embrace_wtz Date: Sat, 13 Apr 2024 09:07:52 +0300 Subject: [PATCH] Sat Apr 13 2024 09:07:51 GMT+0300 (East Africa Time) --- 15/08.txt | 6 +----- 15/17.txt | 6 +----- 15/20.txt | 6 +----- 15/25.txt | 6 +----- 15/31.txt | 6 +----- 16/01.txt | 6 +----- 16/13.txt | 6 +----- 16/24.txt | 6 +----- 16/25.txt | 6 +----- 16/27.txt | 6 +----- 16/29.txt | 6 +----- 17/03.txt | 6 +----- 17/09.txt | 6 +----- 17/11.txt | 6 +----- 17/17.txt | 6 +----- 17/20.txt | 6 +----- manifest.json | 16 ++++++++++++++++ 17 files changed, 32 insertions(+), 80 deletions(-) diff --git a/15/08.txt b/15/08.txt index acd0c29..bcc4f52 100644 --- a/15/08.txt +++ b/15/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Au gwina mukhema iki niwina sarafu ikumi na hela, niwayaghaya sarafu imwedu atrijoacha traa amifenje gwa bidii faka amihange? \v 9 uu niwamiona uguvaitrana marafiki vakwe na jirani vakwe avakhanie yanji nanee, nahangaa sarafu ane neayaghae. \v 10 Uyi nuvakhania gwina furaha usonge a malaika wa Mungu gwasoko a munya mahutye umwedu niwatubu." -======= -\v 8 Au gwina mukhema iki niwina sarafu ikumi na hela, niwayaghaya sarafu imwedu atrijoacha traa amifenje gwa bidii faka amihange? \v 9 uu niwamiona uguvaitrana marafiki vakwe na jirani vakwe avakhanie yanji nanee, nahangaa sarafu ane neayaghae. \v 10 Uyi nuvakhania gwina furaha usonge a malaika wa Mungu gwasoko a munya mahutye umwedu niwatubu". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 8 Au gwina mukhema iki niwina sarafu ikumi na hela, niwayaghaya sarafu imwedu atrijoacha traa amifenje gwa bidii faka amihange? \v 9 uu niwamiona uguvaitrana marafiki vakwe na jirani vakwe avakhanie yanji nanee, nahangaa sarafu ane neayaghae. \v 10 Uyi nuvakhania gwina furaha usonge a malaika wa Mungu gwasoko a munya mahutye umwedu niwatubu." \ No newline at end of file diff --git a/15/17.txt b/15/17.txt index 1dada20..efb2a92 100644 --- a/15/17.txt +++ b/15/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Unoo mwana nimunyuii neakaika unkhoo akwe, akahanya ni atrumami vanga vama baba wane vina maliwa maingi odaha nanee nifo hafai, nukuya na njaa! \v 18 Nijofwaya na uenda guni baba wane na umukhania, "Baba nakoseaa unto a irunde na usonge a miho ako. \v 19 Ntinoneye uitranwa mwana wako kanki; ntenda ginya umwedu wa atrumwa vako." -======= -\v 17 Unoo mwana nimunyuii neakaika unkhoo akwe, akahanya ni atrumami vanga vama baba wane vina maliwa maingi odaha nanee nifo hafai, nukuya na njaa! \v 18 Nijofwaya na uenda guni baba wane na umukhania, "Baba nakoseaa unto a irunde na usonge a miho ako. \v 19 Ntinoneye uitranwa mwana wako kanki; ntenda ginya umwedu wa atrumwa vako". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 17 Unoo mwana nimunyuii neakaika unkhoo akwe, akahanya ni atrumami vanga vama baba wane vina maliwa maingi odaha nanee nifo hafai, nukuya na njaa! \v 18 Nijofwaya na uenda guni baba wane na umukhania, "Baba nakoseaa unto a irunde na usonge a miho ako. \v 19 Ntinoneye uitranwa mwana wako kanki; ntenda ginya umwedu wa atrumwa vako." \ No newline at end of file diff --git a/15/20.txt b/15/20.txt index 74efb92..a240f9f 100644 --- a/15/20.txt +++ b/15/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Uu akafwaya wenda guni baba wakwe. Nekii wi kwenngi akamuonea huruma wadua wendomukumbatria na umutomya. \v 21 Mwana usuu akamukhania, 'baba nahutyaa girunde na usonge a miho ako ntinoneye uitranwa mwana wako.' -======= -\v 20 Uu akafwaya wenda guni baba wakwe. Nekii wi kwenngi akamuonea huruma wadua wendomukumbatria na umutomya. \v 21 Mwana usuu akamukhania, 'baba nahutyaa girunde na usonge a miho ako ntinoneye uitranwa mwana wako'. ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 20 Uu akafwaya wenda guni baba wakwe. Nekii wi kwenngi akamuonea huruma wadua wendomukumbatria na umutomya. \v 21 Mwana usuu akamukhania, 'baba nahutyaa girunde na usonge a miho ako ntinoneye uitranwa mwana wako.' \ No newline at end of file diff --git a/15/25.txt b/15/25.txt index 3fb1a05..788fc9a 100644 --- a/15/25.txt +++ b/15/25.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 25 Mwanakwe ni mukuu nee ugumughunda. Nee uguenda ujie akatregheya ruri ya nyimbo na miinisyo. \v 26 Akaitrana mutrumami umwedu wamuwiya mantu ayai ni ntuni? \v 27 Mutrumami akamukhania muna wako wajaa na baba wako wamukikitriaa mwang'ombe niughiniee gwasoko wasukaa ija.' -======= -\v 25 Mwanakwe ni mukuu nee ugumughunda. Nee uguenda ujie akatregheya ruri ya nyimbo na miinisyo. \v 26 Akaitrana mutrumami umwedu wamuwiya mantu ayai ni ntuni? \v 27 Mutrumami akamukhania muna wako wajaa na baba wako wamukikitriaa mwang'ombe niughiniee gwasoko wasukaa ija'. ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 25 Mwanakwe ni mukuu nee ugumughunda. Nee uguenda ujie akatregheya ruri ya nyimbo na miinisyo. \v 26 Akaitrana mutrumami umwedu wamuwiya mantu ayai ni ntuni? \v 27 Mutrumami akamukhania muna wako wajaa na baba wako wamukikitriaa mwang'ombe niughiniee gwasoko wasukaa ija.' \ No newline at end of file diff --git a/15/31.txt b/15/31.txt index 1b708f9..78d1cc9 100644 --- a/15/31.txt +++ b/15/31.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 31 Baba akamukhania, 'Mwanane, veve wiitrambimwe nanee matriku ong'e na ong'e ninikwetre ni ako veve. \v 32 Unoo jainoneye sese utrenda sherehe na uyanja, uyui muna wako newakuree, uu fanoi mufanga; newayaghae fanoi wagigheaa." -======= -\v 31 Baba akamukhania, 'Mwanane, veve wiitrambimwe nanee matriku ong'e na ong'e ninikwetre ni ako veve. \v 32 Unoo jainoneye sese utrenda sherehe na uyanja, uyui muna wako newakuree, uu fanoi mufanga; newayaghae fanoi wagigheaa". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 31 Baba akamukhania, 'Mwanane, veve wiitrambimwe nanee matriku ong'e na ong'e ninikwetre ni ako veve. \v 32 Unoo jainoneye sese utrenda sherehe na uyanja, uyui muna wako newakuree, uu fanoi mufanga; newayaghae fanoi wagigheaa." \ No newline at end of file diff --git a/16/01.txt b/16/01.txt index 284a24c..475a5aa 100644 --- a/16/01.txt +++ b/16/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 16 \v 1 Yesu akamukhania kanki mwanafunzi wakwe, "Nee gwina muntu umwedu mughwai nee wina meneja, akakhaniwa meneja ugufaghatya mali yakwe. \v 2 Uu mughwai akamuitrana wamukhania, "Ni ntuni iyii ninimitregheye guni veve? Funya hesabu ya umeneja wako, gwasoko utrudaha utrendeka meneja kanki.' -======= -\v 1 Yesu akamukhania kanki mwanafunzi wakwe, "Nee gwina muntu umwedu mughwai nee wina meneja, akakhaniwa meneja ugufaghatya mali yakwe. \v 2 Uu mughwai akamuitrana wamukhania, "Ni ntuni iyii ninimitregheye guni veve? Funya hesabu ya umeneja wako, gwasoko utrudaha utrendeka meneja kanki". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\c 16 \v 1 Yesu akamukhania kanki mwanafunzi wakwe, "Nee gwina muntu umwedu mughwai nee wina meneja, akakhaniwa meneja ugufaghatya mali yakwe. \v 2 Uu mughwai akamuitrana wamukhania, "Ni ntuni iyii ninimitregheye guni veve? Funya hesabu ya umeneja wako, gwasoko utrudaha utrendeka meneja kanki.' \ No newline at end of file diff --git a/16/13.txt b/16/13.txt index b97635f..219f6d8 100644 --- a/16/13.txt +++ b/16/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Gutrii mutrumami niugudaha utrumikia mabwana vaviri, gwasoko ujomukiwa umwedu na umuyanja muuya. Uu mutrudaha umutrumikia Mungu na mali." -======= -\v 13 Gutrii mutrumami niugudaha utrumikia mabwana vaviri, gwasoko ujomukiwa umwedu na umuyanja muuya. Uu mutrudaha umutrumikia Mungu na mali". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 13 Gutrii mutrumami niugudaha utrumikia mabwana vaviri, gwasoko ujomukiwa umwedu na umuyanja muuya. Uu mutrudaha umutrumikia Mungu na mali." \ No newline at end of file diff --git a/16/24.txt b/16/24.txt index 6a73ff2..fa7f7e6 100644 --- a/16/24.txt +++ b/16/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Waria wahanya, 'Baba Ibrahimu ng'urumia umutruma Lazaro atrendee mwancha wakwe u maji auyanjisye urimi wane; gwasoko nukhasywaa u motro urui. -======= -\v 24 Waria wahanya, "Baba Ibrahimu ng'urumia umutruma Lazaro atrendee mwancha wakwe u maji auyanjisye urimi wane; gwasoko nukhasywaa u motro urui. ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 24 Waria wahanya, 'Baba Ibrahimu ng'urumia umutruma Lazaro atrendee mwancha wakwe u maji auyanjisye urimi wane; gwasoko nukhasywaa u motro urui. \ No newline at end of file diff --git a/16/25.txt b/16/25.txt index 7c76093..319783c 100644 --- a/16/25.txt +++ b/16/25.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 25 Nyeso Ibrahimu akahanya, 'Mwaname kumbukwa u maisha ako ukayafokea mantu ayai ni maja uu Lazaro noo akahanga ni mavi. Uu fanoi wihafai ugufarijiwa venoo uguvara. \v 26 Na ino a ayai, guikiwee ikhombo ririfu inoo ufuma kunui uja guni nyenyeunoo antu vitradahe uvuia vije guni sese.' -======= -\v 25 Nyeso Ibrahimu akahanya, 'Mwaname kumbukwa u maisha ako ukayafokea mantu ayai ni maja uu Lazaro noo akahanga ni mavi. Uu fanoi wihafai ugufarijiwa venoo uguvara. \v 26 Na ino a ayai, guikiwee ikhombo ririfu inoo ufuma kunui uja guni nyenyeunoo antu vitradahe uvuia vije guni sese'. ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 25 Nyeso Ibrahimu akahanya, 'Mwaname kumbukwa u maisha ako ukayafokea mantu ayai ni maja uu Lazaro noo akahanga ni mavi. Uu fanoi wihafai ugufarijiwa venoo uguvara. \v 26 Na ino a ayai, guikiwee ikhombo ririfu inoo ufuma kunui uja guni nyenyeunoo antu vitradahe uvuia vije guni sese.' \ No newline at end of file diff --git a/16/27.txt b/16/27.txt index cc86f65..5395442 100644 --- a/16/27.txt +++ b/16/27.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 27 Mughwai usuu akahanya, "Nuguromba baba Ibrahimu, umutrume unyumba guni baba wane \v 28 gwasoko nina auna vatrano avaonye gwa woova uu veso noo vijoja hafai u makhasiko.' -======= -\v 27 Mughwai usuu akahanya, "Nuguromba baba Ibrahimu, umutrume unyumba guni baba wane \v 28 gwasoko nina auna vatrano avaonye gwa woova uu veso noo vijoja hafai u makhasiko'. ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 27 Mughwai usuu akahanya, "Nuguromba baba Ibrahimu, umutrume unyumba guni baba wane \v 28 gwasoko nina auna vatrano avaonye gwa woova uu veso noo vijoja hafai u makhasiko.' \ No newline at end of file diff --git a/16/29.txt b/16/29.txt index be0c36e..a16728a 100644 --- a/16/29.txt +++ b/16/29.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 29 Nyeso Ibrahimu akahanya, 'Vina Musa na manabii vaeke vavaghimbe veso. \v 30 Mughwai usuu akahanya, 'gutrii, Baba Ibrahimu nyeso mwese ende muntu ufuma gw akuyi vijotubu.' \v 31 Nyeso Ibrahimu akamukhania, 'Nivadiovatregheya Musa na manabii vitrijodaha ushawishiwa na muntu hata afume gwa akuyi. -======= -\v 29 Nyeso Ibrahimu akahanya, 'Vina Musa na manabii vaeke vavaghimbe veso. \v 30 Mughwai usuu akahanya, 'gutrii, Baba Ibrahimu nyeso mwese ende muntu ufuma gw akuyi vijotubu'. \v 31 Nyeso Ibrahimu akamukhania, 'Nivadiovatregheya Musa na manabii vitrijodaha ushawishiwa na muntu hata afume gwa akuyi. ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 29 Nyeso Ibrahimu akahanya, 'Vina Musa na manabii vaeke vavaghimbe veso. \v 30 Mughwai usuu akahanya, 'gutrii, Baba Ibrahimu nyeso mwese ende muntu ufuma gw akuyi vijotubu.' \v 31 Nyeso Ibrahimu akamukhania, 'Nivadiovatregheya Musa na manabii vitrijodaha ushawishiwa na muntu hata afume gwa akuyi. \ No newline at end of file diff --git a/17/03.txt b/17/03.txt index be504df..7d7e983 100644 --- a/17/03.txt +++ b/17/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 gilindi. Mpese muna wagukoseaa muonye, unoo niwatubu musamehe. \v 4 Uu niwagukosea mara saba gwa itriku rimwedu waja wahanya, 'nutubu' musamehe!"' -======= -\v 3 gilindi. Mpese muna wagukoseaa muonye, unoo niwatubu musamehe. \v 4 Uu niwagukosea mara saba gwa itriku rimwedu waja wahanya, 'nutubu' musamehe!". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 3 gilindi. Mpese muna wagukoseaa muonye, unoo niwatubu musamehe. \v 4 Uu niwagukosea mara saba gwa itriku rimwedu waja wahanya, 'nutubu' musamehe!"' \ No newline at end of file diff --git a/17/09.txt b/17/09.txt index 9513294..97cd58c 100644 --- a/17/09.txt +++ b/17/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Atrijomushukuru mutrumami usuu gwasoko watrendaa ayoo niwakhaniwaa? \v 10 Uyi nanyee ni mwatrenda ninatrumiwee hanyi, 'sese gu atrumami nivitrinoneye. Gwatrenda ayoo tu niinoneye utrenda.' -======= -\v 9 Atrijomushukuru mutrumami usuu gwasoko watrendaa ayoo niwakhaniwaa? \v 10 Uyi nanyee ni mwatrenda ninatrumiwee hanyi, 'sese gu atrumami nivitrinoneye. Gwatrenda ayoo tu niinoneye utrenda. ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 9 Atrijomushukuru mutrumami usuu gwasoko watrendaa ayoo niwakhaniwaa? \v 10 Uyi nanyee ni mwatrenda ninatrumiwee hanyi, 'sese gu atrumami nivitrinoneye. Gwatrenda ayoo tu niinoneye utrenda.' \ No newline at end of file diff --git a/17/11.txt b/17/11.txt index 44b00bc..e9876b1 100644 --- a/17/11.txt +++ b/17/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Ikagighea kwama nee usafiri winji Yerusalemu akikira u mfaka wa Samaria na Galilaya. \v 12 Nee uguhefea u gijiji gimwedu akatrana na antu ikumi nee vina ukoma. Vikaimika kwengi. \v 13 Vahanya, "Yesu, Bwana guhurumie." -======= -\v 11 Ikagighea kwama nee usafiri winji Yerusalemu akikira u mfaka wa Samaria na Galilaya. \v 12 Nee uguhefea u gijiji gimwedu akatrana na antu ikumi nee vina ukoma. Vikaimika kwengi. \v 13 Vahanya, "Yesu, Bwana guhurumie". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 11 Ikagighea kwama nee usafiri winji Yerusalemu akikira u mfaka wa Samaria na Galilaya. \v 12 Nee uguhefea u gijiji gimwedu akatrana na antu ikumi nee vina ukoma. Vikaimika kwengi. \v 13 Vahanya, "Yesu, Bwana guhurumie." \ No newline at end of file diff --git a/17/17.txt b/17/17.txt index c2aa8d5..b01bda4 100644 --- a/17/17.txt +++ b/17/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Yesu akajibu wahanya, "Uu vitrinaeraa vong'e ikumi? Vigufei avoo vauya tisa? \v 18 Gutrii ata umwedu niwagigheiree usuka na umutukuza Mungu hiya na mughenyi uyui?" \v 19 Akamukhnia, "Imika wende imani ako aguforyaa." -======= -\v 17 Yesu akajibu wahanya, "Uu vitrinaeraa vong'e ikumi? Vigufei avoo vauya tisa? \v 18 Gutrii ata umwedu niwagigheiree usuka na umutukuza Mungu hiya na mughenyi uyui?" \v 19 Akamukhnia, "Imika wende imani ako aguforyaa". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 17 Yesu akajibu wahanya, "Uu vitrinaeraa vong'e ikumi? Vigufei avoo vauya tisa? \v 18 Gutrii ata umwedu niwagigheiree usuka na umutukuza Mungu hiya na mughenyi uyui?" \v 19 Akamukhnia, "Imika wende imani ako aguforyaa." \ No newline at end of file diff --git a/17/20.txt b/17/20.txt index 3ff0942..eb2ed94 100644 --- a/17/20.txt +++ b/17/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Nee wawiywa na mafarisayo utremi wa Mungu ujie nanai? Yesu akajibu wahanya, "Utrmi wa Mungu tri intu nirugigheaa. \v 21 Wala antu vitrijohanya, 'rava hafai' gwasko utremi wa Mungu wi mun'ii ane." -======= -\v 20 Nee wawiywa na mafarisayo utremi wa Mungu ujie nanai? Yesu akajibu wahanya, "Utrmi wa Mungu tri intu nirugigheaa. \v 21 Wala antu vitrijohanya, 'rava hafai' gwasko utremi wa Mungu wi mun'ii ane". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 20 Nee wawiywa na mafarisayo utremi wa Mungu ujie nanai? Yesu akajibu wahanya, "Utrmi wa Mungu tri intu nirugigheaa. \v 21 Wala antu vitrijohanya, 'rava hafai' gwasko utremi wa Mungu wi mun'ii ane." \ No newline at end of file diff --git a/manifest.json b/manifest.json index a51e1d6..22c7b5f 100644 --- a/manifest.json +++ b/manifest.json @@ -344,26 +344,42 @@ "15-01", "15-03", "15-06", + "15-08", "15-11", "15-13", "15-15", + "15-17", + "15-20", "15-22", + "15-25", "15-28", + "15-31", "16-title", + "16-01", "16-03", "16-05", "16-08", "16-10", + "16-13", "16-14", "16-16", "16-18", "16-19", "16-22", + "16-24", + "16-25", + "16-27", + "16-29", "17-title", "17-01", + "17-03", "17-05", "17-07", + "17-09", + "17-11", "17-14", + "17-17", + "17-20", "17-22", "17-30", "17-32",