From 025762acc97e1c2b49bf482cdcf941acf7c9bc73 Mon Sep 17 00:00:00 2001 From: "bahasatech.indotengah" Date: Mon, 3 Aug 2020 11:07:17 +0800 Subject: [PATCH] Mon Aug 03 2020 11:07:17 GMT+0800 (Malay Peninsula Standard Time) --- 02/10.txt | 8 +------- 02/13.txt | 7 +------ 02/15.txt | 8 +------- 02/17.txt | 6 +----- 02/18.txt | 7 +------ 02/20.txt | 7 +------ 02/22.txt | 6 +----- 02/23.txt | 7 +------ 02/25.txt | 8 +------- 02/27.txt | 8 +------- 03/01.txt | 7 +------ 03/title.txt | 1 + manifest.json | 11 +++++++++++ 13 files changed, 23 insertions(+), 68 deletions(-) create mode 100644 03/title.txt diff --git a/02/10.txt b/02/10.txt index 0226ed1..8ffcab2 100644 --- a/02/10.txt +++ b/02/10.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 10 Nda yona kalahan kamotahula ambaoi toba ia î bata i Ningumeled kawasa mehe apung a kaseaan. Numu Sia a totumu hi i mataû lumapang. -\v 11 Be hou i hua hu, tumo iatang niana pahooanu sa maleng ambalenu. -\v 12 Tou no oho tumo iatanga pahooana Sa lumuay amukaî latahula. Pahasa Si latahula mahaungangan sa mawa wonuga i Ningumeled, ange kele wa i awe mahasa mamoali. -======= -\v 10 saniboho halahan i hamotahula, awahêm na mbaoitoba Bata’i totumu’ mahaimbahut mapung i noko” kumua Sia wiboho a totumu’ dupened. \v 11 IhuaHu wehow tumodêm, iatangêm paho’anu osa malêngêm a mbalenu ! \v 12 ni’aho totumu’ kahi, tilahom imatang i paho’ana osa mako lumuai a sa’a-sa’agên i’aho mangatow, ahad pahasa silatahula imaerang osa mapêdayow i Ningumêlêd, kuana. Ê kelewa’i alawe’ mahasa wilahên i hita”. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 10 saniboho halahan i hamotahula, awahêm na mbaoitoba Bata’i totumu’ mahaimbahut mapung i noko” kumua Sia wiboho a totumu’ dupened. \v 11 IhuaHu wehow tumodêm, iatangêm paho’anu osa malêngêm a mbalenu ! \v 12 ni’aho totumu’ kahi, tilahom imatang i paho’ana osa mako lumuai a sa’a-sa’agên i’aho mangatow, ahad pahasa silatahula imaerang osa mapêdayow i Ningumêlêd, kuana. Ê kelewa’i alawe’ mahasa wilahên i hita”. \ No newline at end of file diff --git a/02/13.txt b/02/13.txt index ab30447..65a98a6 100644 --- a/02/13.txt +++ b/02/13.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 13 I halawus oho si Ningumeled a tapirig i luah, bo tadoô totumu moay be Sia, osa sia-sia sumusuy i latahula. -\v 14 Ahadiaho Sia lumapang lumeot bi boho sisia milah si Lewi bata i Alveus dumatuh ambeleh i saau osa sia kumua besilatahula: lumas be ahu, osa tumo si Lewi lumas be sia. -======= -\v 13 ni’aho moho hahi si Yesus a tapirig i luah, osa wahasa tow tado’o mangahi we Sia, osa sia sumani silatahula. \v 14 anoras sia malapang mêbemai wiboho, mêlilah Sia si Lewi bata’i Alfeus medatuh-ratuh a mbale i cukai osa Sia humua we Sia : “Lumasêm i Ahu !” yana mêtodai si Lewi osa lumas i Sia. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 13 ni’aho moho hahi si Yesus a tapirig i luah, osa wahasa tow tado’o mangahi we Sia, osa sia sumani silatahula. \v 14 anoras sia malapang mêbemai wiboho, mêlilah Sia si Lewi bata’i Alfeus medatuh-ratuh a mbale i cukai osa Sia humua we Sia : “Lumasêm i Ahu !” yana mêtodai si Lewi osa lumas i Sia. \ No newline at end of file diff --git a/02/15.txt b/02/15.txt index bf19f1c..682ed59 100644 --- a/02/15.txt +++ b/02/15.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 15 Aha dioho atepo si Ningumeled kuman ambale i totumu i âho, tadoô tapa saâu bo manga totumu tadoô seâ medoro bosisia murit-Na tadoô totumu lumas be Sia. -\v 16 Atepo pataasen Tourat bo sanga rumun Farisi milah Sia kumasn bo totumu tapa saau bo totumu sea kumua silatahula a manga murit-murit-Na “ndaho sia kuman bo tapa saau bo manga totumu mahaore. -======= -\v 15 a noras si Yesus mangaungan a mbale i’aho totumu’, tado’o tapasa’an i cukai bo tow imaoro makaru-harua manganyan bo si Sia wo mangamuri’Na, apa’an tado’o tow mahalas i Sia. -\v 16 i mangatoutêh i Torat a nulelen i Parisi, awahêm mangaungan Sia wo tapasa’aw i cukai bo wa’aho tow imaoro, kumua silatahula a mangamuri’Na : “Nde’aho Sia mangaungan karuru i tapasa’aw i cukai bo tow imaoro ?” ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 15 a noras si Yesus mangaungan a mbale i’aho totumu’, tado’o tapasa’an i cukai bo tow imaoro makaru-harua manganyan bo si Sia wo mangamuri’Na, apa’an tado’o tow mahalas i Sia. \v 16 i mangatoutêh i Torat a nulelen i Parisi, awahêm mangaungan Sia wo tapasa’aw i cukai bo wa’aho tow imaoro, kumua silatahula a mangamuri’Na : “Nde’aho Sia mangaungan karuru i tapasa’aw i cukai bo tow imaoro ?” \ No newline at end of file diff --git a/02/17.txt b/02/17.txt index 01e7cbd..fbc32e9 100644 --- a/02/17.txt +++ b/02/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Ningumeled itumanga bo kumua besi latahula ani i totumu nyaman panutuan tabib sumata pahadosan, siahu ahi i tumiang totumu mauleng, sumata totumu mahaoro. -======= -\v 17 Yesus imahatanga’ i’aho osa humua we silatahula : “Ahi’i totumu’ tomboi ê mahawêrêlu walian, sata’ totumu ahadosan, mahi Ahu ahi’i tanu tumiang i totumu’ ulit, sumata’ tow imaoro”. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 17 Yesus imahatanga’ i’aho osa humua we silatahula : “Ahi’i totumu’ tomboi ê mahawêrêlu walian, sata’ totumu ahadosan, mahi Ahu ahi’i tanu tumiang i totumu’ ulit, sumata’ tow imaoro”. \ No newline at end of file diff --git a/02/18.txt b/02/18.txt index 6742a82..3a6a26e 100644 --- a/02/18.txt +++ b/02/18.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 18 Aha di aho atepo murit-murit Yohanes bo manga totumu Farisi samantara matahang i leô, moay manga totumu sa kumua besi Yesus, ndaho murit-murit Yohanes bo murit-murit tou Farisi lumahang i leô, sumata murit-murit-Nu ahi i? -\v 19 Sowat i Yesus besi latahula awarona karua bredegom manga tuama tumahang i leô osa bredegam bana atai i latahula ? Keeto bredegom a tailahatula si latahula ahi î mataû tumahang i leô. -======= -\v 18 anoras manga murid i Yohanes bo manga totumu’ Parisi mapua wuasa, mangahi mangatow osa humua we si Yesus : “nde’aho manga murid i Yohanes bo manga murid i totumu’ Parisi mawapuasa, sata’ mangamuri’Na ahi’i ? \v 19 i Yesus be silatahula : Do’nandom mangaambe i mampilai tuama mapuasa sedang ni’aho mampilei iwakaru-harua ilatahula ? Kaêto’ ni’aho mampilei iwakarua i latahula, ahi’i silatahula mata’u mapuasa. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 18 anoras manga murid i Yohanes bo manga totumu’ Parisi mapua wuasa, mangahi mangatow osa humua we si Yesus : “nde’aho manga murid i Yohanes bo manga murid i totumu’ Parisi mawapuasa, sata’ mangamuri’Na ahi’i ? \v 19 i Yesus be silatahula : Do’nandom mangaambe i mampilai tuama mapuasa sedang ni’aho mampilei iwakaru-harua ilatahula ? Kaêto’ ni’aho mampilei iwakarua i latahula, ahi’i silatahula mata’u mapuasa. \ No newline at end of file diff --git a/02/20.txt b/02/20.txt index cb94e4d..82374e4 100644 --- a/02/20.txt +++ b/02/20.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 20 Bana tepona mahi bredegom injon besilatahula? Osa atepo oho gredegom osa tumahang i leô. -\v 21 Ahem esa tou tumapal doho taleya andoho koyong apaan sahele waaho doho taleya i oho mawa renet, de taleya mawa renet matua. Sa hele waaho lebe bako denena. -======= -\v 20 tepona mahasa mahi wa’aho mampilei indom be silatahula, osa a tepo wa’ahom silatahula mapuasa. \v 21 mande êsatow tumapal i sangatiras ndoho’ awe’ihumesut a latang koyongan, osa mahawako’ ndayatna. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 20 tepona mahasa mahi wa’aho mampilei indom be silatahula, osa a tepo wa’ahom silatahula mapuasa. \v 21 mande êsatow tumapal i sangatiras ndoho’ awe’ihumesut a latang koyongan, osa mahawako’ ndayatna. \ No newline at end of file diff --git a/02/22.txt b/02/22.txt index 6baa1b0..6deef6a 100644 --- a/02/22.txt +++ b/02/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 Kelei waaho ahem esa tou mehe angur ambolulang matua apaan angur taleya saipa ambolulang matua. Bolulang i oho do yon ahi i harenet. Osa, aggur bo bolulang i tiaam osa anggur taleya lepa a sopoy taleya. -======= -\v 22 hahi alahêm mande êsatow sumuang i nanggor taleya a suang i sopoi wolulang koyongan, apa’an sa helewa’aho wa’aho nanggor mawarayat i’aho sopai, awahad ni’aho nanggor bo sopoina dua-ruana daket ihatia’. Sata’ anggor taleya totu’mu iêpa kahi a sopoi taleya”. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 22 hahi alahêm mande êsatow sumuang i nanggor taleya a suang i sopoi wolulang koyongan, apa’an sa helewa’aho wa’aho nanggor mawarayat i’aho sopai, awahad ni’aho nanggor bo sopoina dua-ruana daket ihatia’. Sata’ anggor taleya totu’mu iêpa kahi a sopoi taleya”. \ No newline at end of file diff --git a/02/23.txt b/02/23.txt index 3fb6dd9..b92fb34 100644 --- a/02/23.txt +++ b/02/23.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 23 Atepo i oho a nendo i sabat, Yesus lumapang am bedeng i gandum a malapa-lapang murit-muritNa tumiwu tangoana ingandum. -\v 24 Osa i hua manga tou Farisi be-Sia: “lahen ! Ndaho si latahula tumuli asia ahi i mataû tuliden a nendoi Sabat ? -======= -\v 23 a nêndo sabat, si Yesus ilumapang a mbondoi i nggandum, osa a mêlapa-lapang mangamuriNa makêbit’ tangoan i nggandum. \v 24 kua i mangatow Parisi we Sia : “êmoho ! Nde’aho silatahula tumulid iwawasia tahi’i mata’u a nêndo sabat ? ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 23 a nêndo sabat, si Yesus ilumapang a mbondoi i nggandum, osa a mêlapa-lapang mangamuriNa makêbit’ tangoan i nggandum. \v 24 kua i mangatow Parisi we Sia : “êmoho ! Nde’aho silatahula tumulid iwawasia tahi’i mata’u a nêndo sabat ? \ No newline at end of file diff --git a/02/25.txt b/02/25.txt index 3d12f54..1c4fcb7 100644 --- a/02/25.txt +++ b/02/25.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 25 Sowa-Na be silatahula : “awa we kamotahula maca asia tinuli indaut, osa sia bo i mâlas bosia alanemoho retala osa kinaleôanem -\v 26 Kelembisa sia sumuang ambale Ningumeled. Atepo i oho Abiyatar tumaka-taka imam bako osa kuman roti bewulah osa ahi i mataû kanen balina oho wati imam-imam osa iêhena besi lata hula i lumas bo sia? -======= -\v 25 we silatahula : Awe’mahasandom komotahula imaca asia tinulid i Daud anoras sia wo silatahula i mahalasisia kinahawuan bo kinale’oan, -\v 26 sia sumuang a mBale i Ningumêlêd a tepo si Abyatar tumaka-taka’ kele Imam Bako’ osa kuman i roti wasil wa’aho ê tahi’i mata’u kanên kaesali i mangaimam osa mehei’aho hahi a manga dengarena ? ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 25 we silatahula : Awe’mahasandom komotahula imaca asia tinulid i Daud anoras sia wo silatahula i mahalasisia kinahawuan bo kinale’oan, \v 26 sia sumuang a mBale i Ningumêlêd a tepo si Abyatar tumaka-taka’ kele Imam Bako’ osa kuman i roti wasil wa’aho ê tahi’i mata’u kanên kaesali i mangaimam osa mehei’aho hahi a manga dengarena ? \ No newline at end of file diff --git a/02/27.txt b/02/27.txt index 4b4ae9a..395395b 100644 --- a/02/27.txt +++ b/02/27.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 27 Osa i hua i si Yesus besi latahula : “Nendo i Sabat tinuli por totumu. Osa ahi i totumu ambaô nendoi Sabat. -\v 28 Kele waaho. Bata Totumu Sia Ningumeled nendoi Sabat. -======= -\v 27 kua a i Yesus be silatahula : êndo sabat pinogimano tanu totumu’ bo ahi’i totumu’ tanu sabat, -\v 28 Bata’ i totumu’ awahêm kahi Tuhan a nêndo sabat. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 27 kua a i Yesus be silatahula : êndo sabat pinogimano tanu totumu’ bo ahi’i totumu’ tanu sabat, \v 28 Bata’ i totumu’ awahêm kahi Tuhan a nêndo sabat. \ No newline at end of file diff --git a/03/01.txt b/03/01.txt index 2530e5f..486b7b9 100644 --- a/03/01.txt +++ b/03/01.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\c 3 \v 1 Awahem Yesus sumuang angonggulang. Biboho bana tou kamana weta i matau. -\v 2 Silatahula mamilah-milah si Yesus, ndesa Sia mawamaulaeng itow nendo anendo Sabat, saniboho silatahula mepa sea be Sia. -======= -\c 3 \v 1 Yesus sumuang angonggulang. Biboho bana tou kamana weta i matau. \v 2 mamilah-milah si Yesus, ndesa Sia mawamaulaeng itow nendo anendo Sabat, saniboho silatahula mepa sea be Sia. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\c 3 \v 1 Yesus sumuang angonggulang. Biboho bana tou kamana weta i matau. \v 2 mamilah-milah si Yesus, ndesa Sia mawamaulaeng itow nendo anendo Sabat, saniboho silatahula mepa sea be Sia. \ No newline at end of file diff --git a/03/title.txt b/03/title.txt new file mode 100644 index 0000000..c39f784 --- /dev/null +++ b/03/title.txt @@ -0,0 +1 @@ +Pasal 3 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 25ca03e..2dc0607 100644 --- a/manifest.json +++ b/manifest.json @@ -70,6 +70,17 @@ "02-03", "02-05", "02-08", + "02-10", + "02-13", + "02-15", + "02-17", + "02-18", + "02-20", + "02-22", + "02-23", + "02-25", + "02-27", + "03-title", "03-28", "03-31", "03-33",