From ccd2977112e62e870a014defae36989806981afe Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Wed, 10 Apr 2024 09:44:05 +0200 Subject: [PATCH] Wed Apr 10 2024 09:44:04 GMT+0200 (Central Africa Time) --- 17/01.txt | 6 +- 17/03.txt | 6 +- 17/05.txt | 6 +- 17/09.txt | 6 +- 17/19.txt | 6 +- 17/22.txt | 6 +- 17/24.txt | 6 +- 17/26.txt | 6 +- manifest.json | 174 ++++++++++++++++++++++++++------------------------ 9 files changed, 97 insertions(+), 125 deletions(-) diff --git a/17/01.txt b/17/01.txt index d4f8270..23b4daa 100644 --- a/17/01.txt +++ b/17/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 17 \v 1 Kombundo mauva hamboumwe Jesus watwaerera Petrus, Jakop na Johanes erumbire, nu okuvetwara ko mbundo ndundu. \v 2 Eye watjituka kumurungu wao. Omurungu we aungaa euva, nu mbanda ye yaerere tjimuna ondjerera. -======= -\c 17 \v 1 Kombombunda omauva hamboumue Jesus watwaerera Petrus,Jakobus na Johanes erumbire, nu okuvetwara ko mbando ndundu. \v 2 Eye watjituka komurungu wao. Omurungu we aungara euva,nu ombanda ye ya erere tjimuna ondjerera. ->>>>>>> 83474aaeb45dcafb0afb352f397e813b09c61aa2 +\c 17 \v 1 Kombundo mauva hamboumwe Jesus watwaerera Petrus, Jakop na Johanes erumbire, nu okuvetwara ko mbundo ndundu. \v 2 Eye watjituka kumurungu wao. Omurungu we aungaa euva, nu mbanda ye yaerere tjimuna ondjerera. \ No newline at end of file diff --git a/17/03.txt b/17/03.txt index 271e92d..bf776ad 100644 --- a/17/03.txt +++ b/17/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Tjimanga, ape riraisa Moses na Elijah mavehungi kuye. \v 4 Petrus wazira atja ku Jesus, " Mukuru, onawa kwete okukara mba. tjimuvanga, Mi ungura po omahahe tatu -oryee noryaMose no ryaEijah." -======= -\v 3 Tjimanga imba ovahongewa ve ve tatu vamuna Moses na Elia ameve hungire puna Jesus. \v 4 Petrus wazira atja ku Jesus;''Muhona, tjiri okokuwa kwete okukara mba. Tjimuvanga,miungurapo omahahe yetatu-rimue oryee no rya Moses no rya Elia''. ->>>>>>> 83474aaeb45dcafb0afb352f397e813b09c61aa2 +\v 3 Tjimanga, ape riraisa Moses na Elijah mavehungi kuye. \v 4 Petrus wazira atja ku Jesus, " Mukuru, onawa kwete okukara mba. tjimuvanga, Mi ungura po omahahe tatu -oryee noryaMose no ryaEijah." \ No newline at end of file diff --git a/17/05.txt b/17/05.txt index e571e4d..8933775 100644 --- a/17/05.txt +++ b/17/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Tjinga mahungire, otjikamba otjinene atji wire kuwo, nu tjiperi naho, apeya ombasiro okuza motjikamba, aritja, "Ingu omuatje wandje omusuverwa,menarye mbuyozikwa. \v 6 Mupwaatene."Ovahongewa tjivazuva, vawa ongota nuvatira. \v 7 Tjazumba Jesus weya ookuve tuna natja, Yerurukee amutira. \v 8 Nu vaera omeho nu vamuna Jesus omuni. -======= -\v 5 Nu Petrus ngunda mahungire,otjikamba otjinene arire tjitjarire otji tjivepe omuzire, nu motjikamba amuzu eraka nda tjere: Ingwi Omuna wandje omuseverwa Ami mi mbi no nyune, purateneye ku Ye!'' \v 6 Ovahongewa tjivazuva indi eraka vauruma tjinene,nu aveu ongota. \v 7 Tjazumba Jesus weya ookuvetuna na tja,'' Pendukeye nu amutira!'' \v 8 Nu vaera omeho wee nu vamuna Jesus omuini. ->>>>>>> 83474aaeb45dcafb0afb352f397e813b09c61aa2 +\v 5 Tjinga mahungire, otjikamba otjinene atji wire kuwo, nu tjiperi naho, apeya ombasiro okuza motjikamba, aritja, "Ingu omuatje wandje omusuverwa,menarye mbuyozikwa. \v 6 Mupwaatene."Ovahongewa tjivazuva, vawa ongota nuvatira. \v 7 Tjazumba Jesus weya ookuve tuna natja, Yerurukee amutira. \v 8 Nu vaera omeho nu vamuna Jesus omuni. \ No newline at end of file diff --git a/17/09.txt b/17/09.txt index a166890..8932532 100644 --- a/17/09.txt +++ b/17/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Tjaa veruka kondundu, Jesus wevevera, atje, " amuhungire otjina hi komundu nga omuna womundu tjapenduka movakoke. \v 10 Ovahongewa vemupura, avetja," Ongwaikenozonongo tjizetja Elijah maso kuya rutenga? -======= -\v 9 Tjaa verauka kondundu,Jesus weveraera,atja,'' Amu hungire otjirimunikise tji mwa munu hi nga omuna wo mundu tja penduka movakoke.'' \v 10 Ovahongewa vemupura,avetja,'' Omgwaike ozonongo zomatwako tjizetja Elia masokuya tjitenga ? ->>>>>>> 83474aaeb45dcafb0afb352f397e813b09c61aa2 +\v 9 Tjaa veruka kondundu, Jesus wevevera, atje, " amuhungire otjina hi komundu nga omuna womundu tjapenduka movakoke. \v 10 Ovahongewa vemupura, avetja," Ongwaikenozonongo tjizetja Elijah maso kuya rutenga? \ No newline at end of file diff --git a/17/19.txt b/17/19.txt index 0ab79d9..ee3fbf4 100644 --- a/17/19.txt +++ b/17/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 Ovahongewa vaamba kuJesus ave tja, " Ongwaike ete tjituhapitisire ozombepo? \v 20 Jesus ookutja kuwo, " Omena ryokangamburiro kenu. Tjiri mimuraere, Tjimuna ongamburiro okatiti ndaryee ndjita po ndanga, nu orundurura ozondundu ndjari ngu otja nguiyende ngu, kapena tjima tjikuuru. \v 21 - -======= -\v 19 Ovahongewa veya ku Jesus mongumumu nave mupura ave tja: '' Okutjavi ete tji twahasorere okupitisa ozombepo zohakohoke ?'' \v 20 Jesus watja kuwo,'' Omena ryokangamburiro kenu okatiti.tjimuna okangamburiro okatiti ndarire ndjita po ndanga yomumosteri,itja muyenena okutja nai kondundu' humburuka kakurame mbena!' noyo itjai humburuka. Nu katja muurwa iyo tjina \v 21 * ->>>>>>> 83474aaeb45dcafb0afb352f397e813b09c61aa2 +\v 19 Ovahongewa veya ku Jesus mongumumu nave mupura ave tja: '' Okutjavi ete tji twahasorere okupitisa ozombepo zohakohoke ?'' \v 20 Jesus watja kuwo,'' Omena ryokangamburiro kenu okatiti.tjimuna okangamburiro okatiti ndarire ndjita po ndanga yomumosteri,itja muyenena okutja nai kondundu' humburuka kakurame mbena!' noyo itjai humburuka. Nu katja muurwa iyo tjina \v 21 * \ No newline at end of file diff --git a/17/22.txt b/17/22.txt index c5e9e6c..f7a9cb9 100644 --- a/17/22.txt +++ b/17/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 Tjivari mo Galilea, Jesus watja kovahongewa, " omuna womundu maandjwa mo make wovandu, \v 23 Nu mave muzepa, nu euva oritjetatu mapenduka. Ovahongewa vaihamwa tjinene. -======= -\v 22 Tjivari mo Galilea, Jesus watja ko vahongewa avehe,''Omuna wOmundu mayandjwa mo make wovandu, \v 23 Nu mavemuzepa nu euva oritjatatu mapenduka'' Ovahongewa vaihamwa tjinene. ->>>>>>> 83474aaeb45dcafb0afb352f397e813b09c61aa2 +\v 22 Tjivari mo Galilea, Jesus watja kovahongewa, " omuna womundu maandjwa mo make wovandu, \v 23 Nu mave muzepa, nu euva oritjetatu mapenduka. Ovahongewa vaihamwa tjinene. \ No newline at end of file diff --git a/17/24.txt b/17/24.txt index 498c630..13d6040 100644 --- a/17/24.txt +++ b/17/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Tjiveya ko kapernaum, omurumendu ngwa ongo ovisuta weya ku Petrus atja, Hapo omuhonge we otjisuta usuta? \v 25 Atja," Petrus tjeya mondjuwo, Jesus wahungira kuye rutenga atja, " Muri puravi Simon? Okuune ombara yaye kuisutisa otjisuta? okuza kovanatje vao poo varwe". -======= -\v 24 Tjiveya moKapernaum,omurumendu ngwaongo ovisuta weya ku Petrus atja,Hapo omuhonge wenu usuta otjisuta tjo ndjiwo ondjapuke ya Muhona ? \v 25 Nu Petrus wazire atja ''Ii,u suta Jesus arire tje mu tengerepo okuhungira atja'' Simon,mpo ripura vi? Owani ngusuta otjimariva tjowini no tjimariva tjouhona kozombara zouye mbwi? Ovature vehi poo ovandu wozonganda? ->>>>>>> 83474aaeb45dcafb0afb352f397e813b09c61aa2 +\v 24 Tjiveya moKapernaum,omurumendu ngwaongo ovisuta weya ku Petrus atja,Hapo omuhonge wenu usuta otjisuta tjo ndjiwo ondjapuke ya Muhona ? \v 25 Nu Petrus wazire atja ''Ii,u suta Jesus arire tje mu tengerepo okuhungira atja'' Simon,mpo ripura vi? Owani ngusuta otjimariva tjowini no tjimariva tjouhona kozombara zouye mbwi? Ovature vehi poo ovandu wozonganda? \ No newline at end of file diff --git a/17/26.txt b/17/26.txt index 43a07e2..157c248 100644 --- a/17/26.txt +++ b/17/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 26 Okuza kuvarwe," Petrus wazira " okutja ovanatje ovakutukeJesus atja naho. \v 27 Kutja tu hatindisa omuawange wotjisuta, twende kokuvare kaumbemo otjipate nu nana ohi ondenga ndjai kotjipate. Tjiwa paturura otjinyo tjayo, movazamo ewe ehuze. Twara ko mu wonge wovisuta otjandje na ove." -======= -\v 26 ''Petrus arire tjaziri atja okuza kuvarwe'' Jesus akotora atja :''Mapehee kutja ovature vehi kave sokusuta. \v 27 Nungwari ete katuno okuvanga okupindikisa ovandu mba. Twende komuronga u kayumbe ondjoro yo mahundju momeva. Nehundju ndatengepo okurumata nana upitise momeva.Nu tjiwapaturura otjinyo tjaro,mo vaza mo otjimariva otjisiriveri. Kmbura ukasute natjo otjisuta tjetu na ove tjondjiwo ondjapuke ya Muhona.'' ->>>>>>> 83474aaeb45dcafb0afb352f397e813b09c61aa2 +\v 26 Okuza kuvarwe," Petrus wazira " okutja ovanatje ovakutukeJesus atja naho. \v 27 Kutja tu hatindisa omuawange wotjisuta, twende kokuvare kaumbemo otjipate nu nana ohi ondenga ndjai kotjipate. Tjiwa paturura otjinyo tjayo, movazamo ewe ehuze. Twara ko mu wonge wovisuta otjandje na ove." \ No newline at end of file diff --git a/manifest.json b/manifest.json index bb2cefc..c359dbc 100644 --- a/manifest.json +++ b/manifest.json @@ -40,7 +40,8 @@ "Deliwe", "Chairman", "chairman", - "mel-12" + "mel-12", + "deliwe" ], "finished_chunks": [ "front-title", @@ -287,7 +288,26 @@ "16-24", "16-27", "17-title", + "17-22", + "17-24", + "17-26", "18-title", + "18-01", + "18-04", + "18-07", + "18-09", + "18-10", + "18-12", + "18-15", + "18-17", + "18-18", + "18-21", + "18-23", + "18-26", + "18-28", + "18-30", + "18-32", + "18-34", "19-title", "19-01", "19-03", @@ -316,6 +336,26 @@ "20-25", "20-29", "20-32", + "21-title", + "21-01", + "21-04", + "21-06", + "21-09", + "21-12", + "21-15", + "21-18", + "21-20", + "21-23", + "21-25", + "21-28", + "21-31", + "21-33", + "21-35", + "21-38", + "21-40", + "21-42", + "21-43", + "21-45", "22-title", "22-01", "22-04", @@ -336,6 +376,23 @@ "22-41", "22-43", "22-45", + "23-title", + "23-01", + "23-04", + "23-06", + "23-08", + "23-11", + "23-13", + "23-16", + "23-18", + "23-20", + "23-23", + "23-25", + "23-27", + "23-29", + "23-32", + "23-34", + "23-37", "24-title", "24-01", "24-03", @@ -373,6 +430,36 @@ "25-37", "25-41", "25-44", + "26-title", + "26-01", + "26-03", + "26-06", + "26-10", + "26-12", + "26-14", + "26-17", + "26-20", + "26-23", + "26-26", + "26-27", + "26-30", + "26-33", + "26-36", + "26-39", + "26-42", + "26-45", + "26-47", + "26-49", + "26-51", + "26-55", + "26-57", + "26-59", + "26-62", + "26-65", + "26-67", + "26-69", + "26-71", + "26-73", "27-title", "27-01", "27-03", @@ -408,89 +495,6 @@ "28-14", "28-16", "28-18", - "28-20", - "18-01", - "18-04", - "18-07", - "18-09", - "18-10", - "18-12", - "18-15", - "18-17", - "18-18", - "18-21", - "18-23", - "18-26", - "18-28", - "18-30", - "18-32", - "18-34", - "21-title", - "21-01", - "21-04", - "21-06", - "21-09", - "21-12", - "21-15", - "21-18", - "21-20", - "21-23", - "21-25", - "21-28", - "21-31", - "21-33", - "21-35", - "21-38", - "21-40", - "21-42", - "21-43", - "21-45", - "23-title", - "23-01", - "23-04", - "23-06", - "23-08", - "23-11", - "23-13", - "23-16", - "23-18", - "23-20", - "23-23", - "23-25", - "23-27", - "23-29", - "23-32", - "23-34", - "23-37", - "26-title", - "26-01", - "26-03", - "26-06", - "26-10", - "26-12", - "26-14", - "26-17", - "26-20", - "26-23", - "26-26", - "26-27", - "26-30", - "26-33", - "26-36", - "26-39", - "26-42", - "26-45", - "26-47", - "26-49", - "26-51", - "26-55", - "26-57", - "26-59", - "26-62", - "26-65", - "26-67", - "26-69", - "26-71", - "26-73" + "28-20" ] } \ No newline at end of file