From 70c19f7cafb5c7146c2bfff982f63c7d0ac6e483 Mon Sep 17 00:00:00 2001 From: Ruben Date: Thu, 20 Jan 2022 18:44:04 +0100 Subject: [PATCH 1/8] =?UTF-8?q?Thu=20Jan=2020=202022=2018:44:03=20GMT+0100?= =?UTF-8?q?=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 1773ea1..e50c248 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 6, + "package_version": 7, "format": "usfm", "generator": { "name": "ts-desktop", From 167fd469aa67751afb10d205f35df5664a2d91c9 Mon Sep 17 00:00:00 2001 From: Ruben Date: Thu, 20 Jan 2022 18:44:24 +0100 Subject: [PATCH 2/8] =?UTF-8?q?Thu=20Jan=2020=202022=2018:44:24=20GMT+0100?= =?UTF-8?q?=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 | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/manifest.json b/manifest.json index e50c248..ab673c9 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 7, + "package_version": 6, "format": "usfm", "generator": { "name": "ts-desktop", @@ -33,10 +33,10 @@ ], "parent_draft": {}, "translators": [ - "anaiglesias", - "Ana Iglesias Duran", "Rubén", "Ruben", + "anaiglesias", + "Ana Iglesias Duran", "Margariña", "Loida Concha Marinhas", "Carnicero", @@ -44,6 +44,21 @@ "Jose Luis Fernandez Diaz" ], "finished_chunks": [ + "04-title", + "04-01", + "04-03", + "04-06", + "04-08", + "04-10", + "04-12", + "04-15", + "04-17", + "04-19", + "04-21", + "04-24", + "04-26", + "04-28", + "04-30", "front-title", "01-title", "01-01", @@ -67,21 +82,6 @@ "03-21", "03-23", "03-27", - "04-title", - "04-01", - "04-03", - "04-06", - "04-08", - "04-10", - "04-12", - "04-15", - "04-17", - "04-19", - "04-21", - "04-24", - "04-26", - "04-28", - "04-30", "05-01", "05-03", "05-05", From 0db7bc5603f7bbcc949782ae7266600de7bc5749 Mon Sep 17 00:00:00 2001 From: Ruben Date: Thu, 20 Jan 2022 18:44:41 +0100 Subject: [PATCH 3/8] =?UTF-8?q?Thu=20Jan=2020=202022=2018:44:40=20GMT+0100?= =?UTF-8?q?=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 1773ea1..e50c248 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 6, + "package_version": 7, "format": "usfm", "generator": { "name": "ts-desktop", From 7b1dece033f99a60a9d8f90c246eea536c360729 Mon Sep 17 00:00:00 2001 From: Ruben Date: Thu, 20 Jan 2022 18:44:45 +0100 Subject: [PATCH 4/8] =?UTF-8?q?Thu=20Jan=2020=202022=2018:44:45=20GMT+0100?= =?UTF-8?q?=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 acc9354..ab673c9 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "package_version": 7, + "package_version": 6, "format": "usfm", "generator": { "name": "ts-desktop", From 218fb1ea250871fd0f4768c49e0d6707566475ca Mon Sep 17 00:00:00 2001 From: Ruben Date: Fri, 21 Jan 2022 12:31:08 +0100 Subject: [PATCH 5/8] =?UTF-8?q?Fri=20Jan=2021=202022=2012:31:08=20GMT+0100?= =?UTF-8?q?=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 +----- manifest.json | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/06/14.txt b/06/14.txt index a7d738e..080d0ce 100644 --- a/06/14.txt +++ b/06/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\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. -======= -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. Porque de pouco vale circuncidarse ou non, senon ser unha nova creación. ->>>>>>> 177f7d6a26de743af155505a44c42e59cff2e81d +\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. \ No newline at end of file diff --git a/manifest.json b/manifest.json index f4304a6..f68e19b 100644 --- a/manifest.json +++ b/manifest.json @@ -45,21 +45,6 @@ "Elim" ], "finished_chunks": [ - "04-title", - "04-01", - "04-03", - "04-06", - "04-08", - "04-10", - "04-12", - "04-15", - "04-17", - "04-19", - "04-21", - "04-24", - "04-26", - "04-28", - "04-30", "front-title", "01-title", "01-01", @@ -83,6 +68,21 @@ "03-21", "03-23", "03-27", + "04-title", + "04-01", + "04-03", + "04-06", + "04-08", + "04-10", + "04-12", + "04-15", + "04-17", + "04-19", + "04-21", + "04-24", + "04-26", + "04-28", + "04-30", "05-01", "05-03", "05-05", @@ -94,6 +94,7 @@ "05-22", "05-25", "06-title", + "06-14", "06-17" ] } \ No newline at end of file From 958ba17e7e6fbd3280d3055bdfdc2e8ceef72f61 Mon Sep 17 00:00:00 2001 From: Ruben Date: Fri, 21 Jan 2022 12:33:10 +0100 Subject: [PATCH 6/8] =?UTF-8?q?Fri=20Jan=2021=202022=2012:33:09=20GMT+0100?= =?UTF-8?q?=20(hora=20est=C3=A1ndar=20de=20Europa=20central)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 05/title.txt | 1 + manifest.json | 1 + 2 files changed, 2 insertions(+) create mode 100644 05/title.txt diff --git a/05/title.txt b/05/title.txt new file mode 100644 index 0000000..7c3a093 --- /dev/null +++ b/05/title.txt @@ -0,0 +1 @@ +Capítulo 5 \ No newline at end of file diff --git a/manifest.json b/manifest.json index f68e19b..10adf12 100644 --- a/manifest.json +++ b/manifest.json @@ -83,6 +83,7 @@ "04-26", "04-28", "04-30", + "05-title", "05-01", "05-03", "05-05", From 187b4d04b0f99028beebff4ac8b1a1f81e5b00b4 Mon Sep 17 00:00:00 2001 From: Ruben Date: Fri, 21 Jan 2022 12:34:26 +0100 Subject: [PATCH 7/8] =?UTF-8?q?Fri=20Jan=2021=202022=2012:34:26=20GMT+0100?= =?UTF-8?q?=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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/manifest.json b/manifest.json index 10adf12..98f823a 100644 --- a/manifest.json +++ b/manifest.json @@ -95,6 +95,11 @@ "05-22", "05-25", "06-title", + "06-01", + "06-03", + "06-06", + "06-09", + "06-11", "06-14", "06-17" ] From 55f584e6bd52237c940d9dc5d29391b93a8cf4d5 Mon Sep 17 00:00:00 2001 From: elim_breixo Date: Thu, 3 Feb 2022 20:04:28 +0100 Subject: [PATCH 8/8] =?UTF-8?q?Thu=20Feb=2003=202022=2020:04:28=20GMT+0100?= =?UTF-8?q?=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",