From 2ce24a52b647f95f7503826eda1b4810e3f298fc Mon Sep 17 00:00:00 2001 From: "bahasatech.indotimur" Date: Mon, 5 Jun 2023 13:12:45 +0700 Subject: [PATCH] Mon Jun 05 2023 13:12:44 GMT+0700 (Western Indonesia Time) --- 02/14.txt | 6 +----- 02/16.txt | 6 +----- 02/19.txt | 6 +----- 02/22.txt | 6 +----- 02/24.txt | 6 +----- 03/01.txt | 6 +----- 04/01.txt | 6 +----- 04/19.txt | 6 +----- manifest.json | 11 ++++++++++- 9 files changed, 18 insertions(+), 41 deletions(-) diff --git a/02/14.txt b/02/14.txt index 2dd6916..6d2517f 100644 --- a/02/14.txt +++ b/02/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Yesusre ako faeuko, aei aka baeke nahibi mo kelemmamile, u taei umamiyende a foi faeu foi aerene ehire-ehire a kilenate yaelene. Bele wali wanem Allah Neyae kena okoi wali ya. \v 15 Weyae kaliya foi jae mokoye, Allah yae be insinembolene, Naei ako faeu kore, naei yebaei bubaeite yeibonde. Fe efaei jae/ ehubai jae wa kaliya mokoyenne, mekanebam, Allah rena a faeu bae weyae huwamae. -======= -\v 14 Yesusre ako faeuko, aei aka baeke nabibi mo kelemmamile, u taei umamiyende a foi faeu foi aerene ehire-ehire a kilenate yaelene. Bele wali wanem Allah neyae kena okoi wali ya. \v 15 Weyae kaliya foi jat mo mokoye, Allah yae be insinembolene, naei ako faeu kore, naei yebali bubaeite yeibonde. Fe efaei jae/ ehubai jae wa kaliya mokoyenne, meka nebam, Allah rena a faeu bae weyae huwamee. ->>>>>>> 83d179444c7684043180c734ad312c2445ef0118 +\v 14 Yesusre ako faeuko, aei aka baeke nabibi mo kelemmamile, u taei umamiyende a foi faeu foi aerene ehire-ehire a kilenate yaelene. Bele wali wanem Allah neyae kena okoi wali ya. \v 15 Weyae kaliya foi jat mo mokoye, Allah yae be insinembolene, naei ako faeu kore, naei yebali bubaeite yeibonde. Fe efaei jae/ ehubai jae wa kaliya mokoyenne, meka nebam, Allah rena a faeu bae weyae huwamee. \ No newline at end of file diff --git a/02/16.txt b/02/16.txt index 61fcbf7..a0753de 100644 --- a/02/16.txt +++ b/02/16.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 16 Ro miyae a bangga-bangga, a moi-moi ennai elende anuwau nge weyae ehakoyei jae, mekanebam, bele are huweijate ro miyae, Allah bele yore kena okoiyei nekejeye. Bele ro miyae Allah ro miyae kobouka weyeye eye. \v 17 Bele a bangga-bangga elejaete ro miyae, aei u nulu ne buloo fela mekai yembonde, Himeneus re Filetus re na falem-falem niyae, a bangga-bangga huweyaimile ra bee reyae. \v 18 Bele ro bee ro miyaere kelaimile, "Eyae heremabonde hee, ewaleiboi hangga!'' Waleiboi maei kaye, nenae yeuboke ya, benem e waleiboi hangga, bele ubene ro miyae ehire nebam bae waimile. -======= -\v 16 Ro miyae a bangga-bangga, a moi-moi ennai elende anuwau nge weyae ehako yei jae, mekanebam, bele are huwei jate ro miyae, Allah bele yore kena okoiyei nekejeye. Bele ro miyae Allah re miyae kobouka weyeye ahangga eye. \v 17 Bele a bangga-bangga elejaete ro miyae, aei u dulu ne buloo fela mekai yemboude, Himeneus re Filetus re na falem-falem niyae, a bangga-bangga hu we yaimile ra bee reyae. \v 18 Bele ro bee ro miyae keleimile, "Eyae here mabon dera, e walei boi hangga!'' Waleiboi maei kaye, nenae yeuboke ya, benem e waleiboi hangga, bele w bene ro miyae ehire nebam bae waimile. ->>>>>>> 83d179444c7684043180c734ad312c2445ef0118 +\v 16 Ro miyae a bangga-bangga, a moi-moi ennai elende anuwau nge weyae ehako yei jae, mekanebam, bele are huwei jate ro miyae, Allah bele yore kena okoiyei nekejeye. Bele ro miyae Allah re miyae kobouka weyeye ahangga eye. \v 17 Bele a bangga-bangga elejaete ro miyae, aei u dulu ne buloo fela mekai yemboude, Himeneus re Filetus re na falem-falem niyae, a bangga-bangga hu we yaimile ra bee reyae. \v 18 Bele ro bee ro miyae keleimile, "Eyae here mabon dera, e walei boi hangga!'' Waleiboi maei kaye, nenae yeuboke ya, benem e waleiboi hangga, bele w bene ro miyae ehire nebam bae waimile. \ No newline at end of file diff --git a/02/19.txt b/02/19.txt index b9c4820..a1c85fb 100644 --- a/02/19.txt +++ b/02/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 Bele yaere Allah rena ako faeuko nehale, aeru raufike ruka mekai honojeye, ''Tuhan nataei nekejeye, hinye naei Allah re hakainyele, hinye naei namamam Tuhan re ehakoiboi!'' Ro miyae hinya yae elende, "Reyae Tuhan Yesus hakongobokale mende, bele ro miyae a nebam fau nebam, me nebam u nebam na walira wonnonde!'' \v 20 Rake ahuba u benere nekenayembe, Imae kabam mbai na hambung-hambung, kere nale mehi-mehi, ehi emasra moko wate, ehi perakra moko wate, ehi bae o hara mokowate, ehi kani kendara moko wate. Emasra, Perakra mokowate hambum-hambaum, hamam bulau kabam hele mokate mo, bele hambum-hambum yarate mokate. \v 21 Bele yaere hambum-hambum o hara, kani kendara mokowate kaye, na yane baei bele hambum-hambum ya, yarate mokate. -======= -\v 19 Bele yaere Allah rena ako faeuko nehale, aeru raufike ruka mekai nonojeye, bele a bee nehale, aeru re raufike rukane nomo molokoke, hono nendere, ''Tuhan nataei nekejeye, hinye naei Allah re hakainyele, hinye naei namamam Tuhan re ehakoiboi!'' Ro miyae hinya yae elende, "Reyae Tuhan Yesus hakongobokale meude, bele ro miyae a nebam fau nebam, me nebam u nebam na walira wonnonde!'' \v 20 Rake ahuba u benere nekenayembe, Imae kabam mbai na hambung-hambung, kere nale mehi-mehi, ehi emasra moko nate, ehi perakra moko wate, ehi bae o hara mokowate, ehi kani kendara moko wate. Emasra, Perakra mokowate nambam-nambam, hamam bulau kabam hele mokate mo, bele hambum-hambum yarate mokate. \v 21 Bele yaere hambum-hambum o hara, kani kendara mokowate kaye, na yene baei kele hambum-hambum ya, yarate mokate. Bele mekai mbai maei wali, "Mai wali nehale Tuhanre yennelena kayae hebembe, u mekai wa mekai foi mo, heyae hambum eme mekai yembembe, neme hele yembombe, Tuhan maere elae wake, itaei suba, hayenembe, naei kaliya mokomembe!'' ->>>>>>> 83d179444c7684043180c734ad312c2445ef0118 +\v 19 Bele yaere Allah rena ako faeuko nehale, aeru raufike ruka mekai nonojeye, bele a bee nehale, aeru re raufike rukane nomo molokoke, hono nendere, ''Tuhan nataei nekejeye, hinye naei Allah re hakainyele, hinye naei namamam Tuhan re ehakoiboi!'' Ro miyae hinya yae elende, "Reyae Tuhan Yesus hakongobokale meude, bele ro miyae a nebam fau nebam, me nebam u nebam na walira wonnonde!'' \v 20 Rake ahuba u benere nekenayembe, Imae kabam mbai na hambung-hambung, kere nale mehi-mehi, ehi emasra moko nate, ehi perakra moko wate, ehi bae o hara mokowate, ehi kani kendara moko wate. Emasra, Perakra mokowate nambam-nambam, hamam bulau kabam hele mokate mo, bele hambum-hambum yarate mokate. \v 21 Bele yaere hambum-hambum o hara, kani kendara mokowate kaye, na yene baei kele hambum-hambum ya, yarate mokate. Bele mekai mbai maei wali, "Mai wali nehale Tuhanre yennelena kayae hebembe, u mekai wa mekai foi mo, heyae hambum eme mekai yembembe, neme hele yembombe, Tuhan maere elae wake, itaei suba, hayenembe, naei kaliya mokomembe!'' \ No newline at end of file diff --git a/02/22.txt b/02/22.txt index 38d198e..96f9d9b 100644 --- a/02/22.txt +++ b/02/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 U nebam mokojate re nokolo fafa mokoijate wali mekai moi wommombe, moi bulem bombe, Allah naei eleukoke mekai jae ma wali aloungele, Yesusre hila rabo heleye, ro miyae re kena buhae heumile. \v 23 A koi-koi maei ekileyei jae, mekanebam, bele a kobu-kobu yae mokonembe isam felare hombe yaelene. -======= -\v 22 U nebam mokojate re nokolo tata mokoijate wali mekai moi wommombe, moi bulem bombe, Allah naei eleukoke mekai jae wa wali aloungele, Yesusre hila rabo heleye, ro miyae re kena buhae heumile. \v 23 A Koei-koi maei ekileyei jae, mekanebam, bele a kobu-kobu yae mokonembe isam felare hombe yaelene. ->>>>>>> 83d179444c7684043180c734ad312c2445ef0118 +\v 22 U nebam mokojate re nokolo tata mokoijate wali mekai moi wommombe, moi bulem bombe, Allah naei eleukoke mekai jae wa wali aloungele, Yesusre hila rabo heleye, ro miyae re kena buhae heumile. \v 23 A Koei-koi maei ekileyei jae, mekanebam, bele a kobu-kobu yae mokonembe isam felare hombe yaelene. \ No newline at end of file diff --git a/02/24.txt b/02/24.txt index be3b60d..99c3cc5 100644 --- a/02/24.txt +++ b/02/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Yesusre yebaei bubaei na mekai bam isam fela korebe, relennele, Yesus re yebaei bubaei mekai jae wali nekembe, rei jae- mai jae, nime haba yae, ro miyae re kelemmile a foi faeu foi jae mo elenate, rilibo ehayei jae ma wali nekembe. \v 25 Rake wali mekaita wennende kaye, a elau yae nasom wennele, itaeyembonde a foi faeu foi na wali ne annebonde. \v 26 Rabo halemale, Allah rikennebonde bulo walobo re nibira bensode. -======= -\v 24 Yesusre yebaei buhaei na mekai bam isam fela korube, relennele, Yesus re yebaei raubaei mekai jae wali nekembe, rei jae- mai jae, rime haba yae, oo miyae re kelemmile a foi faeu foi jae mo eletmate, rilibo ehayei jae ma wali nekembe. \v 25 Rake wali mekaita wennende kaye, a elau yae nasom wennele, itaeyembonde a foi faeu foi na wali ne annebonde. \v 26 Rabo nalemale, Allah ri kennebonde bulo walobo re nibira bensode. ->>>>>>> 83d179444c7684043180c734ad312c2445ef0118 +\v 24 Yesusre yebaei buhaei na mekai bam isam fela korube, relennele, Yesus re yebaei raubaei mekai jae wali nekembe, rei jae- mai jae, rime haba yae, oo miyae re kelemmile a foi faeu foi jae mo eletmate, rilibo ehayei jae ma wali nekembe. \v 25 Rake wali mekaita wennende kaye, a elau yae nasom wennele, itaeyembonde a foi faeu foi na wali ne annebonde. \v 26 Rabo nalemale, Allah ri kennebonde bulo walobo re nibira bensode. \ No newline at end of file diff --git a/03/01.txt b/03/01.txt index b947a16..2705a46 100644 --- a/03/01.txt +++ b/03/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Timotius u bene nekenayete, huba mokoi koi ya ro miyae na wali himi hama hele hubamande. \v 2 Ro miyae na u mekai wa mekai mehi hele inyaibonde na u mbaite mo kena buhae henaimile, roi be, roi nibire kena kabam konate, u kaei, u maenggeu mae-mae nekenate ro miyae maei ro feite omokoiyei na wali einye ako nake rena utaei boroi boi nekenate. \v 3 Ro miyae ehire kera buhae ehei, ehi yo maei nebam mokoijaite, a hutai na wali einye mae mae hele nebam maei wali mekai helem molana yende, Allah naei kena re okoi kaye no na wali ne mokonayende. \v 4 Allah naei mende yaa ro miyae na kahili yaele yoku jo yembonde, u bene heki enekei, mbei aiko na wali ne mae mae, ro miyae ehi yo re bene enekei. -======= -\c 3 ( Ro miyae na wali mekai huba mokoikoi ya ) \v 1 Timotius u bene neke nayete, huba mokoi koi ya ro miyae na wali himi nama hele hubamande. \v 2 Ro miyae na u mekai wa mekai mehi hele inyaibonde nai u mbaite mo kena buhae henai mile, roi be, roi nibire kena kabam konate, u kaei, u maenggeu mae-mae nekenate ro miyae maei ro feite omokoiyei na wali einye ako nake rena utaei boroi boi nekenate. \v 3 Ro miyae ehire kera buhae ehei, ehi yo maei nebam mokoijaite, a hutai na wali einye mae mae hele nebam maei wali mekai helem molana yende, Allah naei kena re okoi kaye no na wali ne mokonayende. \v 4 Allah naei mende yaa ro miyae na kahili yaele yoku jo yembonde, u bene heki enekei, mbei aiko na wali ne mae mae, ro miyae ehi yo re bene enekei. ->>>>>>> 83d179444c7684043180c734ad312c2445ef0118 +\c 3 ( Ro miyae na wali mekai huba mokoikoi ya ) \v 1 Timotius u bene neke nayete, huba mokoi koi ya ro miyae na wali himi nama hele hubamande. \v 2 Ro miyae na u mekai wa mekai mehi hele inyaibonde nai u mbaite mo kena buhae henai mile, roi be, roi nibire kena kabam konate, u kaei, u maenggeu mae-mae nekenate ro miyae maei ro feite omokoiyei na wali einye ako nake rena utaei boroi boi nekenate. \v 3 Ro miyae ehire kera buhae ehei, ehi yo maei nebam mokoijaite, a hutai na wali einye mae mae hele nebam maei wali mekai helem molana yende, Allah naei kena re okoi kaye no na wali ne mokonayende. \v 4 Allah naei mende yaa ro miyae na kahili yaele yoku jo yembonde, u bene heki enekei, mbei aiko na wali ne mae mae, ro miyae ehi yo re bene enekei. \ No newline at end of file diff --git a/04/01.txt b/04/01.txt index 5759264..86c38fc 100644 --- a/04/01.txt +++ b/04/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Yesusbenem rake kani kelare bensonde mende, mende aei wali Ondofolore yembonde mende aei foi nebam mokowonde beleya. \v 2 Ro miyae wali nekande yo, here wate yo nemene arilemmile, u mali hubam mile, wali henare emayorende na mekai here kakare emayondere yore. Allahre aka faeu ko ro miyae ehire huuei miyende anggaei bero rate maei, oboroi maoi, kena heraweibonde keleimile, ako faeuko eita kelemile, nebam na foi mokoijate keleumile, namekai a ela nasam weimile. -======= -\c 4 \v 1 Yesusbenem rake kani kelare bensonde mende, mende aei wali Ondofolore yembonde mende aei foi nebam mokowonde beleya. \v 2 Ro miyae wali nekande yo, here wate yo nemene arilemmile, u mali hubam mile, wali henare emayorende na mekai here kakare emayondere yore. Allahre aka faeu ko ro miyae ehire huuei miyende anggaei bero rate maei, oboroi maoi, kena heraweibonde keleimile, ako faeuko eita kelemile, nebam na foi mokoijate keleumile, namekai a ela nasam weimile. ->>>>>>> 83d179444c7684043180c734ad312c2445ef0118 +\c 4 \v 1 Yesusbenem rake kani kelare bensonde mende, mende aei wali Ondofolore yembonde mende aei foi nebam mokowonde beleya. \v 2 Ro miyae wali nekande yo, here wate yo nemene arilemmile, u mali hubam mile, wali henare emayorende na mekai here kakare emayondere yore. Allahre aka faeu ko ro miyae ehire huuei miyende anggaei bero rate maei, oboroi maoi, kena heraweibonde keleimile, ako faeuko eita kelemile, nebam na foi mokoijate keleumile, namekai a ela nasam weimile. \ No newline at end of file diff --git a/04/19.txt b/04/19.txt index 17d6224..8982844 100644 --- a/04/19.txt +++ b/04/19.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -\v 19 Raeinya onomi Priskila re, Akwila re namekai Onesiforus na miyae fare. \v 20 Rake merelere, Erastus hokokoke Korintus yone nekendere. Trofimus ehane kouboye ne, reyae nukeungebokale nekewoye. \v 21 Him mandilim hee emeijae, hasale yae nibi baeikonde meye Ebulus, Pudes, Linus, Klaudia, namekai rakena rekate alea baeke nemene mare onomi yae weyembe. \v 22 Timotius, raei ebeli Tuhanre bannale, ware rikeneite, haleonete, namekai miyae rake homo re ronde kaye. Allah nena foi moi mae-mae hele aei wali einye nekemayende. Amin -======= \v 19 Raeinya onomi Priskila re, Akwila re namekai Onesiforus na miyae fare. \v 20 Rake merelere, Erastus hokokoke Korintus yone nekendere. Trofimus ehane kouboye ne, reyae nukeungebokale nekewoye. \v 21 Him mandilim hee emeijae, hasale yae nibi baeikonde meye Ebulus, Pudes, Linus, Klaudia, namekai rakena rekate alea baeke nemene mare onomi yae weyembe. \v 22 Timotius, raei ebeli Tuhanre bannale, ware rikeneite, haleonete, namekai miyae rake homo re ronde kaye. -Allah nena foi moi mae-mae hele aei wali einye nekemayende. Amin ->>>>>>> 83d179444c7684043180c734ad312c2445ef0118 +Allah nena foi moi mae-mae hele aei wali einye nekemayende. Amin \ No newline at end of file diff --git a/manifest.json b/manifest.json index c69535b..c627379 100644 --- a/manifest.json +++ b/manifest.json @@ -51,18 +51,27 @@ "02-03", "02-06", "02-08", + "02-11", + "02-14", + "02-16", + "02-19", + "02-22", + "02-24", "03-title", + "03-01", "03-05", "03-08", "03-10", "03-14", "03-16", "04-title", + "04-01", "04-03", "04-06", "04-09", "04-11", "04-14", - "04-17" + "04-17", + "04-19" ] } \ No newline at end of file