From 4d842d648ea13bee4ffe712c82a4e7018ca70712 Mon Sep 17 00:00:00 2001 From: "bahasatech.indotengah" Date: Mon, 29 Jul 2024 06:18:30 -0700 Subject: [PATCH] Mon Jul 29 2024 06:18:30 GMT-0700 (Pacific Daylight Time) --- 03/25.txt | 18 ++---------------- 03/27.txt | 25 +++---------------------- 03/30.txt | 23 ++--------------------- 03/33.txt | 25 +++---------------------- 03/36.txt | 22 ++-------------------- 04/01.txt | 13 +++---------- 04/03.txt | 11 ++--------- 04/05.txt | 12 ++---------- 04/09.txt | 16 ++-------------- 04/12.txt | 12 ++---------- 04/14.txt | 11 ++--------- 04/16.txt | 11 ++--------- 04/18.txt | 14 ++------------ 04/title.txt | 6 +----- 14 files changed, 30 insertions(+), 189 deletions(-) diff --git a/03/25.txt b/03/25.txt index a507e12d..8ef948c2 100644 --- a/03/25.txt +++ b/03/25.txt @@ -1,23 +1,10 @@ -<<<<<<< HEAD -\V25 Yusuf anai Matica. -Matica anai Amos -Amos anai Nahum. -Nahum anai Hesli. -Hesli anai Nagai. -\V26 Nagai anai Maat. -Maat anai Matica. -Matica anai Simei. -Simei anai Yosekh. -Yosekh anai Yoda. -======= \v 25 Yusuf ananai Matica. Matica ananai Amos. Amos Ananai Nahum Nahum ananai Hesli - Hesli ananai Nagai -\v 26 Nagai + Hesli ananai Nagai \v 26 Nagai ananai Maat Maat ananai Matica. @@ -26,5 +13,4 @@ Simei. Simei ananai Yosekh. Yosekh ananai -Yoda. ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +Yoda. \ No newline at end of file diff --git a/03/27.txt b/03/27.txt index b1ccb2a0..3245db03 100644 --- a/03/27.txt +++ b/03/27.txt @@ -1,19 +1,3 @@ -<<<<<<< HEAD -\V27 Yoda anai Yohanan -Yohanan anai Resa. -Resa anai Zerubabel -Zerubabel anai Sealtiel. -Sealtiel anai Neri. -\V28Neri anai Adi. -Adi anai Kosam. -Kosam anai Elmadam. -Elmadam anai Er. -\V29 Er anai Yesua -Yesua anai Eliezer. -Eliezer anai Yorim. -Yorim anai Matat. -Matat anai Lewi. -======= \v 27 Yoda idokala Ananai Yohanan. Yohanan ananai @@ -21,16 +5,14 @@ Resa. Resa ananai Zerubabel. Zerubabel ananai Sealtiel. - Sealtiel ananai Neri. -\v 28 Neri ananai + Sealtiel ananai Neri. \v 28 Neri ananai ananai Malkhi Malkhi ananai Adi Adi ananai Kosam. kosam ananai Elmadan - Elmadan ananai Er. -\v 29 Er ananai + Elmadan ananai Er. \v 29 Er ananai Yesua. Yesua ananai Eliezer @@ -39,5 +21,4 @@ Yorim. Yorim ananai Matat Matat ananai -Lewih. ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +Lewih. \ No newline at end of file diff --git a/03/30.txt b/03/30.txt index 6b73fc71..40ed9e5f 100644 --- a/03/30.txt +++ b/03/30.txt @@ -1,20 +1,3 @@ -<<<<<<< HEAD -\V30 Lewi anai Simeon. -Simeon anai Yahuda. -Yahuda anai Yusuf. -Yusuf anai Yonam. -Yonam anai Elyakim. -\V31 Elyakim anai Melea. -Melea anai Mina. -Mina anai Matata. -Matata anai Natan. -Natan anai Daud. -\V32 Daud anai Isai. -Isai anai Obed. -Obed anai Boas. -Boas anai Salmon. -Salmon anai Nahason. -======= \v 30 Lewi idokala Ananai Simeon. Simeon ananai @@ -24,8 +7,7 @@ Yusuf. Yusuf ananai Yonam. Yonam ananai -Elyakim.\v 31 -Elyakim ananai +Elyakim. \v 31 Elyakim ananai Melea. Melea ananai Mina. @@ -43,5 +25,4 @@ Boas. Boas ananai Salmon. Salmon ananai -Nahason. ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +Nahason. \ No newline at end of file diff --git a/03/33.txt b/03/33.txt index 08903cd5..092c22d3 100644 --- a/03/33.txt +++ b/03/33.txt @@ -1,20 +1,3 @@ -<<<<<<< HEAD -\V33 Nahason anai Aminadab. -Aminadab anai Arni. -Arni anai Hezron. -Hezron anai Peres. -Peres anai Yehuda. -\V34 Yehuda anai Yakub. -Yakub anai Ishak. -Ishak anai Abraham. -Abraham anai Terah. -Terah anai Nahor. -\V35 Nahor anai Serug. -Serug anai Rehu. -Rehu anai Peleg. -Peleg anai Eber. -Eber anai Salmon. -======= \v 33 Nahason idokala ananai Aminadab. @@ -26,8 +9,7 @@ Hezron. Hezron ananai Peres. Peres ananai -Yehuda. \v 34 -Yehuda ananai +Yehuda. \v 34 Yehuda ananai Yakub. Yakub ananai Ishak. @@ -35,7 +17,7 @@ Ishak. Abraham Abraham ananai Terah. Terah ananai -Nahor.\v 35 Nahor Ananai +Nahor. \v 35 Nahor Ananai Serug. Serug ananai Rehu. @@ -44,5 +26,4 @@ Peleg. Peleg ananai Eber. Eber ananai -Salmon. ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +Salmon. \ No newline at end of file diff --git a/03/36.txt b/03/36.txt index 77237e4f..06855c56 100644 --- a/03/36.txt +++ b/03/36.txt @@ -1,19 +1,3 @@ -<<<<<<< HEAD -\V36 Salmon anai Kenan. -Kenan anai Arpakhsad. -Arpakhsad anai Sem. -Sem anai Nuh. -Nuh anai Lamekh. -\V37 Lamekh anai Metusalah. -Metusalah anai Henokh. -Henokh anai Yared -Yaret anai Mahalaleel. -Mahalaleel anai Kenan -\V38 Kenan anak Enos. -Enos anai Set. -Set anai Adam. -Adam anani Maroba Allah. -======= \v 36 Salmon idokala na ananai Kenan. Kenan ananai @@ -29,11 +13,9 @@ Metusalah. Yared Yared ananai Mahalaeel - Mahalaeel ananai Kenen. -\v 38 Kenan ananai Enos. + Mahalaeel ananai Kenen. \v 38 Kenan ananai Enos. Enos ananai Set. Set ananai Adam Adam idokala na Anana kama wolu -Kama rayi. ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +Kama rayi. \ No newline at end of file diff --git a/04/01.txt b/04/01.txt index b1244bd0..1ad3dbc3 100644 --- a/04/01.txt +++ b/04/01.txt @@ -1,16 +1,9 @@ -<<<<<<< HEAD -Bada kabani Maroba Yesus -\V1 Maroba Yesus, Kabonngo Wad katengngo kabali wali la Yordan. Mono, engadongo badadokuni Wad Katengngo bana aro la maroda gilro -\V2 Kapato bullu lodongo madenna bana kabani Pajode. Janekmango hamuda kapirra lodongo. kole bana pojayaka, ubnapodani nakarebana. -======= -\v 1 Maroba Yesus, +\c 4 \v 1 Maroba Yesus, Na bonuni Wadi ka tengngo bana bali wali la Yordan. Mowalka. Iyo daka wahani Wadi ka tengngo -bada aro la maroda gilra -\v 2 Kahengo madena ka pato kabulu lodo tutna +bada aro la maroda gilra \v 2 Kahengo madena ka pato kabulu lodo tutna bada kabani Pa jode. Iyo ja nekmango ha muna ka pira lodongo nene. Kolehengo bana -ha dukaka,Iyo naka reba. ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +ha dukaka,Iyo naka reba. \ No newline at end of file diff --git a/04/03.txt b/04/03.txt index 9c02a5a6..a09a6249 100644 --- a/04/03.txt +++ b/04/03.txt @@ -1,14 +1,7 @@ -<<<<<<< HEAD -\V3 Moka, Pajode wena labara-Na, " Baana hijakaknagui Maroba Allah, pawedei hitu watu kana dadi kababa." -\V4 Balehanai Maroba Yesus, " Nenkama tulha, -' To'o banamorho jawali lakababa belemana."' Ulangan 8:3 -======= \v 3 Mokai,ka bolko naha newe labara-na, "Ba yoka anana kama wolu kama rayi,kamu ha wedeyi ha watu nana kana dadi -Rotiyi." -\v 4 Maroba Yesus +Rotiyi." \v 4 Maroba Yesus kana balehaya, " Neni kama tulho, 'Ka dadi toyo mana morho -jaka walila roti belekma."' ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +jaka walila roti belekma."' \ No newline at end of file diff --git a/04/05.txt b/04/05.txt index 5034e72f..e4bdbcea 100644 --- a/04/05.txt +++ b/04/05.txt @@ -1,18 +1,10 @@ -<<<<<<< HEAD -\V5 Pojanono, Pajode na ngodiya Maroba Yesus lapadoyo kamadeta mono napatingo lawe nadi labara-Na tangada kerajaan ponutana. -\V6 Halege walnanka, Pajode wewalna labara-Na, " Yayo gu wogu buto pareha mono manadango la tangkohada padoyo, orongo tangada womowagadka labaragu. Mono, Yayo Guwoya labarada pabeggu. -\V7 I, bamhatenakwa,tangada heyo dagmudka." -======= \v 5 Mowalka, ka bolko nama rongani Maroba Yesus laha doyo kama deta mono -Naha tingoni labara-na tanga kohana kama gilata la ponu tana paha ite lepa. -\v 6 Mokai, ka bolko naha newe +Naha tingoni labara-na tanga kohana kama gilata la ponu tana paha ite lepa. \v 6 Mokai, ka bolko naha newe labara-na, " Yayo enga gu wogu kawaha mono kama gilata nola tanga kohana naha doyo yiyo, oronani tanga kohana kole da Wogani labaragu. Mono, yayo gu woya labara gara jalani yayo haka -madigu. -\v 7 Moka, ba yoyo bamu manuta kawa,tanga kohana nene engana dadi bamu daguni." ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +madigu. \v 7 Moka, ba yoyo bamu manuta kawa,tanga kohana nene engana dadi bamu daguni." \ No newline at end of file diff --git a/04/09.txt b/04/09.txt index 1d723eab..097dda72 100644 --- a/04/09.txt +++ b/04/09.txt @@ -1,12 +1,3 @@ -<<<<<<< HEAD -\V9 Mowalka, Pajode namarongani Maroba Yesus la Yerusalem mono nataya lapadoyo kamadeta latoko umma Bait Allah. Wenai Pajode labarai Maroba Yesus, " Yoyo ba ana pijaknagu Maroba Allah, dolngo wumu wal yiyo dukne wawa, -\V10 Orongoka ned kamatulho, -' Tuttum Yoyo, Maroba Allah naparehayi malaikat-malaikat-Na tonam kadajawawu.' -Mazmur 91:11 -\V11 Mono -'Kadawadi limada, bada harema-Gu -tonam witi-Mu abuda mapobaha la watu."' Mazmur 91:12 -======= \v 9 Mowalka,ka bolko na ngodiya Na Maroba Yesus la Yerusalem mono na bojolaya @@ -15,11 +6,8 @@ Kama wolu kama rayi.wenenai kabolko labaranai Maroba Yesus, " Ba yoyo ba ana kanagu kama wolu kama rayi, Dolu ka wumu wali yiyo lopo noyo dalo, \v 10 Oronani neni kama tulho,' Tutumu yoyo,kama wolu kama rayi engana -Na parehayi tangana Malaikat-na tutna bana angu-gu.' - -\v 11 Mono, +Na parehayi tangana Malaikat-na tutna bana angu-gu.' \v 11 Mono, Monai Limana he iyo, he iyo engada ruka-wu tanam witi-mu -Abina ma pobahayi la watu."' ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +Abina ma pobahayi la watu."' \ No newline at end of file diff --git a/04/12.txt b/04/12.txt index 2e0c929d..7d81d8fb 100644 --- a/04/12.txt +++ b/04/12.txt @@ -1,18 +1,10 @@ -<<<<<<< HEAD -\V12 Balehana Maroba Yesus labarana Pajode, "Nen kamatulha, -' Abum kabakani Morimu Maroba Allah.."' Ulangan 6:16 -\V13 Pajode Kolebana pojaka bana kamani Maroba Yesus, iyo nahalako manajena-Ka mono naremango kaloga heka. -======= \v 12 Nabalehaya Maroba Yesus labarai kabolko, " neni kama tulho, -Abim kabakani Mori kama wolu kama rayi-mu."' - -\v 13 Kolehengoi kabolko bana poja ha kabani Maroba Yesus, iyo +Abim kabakani Mori kama wolu kama rayi-mu."' \v 13 Kolehengoi kabolko bana poja ha kabani Maroba Yesus, iyo naha lako yela-ni Mono na remani ka loga hekango. Ka wunga ha yilina na Maroba -Yesus la Galilea ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +Yesus la Galilea \ No newline at end of file diff --git a/04/14.txt b/04/14.txt index 7530ce4e..172e12a8 100644 --- a/04/14.txt +++ b/04/14.txt @@ -1,13 +1,6 @@ -<<<<<<< HEAD -Kawunga Pahalakonani Maroba Yesus La Galilea -\V14 Maroba Yesus nabali la Galilea nabonuni Wad hatena, mono naliyo tutna namahobara langaradukkana kalingora la barana. -\V15 Mana kapungengo bana hanuwadi la Sinagoge mono tangada toyo da deka-Ya. -======= \v 14 Maroba Yesus na bali la Galilea mono dabonuni da kawahani Wadi katengngo,mono na liyo tut-na bana ma hobara na tangana laha -doyo ka lingorana. -\v 15 Moka Iyo naha legeya naha +doyo ka lingorana. \v 15 Moka Iyo naha legeya naha nuwana la sinagoge mono tangakohana na -Toyo dama hadi deka-ya. ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +Toyo dama hadi deka-ya. \ No newline at end of file diff --git a/04/16.txt b/04/16.txt index 8ed24412..e54d9523 100644 --- a/04/16.txt +++ b/04/16.txt @@ -1,14 +1,7 @@ -<<<<<<< HEAD -Maroba Yesus da Tularani La Harona Hado Wali-Na -\V16 Mowalka Maroba Yesus nahalako la Nazaret, harona hado pamatudan. Dokini kadoma-Na, Maroba Yesus halako la Sinagoge la lodo miggu mono nadede bana baha. -\V17 Hurata Nabi Yesaya dawonani labara-Na, mono Na bugerani nahurata mono natobokoya kamatulho, -======= \v 16 Mowalka Maroba Yesus naha lako la Nasaret,Kota ha doyo iyo ha doyo matuna.kahengo ka doma, Maroba Yesus naha lako la sinagoge nela Lodo migu mono -na dede tutna bana baha. -\v 17 Na hurato hori na rato Yesaya da wonani +na dede tutna bana baha. \v 17 Na hurato hori na rato Yesaya da wonani labara-na,moka iyo na bugerani na hurato hori nene mono na jomuya na taguda -ha tulhoda, ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +ha tulhoda, \ No newline at end of file diff --git a/04/18.txt b/04/18.txt index 92fcfb32..b2895a91 100644 --- a/04/18.txt +++ b/04/18.txt @@ -1,17 +1,7 @@ -<<<<<<< HEAD -\V18 "Wad Mori neni labara-Gu, -orongoka Iyo banakeketawa Yayo tutna bapadukini nali'i kadoha labarada tangkohada to'o milla. -Iyo nahawedewa Yayo hadukini na liyo hoilo tuttu to'o tama la gollu, -mono hatogahayi napa iteyi hittu to'o kamoro, -tonam to'o panoko kada hoilo, -\V19 Mono napadukini yina tutna na doyo rahi burna Morida manarnanka." Yesaya 61:1-2 -======= \v 18 " Wadnai Mori neni labara-gu,oronani Iyo koleha bana hamurahaga yayo Tutna ba todo talarani na liyo ka doha la tangana toyo ka mila ka dengo. iyo naha wedewa yayo tutna ba tokiya nama higo maloga labara heyo tawanan,mono pahatogaha pa iteda la tangada toyo ka moro,tutna baha hoiladi tangada -toyo ka tertindas, -\v 19 Mono tutna -baha dukini na doyo manawaranai Mori ka nemengo." ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +toyo ka tertindas, \v 19 Mono tutna +baha dukini na doyo manawaranai Mori ka nemengo." \ No newline at end of file diff --git a/04/title.txt b/04/title.txt index 5d5a8993..ee86987e 100644 --- a/04/title.txt +++ b/04/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Kawukku Kapatongo (4) -======= -KAWUKU KAPATONGO ->>>>>>> 3573617f94c57dab521392ecbdb2f1fd338ca997 +KAWUKU KAPATONGO \ No newline at end of file