From f26756b7f75d9a69435a065d1258427e99c810a5 Mon Sep 17 00:00:00 2001 From: Carla_Abarza Date: Tue, 18 Jun 2024 22:55:12 -0600 Subject: [PATCH 1/7] =?UTF-8?q?Tue=20Jun=2018=202024=2022:55:11=20GMT-0600?= =?UTF-8?q?=20(hora=20est=C3=A1ndar=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 54236df..7d837ab 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "format": "usfm", "generator": { "name": "ts-desktop", - "build": "543" + "build": "83" }, "target_language": { "id": "pay", From 3a0cb8f0084c17263c2ff10de90fe9293f897794 Mon Sep 17 00:00:00 2001 From: Carla_Abarza Date: Tue, 18 Jun 2024 23:04:44 -0600 Subject: [PATCH 2/7] =?UTF-8?q?Tue=20Jun=2018=202024=2023:04:44=20GMT-0600?= =?UTF-8?q?=20(hora=20est=C3=A1ndar=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 15/24.txt | 2 +- manifest.json | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/15/24.txt b/15/24.txt index 25bd19c..5e12749 100644 --- a/15/24.txt +++ b/15/24.txt @@ -1 +1 @@ -\v 24 Weshbarawa toh arwa yar apaskri ehka untas ña atá taí untas aschaní kawishbartui orden ká, (FALTA TRADUCCIÓN) \v 25 Imi tohkenaí toh krih untaska untarta arwá akamanaska tuhapiró pawa ñá arwakriró untas keish Bernabé éhka Pablo rí Jesucristo rish. \v 26 Toh arwa ké arriesgado lerií toh ã u tas ẽ toh unta Señor Jesucristo rísh. \ No newline at end of file +\v 24 Ña as wẽhpri arwã tish aakri untasma chilera apaskri, taña un tasña asnani ta wishkitii, to' achiwish kayo' taña õshkri ima pesh kuanzaró akasna kakii. \v 25 Ima akenma, untas krí'ró unta'aaki \v 26 Arwä̃ akamasprá katunhápiro payó askenyowá untaste amados bernabé to' pablo, arwã õihsitishkri ekapesh kaooró to apin untaste Señor Jesucristo . \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7d837ab..26c91a6 100644 --- a/manifest.json +++ b/manifest.json @@ -27,13 +27,14 @@ "language_id": "es-419", "resource_id": "ulb", "checking_level": "3", - "date_modified": "2024-02-07T22:32:48.2195147+00:00", - "version": "1.9" + "date_modified": "2022-03-24T15:52:56.224148+00:00", + "version": "1.7" } ], "parent_draft": {}, "translators": [ - "Juan_HRomeroC" + "Juan_HRomeroC", + "Carla Abarza" ], "finished_chunks": [ "front-title", From e93a1c84a427c62a6841cc354926b67978831a55 Mon Sep 17 00:00:00 2001 From: Carla_Abarza Date: Tue, 18 Jun 2024 23:07:04 -0600 Subject: [PATCH 3/7] =?UTF-8?q?Tue=20Jun=2018=202024=2023:07:03=20GMT-0600?= =?UTF-8?q?=20(hora=20est=C3=A1ndar=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 15/24.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 15/24.txt diff --git a/15/24.txt b/15/24.txt deleted file mode 100644 index 5e12749..0000000 --- a/15/24.txt +++ /dev/null @@ -1 +0,0 @@ -\v 24 Ña as wẽhpri arwã tish aakri untasma chilera apaskri, taña un tasña asnani ta wishkitii, to' achiwish kayo' taña õshkri ima pesh kuanzaró akasna kakii. \v 25 Ima akenma, untas krí'ró unta'aaki \v 26 Arwä̃ akamasprá katunhápiro payó askenyowá untaste amados bernabé to' pablo, arwã õihsitishkri ekapesh kaooró to apin untaste Señor Jesucristo . \ No newline at end of file From 76dbe47db681770937e50276da452a03de44a912 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Wed, 19 Jun 2024 11:05:14 -0600 Subject: [PATCH 4/7] =?UTF-8?q?Wed=20Jun=2019=202024=2011:05:14=20GMT-0600?= =?UTF-8?q?=20(hora=20est=C3=A1ndar=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 26c91a6..8ab2b20 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "format": "usfm", "generator": { "name": "ts-desktop", - "build": "83" + "build": "543" }, "target_language": { "id": "pay", From 259c15e3a09805570ba2f75be749c4ec2c7dda9c Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Wed, 19 Jun 2024 11:23:13 -0600 Subject: [PATCH 5/7] =?UTF-8?q?Wed=20Jun=2019=202024=2011:23:13=20GMT-0600?= =?UTF-8?q?=20(hora=20est=C3=A1ndar=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index d7ae9be..5c56e64 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { - "package_version": 6, + "package_version": 7, "format": "usfm", "generator": { "name": "ts-desktop", - "build": "280" + "build": "543" }, "target_language": { "id": "pay", From 9473b4f01eff31d52e708c9f841108ab387c8a91 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Wed, 19 Jun 2024 11:37:28 -0600 Subject: [PATCH 6/7] =?UTF-8?q?Wed=20Jun=2019=202024=2011:37:27=20GMT-0600?= =?UTF-8?q?=20(hora=20est=C3=A1ndar=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.json b/manifest.json index fda3e22..793d6f7 100644 --- a/manifest.json +++ b/manifest.json @@ -409,6 +409,7 @@ "24-17", "24-20", "24-22", + "24-24", "24-26", "25-title", "25-01", From ab918715c523563ebd073ff8ec10b20a890de6f7 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Wed, 19 Jun 2024 11:39:16 -0600 Subject: [PATCH 7/7] =?UTF-8?q?Wed=20Jun=2019=202024=2011:39:16=20GMT-0600?= =?UTF-8?q?=20(hora=20est=C3=A1ndar=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24/22.txt | 6 +----- manifest.json | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/24/22.txt b/24/22.txt index 1ab5b26..c3d560c 100644 --- a/24/22.txt +++ b/24/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 Akashkuá Felixma, tarõ eña archiwishkrí to taha ñaharó, to tauwẽriñawa taishpakí. Eka ñehí: "Ahí to comandantema Lisias Jerusalénña chii chreí, tasña ña'pa ta irõ ti'pikilerkena". \v 23 Akashkuá ekaña centuriónro ti'kii Pablo chaenkilerpiró, eña tarstesh we piró asnani to tentawalerwá chẽ kaû'lertipiró irõ akachituma wishkerpiró. -======= -\v 22 \v 23 ->>>>>>> 259c15e3a09805570ba2f75be749c4ec2c7dda9c +\v 22 Akashkuá Felixma, tarõ eña archiwishkrí to taha ñaharó, to tauwẽriñawa taishpakí. Eka ñehí: "Ahí to comandantema Lisias Jerusalénña chii chreí, tasña ña'pa ta irõ ti'pikilerkena". \v 23 Akashkuá ekaña centuriónro ti'kii Pablo chaenkilerpiró, eña tarstesh we piró asnani to tentawalerwá chẽ kaû'lertipiró irõ akachituma wishkerpiró. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 793d6f7..beb02a1 100644 --- a/manifest.json +++ b/manifest.json @@ -34,7 +34,8 @@ "parent_draft": {}, "translators": [ "Juan_HRomeroC", - "Carla Abarza" + "Carla Abarza", + "abarza" ], "finished_chunks": [ "front-title",