From d5c8a5d390232c4f1f6a6b7f9457ef18588fa7a0 Mon Sep 17 00:00:00 2001 From: parfait-ayanou Date: Thu, 25 Apr 2024 07:25:41 -0700 Subject: [PATCH] Thu Apr 25 2024 07:25:41 GMT-0700 (Pacific Daylight Time) --- 01/01.txt | 6 +----- 01/02.txt | 6 +----- 01/04.txt | 6 +----- 01/06.txt | 6 +----- 01/08.txt | 6 +----- manifest.json | 48 +++++++++++++++++++++++++++--------------------- 6 files changed, 32 insertions(+), 46 deletions(-) diff --git a/01/01.txt b/01/01.txt index 7a7d346..0095092 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Paulu, Silive na Timotei ya vear evuru e Nzeam e Tesalonika eli ya Tea Nzeam ti ya Nkum Yezu Kristu. Ngrasia ti ngemba eyi ya gnu. -======= -\v 1 Polo, Silive na Timotei, ya vear evuru e Nzeam e Tesalonika eli ya Tea Nzeam ti ya Nkum Yezu Kristu. Ngrasia ti ngemba eyi ya gnu. ->>>>>>> 256891b00dacf5dc9961466fde4b614a4269f4b2 +\c 1 \v 1 Paulu, Silive na Timotei ya vear evuru e Nzeam e Tesalonika eli ya Tea Nzeam ti ya Nkum Yezu Kristu. Ngrasia ti ngemba eyi ya gnu. \ No newline at end of file diff --git a/01/02.txt b/01/02.txt index 4c4ee1b..ab670d9 100644 --- a/01/02.txt +++ b/01/02.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 2 Atsasunkeara ntangu enkum nsag na viye na Nzeam djwi na gnu gnankum, mpe atsasu onkanagni gnu ne bisamu isu. \v 3 Atsasunkana ntangu enkum ne nteang e Teasu Nzeam otshia o lukwikilu egnu, otshia o lutondo egnu mpe ekaagn egnu e biuu ya Nkum esu Yezu Kristu. -======= -\v 2 Atsasunkeara ntangu enkum nsag-na-viye ya Nzeam djwi na gnu gnankum, mpi atsasu onkanagni gnu ne bisamu isu. \v 3 Atsasunkana ntangu enkum ne nteang e Teasu Nzeam otshia o lukwikilu egnu, otshia o lutondo egnu mpi ekaagn egnu e biu ya Nkum esu Yezu Kristu. ->>>>>>> 256891b00dacf5dc9961466fde4b614a4269f4b2 +\v 2 Atsasunkeara ntangu enkum nsag na viye na Nzeam djwi na gnu gnankum, mpe atsasu onkanagni gnu ne bisamu isu. \v 3 Atsasunkana ntangu enkum ne nteang e Teasu Nzeam otshia o lukwikilu egnu, otshia o lutondo egnu mpe ekaagn egnu e biuu ya Nkum esu Yezu Kristu. \ No newline at end of file diff --git a/01/04.txt b/01/04.txt index 6ae17d3..4a07ecd 100644 --- a/01/04.txt +++ b/01/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Atwung, gnu aman amileang Nzeam, sijia susun amosonagni, \v 5 djwi along ayilongsu ekayia ko n'odzum o mpama ve, kansi ayiwo mpi na biuu, na Mpeve Santu ti na kikesa e mveara vear ne lukwikilu. Ohin omog ko, opikug ndjingagni ve oshin nge oyipiersu ne kati egnu djwi na litomba egnu. -======= -\v 4 Atwung, gnu aman ali Nzeam amoleangagni, sijia susun amosonagni, \v 5 djwi along ayilong su ekayia ko n'odzum o mpama ve, kansi ayiwo mpi na biu, na Mpeve Santu ti na kikesa e mveara vear ne lukwikilu. Oshin omog ko, opikug njingagni ve oshin nge eyipiersu ne kati egnu djwi na mfunu eli ya gnu. ->>>>>>> 256891b00dacf5dc9961466fde4b614a4269f4b2 +\v 4 Atwung, gnu aman ali Nzeam amoleangagni, sijia susun amosonagni, \v 5 djwi along ayilong su ekayia ko n'odzum o mpama ve, kansi ayiwo mpi na biu, na Mpeve Santu ti na kikesa e mveara vear ne lukwikilu. Oshin omog ko, opikug njingagni ve oshin nge eyipiersu ne kati egnu djwi na mfunu eli ya gnu. \ No newline at end of file diff --git a/01/06.txt b/01/06.txt index 38831b7..1b29a1c 100644 --- a/01/06.txt +++ b/01/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Gnu gnemie akum gnu ndjie mbanu esu mpe mbanu e Nkum Yezu n'oshin oyiyamignu otuba o Nzeam ne kati i mpay eshin n'eshin kumosi na kiese eyum na Mpeve Santu.\v 7 Yo yina s'emikum gnu mbanu ne nteang e wandimi inkum i Masedonia ti Akai. -======= -\v 6 Gnu gnemie akum gnu ndjie mbanu esu mpi mbanu e Nkum Yezu n'oshin oyiyamignu otuba o Nzeam ne kati i mpay eshin n'eshin ti osiang eyum ya Mpeve Santu. \v 7 Wog enagn, s'emikum gnu mbanu ne nteang e vear ankum amidjir ne Masedonia ti Akai. ->>>>>>> 256891b00dacf5dc9961466fde4b614a4269f4b2 +\v 6 Gnu gnemie akum gnu ndjie mbanu esu mpi mbanu e Nkum Yezu n'oshin oyiyamignu otuba o Nzeam ne kati i mpay eshin n'eshin ti osiang eyum ya Mpeve Santu. \v 7 Wog enagn, s'emikum gnu mbanu ne nteang e vear ankum amidjir ne Masedonia ti Akai. \ No newline at end of file diff --git a/01/08.txt b/01/08.txt index d3ad047..8bc819f 100644 --- a/01/08.txt +++ b/01/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Djwi na gnu otuba o Nzeam otizabana epa ku ne Masedonia ti n'Akai ve, kansi mpi n'endii enkum eyizabani lukwikilu egnu ya Nzeam, ne mpila nde kakusu diaka na mfunu e ntuba djwi ne tii ve. \v 9 Djwi, wog wemie wekab djwi na su oshin nge oyishwisu etay egnu. Walekab oshin nge emitshimagnu itura etay e Nzeam, oshin omisasiangagnu nzeam ignu i biteke djwi na nsadila Nzeam eli na luzingu mpe eli viavi. \v 10 Waletubi wuwun okwungagni Mon nde eyayum dzug olung mpe eyibiyinde n'ewa. Eli Yezu Kristu, eleselimi ne nkier ileseye ine. -======= -\v 8 Djwi na gnu, vear watijia otuba o Nkum, epa ko ne Masedonia ti n'Akai ve, kansi mpi n'endii enkum emijiawo lukwikilu egnu ya Nzeam, djwi kakusu diaka na mfunu e ntuba ata djwi neti ve. \v 9 Djwi, wog wemie walekab djwi na su oshin nge oyishwisu etay egnu. Walekab oshin nge emitshimagnu itura etay e Nzeam, oshin omisasiangagnu nzeam ignu i biteke djwi na nsama Nzeam eli na luzingu mpi e masonga. \v 10 Waletubi wuwun okwungagni Mon nde eyayum dzug olung mpi eyibiyinde n'ewa. Eli Yezu Kristu, eletelimi ne nkier ileseye ine. ->>>>>>> 256891b00dacf5dc9961466fde4b614a4269f4b2 +\v 8 Djwi na gnu, vear watijia otuba o Nkum, epa ko ne Masedonia ti n'Akai ve, kansi mpi n'endii enkum emijiawo lukwikilu egnu ya Nzeam, djwi kakusu diaka na mfunu e ntuba ata djwi neti ve. \v 9 Djwi, wog wemie walekab djwi na su oshin nge oyishwisu etay egnu. Walekab oshin nge emitshimagnu itura etay e Nzeam, oshin omisasiangagnu nzeam ignu i biteke djwi na nsama Nzeam eli na luzingu mpi e masonga. \v 10 Waletubi wuwun okwungagni Mon nde eyayum dzug olung mpi eyibiyinde n'ewa. Eli Yezu Kristu, eletelimi ne nkier ileseye ine. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7bebe53..9ae13e4 100644 --- a/manifest.json +++ b/manifest.json @@ -1,17 +1,10 @@ { - "project": { - "id": "1th", - "name": "" - }, - "type": { - "id": "text", - "name": "Text" - }, + "package_version": 7, + "format": "usfm", "generator": { "name": "ts-desktop", "build": "543" }, - "package_version": 7, "target_language": { "name": "Ngul", "direction": "ltr", @@ -20,38 +13,53 @@ "is_gateway_language": false, "id": "nlo" }, - "format": "usfm", + "project": { + "id": "1th", + "name": "1 Thessalonians" + }, + "type": { + "id": "text", + "name": "Text" + }, "resource": { "id": "reg" }, - "translators": [ - "drc557", - "Georges" - ], "source_translations": [ { "language_id": "fr", "resource_id": "ulb", "checking_level": "3", - "date_modified": 20180816, + "date_modified": "2024-02-07T22:46:45.5879651+00:00", "version": "7.1" } ], + "translators": [ + "drc557", + "Georges", + "parfait-ayanou" + ], "finished_chunks": [ - "01-title", "front-title", + "01-title", + "01-01", + "01-02", + "01-04", + "01-06", + "01-08", + "02-title", + "02-01", "02-03", "02-05", "02-07", "02-10", "02-13", - "02-17", "02-14", + "02-17", "03-01", "03-04", "03-06", - "03-11", "03-08", + "03-11", "04-01", "04-03", "04-07", @@ -65,8 +73,6 @@ "05-15", "05-19", "05-23", - "05-25", - "02-title", - "02-01" + "05-25" ] } \ No newline at end of file