From 002fd4a281c14b284a778910a34452d01cf20d5c Mon Sep 17 00:00:00 2001 From: "bahasatech.indotengah" Date: Mon, 3 Aug 2020 11:05:17 +0800 Subject: [PATCH] Mon Aug 03 2020 11:05:17 GMT+0800 (Malay Peninsula Standard Time) --- 01/38.txt | 8 +------- 01/40.txt | 8 +------- 01/43.txt | 7 +------ 01/45.txt | 6 +----- 02/01.txt | 7 +------ 02/03.txt | 7 +------ 02/05.txt | 8 +------- 02/08.txt | 7 +------ 02/title.txt | 1 + manifest.json | 10 ++++++++++ 10 files changed, 19 insertions(+), 50 deletions(-) create mode 100644 02/title.txt diff --git a/01/38.txt b/01/38.txt index ace925d..9b293e8 100644 --- a/01/38.txt +++ b/01/38.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 38 SowateNa mayom kita moho atampabalina boho a kota-kota mesusutan bobo wi boho hahi ahu sumahai kukua nde waaho si ahu imoai. -\v 39 Osamuho sia asakum ingGalilea sumahai kukua amanga wale i Ningulemed i latahula bo maherei manga tutu. -======= -\v 38 : “Ayomêm moho hita a lesad balina, a mangakota masusutan, saniboho boboho hahi Ahu sumahai i Kukua, nde tanu wa’aho si Ahu imahim’. -\v 39 Sia moho a sêrêb i NgGalilea osa maposahai i Kukua a manga wale waibadatan ilatahula bo mahelei inganga setang. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 38 : “Ayomêm moho hita a lesad balina, a mangakota masusutan, saniboho boboho hahi Ahu sumahai i Kukua, nde tanu wa’aho si Ahu imahim’. \v 39 Sia moho a sêrêb i NgGalilea osa maposahai i Kukua a manga wale waibadatan ilatahula bo mahelei inganga setang. \ No newline at end of file diff --git a/01/40.txt b/01/40.txt index 5c97060..2f8bbe5 100644 --- a/01/40.txt +++ b/01/40.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 40 Esa tou mahados kusta mahi besi Yesus osa sumarimbuhu asaangeNa, mangerei mahitulung, kuana, sasihou mabog, sihou mewamahuleng ngahu. -\v 41 Osa i hasait nateNa imberena, osa sia mayoikamana, tumakakama tou iboho, osa kumua besia i habogKu, mamuali mawuleng. -\v 42 Akotiroan ni boho behatalam mahados kusta tou iboho, bosia mamulai mawuleng. -======= -\v 40 adosên i kusta mahi we si Yesus, bo karêngan isumalibuhu a ndior. A mamohong sia tutulungNga, kuana : “sa how mabog, do’na how mawamauleng iahu”. \v 41 ateNa wahali’is i mbele’Na osa mayomoho Sia i kamaNa mamos i’aho totumu’ osa humua we sia : “mabog Ahu, memaulêngange how. \v 42 wa’aho behatalam ê mahados kusta i’aho totumu’, osa mewaulêng sia. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 40 adosên i kusta mahi we si Yesus, bo karêngan isumalibuhu a ndior. A mamohong sia tutulungNga, kuana : “sa how mabog, do’na how mawamauleng iahu”. \v 41 ateNa wahali’is i mbele’Na osa mayomoho Sia i kamaNa mamos i’aho totumu’ osa humua we sia : “mabog Ahu, memaulêngange how. \v 42 wa’aho behatalam ê mahados kusta i’aho totumu’, osa mewaulêng sia. \ No newline at end of file diff --git a/01/43.txt b/01/43.txt index f0fc6f1..15274b9 100644 --- a/01/43.txt +++ b/01/43.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 43 Tilahona bewasiu tou wiboho mohonem, teka mehe pawaimunen kete. -\v 44 Imunen, naampow sumahai asia mange asakum waaho a mangatou, sumata mohonem ituru batanganu besi imam bo iwowalad, pawalenoan, pinereta i Musa mainjo kekemen ilatahula -======= -\v 43 Sia imaiso i’aho totumu’ maleng karêngan i kêtêh darandi : \v 44 na’am maosiri-sirita awa-awa sakumên êwa’i wesiseiange, sata’ mohonêm, iwawaturu’nu batanganu a nimam bo mowaladio’ powalad tanu pinêmaulênganu, ê mbewêreta i Musa, maindo sairi tanu silatahula. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 43 Sia imaiso i’aho totumu’ maleng karêngan i kêtêh darandi : \v 44 na’am maosiri-sirita awa-awa sakumên êwa’i wesiseiange, sata’ mohonêm, iwawaturu’nu batanganu a nimam bo mowaladio’ powalad tanu pinêmaulênganu, ê mbewêreta i Musa, maindo sairi tanu silatahula. \ No newline at end of file diff --git a/01/45.txt b/01/45.txt index 669d95c..2dbb01e 100644 --- a/01/45.txt +++ b/01/45.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 45 Sumata tou wiboho mo sumahai bisana mange ahad si Yesus arammatahu i waruru-ruru sumuang a kota, sia mutun a tampa leno, sumata tou menenet moai beSia apahasanduru. -======= -\v 45 ni’aho totumu’ moho imapakua i’aho mbehamoali osa imawarere wisana mange, ahad si Yesus alam mata’u mawaturu’ sumuang a kota. Imêtêwêmio’ sia a luar a mangatampa liai ; sata tow a mororu’una imoroahimage we Sia. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 45 ni’aho totumu’ moho imapakua i’aho mbehamoali osa imawarere wisana mange, ahad si Yesus alam mata’u mawaturu’ sumuang a kota. Imêtêwêmio’ sia a luar a mangatampa liai ; sata tow a mororu’una imoroahimage we Sia. \ No newline at end of file diff --git a/02/01.txt b/02/01.txt index 905a120..d1ff775 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\c 2 \v 1 Alam behaleotem tahula ngando, tepo Ningumeled mahihahi Kapernaum, kinototauanem Sia bana ambale. -\v 2 Mahihahi pahasa totumu sumesen, motaha ahen tampa, aha amuka imbonang ahem. Anoras Sia numu kaol, -======= -\c 2 \v 1 ihaleotoho tahula ngando, ahad si Yesus imalengêmiloho a Kapernaum, beharerem sirirta, awahêm Sia a mbale. \v 2 mangahi mangatow mêlilaw mahad alanêmange tampa, sedang na ndior i mbonang alanêmoho hahi. A mêsaha-sahai we’ Sia u Kukua we silatahula, ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\c 2 \v 1 ihaleotoho tahula ngando, ahad si Yesus imalengêmiloho a Kapernaum, beharerem sirirta, awahêm Sia a mbale. \v 2 mangahi mangatow mêlilaw mahad alanêmange tampa, sedang na ndior i mbonang alanêmoho hahi. A mêsaha-sahai we’ Sia u Kukua we silatahula, \ No newline at end of file diff --git a/02/03.txt b/02/03.txt index 48b801c..b86b361 100644 --- a/02/03.txt +++ b/02/03.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 3 Bana hahi manga totumu mahi beSia latahula tumambar totumu ahii mataû lumapang. Tinambal epat tou. -\v 4 Si latahula ahi i mataû meang i sia tatawoy tadoô totumu, osa binuhai latahula selet imbale, behauhaam selet imbale osa ilolos latahula totumu ahi halapang imake kalekos bepaan totumu ahi i halapang amuka Yesus. -======= -\v 3 mangatow imahi me’angai êsa totumu’ dupened be Sia, patambalên i nêpat tow. \v 4 ahi’i silatahula mata’u me’angoho i sia we Sia, tatawoi i’aho tow tado’o osa silatahula muha selet ê na mbaoNa, ihauha moho iroyot ilatahula paho’an, beleletan i’aho totumu’ dupened. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 3 mangatow imahi me’angai êsa totumu’ dupened be Sia, patambalên i nêpat tow. \v 4 ahi’i silatahula mata’u me’angoho i sia we Sia, tatawoi i’aho tow tado’o osa silatahula muha selet ê na mbaoNa, ihauha moho iroyot ilatahula paho’an, beleletan i’aho totumu’ dupened. \ No newline at end of file diff --git a/02/05.txt b/02/05.txt index 793b48e..7070f99 100644 --- a/02/05.txt +++ b/02/05.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 5 Pilahen i Ningumeled kawahaman imanem latahula, kumuaSia atotumu ahi’i halapang. Kumuasia bataKu beapunganem kaseaanu -\v 6 Biboho bana manga totumu mahaila i kaor silatahula mapikir asuang nate latahula. -\v 7 Sei to tumu ia i numu kelewa i ? sia medoros Ningumeled. Sei do na meheapung kaseaan sa ahi i wati Ningumeled. -======= -\v 5 oho i Yesus ê neman i latahula, kuaNa wiboho a tow rupened : “Ei bata’Ku, oronu beapunganêm ! \v 6 biboho bena hahi toutêh i Torat mêdatuh-ratuh, mapêndam silatahula a natena. \v 7 nia’i totumu’ mohodait kelewa’aho ? Imoposêm sia i Ningumêlêd, sisei ê ndoro’na mapung i noro iwalina i Ningumêlêd kêmoho ? ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 5 oho i Yesus ê neman i latahula, kuaNa wiboho a tow rupened : “Ei bata’Ku, oronu beapunganêm ! \v 6 biboho bena hahi toutêh i Torat mêdatuh-ratuh, mapêndam silatahula a natena. \v 7 nia’i totumu’ mohodait kelewa’aho ? Imoposêm sia i Ningumêlêd, sisei ê ndoro’na mapung i noro iwalina i Ningumêlêd kêmoho ? \ No newline at end of file diff --git a/02/08.txt b/02/08.txt index e7fe38d..abda0b1 100644 --- a/02/08.txt +++ b/02/08.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 8 Andalem nate-Hu kalai-Ku pinikir i latahula numu si Yesus ndaho kamotahula mikir kelewaaho asuang natenu. -\v 9 Misa polah i hua atotumu ahii mataû lumapang pahasa kaseaanu beapung nganem suma ihua tumo osa iatang niana pahooan osa lumapangem. -======= -\v 8 a suang inateNa si Yesus tilaho imahalah, awahêm silatahula mapêndêm kelewa’aho, osa Sia humua we silatahula : “Nde’aho homotahula mapêndam kelewana asuang i natenu ? \v 9 ê lebe gapang, kumua wia’i totumu’ dupened : boronu beapunganêm, sumua humua : Tumodêm, iatangêm paho’anu osa lumapang ? ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 8 a suang inateNa si Yesus tilaho imahalah, awahêm silatahula mapêndêm kelewa’aho, osa Sia humua we silatahula : “Nde’aho homotahula mapêndam kelewana asuang i natenu ? \v 9 ê lebe gapang, kumua wia’i totumu’ dupened : boronu beapunganêm, sumua humua : Tumodêm, iatangêm paho’anu osa lumapang ? \ No newline at end of file diff --git a/02/title.txt b/02/title.txt new file mode 100644 index 0000000..bf783de --- /dev/null +++ b/02/title.txt @@ -0,0 +1 @@ +Pasal 2 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 2a10092..25ca03e 100644 --- a/manifest.json +++ b/manifest.json @@ -60,6 +60,16 @@ "01-27", "01-29", "01-32", + "01-35", + "01-38", + "01-40", + "01-43", + "01-45", + "02-title", + "02-01", + "02-03", + "02-05", + "02-08", "03-28", "03-31", "03-33",