From 47d075d4b30bad2b3cd7da3f78b7745a9b61c24c Mon Sep 17 00:00:00 2001 From: "bahasatech.indotengah" Date: Sat, 6 Aug 2022 14:22:39 +1200 Subject: [PATCH] Sat Aug 06 2022 14:22:39 GMT+1200 (Fiji Standard Time) --- 07/01.txt | 13 +---- 07/title.txt | 6 +- manifest.json | 157 +++++++++++++++++++++++++------------------------- 3 files changed, 83 insertions(+), 93 deletions(-) diff --git a/07/01.txt b/07/01.txt index 51f7f70..89ec262 100644 --- a/07/01.txt +++ b/07/01.txt @@ -1,11 +1,2 @@ -<<<<<<< HEAD -\v 2 \v 3 IMAM MELKISEDEK -\v 1 Asel, melkisedek, Afen Salem med Lahtal Mate lafining o imam, ho araham Abraham mang Afen nun ara tetang no' supi ho' olap ho' hal tafoiy med ta -======= -MELKISEDEK HO, IMAM - -\v 1 Fede, Melkisedek ho, Salem o' afen, med Lahtal o' imam so mi lafining, Abraham afen ernu a' mine sabor ho' honi hee, Melkisedek ho' a' hol, satang ta a' habu no' ham med en. -\v 2 Na ernu ba Abraham utot med nun ho, Sa a'pite' habuden med Melkisedek en. Aai nanang, a' niba Melkisedek ho, o' lel honi hee a' bul ernu o' afen, o' a'taain hee Salem o' afen, o' lel honi hee, tining talaj o' afen. -\v 3 Sariho o' fo o' mang a' ai, bap taro femi safain sahel ho' Sari ho mimeng hodi a' hol nene, ei fetang ho aainang homi sam o' a' mujmi hodi a' ai. Honi sobo -mang fede' Lahtal Ai honi, sel numi Sa sano' imam em sam so em ho a' meng. ->>>>>>> 72e25eeb213c74632fb05b41ff08baae167d97fa +\c 7 MELKISEDEK HO, IMAM \v 1 Fede, Melkisedek ho, Salem o' afen, med Lahtal o' imam so mi lafining, Abraham afen ernu a' mine sabor ho' honi hee, Melkisedek ho' a' hol, satang ta a' habu no' ham med en. \v 2 Na ernu ba Abraham utot med nun ho, Sa a'pite' habuden med Melkisedek en. Aai nanang, a' niba Melkisedek ho, o' lel honi hee a' bul ernu o' afen, o' a'taain hee Salem o' afen, o' lel honi hee, tining talaj o' afen. \v 3 Sariho o' fo o' mang a' ai, bap taro femi safain sahel ho' Sari ho mimeng hodi a' hol nene, ei fetang ho aainang homi sam o' a' mujmi hodi a' ai. Honi sobo +mang fede' Lahtal Ai honi, sel numi Sa sano' imam em sam so em ho a' meng. \ No newline at end of file diff --git a/07/title.txt b/07/title.txt index 9fa58a2..5ac2ce1 100644 --- a/07/title.txt +++ b/07/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -IBRANI O SURA' ASEL ITITO -======= -SURA' MED IBRANI HINUNG EN, ASEL MATE O' MI ITITO ->>>>>>> 72e25eeb213c74632fb05b41ff08baae167d97fa +SURA' MED IBRANI HINUNG EN, ASEL MATE O' MI ITITO \ No newline at end of file diff --git a/manifest.json b/manifest.json index 71cc32b..08e317e 100644 --- a/manifest.json +++ b/manifest.json @@ -1,17 +1,10 @@ { - "project": { - "id": "heb", - "name": "" - }, - "type": { - "id": "text", - "name": "Text" - }, + "package_version": 7, + "format": "usfm", "generator": { "name": "ts-desktop", "build": "27" }, - "package_version": 7, "target_language": { "name": "Adang", "direction": "ltr", @@ -20,80 +13,33 @@ "is_gateway_language": false, "id": "adn" }, - "format": "usfm", + "project": { + "id": "heb", + "name": "Hebrews" + }, + "type": { + "id": "text", + "name": "Text" + }, "resource": { "id": "reg" }, - "translators": [ - "adang 3", - "adang" - ], "source_translations": [ { "language_id": "id", "resource_id": "ayt", "checking_level": "3", - "date_modified": 20180816, - "version": "2016" + "date_modified": "2021-10-26T13:24:35.3535107+00:00", + "version": "1.3" } ], + "translators": [ + "adang 3", + "adang", + "bahasatech.indotengah" + ], "finished_chunks": [ - "05-01", - "05-04", - "05-06", - "05-07", - "05-09", - "05-12", - "06-01", - "06-04", - "06-07", - "06-09", - "06-11", - "06-13", - "06-16", - "06-title", - "05-title", - "06-19", - "11-01", - "11-04", - "11-05", - "11-07", - "11-08", - "11-11", - "11-13", - "11-15", - "11-17", - "11-20", - "11-23", - "11-27", - "11-29", - "11-32", - "11-35", - "11-39", - "12-01", - "12-04", - "12-07", - "12-09", - "12-12", - "12-14", - "12-18", - "12-22", - "12-25", - "12-27", - "13-01", - "13-03", - "13-05", - "13-07", - "13-18", - "13-22", - "13-24", - "13-15", - "13-20", - "13-09", - "13-12", - "13-title", - "12-title", - "11-title", + "front-title", "01-title", "01-01", "01-04", @@ -108,6 +54,7 @@ "02-07", "02-09", "02-11", + "02-13", "02-16", "03-title", "03-01", @@ -122,20 +69,36 @@ "04-03", "04-06", "04-08", - "04-14", - "front-title", - "02-13", "04-12", + "04-14", + "05-title", + "05-01", + "05-04", + "05-06", + "05-07", + "05-09", + "05-12", + "06-title", + "06-01", + "06-04", + "06-07", + "06-09", + "06-11", + "06-13", + "06-16", + "06-19", + "07-title", + "07-01", "07-04", "07-07", "07-11", "07-13", "07-15", "07-18", + "07-20", "07-22", "07-25", "07-27", - "07-20", "08-title", "08-01", "08-03", @@ -170,6 +133,46 @@ "10-30", "10-32", "10-35", - "10-38" + "10-38", + "11-title", + "11-01", + "11-04", + "11-05", + "11-07", + "11-08", + "11-11", + "11-13", + "11-15", + "11-17", + "11-20", + "11-23", + "11-27", + "11-29", + "11-32", + "11-35", + "11-39", + "12-title", + "12-01", + "12-04", + "12-07", + "12-09", + "12-12", + "12-14", + "12-18", + "12-22", + "12-25", + "12-27", + "13-title", + "13-01", + "13-03", + "13-05", + "13-07", + "13-09", + "13-12", + "13-15", + "13-18", + "13-20", + "13-22", + "13-24" ] } \ No newline at end of file