diff --git a/01/01.txt b/01/01.txt index 9641d2b..39da33e 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,9 +1,3 @@ -<<<<<<< HEAD -\v 1 Dah ado manyak urokng nyusun segek catatan tentang kajadian-kajadian dah tajadi ka tangoh-tangoh diri,\v 2 angayo hal e cataan nang dah di nyapeot ka diri oleh urokng-urokng nang mulai samulo dah jadi saksi mato ba pa pambarito Firman. \v 3 Karmo aku dah malajari dengan taliti dari mulae, batol lah gae aku nulissotNyo' sacaro baurutan unto' kau Hai teofilus nang Mulia,\v 4 supayo kau biso nahui kabanaran tantang jukut-jukut dah di ngajarot kakau. MATAKKI TANTANG YOHANES PEMBABTIS -======= -PANYALASOT NANG MULO-MULO +\c 1 PANYALASOT NANG MULO-MULO \v 1 dah manyak urokng barusoho nyusun catatan nang ado hubungane dah tajadi katangoh-tangoh diri, \v 2 angayo catatan nang dah dinyampeot ka diri oleh urokng-urokng nang jaman dee dah jaji saksi mato lantas panyampeot firman. \v 3 karamo aku dah maajari samuae secaro taliti dari mulae, baeklah aku ugo nulisot secaro baurutan onto'ngu, hai Teofilus nang setia, \v 4 supayo kao biso nahui kabanarot nang hal-hal dah dingajarot ka kao. -\v 1 dah manyak urokng barusoho nyusun catatan nang ado hubungane dah tajadi katangoh-tangoh diri, \v 2 angayo catatan nang dah dinyampeot ka diri oleh urokng-urokng nang jaman dee dah jaji saksi mato lantas panyampeot firman. \v 3 karamo aku dah maajari samuae secaro taliti dari mulae, baeklah aku ugo nulisot secaro baurutan onto'ngu, hai Teofilus nang setia, \v 4 supayo kao biso nahui kabanarot nang hal-hal dah dingajarot ka kao. - -MARENAHUI YOHANES PAMAPTIS ->>>>>>> 39e5baf83882b90ce3a5d084a37161845123a054 +MARENAHUI YOHANES PAMAPTIS \ No newline at end of file diff --git a/01/05.txt b/01/05.txt index fd45b20..116329e 100644 --- a/01/05.txt +++ b/01/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Pas maso pamarentoh Herodes, Rajo Yudea, ado seko urokng banamo\v 6 Zakharia nang barasal ampat ka kalompok iman Abia. Binie barasal ampat ka katurunan Harun, ba namo e ado lah Elisabet adolah urokng- urokng nang banar ka mato Allah. Na'ido' idup inok bacela sasuai ba samuee hukum ba parentoh, Tuhan.\v 7 Tapi na'ido ano'ado anak karamo kaduoe manu' ba kaduoe dah tuho sidi. -======= -\v 5 pado waktu pamarintoh Herodes, Rajo Yudea, ado urokng imam banamo Zakharia nang asale dari kalompok imam Abia. binie asale dari katurunan Harun, lantas namoe adolah Elisabet.\v 6 zakharia nang Elisabet adolah urokng-urokng nang banar kamato Allah. ne'udo idup ano' kotor sasuai nang samuae ukum nang parintoh Tuhan. \v 7 tapi, ne'udo ano' baranak karamo Elisabet mandul lantas urokng ba duo dah tuho sidi. ->>>>>>> 39e5baf83882b90ce3a5d084a37161845123a054 +\v 5 pado waktu pamarintoh Herodes, Rajo Yudea, ado urokng imam banamo Zakharia nang asale dari kalompok imam Abia. binie asale dari katurunan Harun, lantas namoe adolah Elisabet. \v 6 zakharia nang Elisabet adolah urokng-urokng nang banar kamato Allah. ne'udo idup ano' kotor sasuai nang samuae ukum nang parintoh Tuhan. \v 7 tapi, ne'udo ano' baranak karamo Elisabet mandul lantas urokng ba duo dah tuho sidi. \ No newline at end of file diff --git a/01/08.txt b/01/08.txt index 86ced34..86677cc 100644 --- a/01/08.txt +++ b/01/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Pas sampe pagiirot kalompoke unto' ba tugas, Zakharia namu tugas unto' jadi Imam ka hadapot Allah.\v 9 manururut kabiasaan ka imanan, Zakharia tapilih badasarot undian unto' taamo ka bait Allah lalu nunu ukupan. \v 10 Pas waktu ukupan Di mareot, samue' umat ba pinto ka uas. -======= -\v 8 waktu giliran rombongane onto' batugas, Zakharia namu tugas onto' jaji imam kaadapot Allah. \v 9 manurut kabiasaan imam, Zakharia kano pilih manurut undian onto' taamo kabait Allah lantas nunu persembahane onto Tuhan. \v 10 pado saat persembahane di ngantarot, samuae umat badoa ka luar. ->>>>>>> 39e5baf83882b90ce3a5d084a37161845123a054 +\v 8 waktu giliran rombongane onto' batugas, Zakharia namu tugas onto' jaji imam kaadapot Allah. \v 9 manurut kabiasaan imam, Zakharia kano pilih manurut undian onto' taamo kabait Allah lantas nunu persembahane onto Tuhan. \v 10 pado saat persembahane di ngantarot, samuae umat badoa ka luar. \ No newline at end of file diff --git a/01/11.txt b/01/11.txt index b9baa8c..0335181 100644 --- a/01/11.txt +++ b/01/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Tibo-tibo, Malaikat Tuhan magarikot diri E ka Zakharia lalu badiri ka sabaloh kanan Altar ukupan,\v 12 Pas nanang malaikat ko Zhakaria jadi gagatar ba gai' sidi.\v 13 Tapi bo,malaikat ko bakato ka Io," ame gai', Zhakaria, karamo doa pamintaanNgu dah di nangar. biningu, Elisabet, mok maranakot seko kamudo angaki unto' Mu ba kau mao ngayuki Yohanes. -======= -\v 11 tibo-tibo, malaekat magariot dirie ka zakharia lantas badiri kasabaloh pangung persembahan. \v 12 waktu nanang malaekat koo, zakharia jaji gagatar lantas kagaianan sidi. \v 13 tapi malaekat koo bakato ka iyo, "ame gai, zakharia, makae doa pamohonanngu dah dinangar. biningu, Elisabet, pasti maranakot anak angaki onto'ngu lantas lantas kao mare io namo Yohanes. ->>>>>>> 39e5baf83882b90ce3a5d084a37161845123a054 +\v 11 tibo-tibo, malaekat magariot dirie ka zakharia lantas badiri kasabaloh pangung persembahan. \v 12 waktu nanang malaekat koo, zakharia jaji gagatar lantas kagaianan sidi. \v 13 tapi malaekat koo bakato ka iyo, "ame gai, zakharia, makae doa pamohonanngu dah dinangar. biningu, Elisabet, pasti maranakot anak angaki onto'ngu lantas lantas kao mare io namo Yohanes. \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index 062ffe2..2250720 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Lukas -======= -LUKAS ->>>>>>> 39e5baf83882b90ce3a5d084a37161845123a054 +Lukas \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7c466c3..4739f0f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,17 +1,10 @@ { - "project": { - "id": "luk", - "name": "" - }, - "type": { - "id": "text", - "name": "Text" - }, + "package_version": 7, + "format": "usfm", "generator": { "name": "ts-desktop", - "build": "132" + "build": "5" }, - "package_version": 7, "target_language": { "name": "Dayak Salako", "direction": "ltr", @@ -20,25 +13,38 @@ "is_gateway_language": false, "id": "iba-x-salako" }, - "format": "usfm", + "project": { + "id": "luk", + "name": "Luke" + }, + "type": { + "id": "text", + "name": "Text" + }, "resource": { "id": "reg" }, - "translators": [ - "Theresia", - "SUANDI" - ], "source_translations": [ { "language_id": "id", "resource_id": "ayt", "checking_level": "3", - "date_modified": 20180816, - "version": "2016" + "date_modified": "2020-06-22T00:00:00+00:00", + "version": "1.3" } ], + "translators": [ + "Theresia", + "SUANDI", + "dayaksalako" + ], "finished_chunks": [ + "front-title", "01-title", + "01-01", + "01-05", + "01-08", + "01-11", "01-18", "01-21", "01-24", @@ -62,156 +68,6 @@ "01-72", "01-76", "01-78", - "01-80", - "front-title", - "01-01", - "01-05", - "01-08", - "01-11", - "01-14", - "01-16", - "02-04", - "02-06", - "02-08", - "02-10", - "02-13", - "02-15", - "02-17", - "02-21", - "02-22", - "02-25", - "02-27", - "02-30", - "02-33", - "02-36", - "02-39", - "02-41", - "02-45", - "02-48", - "03-01", - "03-03", - "03-04", - "03-07", - "03-08", - "03-05", - "03-09", - "03-10", - "02-title", - "02-01", - "02-51", - "03-title", - "03-12", - "03-14", - "03-15", - "03-17", - "03-18", - "03-21", - "03-23", - "03-25", - "03-30", - "03-27", - "03-33", - "03-36", - "04-01", - "04-03", - "04-05", - "04-08", - "04-09", - "04-12", - "04-14", - "04-16", - "04-18", - "05-title", - "04-20", - "04-23", - "04-25", - "04-42", - "04-28", - "04-31", - "04-33", - "04-35", - "04-38", - "04-40", - "06-title", - "05-01", - "05-04", - "05-08", - "05-12", - "05-14", - "05-15", - "05-17", - "05-18", - "05-20", - "05-22", - "05-25", - "05-27", - "05-29", - "07-title", - "05-33", - "05-36", - "05-37", - "06-01", - "06-03", - "06-06", - "06-09", - "06-12", - "06-14", - "06-17", - "06-20", - "06-22", - "06-24", - "06-26", - "06-27", - "06-29", - "06-31", - "06-35", - "06-37", - "06-38", - "06-39", - "06-41", - "06-43", - "06-46", - "06-45", - "06-49", - "07-01", - "07-02", - "07-06", - "07-09", - "07-11", - "07-16", - "07-18", - "07-21", - "07-24", - "07-27", - "07-29", - "07-31", - "07-33", - "07-36", - "07-39", - "07-41", - "07-44", - "07-46", - "07-48", - "08-title", - "08-01", - "08-04", - "08-07", - "08-09", - "08-11", - "08-14", - "08-16", - "08-19", - "08-22", - "08-24", - "08-26", - "08-28", - "08-30", - "08-32", - "08-34", - "08-36", - "08-38", - "08-40", - "08-43", - "08-45" + "01-80" ] } \ No newline at end of file