diff --git a/08/04.txt b/08/04.txt index d5a9767..c756bab 100644 --- a/08/04.txt +++ b/08/04.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -\v 4 Shime hatawi awa hakuhanyanganin ha twikerire kuyuvitha nando dhendi. \v 5 Philipusi ghayendire munurumbara dhaSamariya no kuwa yuvithera kuhamena Kristusi. -======= -\v 4 Shime hatawi awa hakuhanyanganin ha twikerire kuyuvitha nando dhendi. \v 5 Philipusi ghayendire munurumbara dhaSamariya no kuwa yuvithera kuhamena Kristusi. ->>>>>>> c20ded486bd9d8cc714262e241a4970217d8599a -======= -\v 4 Shime hatawi awa hakuhanyanganin ha twikerire kuyuvitha nando dhendi. \v 5 Philipusi ghayendire munurumbara dhaSamariya no kuwa yuvithera kuhamena Kristusi. ->>>>>>> b67796cf25608e4b7aa6a2394095630b910902ab +\v 4 Shime hatawi awa hakuhanyanganin ha twikerire kuyuvitha nando dhendi. \v 5 Philipusi ghayendire munurumbara dhaSamariya no kuwa yuvithera kuhamena Kristusi. \ No newline at end of file diff --git a/08/09.txt b/08/09.txt index f48a36e..a0d248a 100644 --- a/08/09.txt +++ b/08/09.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -\v 9 Ene pakarire katughuru ghumweya munurumbara dhiya gho dina dyoSimoni,oyu gha karire nokare murodhi;aye ngatetukithanga thikuma hanu homuSamariya ghumutanaghura eshi aye ne munu gho mudyo. \v 10 Haka Samaritani waheya kutangera kohambiru kare kohakuru,nga ha muteghereranga; haghambire eshi,''Oyu katughuru ne yo ngcamu dhaNyambi dhakahurako.'' \v 11 Hamutegherere yoyishi kare gha katangire kuwa tetukitha noghurodhi wendi. -======= -\v 9 Ene pakarire katughuru ghumweya munurumbara dhiya gho dina dyoSimoni,oyu gha karire nokare murodhi;aye ngatetukithanga thikuma hanu homuSamariya ghumutanaghura eshi aye ne munu gho mudyo. \v 10 Haka Samaritani waheya kutangera kohambiru kare kohakuru,nga ha muteghereranga; haghambire eshi,''Oyu katughuru ne yo ngcamu dhaNyambi dhakahurako.'' \v 11 Hamutegherere yoyishi kare gha katangire kuwa tetukitha noghurodhi wendi. ->>>>>>> c20ded486bd9d8cc714262e241a4970217d8599a -======= -\v 9 Ene pakarire katughuru ghumweya munurumbara dhiya gho dina dyoSimoni,oyu gha karire nokare murodhi;aye ngatetukithanga thikuma hanu homuSamariya ghumutanaghura eshi aye ne munu gho mudyo. \v 10 Haka Samaritani waheya kutangera kohambiru kare kohakuru,nga ha muteghereranga; haghambire eshi,''Oyu katughuru ne yo ngcamu dhaNyambi dhakahurako.'' \v 11 Hamutegherere yoyishi kare gha katangire kuwa tetukitha noghurodhi wendi. ->>>>>>> b67796cf25608e4b7aa6a2394095630b910902ab +\v 9 Ene pakarire katughuru ghumweya munurumbara dhiya gho dina dyoSimoni,oyu gha karire nokare murodhi;aye ngatetukithanga thikuma hanu homuSamariya ghumutanaghura eshi aye ne munu gho mudyo. \v 10 Haka Samaritani waheya kutangera kohambiru kare kohakuru,nga ha muteghereranga; haghambire eshi,''Oyu katughuru ne yo ngcamu dhaNyambi dhakahurako.'' \v 11 Hamutegherere yoyishi kare gha katangire kuwa tetukitha noghurodhi wendi. \ No newline at end of file diff --git a/08/26.txt b/08/26.txt index a63abcc..cc99503 100644 --- a/08/26.txt +++ b/08/26.txt @@ -1,10 +1,2 @@ -<<<<<<< HEAD -<<<<<<< HEAD \v 26 Muengeli waFumu gha ghambire kwa Philipusi eshi; -''Matuke noyende mughucuma mundhira dhokughurumuka kushwagha kuJerusalema dhiyende kuGaza.'' (Ndhira dhi dhakara dhomumamboreya.) \v 27 Ghemanine noghayendire. Kapupi kamanana, pakarire katughuru ghomuka Ethiopiya, ghomutungi noghuraghuri ghoghukuru mwishi dhaCandee, herekadhi waka Ethiopiya. Yiwana yendi yoyiheya yakarire mumoko ghendi. Gheyire muJerusalema mukunaraperera. \v 28 Ghahukire oku ghanahungumana muditemba dyendi, no ghutoya mwamuporofeta Isaya. -======= -\v 26 Muengeli waFumu gha ghambire kwa Philipusi eshi; ''Matuke noyende mughucuma mundhira dhokughurumuka kushwagha kuJerusalema dhiyende kuGaza.'' (Ndhira dhi dhakara dhomumamboreya.) \v 27 Ghemanine noghayendire. Kapupi kamanana, pakarire katughuru ghomuka Ethiopiya, ghomutungi noghuraghuri ghoghukuru mwishi dhaCandee, herekadhi waka Ethiopiya. Yiwana yendi yoyiheya yakarire mumoko ghendi. Gheyire muJerusalema mukunaraperera. \v 28 Ghahukire oku ghanahungumana muditemba dyendi, no ghutoya mwamuporofeta Isaya. ->>>>>>> c20ded486bd9d8cc714262e241a4970217d8599a -======= -\v 26 Muengeli waFumu gha ghambire kwa Philipusi eshi; ''Matuke noyende mughucuma mundhira dhokughurumuka kushwagha kuJerusalema dhiyende kuGaza.'' (Ndhira dhi dhakara dhomumamboreya.) \v 27 Ghemanine noghayendire. Kapupi kamanana, pakarire katughuru ghomuka Ethiopiya, ghomutungi noghuraghuri ghoghukuru mwishi dhaCandee, herekadhi waka Ethiopiya. Yiwana yendi yoyiheya yakarire mumoko ghendi. Gheyire muJerusalema mukunaraperera. \v 28 Ghahukire oku ghanahungumana muditemba dyendi, no ghutoya mwamuporofeta Isaya. ->>>>>>> b67796cf25608e4b7aa6a2394095630b910902ab +''Matuke noyende mughucuma mundhira dhokughurumuka kushwagha kuJerusalema dhiyende kuGaza.'' (Ndhira dhi dhakara dhomumamboreya.) \v 27 Ghemanine noghayendire. Kapupi kamanana, pakarire katughuru ghomuka Ethiopiya, ghomutungi noghuraghuri ghoghukuru mwishi dhaCandee, herekadhi waka Ethiopiya. Yiwana yendi yoyiheya yakarire mumoko ghendi. Gheyire muJerusalema mukunaraperera. \v 28 Ghahukire oku ghanahungumana muditemba dyendi, no ghutoya mwamuporofeta Isaya. \ No newline at end of file diff --git a/09/01.txt b/09/01.txt index 6defdf3..a8e9b7e 100644 --- a/09/01.txt +++ b/09/01.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -\c 9 \v 1 Ene Saulusi, oku shime haghamba yokuthineneka kupagha haka thishongero waFumu, ghayendire kwamupristeri ghomukuru \v 2 no kamwipura mambapira ghomumasinagoge ghomu Damasikusi, podigho eshi ngeshi ghakawane kehe yuno ghahatera kundhira, yikare katughuru ndi mbuyama, ghana kawareta munwato muJerusalema. -======= -\v 1 Ene Saulusi, oku shime haghamba yokuthineneka kupagha haka thishongero waFumu, ghayendire kwamupristeri ghomukuru \v 2 no kamwipura mambapira ghomumasinagoge ghomu Damasikusi, podigho eshi ngeshi ghakawane kehe yuno ghahatera kundhira, yikare katughuru ndi mbuyama, ghana kawareta munwato muJerusalema. ->>>>>>> c20ded486bd9d8cc714262e241a4970217d8599a -======= -\v 1 Ene Saulusi, oku shime haghamba yokuthineneka kupagha haka thishongero waFumu, ghayendire kwamupristeri ghomukuru \v 2 no kamwipura mambapira ghomumasinagoge ghomu Damasikusi, podigho eshi ngeshi ghakawane kehe yuno ghahatera kundhira, yikare katughuru ndi mbuyama, ghana kawareta munwato muJerusalema. ->>>>>>> b67796cf25608e4b7aa6a2394095630b910902ab +\c 9 \v 1 Ene Saulusi, oku shime haghamba yokuthineneka kupagha haka thishongero waFumu, ghayendire kwamupristeri ghomukuru \v 2 no kamwipura mambapira ghomumasinagoge ghomu Damasikusi, podigho eshi ngeshi ghakawane kehe yuno ghahatera kundhira, yikare katughuru ndi mbuyama, ghana kawareta munwato muJerusalema. \ No newline at end of file diff --git a/09/20.txt b/09/20.txt index 20be872..f6ba8f2 100644 --- a/09/20.txt +++ b/09/20.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -\v 21 Popo vene ghatangire kuyuvitha Jesusi mumasinagoge, ghughamba eshi ayene mwana Nyambi. \v 20 Wahe awa hamuyuvire yawa tetukithire no haghambire eshi, ''Oyune mbadi yoyu murume ghahanyaghuranga haka Jelusalema awa ngahatoyanga dina di? Ngeya mukuna wa kwata no kuwa twara kwawa pristeri hashokuru \v 22 Ene Saulusi gheyire no ngcamu thikuma . No gharetedherire toko-toko mukatji kawa Juda awa hatungire muDamascusi pakuneghedha eshi Jesusi ne Kristusi. -======= -\v 21 Popo vene ghatangire kuyuvitha Jesusi mumasinagoge, ghughamba eshi ayene mwana Nyambi. ->>>>>>> c20ded486bd9d8cc714262e241a4970217d8599a -======= -\v 21 Popo vene ghatangire kuyuvitha Jesusi mumasinagoge, ghughamba eshi ayene mwana Nyambi. ->>>>>>> b67796cf25608e4b7aa6a2394095630b910902ab +\v 21 Popo vene ghatangire kuyuvitha Jesusi mumasinagoge, ghughamba eshi ayene mwana Nyambi. \v 20 Wahe awa hamuyuvire yawa tetukithire no haghambire eshi, ''Oyune mbadi yoyu murume ghahanyaghuranga haka Jelusalema awa ngahatoyanga dina di? Ngeya mukuna wa kwata no kuwa twara kwawa pristeri hashokuru \v 22 Ene Saulusi gheyire no ngcamu thikuma . No gharetedherire toko-toko mukatji kawa Juda awa hatungire muDamascusi pakuneghedha eshi Jesusi ne Kristusi. \ No newline at end of file diff --git a/10/01.txt b/10/01.txt index ae00462..c64c854 100644 --- a/10/01.txt +++ b/10/01.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -\c 10 \v 1 Ndani pakarire katughuru ghongandji munurumbara dhaCaesareya, Corneliusi padina mupiterithi ghomashurundate awa ngahethanga eshi hakaItali. \v 2 Ghakarire katughuru ghodikuto, ghoyu ghayapire Nyambi nawakadighumbo dyendi dyodiheya, ghatapire manyinga ghomengi kwawakakunyanda no gharapere kwaNyambi kehe pano -======= -\v 1 Ndani pakarire katughuru ghongandji munurumbara dhaCaesareya, Corneliusi padina mupiterithi ghomashurundate awa ngahethanga eshi hakaItali. \v 2 Ghakarire katughuru ghodikuto, ghoyu ghayapire Nyambi nawakadighumbo dyendi dyodiheya, ghatapire manyinga ghomengi kwawakakunyanda no gharapere kwaNyambi kehe pano ->>>>>>> c20ded486bd9d8cc714262e241a4970217d8599a -======= -\v 1 Ndani pakarire katughuru ghongandji munurumbara dhaCaesareya, Corneliusi padina mupiterithi ghomashurundate awa ngahethanga eshi hakaItali. \v 2 Ghakarire katughuru ghodikuto, ghoyu ghayapire Nyambi nawakadighumbo dyendi dyodiheya, ghatapire manyinga ghomengi kwawakakunyanda no gharapere kwaNyambi kehe pano ->>>>>>> b67796cf25608e4b7aa6a2394095630b910902ab +\c 10 \v 1 Ndani pakarire katughuru ghongandji munurumbara dhaCaesareya, Corneliusi padina mupiterithi ghomashurundate awa ngahethanga eshi hakaItali. \v 2 Ghakarire katughuru ghodikuto, ghoyu ghayapire Nyambi nawakadighumbo dyendi dyodiheya, ghatapire manyinga ghomengi kwawakakunyanda no gharapere kwaNyambi kehe pano \ No newline at end of file diff --git a/10/46.txt b/10/46.txt index d17e2a6..16d6a2f 100644 --- a/10/46.txt +++ b/10/46.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -\v 46 Awo hayuvire hahayidena wa hana kughamba mumandimi ghamweya ndani ghushogherera Nyambi. Petrusi ghoghahuthire eshi; \v 47 ''Kukona ghumwe ghashweneke meyu ko hanu wa eshi mbadi hapwe kuyogha, hanu wa hatamburire Mupepo Ghokupongoka yira kenge twe?'' \v 48 Ghoghawarawerere hapwe kuyogha mudina dya Jesusi Kristusi. Ghohamwipurire mukukara nawo mayuwa ghongandji. -======= -\v 46 Awo hayuvire hahayidena wa hana kughamba mumandimi ghamweya ndani ghushogherera Nyambi. Petrusi ghoghahuthire eshi; \v 47 ''Kukona ghumwe ghashweneke meyu ko hanu wa eshi mbadi hapwe kuyogha, hanu wa hatamburire Mupepo Ghokupongoka yira kenge twe?'' \v 48 Ghoghawarawerere hapwe kuyogha mudina dya Jesusi Kristusi. Ghohamwipurire mukukara nawo mayuwa ghongandji. ->>>>>>> c20ded486bd9d8cc714262e241a4970217d8599a -======= -\v 46 Awo hayuvire hahayidena wa hana kughamba mumandimi ghamweya ndani ghushogherera Nyambi. Petrusi ghoghahuthire eshi; \v 47 ''Kukona ghumwe ghashweneke meyu ko hanu wa eshi mbadi hapwe kuyogha, hanu wa hatamburire Mupepo Ghokupongoka yira kenge twe?'' \v 48 Ghoghawarawerere hapwe kuyogha mudina dya Jesusi Kristusi. Ghohamwipurire mukukara nawo mayuwa ghongandji. ->>>>>>> b67796cf25608e4b7aa6a2394095630b910902ab +\v 46 Awo hayuvire hahayidena wa hana kughamba mumandimi ghamweya ndani ghushogherera Nyambi. Petrusi ghoghahuthire eshi; \v 47 ''Kukona ghumwe ghashweneke meyu ko hanu wa eshi mbadi hapwe kuyogha, hanu wa hatamburire Mupepo Ghokupongoka yira kenge twe?'' \v 48 Ghoghawarawerere hapwe kuyogha mudina dya Jesusi Kristusi. Ghohamwipurire mukukara nawo mayuwa ghongandji. \ No newline at end of file diff --git a/11/01.txt b/11/01.txt index 970a28b..48de191 100644 --- a/11/01.txt +++ b/11/01.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -\c 11 \v 1 Hapostoli nohatawi hamweya wa hakarire muJudeya hayiyuvire eshi hahayidena nawo hatmburire nando dhaNyambi. \v 2 Apa eyire Petrusi muJerusalema, awa hahatererire kumbunga dhawakamakyeneno hamuningaghurire; \v 3 haghambire eshi, ''Ghunakukara nawatutughuru ghokupira kukyena nokudya nawo!'' -======= -\v 1 Hapostoli nohatawi hamweya wa hakarire muJudeya hayiyuvire eshi hahayidena nawo hatmburire nando dhaNyambi. \v 2 Apa eyire Petrusi muJerusalema, awa hahatererire kumbunga dhawakamakyeneno hamuningaghurire; \v 3 haghambire eshi, ''Ghunakukara nawatutughuru ghokupira kukyena nokudya nawo!'' ->>>>>>> c20ded486bd9d8cc714262e241a4970217d8599a -======= -\v 1 Hapostoli nohatawi hamweya wa hakarire muJudeya hayiyuvire eshi hahayidena nawo hatmburire nando dhaNyambi. \v 2 Apa eyire Petrusi muJerusalema, awa hahatererire kumbunga dhawakamakyeneno hamuningaghurire; \v 3 haghambire eshi, ''Ghunakukara nawatutughuru ghokupira kukyena nokudya nawo!'' ->>>>>>> b67796cf25608e4b7aa6a2394095630b910902ab +\c 11 \v 1 Hapostoli nohatawi hamweya wa hakarire muJudeya hayiyuvire eshi hahayidena nawo hatmburire nando dhaNyambi. \v 2 Apa eyire Petrusi muJerusalema, awa hahatererire kumbunga dhawakamakyeneno hamuningaghurire; \v 3 haghambire eshi, ''Ghunakukara nawatutughuru ghokupira kukyena nokudya nawo!'' \ No newline at end of file diff --git a/11/22.txt b/11/22.txt index 9be6886..c796d54 100644 --- a/11/22.txt +++ b/11/22.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -\v 22 Mudhi dhokukwawo dheyire mumatwi ghongirishe dhomuJerusalema, no hatumine Barnabasi ghure ghokupiterere Antioka. \v 23 Apa gheyire nokunamona thineke thaFumu, ghashambererire no ghawatjokedhire wahe hakare naFumu nomitjima dhawo dhodhiheya. \v 24 Ghakarire katughuru ghomuwa no ghayarire no mupepo ghokupongoka no matawero, no hanu hohengi hakuwedherere kwaFumu. -======= -\v 22 Mudhi dhokukwawo dheyire mumatwi ghongirishe dhomuJerusalema, no hatumine Barnabasi ghure ghokupiterere Antioka. \v 23 Apa gheyire nokunamona thineke thaFumu, ghashambererire no ghawatjokedhire wahe hakare naFumu nomitjima dhawo dhodhiheya. \v 24 Ghakarire katughuru ghomuwa no ghayarire no mupepo ghokupongoka no matawero, no hanu hohengi hakuwedherere kwaFumu. ->>>>>>> c20ded486bd9d8cc714262e241a4970217d8599a -======= -\v 22 Mudhi dhokukwawo dheyire mumatwi ghongirishe dhomuJerusalema, no hatumine Barnabasi ghure ghokupiterere Antioka. \v 23 Apa gheyire nokunamona thineke thaFumu, ghashambererire no ghawatjokedhire wahe hakare naFumu nomitjima dhawo dhodhiheya. \v 24 Ghakarire katughuru ghomuwa no ghayarire no mupepo ghokupongoka no matawero, no hanu hohengi hakuwedherere kwaFumu. ->>>>>>> b67796cf25608e4b7aa6a2394095630b910902ab +\v 22 Mudhi dhokukwawo dheyire mumatwi ghongirishe dhomuJerusalema, no hatumine Barnabasi ghure ghokupiterere Antioka. \v 23 Apa gheyire nokunamona thineke thaFumu, ghashambererire no ghawatjokedhire wahe hakare naFumu nomitjima dhawo dhodhiheya. \v 24 Ghakarire katughuru ghomuwa no ghayarire no mupepo ghokupongoka no matawero, no hanu hohengi hakuwedherere kwaFumu. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 166cb9d..598ecbe 100644 --- a/manifest.json +++ b/manifest.json @@ -150,25 +150,30 @@ "07-59", "08-title", "08-01", + "08-04", "08-06", + "08-09", "08-12", "08-14", "08-18", "08-20", "08-24", "08-25", + "08-26", "08-29", "08-32", "08-34", "08-36", "08-39", "09-title", + "09-01", "09-03", "09-05", "09-08", "09-10", "09-13", "09-17", + "09-20", "09-23", "09-26", "09-28", @@ -178,6 +183,7 @@ "09-38", "09-40", "10-title", + "10-01", "10-03", "10-07", "10-09", @@ -194,13 +200,16 @@ "10-39", "10-42", "10-44", + "10-46", "11-title", + "11-01", "11-04", "11-07", "11-11", "11-15", "11-17", "11-19", + "11-22", "11-25", "11-27", "11-29",