From 708637cefad41f563e68180ad63367cdd759688b Mon Sep 17 00:00:00 2001 From: WatchTheFort <36827423+WatchTheFort@users.noreply.github.com> Date: Tue, 1 Oct 2024 11:52:25 -0400 Subject: [PATCH 01/13] Update transifex_merge.yml --- .github/workflows/transifex_merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/transifex_merge.yml b/.github/workflows/transifex_merge.yml index 82c033a..bc374fc 100644 --- a/.github/workflows/transifex_merge.yml +++ b/.github/workflows/transifex_merge.yml @@ -29,8 +29,8 @@ jobs: git fetch --unshallow origin transifex-synchronization-source for dir in language/*/; do if [ -d $dir ] && [ "$(basename $dir)" != "en" ]; then - git checkout transifex-synchronization-source -- $dir - git add $dir + git checkout transifex-synchronization-source -- language/$dir + git add language/$dir fi done git commit -m "[Transifex] Update translations on master" From ac4c3270f8a2f62c25851dfb8ef8203fbc3abde1 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 10:57:03 -0400 Subject: [PATCH 02/13] [Transifex] Translate language/en/ui.json in fr (#30) 100% reviewed source file: 'language/en/ui.json' on 'fr'. Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> --- language/fr/ui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/fr/ui.json b/language/fr/ui.json index 96cf35e..1417115 100644 --- a/language/fr/ui.json +++ b/language/fr/ui.json @@ -1,7 +1,7 @@ { "interface": { "welcome": "Bienvenue a test du Transifex!", - "goodbye2": "Au revoir, Commandantes", + "goodbye2": "Au revoir, Commandant!", "error": "Mon dieu! C'est une catastrophe!" } } From c38f50a51a7f311155fa3b20fb2e437eb4444abc Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 11:01:35 -0400 Subject: [PATCH 03/13] [Transifex] Translate language/en/ui.json in fr (#31) 100% reviewed source file: 'language/en/ui.json' on 'fr'. Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> --- language/fr/ui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/fr/ui.json b/language/fr/ui.json index 1417115..b0847c7 100644 --- a/language/fr/ui.json +++ b/language/fr/ui.json @@ -1,7 +1,7 @@ { "interface": { "welcome": "Bienvenue a test du Transifex!", - "goodbye2": "Au revoir, Commandant!", + "goodbye2": "Au revoir, Commandante!", "error": "Mon dieu! C'est une catastrophe!" } } From f1d051b15382c147c2443af198fb283e0f436448 Mon Sep 17 00:00:00 2001 From: WatchTheFort <36827423+WatchTheFort@users.noreply.github.com> Date: Sat, 5 Oct 2024 11:58:39 -0400 Subject: [PATCH 04/13] Update transifex_merge.yml --- .github/workflows/transifex_merge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/transifex_merge.yml b/.github/workflows/transifex_merge.yml index bc374fc..94a01ab 100644 --- a/.github/workflows/transifex_merge.yml +++ b/.github/workflows/transifex_merge.yml @@ -28,6 +28,8 @@ jobs: run: | git fetch --unshallow origin transifex-synchronization-source for dir in language/*/; do + echo "$dir" + echo "$(basename $dir)" if [ -d $dir ] && [ "$(basename $dir)" != "en" ]; then git checkout transifex-synchronization-source -- language/$dir git add language/$dir From 4e3a928722fe10def145bc6110a95b480061890e Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:00:19 -0400 Subject: [PATCH 05/13] [Transifex] Translate language/en/ui.json in fr (#33) 100% reviewed source file: 'language/en/ui.json' on 'fr'. Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> --- language/fr/ui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/fr/ui.json b/language/fr/ui.json index b0847c7..7e835cd 100644 --- a/language/fr/ui.json +++ b/language/fr/ui.json @@ -1,7 +1,7 @@ { "interface": { "welcome": "Bienvenue a test du Transifex!", - "goodbye2": "Au revoir, Commandante!", + "goodbye2": "Au revoir, Commandantes!", "error": "Mon dieu! C'est une catastrophe!" } } From c955bc4703f177dfa87b3f4ad51ec8841ef52931 Mon Sep 17 00:00:00 2001 From: WatchTheFort <36827423+WatchTheFort@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:03:15 -0400 Subject: [PATCH 06/13] Update transifex_merge.yml --- .github/workflows/transifex_merge.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/transifex_merge.yml b/.github/workflows/transifex_merge.yml index 94a01ab..b773f9f 100644 --- a/.github/workflows/transifex_merge.yml +++ b/.github/workflows/transifex_merge.yml @@ -26,14 +26,24 @@ jobs: - name: Force merge translation directories (excluding English) run: | + echo "1" + git status git fetch --unshallow origin transifex-synchronization-source + echo "2" + git status for dir in language/*/; do + echo "3" echo "$dir" echo "$(basename $dir)" if [ -d $dir ] && [ "$(basename $dir)" != "en" ]; then git checkout transifex-synchronization-source -- language/$dir git add language/$dir + git status fi done + echo "4" + git status git commit -m "[Transifex] Update translations on master" + echo "5" + git status git push origin master --force From 043040d85b94570234c741918b3837dc589995d3 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:05:42 -0400 Subject: [PATCH 07/13] [Transifex] Translate language/en/ui.json in fr (#35) 100% reviewed source file: 'language/en/ui.json' on 'fr'. Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> --- language/fr/ui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/fr/ui.json b/language/fr/ui.json index 7e835cd..989448f 100644 --- a/language/fr/ui.json +++ b/language/fr/ui.json @@ -1,7 +1,7 @@ { "interface": { "welcome": "Bienvenue a test du Transifex!", - "goodbye2": "Au revoir, Commandantes!", + "goodbye2": "Au revoir, Commandant", "error": "Mon dieu! C'est une catastrophe!" } } From fa3a5f49a35da7ad582eb8d76560ff5a5f445767 Mon Sep 17 00:00:00 2001 From: WatchTheFort <36827423+WatchTheFort@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:10:23 -0400 Subject: [PATCH 08/13] Update transifex_merge.yml --- .github/workflows/transifex_merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/transifex_merge.yml b/.github/workflows/transifex_merge.yml index b773f9f..375b990 100644 --- a/.github/workflows/transifex_merge.yml +++ b/.github/workflows/transifex_merge.yml @@ -36,7 +36,7 @@ jobs: echo "$dir" echo "$(basename $dir)" if [ -d $dir ] && [ "$(basename $dir)" != "en" ]; then - git checkout transifex-synchronization-source -- language/$dir + git checkout origin/transifex-synchronization-source -- language/$dir git add language/$dir git status fi From 446ce6ea4796ac970c2771e0906d7459c430efde Mon Sep 17 00:00:00 2001 From: WatchTheFort <36827423+WatchTheFort@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:11:12 -0400 Subject: [PATCH 09/13] Update transifex_merge.yml --- .github/workflows/transifex_merge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/transifex_merge.yml b/.github/workflows/transifex_merge.yml index 375b990..6730f8c 100644 --- a/.github/workflows/transifex_merge.yml +++ b/.github/workflows/transifex_merge.yml @@ -26,6 +26,7 @@ jobs: - name: Force merge translation directories (excluding English) run: | + echo "test" echo "1" git status git fetch --unshallow origin transifex-synchronization-source From eeb4352c425f2e6563bac1fd6668a8f0653fc7c8 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:11:42 -0400 Subject: [PATCH 10/13] [Transifex] Translate language/en/ui.json in fr (#36) 100% reviewed source file: 'language/en/ui.json' on 'fr'. Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> --- language/fr/ui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/fr/ui.json b/language/fr/ui.json index 989448f..1417115 100644 --- a/language/fr/ui.json +++ b/language/fr/ui.json @@ -1,7 +1,7 @@ { "interface": { "welcome": "Bienvenue a test du Transifex!", - "goodbye2": "Au revoir, Commandant", + "goodbye2": "Au revoir, Commandant!", "error": "Mon dieu! C'est une catastrophe!" } } From a390ee4f2f09f4ad39572a020b29d94cbf758f03 Mon Sep 17 00:00:00 2001 From: WatchTheFort <36827423+WatchTheFort@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:13:11 -0400 Subject: [PATCH 11/13] Update transifex_merge.yml --- .github/workflows/transifex_merge.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/transifex_merge.yml b/.github/workflows/transifex_merge.yml index 6730f8c..2ddbfd1 100644 --- a/.github/workflows/transifex_merge.yml +++ b/.github/workflows/transifex_merge.yml @@ -26,7 +26,7 @@ jobs: - name: Force merge translation directories (excluding English) run: | - echo "test" + echo "Test 2" echo "1" git status git fetch --unshallow origin transifex-synchronization-source @@ -37,8 +37,8 @@ jobs: echo "$dir" echo "$(basename $dir)" if [ -d $dir ] && [ "$(basename $dir)" != "en" ]; then - git checkout origin/transifex-synchronization-source -- language/$dir - git add language/$dir + git checkout origin/transifex-synchronization-source -- $dir + git add $dir git status fi done From 240115e69735d5f1b5d5c987a040deae053c5b37 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:13:44 -0400 Subject: [PATCH 12/13] [Transifex] Translate language/en/ui.json in fr (#37) 100% reviewed source file: 'language/en/ui.json' on 'fr'. Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> --- language/fr/ui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/fr/ui.json b/language/fr/ui.json index 1417115..7dea008 100644 --- a/language/fr/ui.json +++ b/language/fr/ui.json @@ -1,7 +1,7 @@ { "interface": { "welcome": "Bienvenue a test du Transifex!", - "goodbye2": "Au revoir, Commandant!", + "goodbye2": "Au revoir, Commandantente!", "error": "Mon dieu! C'est une catastrophe!" } } From 932d6b94c3b4e6d52dbffb8ca11d18cc19329541 Mon Sep 17 00:00:00 2001 From: WatchTheFort <36827423+WatchTheFort@users.noreply.github.com> Date: Sat, 5 Oct 2024 14:56:18 -0400 Subject: [PATCH 13/13] Update transifex_merge.yml --- .github/workflows/transifex_merge.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/transifex_merge.yml b/.github/workflows/transifex_merge.yml index 2ddbfd1..8f55ebf 100644 --- a/.github/workflows/transifex_merge.yml +++ b/.github/workflows/transifex_merge.yml @@ -26,25 +26,12 @@ jobs: - name: Force merge translation directories (excluding English) run: | - echo "Test 2" - echo "1" - git status git fetch --unshallow origin transifex-synchronization-source - echo "2" - git status for dir in language/*/; do - echo "3" - echo "$dir" - echo "$(basename $dir)" if [ -d $dir ] && [ "$(basename $dir)" != "en" ]; then git checkout origin/transifex-synchronization-source -- $dir git add $dir - git status fi done - echo "4" - git status git commit -m "[Transifex] Update translations on master" - echo "5" - git status git push origin master --force