From c3bce4432c04439311cbbd4d013c872c6cf58f7b Mon Sep 17 00:00:00 2001 From: "bahasatech.indotengah" Date: Mon, 29 Jul 2024 06:04:24 -0700 Subject: [PATCH] Mon Jul 29 2024 06:04:23 GMT-0700 (Pacific Daylight Time) --- 01/11.txt | 14 +++----------- 01/14.txt | 10 ++-------- 01/16.txt | 10 ++-------- 01/18.txt | 15 +++------------ 01/21.txt | 11 ++--------- 5 files changed, 12 insertions(+), 48 deletions(-) diff --git a/01/11.txt b/01/11.txt index 537ab0a0..0fef396c 100644 --- a/01/11.txt +++ b/01/11.txt @@ -1,21 +1,13 @@ -<<<<<<< HEAD -\v11 Jahataja donganka, malaikat Morda nahatingowungo labarai Zakharia mono nadede tabara la kawanana .......... -\12 Orongo baiteya na malaikat, Zakharia nakadadaka na ihna mono nakabohi tepijja. -\13 Ta idoyaka, na malaikat nahanewe labarana, " Abumkabohkaw, Zakharia, orongo bamhaduwdongan na Morda mono bamhakarewu na rongoka. Arawemmu, Elisabet, nahaanango lakeda kabani dagumu mono hangarani Yohanes. -======= \v 11 Mono naha wodda wunai, Malaikat nai Mori bana tingo wuna labaranai Zakaria mono nadede nola tabara laka wananai altar -ukupan. -\v 12 kole bana iteya nena +ukupan. \v 12 kole bana iteya nena malaikat, Zakaria mono naka redi na ihina mono na -hoda ka bohi. -\v 13 Tabolo, nena Malaikat +hoda ka bohi. \v 13 Tabolo, nena Malaikat naha newe labarana,''Abim kabohkawu, Zakaria, tabolo naka wojo katabamu mono paka remu na rongo mowaguni. arawemu, Elisabet,engana naha Anango diha wuyo lakeda kabani tutmi mono yomi -kami ha ngarani Yohanes . ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +kami ha ngarani Yohanes . \ No newline at end of file diff --git a/01/14.txt b/01/14.txt index c54eefab..e40a42a3 100644 --- a/01/14.txt +++ b/01/14.txt @@ -1,11 +1,5 @@ -<<<<<<< HEAD -\v14 Yomi magebora mono doha na atem , loho dangai toyo kahadoki magebora orongo bana dadi. -\v15 iyaka ma dadi bokolo la arona Morda mono jana inukma anggur jedoka innu we kahawona kahekango. Lohowido, wal badalohoya lakabu inyana......................... -======= \v 14 Yomi engam ege ate dita kokomi mono lagahara, mono danga jala toyo kadokungo bami ege ate dita kokomi noyo bana -dadi. -\v 15 Iyo engana bana matuyo la aronai Mori mono enga jana inukma Anggur bajedokka ha inu ka keras heka. lopo jala,mono walidomo nola -kabu inyana iyo engana dokuni wadi katengngo. ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +dadi. \v 15 Iyo engana bana matuyo la aronai Mori mono enga jana inukma Anggur bajedokka ha inu ka keras heka. lopo jala,mono walidomo nola +kabu inyana iyo engana dokuni wadi katengngo. \ No newline at end of file diff --git a/01/16.txt b/01/16.txt index f5f5d3c6..5eb2edab 100644 --- a/01/16.txt +++ b/01/16.txt @@ -1,14 +1,8 @@ -<<<<<<< HEAD -\v16 Moloho narayidi to'o danga Israel da balhabali labarana Morda Maroba Allah da. -\v17 Moloho da halako pahaulya na Morda wan na wad hatena mono kawahai Elia,' tanam karayidad ateda bapa-bapa kada balhabali labarada ana-ana da'. i jala domo rayid hit to'o-to'o jaka........................... mono idoyaka, i dahagonango kalibo toyo yit habodo longaha gonana na Morda." -======= \v 16 Iyo engana na rayini danga toyo Israel ka aro la -barai Mori,kama wolu kama rayida he iyo. -\v 17 Iyo enga daha lako ulungo lara lai Mori mono +barai Mori,kama wolu kama rayida he iyo. \v 17 Iyo enga daha lako ulungo lara lai Mori mono wadi katengngo mono kawahanai Elia , 'tutna bada rayini ateda tangada ha bapa bada ka bali labara tangada ha Anada he iyo' .Iyo jala engana na rayi tangana toyo kaja li wawa tutna bada kabali labarada kamadingo tangada toyo ha tena. mono kahe jalango , Iyo kaha inyakayi toyo ha tena -ha koleha Paha gonada tutnai Mori '' ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +ha koleha Paha gonada tutnai Mori '' \ No newline at end of file diff --git a/01/18.txt b/01/18.txt index 9f9e8e00..45972af4 100644 --- a/01/18.txt +++ b/01/18.txt @@ -1,17 +1,8 @@ -<<<<<<< HEAD -\v18 wenenai Zakharia labaranai malaikat, "Ahanyikkanna ya bagutajaya tutna yi? orngo, ya yiyo kawedawaka mono arawe jalagu na kaweda jalaka." -\v19 Nana malaikat nabaleha , " Yayo idokai Gabriel, malaikat kadede la arona Morda Maroba Allah. Yayo pahatutwa tanam kagu kaguhanewe dongagu mono hadukini na li'i kadoha yiyo labaramu. -/v20 Tabollo, nebahenaka rongomla! yami dadi kabongami mono jam dakma hanewe koha badukini na lodo rahi ngaradukkada hit banadadiyi orongo yomi bajam hatenai ahad hatokigu, hit haponnuggu neme la lodo rahna." -======= \v 18 Zakaria naha newe labarai malaikat nene, ''Ba anyik kagu yayo bagu tajaya tutna ka dadi yiyo. -Oronani, yayo yiyo kole guka wedawa mono arawegu koleha ka tungo.'' - -\v 19 Malaikat nene na balehaya, ''Ya dokai Gabriel ,malaikat ka dede la aronai kama wolu kama rayi. Yadoka paha wedena -tutna bagu ha newe dongagu mono bagu ha dukiguni yiyo na liyo kadoha labaramu. -\v 20 Neba, hena rongowula . yomi engam kabongawu mono jamu pewekmango ha newe koha nela lodo kole tangana kadadi yiyo bana +Oronani, yayo yiyo kole guka wedawa mono arawegu koleha ka tungo.'' \v 19 Malaikat nene na balehaya, ''Ya dokai Gabriel ,malaikat ka dede la aronai kama wolu kama rayi. Yadoka paha wedena +tutna bagu ha newe dongagu mono bagu ha dukiguni yiyo na liyo kadoha labaramu. \v 20 Neba, hena rongowula . yomi engam kabongawu mono jamu pewekmango ha newe koha nela lodo kole tangana kadadi yiyo bana dadi oronani yomi bajam ha tena gani ha tokigu, -nopaha tutda nola rahina.'' ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +nopaha tutda nola rahina.'' \ No newline at end of file diff --git a/01/21.txt b/01/21.txt index 8ee64f79..2b1643d9 100644 --- a/01/21.txt +++ b/01/21.txt @@ -1,8 +1,3 @@ -<<<<<<< HEAD -\v21 Tongrongo nana, hit toyo badaremani Zakharia. tangada dakapata-patan abai Zakharia baneni mana madehingkango yidalo Bait Allah. -\v22 Dukngo banalohongo, Zakharia janekmangka hatokna labarada tangkohada. Tangkoha wikda da tajayaka orongoi Zakharia na kolengoka haitena yidalo la Bait Allah oroiyaka hangata-ngatango rayingo ........... labarada tangkohada, taidoyaka jadda dakma hanewe. -\v23 Pojayaka narahi hayilda pahatenada, balinankai Zakharia la ummana. -======= \v 21 Tongro heda nene, toyo hatena da remani Zakaria he iyo daka pata -pata wungo Abai Zakaria mana madehingo no dalo la umana kama wolu kama @@ -10,7 +5,5 @@ rayi. \v 22 Koleha bana loho ngoi, Zakaria jana helu ha newekma labarada he iyo. He iyo da tajaya ba nai Zakaria koleha bana kolengo majura nola umana kama wolu kama rayi oronani iyo bana ha kita-kitango bana rayingo -pata labarada he iyo, tabolo jana ha newekma. -\v 23 Koleha pira moyaka narahi keimamanna bana pojaya, balinankai Zakaria -la umana. ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +pata labarada he iyo, tabolo jana ha newekma. \v 23 Koleha pira moyaka narahi keimamanna bana pojaya, balinankai Zakaria +la umana. \ No newline at end of file