From 56a3d613e05526b04bf0f210b717480ac9e82e0d Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 21:34:44 +0100 Subject: [PATCH 01/23] =?UTF-8?q?Mon=20Jan=2031=202022=2021:34:44=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE.md | 39 +++++++++++++++++++++++++++++++++++++++ manifest.json | 29 +++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 LICENSE.md create mode 100644 manifest.json diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..d31d4f9 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,39 @@ + +## Creative Commons Attribution-ShareAlike 4.0 International + +### Human-Readable Summary + + +The Creative Commons Attribution-Share Alike 4.0 International License is available at +http://creativecommons.org/licenses/by-sa/4.0/. + +#### This is a human-readable summary of (and not a substitute for) the License. + + +### You are free to: + + +* **Share** — copy and redistribute the material in any medium or format. + +* **Adapt** — remix, transform, and build upon the material for any purpose, even commercially. + + The licensor cannot revoke these freedoms as long as you follow the license terms. + +### Under the following terms: + +* **Attribution** —You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. + +* **ShareAlike** — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original. + +* **No additional restrictions** — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. + + +### Notices: + +* You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation. + +* No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material. + + + +This PDF was generated using Prince (https://www.princexml.com/). \ No newline at end of file diff --git a/manifest.json b/manifest.json new file mode 100644 index 0000000..da19d64 --- /dev/null +++ b/manifest.json @@ -0,0 +1,29 @@ +{ + "package_version": 6, + "format": "usfm", + "generator": { + "name": "ts-desktop", + "build": "27" + }, + "target_language": { + "id": "gl", + "name": "galego", + "direction": "ltr" + }, + "project": { + "id": "gal", + "name": "Galatians" + }, + "type": { + "id": "text", + "name": "Text" + }, + "resource": { + "id": "reg", + "name": "Regular" + }, + "source_translations": [], + "parent_draft": {}, + "translators": [], + "finished_chunks": [] +} \ No newline at end of file From f129f263be028fe2a15e0d52d90928e29d43c13c Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 21:35:17 +0100 Subject: [PATCH 02/23] =?UTF-8?q?Mon=20Jan=2031=202022=2021:35:17=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index da19d64..fa9fb18 100644 --- a/manifest.json +++ b/manifest.json @@ -22,7 +22,15 @@ "id": "reg", "name": "Regular" }, - "source_translations": [], + "source_translations": [ + { + "language_id": "es-419", + "resource_id": "ulb", + "checking_level": "3", + "date_modified": "2021-10-26T13:25:43.6438639+00:00", + "version": "1.4" + } + ], "parent_draft": {}, "translators": [], "finished_chunks": [] From 98d6a4bd9dfce697a10f412b610791e663e15bf7 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 21:36:46 +0100 Subject: [PATCH 03/23] =?UTF-8?q?Mon=20Jan=2031=202022=2021:36:46=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 06/01.txt | 1 + 06/title.txt | 1 + manifest.json | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 06/01.txt create mode 100644 06/title.txt diff --git a/06/01.txt b/06/01.txt new file mode 100644 index 0000000..fa7e44b --- /dev/null +++ b/06/01.txt @@ -0,0 +1 @@ +\c 6 Irmáns, se algúns de vós é descuberto facendo o que non debe, vós que sodes espirituais restaurádeo con dozura \ No newline at end of file diff --git a/06/title.txt b/06/title.txt new file mode 100644 index 0000000..f7c354f --- /dev/null +++ b/06/title.txt @@ -0,0 +1 @@ +Capítulo 6 \ No newline at end of file diff --git a/manifest.json b/manifest.json index fa9fb18..9ce51f0 100644 --- a/manifest.json +++ b/manifest.json @@ -32,6 +32,8 @@ } ], "parent_draft": {}, - "translators": [], + "translators": [ + "elim_breixo" + ], "finished_chunks": [] } \ No newline at end of file From f9a1ec5ffc24f6dfdac29f947f0cf4f3dfa6bde7 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 21:38:46 +0100 Subject: [PATCH 04/23] =?UTF-8?q?Mon=20Jan=2031=202022=2021:38:46=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 06/01.txt | 2 +- 06/03.txt | 1 + manifest.json | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 06/03.txt diff --git a/06/01.txt b/06/01.txt index fa7e44b..2b7c59c 100644 --- a/06/01.txt +++ b/06/01.txt @@ -1 +1 @@ -\c 6 Irmáns, se algúns de vós é descuberto facendo o que non debe, vós que sodes espirituais restaurádeo con dozura \ No newline at end of file +\c 6 \v 1 Irmáns, se algúns de vós é descuberto facendo o que non debe, vós que sodes espirituais restaurádeo con dozura. Coidándote de non acabar caendo ti no mesmo. \v 2 Axudádevos mutuamente cos vosos problemas imitando así o exemplo de Xesús Cristo. \ No newline at end of file diff --git a/06/03.txt b/06/03.txt new file mode 100644 index 0000000..20ca66f --- /dev/null +++ b/06/03.txt @@ -0,0 +1 @@ +Porque se alguén cre ser máis do que é, autoengánase \ No newline at end of file diff --git a/manifest.json b/manifest.json index 9ce51f0..68c7b99 100644 --- a/manifest.json +++ b/manifest.json @@ -35,5 +35,8 @@ "translators": [ "elim_breixo" ], - "finished_chunks": [] + "finished_chunks": [ + "06-title", + "06-01" + ] } \ No newline at end of file From 529c8b1809dd88d03337b3bd47b81e6e8f1aed92 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 21:40:46 +0100 Subject: [PATCH 05/23] =?UTF-8?q?Mon=20Jan=2031=202022=2021:40:46=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 06/03.txt | 2 +- 06/06.txt | 1 + manifest.json | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 06/06.txt diff --git a/06/03.txt b/06/03.txt index 20ca66f..a39216f 100644 --- a/06/03.txt +++ b/06/03.txt @@ -1 +1 @@ -Porque se alguén cre ser máis do que é, autoengánase \ No newline at end of file +\v 3 Porque se alguén cre ser máis do que é, autoengánase. \v 4 Cada un que reflexione sobre as súas propias obras, e daquela terá motivo de estar satisfeito de si mesmo sen mirar aos outros. \v 5 Porque cada un levará cadansúa carga. \ No newline at end of file diff --git a/06/06.txt b/06/06.txt new file mode 100644 index 0000000..72b12e4 --- /dev/null +++ b/06/06.txt @@ -0,0 +1 @@ +\v 6 \v 7 \v 8 A quen se lle ensine sobre a palabra, que comparta toda cousa boa con quen lle ensina. Que \ No newline at end of file diff --git a/manifest.json b/manifest.json index 68c7b99..42e8e40 100644 --- a/manifest.json +++ b/manifest.json @@ -37,6 +37,7 @@ ], "finished_chunks": [ "06-title", - "06-01" + "06-01", + "06-03" ] } \ No newline at end of file From b35bbced7c1aac154aea32880b7fb84dff3c50b4 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 21:42:46 +0100 Subject: [PATCH 06/23] =?UTF-8?q?Mon=20Jan=2031=202022=2021:42:46=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 06/06.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/06/06.txt b/06/06.txt index 72b12e4..a153464 100644 --- a/06/06.txt +++ b/06/06.txt @@ -1 +1 @@ -\v 6 \v 7 \v 8 A quen se lle ensine sobre a palabra, que comparta toda cousa boa con quen lle ensina. Que \ No newline at end of file +\v 6 \v 8 A quen se lle ensine sobre a palabra, que comparta toda cousa boa con quen lle ensina. \v 7 Que non vos enganen. De Deus non vos podedes burlar, aquilo que sementedes, iso mesmo recolleredes. Porque o que sementa para a súa propia carne, recollerá destrución. E o que sementa agradando ao seu espírito, do Espírito vida eterna recollerá. \ No newline at end of file From 443b06c278198b9892680660789b7537d381ff39 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 21:44:46 +0100 Subject: [PATCH 07/23] =?UTF-8?q?Mon=20Jan=2031=202022=2021:44:46=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 06/06.txt | 2 +- 06/09.txt | 1 + 06/11.txt | 1 + manifest.json | 4 +++- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 06/09.txt create mode 100644 06/11.txt diff --git a/06/06.txt b/06/06.txt index a153464..8b9398e 100644 --- a/06/06.txt +++ b/06/06.txt @@ -1 +1 @@ -\v 6 \v 8 A quen se lle ensine sobre a palabra, que comparta toda cousa boa con quen lle ensina. \v 7 Que non vos enganen. De Deus non vos podedes burlar, aquilo que sementedes, iso mesmo recolleredes. Porque o que sementa para a súa propia carne, recollerá destrución. E o que sementa agradando ao seu espírito, do Espírito vida eterna recollerá. \ No newline at end of file +\v 6 A quen se lle ensine sobre a palabra, que comparta toda cousa boa con quen lle ensina. \v 7 Que non vos enganen. De Deus non vos podedes burlar, aquilo que sementedes, iso mesmo recolleredes. \v 8 Porque o que sementa para a súa propia carne, recollerá destrución. E o que sementa agradando ao seu espírito, do Espírito vida eterna recollerá. \ No newline at end of file diff --git a/06/09.txt b/06/09.txt new file mode 100644 index 0000000..cd191e8 --- /dev/null +++ b/06/09.txt @@ -0,0 +1 @@ +\v 9 Non nos fartemos de facer o ben, porque ao seu debido tempo segaremos. \v 10 Porén, non perdamos a oportunidade de facer ben a todos, especialmente á familia da fe \ No newline at end of file diff --git a/06/11.txt b/06/11.txt new file mode 100644 index 0000000..3727eab --- /dev/null +++ b/06/11.txt @@ -0,0 +1 @@ +Ollade as grandes letras que vos escribo da miña man. Todos os que queren quedar ben na carne, fórzanvos a que vos circuncidedes co fin \ No newline at end of file diff --git a/manifest.json b/manifest.json index 42e8e40..7891e7b 100644 --- a/manifest.json +++ b/manifest.json @@ -38,6 +38,8 @@ "finished_chunks": [ "06-title", "06-01", - "06-03" + "06-03", + "06-06", + "06-09" ] } \ No newline at end of file From 1cb9a6c5a4eae94524eed840f060c23ee69b4fee Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 21:46:46 +0100 Subject: [PATCH 08/23] =?UTF-8?q?Mon=20Jan=2031=202022=2021:46:46=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 06/11.txt | 2 +- 06/14.txt | 1 + manifest.json | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 06/14.txt diff --git a/06/11.txt b/06/11.txt index 3727eab..8ba82e2 100644 --- a/06/11.txt +++ b/06/11.txt @@ -1 +1 @@ -Ollade as grandes letras que vos escribo da miña man. Todos os que queren quedar ben na carne, fórzanvos a que vos circuncidedes co fin \ No newline at end of file +\v 11 Ollade as grandes letras que vos escribo da miña man. \v 12 Todos os que queren quedar ben na carne, fórzanvos a que vos circuncidedes co fin de non ser perseguidos pola causa da cruz de Cristo. \v 13 Porque nen aínda eles cumpren a lei, pero queren gabarse da vosa propia circuncisión. \ No newline at end of file diff --git a/06/14.txt b/06/14.txt new file mode 100644 index 0000000..97cd75a --- /dev/null +++ b/06/14.txt @@ -0,0 +1 @@ +Pero que non veña eu gabarme en cousa algunha agás na cruz de Cristo, para a cal eu fun crucificado para o mundo e o mundo apra min. Porque de pouco vale circun \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7891e7b..18e1736 100644 --- a/manifest.json +++ b/manifest.json @@ -40,6 +40,7 @@ "06-01", "06-03", "06-06", - "06-09" + "06-09", + "06-11" ] } \ No newline at end of file From 1041af4d52bdc622b84623a77509376917b87fdf Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 21:48:46 +0100 Subject: [PATCH 09/23] =?UTF-8?q?Mon=20Jan=2031=202022=2021:48:46=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 06/14.txt | 2 +- 06/17.txt | 1 + manifest.json | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 06/17.txt diff --git a/06/14.txt b/06/14.txt index 97cd75a..a81fad8 100644 --- a/06/14.txt +++ b/06/14.txt @@ -1 +1 @@ -Pero que non veña eu gabarme en cousa algunha agás na cruz de Cristo, para a cal eu fun crucificado para o mundo e o mundo apra min. Porque de pouco vale circun \ No newline at end of file +\v 14 Pero que non veña eu gabarme en cousa algunha agás na cruz de Cristo, para a cal eu fun crucificado para o mundo e o mundo para min. \v 15 Porque de pouco vale circuncidarse ou non, senón ser unha nova creación. \v 16 E os que vivan segundo esta norma, graza e paz a eles e ao Israel de Deus \ No newline at end of file diff --git a/06/17.txt b/06/17.txt new file mode 100644 index 0000000..6d05ab4 --- /dev/null +++ b/06/17.txt @@ -0,0 +1 @@ +De aquí en diante que ninguén me veña amolar, pois eu xa levo as marcas de Cristo. Que a graza do noso Señor Xesús Cristo estea co voso espírito irm \ No newline at end of file diff --git a/manifest.json b/manifest.json index 18e1736..34ac124 100644 --- a/manifest.json +++ b/manifest.json @@ -41,6 +41,7 @@ "06-03", "06-06", "06-09", - "06-11" + "06-11", + "06-14" ] } \ No newline at end of file From 8683f0ced6c11d02b9b04071bbd8ff75de51d0fa Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 21:49:32 +0100 Subject: [PATCH 10/23] =?UTF-8?q?Mon=20Jan=2031=202022=2021:49:32=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 06/17.txt | 2 +- manifest.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/06/17.txt b/06/17.txt index 6d05ab4..9eedaf9 100644 --- a/06/17.txt +++ b/06/17.txt @@ -1 +1 @@ -De aquí en diante que ninguén me veña amolar, pois eu xa levo as marcas de Cristo. Que a graza do noso Señor Xesús Cristo estea co voso espírito irm \ No newline at end of file +\v 17 De aquí en diante que ninguén me veña amolar, pois eu xa levo as marcas de Cristo. \v 18 Que a graza do noso Señor Xesús Cristo estea co voso espírito irmáns, amén \ No newline at end of file diff --git a/manifest.json b/manifest.json index 34ac124..d341c13 100644 --- a/manifest.json +++ b/manifest.json @@ -42,6 +42,7 @@ "06-06", "06-09", "06-11", - "06-14" + "06-14", + "06-17" ] } \ No newline at end of file From 664922ba8f098e3875bb20d7e2a82e040b5f5a90 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 22:30:52 +0100 Subject: [PATCH 11/23] =?UTF-8?q?Mon=20Jan=2031=202022=2022:30:52=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=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 68196e6..6ecac13 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 6, + "package_version": 7, "format": "usfm", "generator": { "name": "ts-desktop", From a7d12f3a861732b0ee1c399ea2132178992dc908 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 22:32:03 +0100 Subject: [PATCH 12/23] =?UTF-8?q?Mon=20Jan=2031=202022=2022:32:03=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=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 68196e6..6ecac13 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 6, + "package_version": 7, "format": "usfm", "generator": { "name": "ts-desktop", From af99757126229b697d9cbca1c91df23c36defe92 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 22:32:06 +0100 Subject: [PATCH 13/23] =?UTF-8?q?Mon=20Jan=2031=202022=2022:32:06=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=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 353565e..2573185 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 7, + "package_version": 6, "format": "usfm", "generator": { "name": "ts-desktop", From 8babc587879827498f9b004a7b0167c8076dac59 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 22:37:33 +0100 Subject: [PATCH 14/23] =?UTF-8?q?Mon=20Jan=2031=202022=2022:37:32=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 06/01.txt | 6 +----- 06/03.txt | 6 +----- 06/06.txt | 6 +----- 06/09.txt | 7 +------ 06/11.txt | 6 +----- 06/14.txt | 6 +----- 06/17.txt | 6 +----- manifest.json | 7 +++++-- 8 files changed, 12 insertions(+), 38 deletions(-) diff --git a/06/01.txt b/06/01.txt index b00d2cc..2b7c59c 100644 --- a/06/01.txt +++ b/06/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 6 \v 1 Irmáns, se algúns de vós é descuberto facendo o que non debe, vós que sodes espirituais restaurádeo con dozura. Coidándote de non acabar caendo ti no mesmo. \v 2 Axudádevos mutuamente cos vosos problemas imitando así o exemplo de Xesús Cristo. -======= -\v 1 Irmáns, se algún de vós é descuberto facendo o que non debe, que algúns guiados polo Espírito Santo corrixa con misericordia a aquel que pecou. Coidándose de non acabar pecando. \v 2 Axudádevos mutuamente cos vosos problemas imitando así o exemplo de Xesús Cristo. ->>>>>>> a65efdc871a764e15b16f1d53eb85a4474ca29a2 +\c 6 \v 1 Irmáns, se algúns de vós é descuberto facendo o que non debe, vós que sodes espirituais restaurádeo con dozura. Coidándote de non acabar caendo ti no mesmo. \v 2 Axudádevos mutuamente cos vosos problemas imitando así o exemplo de Xesús Cristo. \ No newline at end of file diff --git a/06/03.txt b/06/03.txt index 8998ca8..a39216f 100644 --- a/06/03.txt +++ b/06/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Porque se alguén cre ser máis do que é, autoengánase. \v 4 Cada un que reflexione sobre as súas propias obras, e daquela terá motivo de estar satisfeito de si mesmo sen mirar aos outros. \v 5 Porque cada un levará cadansúa carga. -======= -\v 3 Porque se algué cre ser máis do que é, autoenganase. \v 4 Cada un que reflexione sobre os propios actos, atopando neles o valor sen depender dos demáis. \v 5 Porque cada un terá candasúa tarefa. ->>>>>>> a65efdc871a764e15b16f1d53eb85a4474ca29a2 +\v 3 Porque se alguén cre ser máis do que é, autoengánase. \v 4 Cada un que reflexione sobre as súas propias obras, e daquela terá motivo de estar satisfeito de si mesmo sen mirar aos outros. \v 5 Porque cada un levará cadansúa carga. \ No newline at end of file diff --git a/06/06.txt b/06/06.txt index e0b0195..8b9398e 100644 --- a/06/06.txt +++ b/06/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 A quen se lle ensine sobre a palabra, que comparta toda cousa boa con quen lle ensina. \v 7 Que non vos enganen. De Deus non vos podedes burlar, aquilo que sementedes, iso mesmo recolleredes. \v 8 Porque o que sementa para a súa propia carne, recollerá destrución. E o que sementa agradando ao seu espírito, do Espírito vida eterna recollerá. -======= -\v 6 A quen se lle ensine sobre a palabra, que comparta dos seus bens, materiais e espirituais con quen lles ensinou. \v 7 Non vos trabuquedes. A Deus non se lle pode enganar, aquilo que sementas, iso recollerás. \v 8 Porque o que sementa para o seu propio egoísmo, recollerá destrucción. E o que sementa agradando ó o seu Espírito, vida eterna recollerá. ->>>>>>> a65efdc871a764e15b16f1d53eb85a4474ca29a2 +\v 6 A quen se lle ensine sobre a palabra, que comparta toda cousa boa con quen lle ensina. \v 7 Que non vos enganen. De Deus non vos podedes burlar, aquilo que sementedes, iso mesmo recolleredes. \v 8 Porque o que sementa para a súa propia carne, recollerá destrución. E o que sementa agradando ao seu espírito, do Espírito vida eterna recollerá. \ No newline at end of file diff --git a/06/09.txt b/06/09.txt index 7dd2d04..98bfc85 100644 --- a/06/09.txt +++ b/06/09.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 9 Non nos fartemos de facer o ben, porque ao seu debido tempo segaremos. \v 10 Porén, non perdamos a oportunidade de facer ben a todos, especialmente á familia da fe -======= -\v 9 Non cansemos de facer o ben, porque ó seu debido tempo recibiremos recompensa sempre que perseveremos. -\v 10 Porén, busquemos como facer ben aos demáis, especialmente aos irmáns na fe. ->>>>>>> a65efdc871a764e15b16f1d53eb85a4474ca29a2 +\v 9 Non nos fartemos de facer o ben, porque ao seu debido tempo segaremos. \v 10 Porén, non perdamos a oportunidade de facer ben a todos, especialmente á familia da fe. \ No newline at end of file diff --git a/06/11.txt b/06/11.txt index 63a57a7..8ba82e2 100644 --- a/06/11.txt +++ b/06/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Ollade as grandes letras que vos escribo da miña man. \v 12 Todos os que queren quedar ben na carne, fórzanvos a que vos circuncidedes co fin de non ser perseguidos pola causa da cruz de Cristo. \v 13 Porque nen aínda eles cumpren a lei, pero queren gabarse da vosa propia circuncisión. -======= -\v 11 Agora escríbolles da miña propia man. Ollo co que lles vou dicir. \v 12 Algúns xudeus estanvos forzando a circuncidarvos buscando a aprobación dos demáis, pero realmente, fanno para evitaren ser perseguidos pola causa da cruz de Cristo.\v 13 Porque nin aínda os que se circuncidan gardan a lei. Estes querenvos circuncidar para se poderen gabar. ->>>>>>> a65efdc871a764e15b16f1d53eb85a4474ca29a2 +\v 11 Ollade as grandes letras que vos escribo da miña man. \v 12 Todos os que queren quedar ben na carne, fórzanvos a que vos circuncidedes co fin de non ser perseguidos pola causa da cruz de Cristo. \v 13 Porque nen aínda eles cumpren a lei, pero queren gabarse da vosa propia circuncisión. \ No newline at end of file diff --git a/06/14.txt b/06/14.txt index 1653869..a81fad8 100644 --- a/06/14.txt +++ b/06/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Pero que non veña eu gabarme en cousa algunha agás na cruz de Cristo, para a cal eu fun crucificado para o mundo e o mundo para min. \v 15 Porque de pouco vale circuncidarse ou non, senón ser unha nova creación. \v 16 E os que vivan segundo esta norma, graza e paz a eles e ao Israel de Deus -======= -\v 14 Pero xamáis caia eu en xactarme, agás na cruz de Cristo, para a cal eu fun crucificado para o mundo e o mundo para min. \v 15 Porque de pouco vale circuncidarse ou non, senón ser unha nova creación. \v 16 Que a paz e a misericordia sexa sobre todos os que vivan deste xeito, aínda sobre os Israel de Deus. ->>>>>>> a65efdc871a764e15b16f1d53eb85a4474ca29a2 +\v 14 Pero que non veña eu gabarme en cousa algunha agás na cruz de Cristo, para a cal eu fun crucificado para o mundo e o mundo para min. \v 15 Porque de pouco vale circuncidarse ou non, senón ser unha nova creación. \v 16 E os que vivan segundo esta norma, graza e paz a eles e ao Israel de Deus \ No newline at end of file diff --git a/06/17.txt b/06/17.txt index 7617331..9eedaf9 100644 --- a/06/17.txt +++ b/06/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 De aquí en diante que ninguén me veña amolar, pois eu xa levo as marcas de Cristo. \v 18 Que a graza do noso Señor Xesús Cristo estea co voso espírito irmáns, amén -======= -\v 17 De aquí en diante que ningén me veña amolar con estos asuntos, pois levo no meu corpo as marcas de Xesús. \v 18 Irmáns, que a graza do noso Señor Xesús Cristo vos acompañe. Amén. ->>>>>>> a65efdc871a764e15b16f1d53eb85a4474ca29a2 +\v 17 De aquí en diante que ninguén me veña amolar, pois eu xa levo as marcas de Cristo. \v 18 Que a graza do noso Señor Xesús Cristo estea co voso espírito irmáns, amén \ No newline at end of file diff --git a/manifest.json b/manifest.json index 911caf5..abac686 100644 --- a/manifest.json +++ b/manifest.json @@ -46,7 +46,6 @@ "Elim" ], "finished_chunks": [ - "06-title", "front-title", "01-title", "01-01", @@ -105,6 +104,10 @@ "05-16", "05-19", "05-22", - "05-25" + "05-25", + "06-title", + "06-11", + "06-14", + "06-17" ] } \ No newline at end of file From cd07cb0547bcd5a6abd1273e9770dca57d520f85 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Mon, 31 Jan 2022 22:39:17 +0100 Subject: [PATCH 15/23] =?UTF-8?q?Mon=20Jan=2031=202022=2022:39:16=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest.json b/manifest.json index abac686..1df9eea 100644 --- a/manifest.json +++ b/manifest.json @@ -106,6 +106,10 @@ "05-22", "05-25", "06-title", + "06-01", + "06-03", + "06-06", + "06-09", "06-11", "06-14", "06-17" From 08d3c91990747346489fe00499a12bff6667e5e6 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Thu, 3 Feb 2022 19:59:10 +0100 Subject: [PATCH 16/23] =?UTF-8?q?Thu=20Feb=2003=202022=2019:59:09=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=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 d341c13..c47a82b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 6, + "package_version": 7, "format": "usfm", "generator": { "name": "ts-desktop", From 2d388c243daaeae7e426c5db95f01d71859440ff Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Thu, 3 Feb 2022 19:59:13 +0100 Subject: [PATCH 17/23] =?UTF-8?q?Thu=20Feb=2003=202022=2019:59:13=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=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 f2b30ff..1df9eea 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 7, + "package_version": 6, "format": "usfm", "generator": { "name": "ts-desktop", From 47d453c7c4538f3b943a685de97fa9b024613219 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Thu, 3 Feb 2022 20:01:30 +0100 Subject: [PATCH 18/23] =?UTF-8?q?Thu=20Feb=2003=202022=2020:01:30=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=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 d341c13..c47a82b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 6, + "package_version": 7, "format": "usfm", "generator": { "name": "ts-desktop", From 03d4f2a4f06a2af1a0484a8b552748d56682b8fb Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Thu, 3 Feb 2022 20:01:34 +0100 Subject: [PATCH 19/23] =?UTF-8?q?Thu=20Feb=2003=202022=2020:01:34=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=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 f2b30ff..1df9eea 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 7, + "package_version": 6, "format": "usfm", "generator": { "name": "ts-desktop", From 7407187cb22720ae7fcba0d675499a09e12ff1ed Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Thu, 3 Feb 2022 20:03:23 +0100 Subject: [PATCH 20/23] =?UTF-8?q?Thu=20Feb=2003=202022=2020:03:23=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=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 a8d768a..2ac1961 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 6, + "package_version": 7, "format": "usfm", "generator": { "name": "ts-desktop", From 55f584e6bd52237c940d9dc5d29391b93a8cf4d5 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Thu, 3 Feb 2022 20:04:28 +0100 Subject: [PATCH 21/23] =?UTF-8?q?Thu=20Feb=2003=202022=2020:04:28=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=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 98f823a..c6f509d 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 6, + "package_version": 7, "format": "usfm", "generator": { "name": "ts-desktop", From 76bba912033f2b138df997ddf76e165986432e04 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Thu, 3 Feb 2022 20:05:26 +0100 Subject: [PATCH 22/23] =?UTF-8?q?Thu=20Feb=2003=202022=2020:05:26=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 06/14.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/06/14.txt b/06/14.txt index b2ce5ef..a81fad8 100644 --- a/06/14.txt +++ b/06/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Pero que non veña eu gabarme en cousa algunha agás na cruz de Cristo, para a cal eu fun crucificado para o mundo e o mundo para min. \v 15 Porque de pouco vale circuncidarse ou non, senón ser unha nova creación. \v 16 E os que vivan segundo esta norma, graza e paz a eles e ao Israel de Deus -======= -\v 14 Pero xamáis caia eu en xactarme, agás na cruz de Cristo, para a cal eu fun crucificado para o mundo e o mundo para min. \v 15 Porque de pouco vale circuncidarse ou non, senón ser unha nova creación. \v 16 Que a paz e a misericordia sexa sobre todos os que vivan deste xeito, aínda sobre o Israel de Deus. ->>>>>>> 55f584e6bd52237c940d9dc5d29391b93a8cf4d5 +\v 14 Pero que non veña eu gabarme en cousa algunha agás na cruz de Cristo, para a cal eu fun crucificado para o mundo e o mundo para min. \v 15 Porque de pouco vale circuncidarse ou non, senón ser unha nova creación. \v 16 E os que vivan segundo esta norma, graza e paz a eles e ao Israel de Deus \ No newline at end of file From 6cc708c1ff7a254ad42af03e64cdeba341fc0dd5 Mon Sep 17 00:00:00 2001 From: AnaIglesias Date: Fri, 18 Feb 2022 10:24:17 +0100 Subject: [PATCH 23/23] =?UTF-8?q?Fri=20Feb=2018=202022=2010:24:17=20GMT+01?= =?UTF-8?q?00=20(hora=20est=C3=A1ndar=20de=20Europa=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 e67a68d..9e6f2dd 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 6, + "package_version": 7, "format": "usfm", "generator": { "name": "ts-desktop",