From 0fae581201e401cce30971f83ac59d5641a78d45 Mon Sep 17 00:00:00 2001 From: service-tip-git Date: Thu, 22 Aug 2024 15:21:44 +0000 Subject: [PATCH 1/5] [INTERNAL] Translation delivery: commit by LX Lab Change-Id: I176af378b465f9247e8d8b2984e4dc9384fd830f --- .../stringmessages/Sailing_StringMessages_cs.properties | 1 + .../stringmessages/Sailing_StringMessages_da.properties | 1 + .../stringmessages/Sailing_StringMessages_es.properties | 1 + .../stringmessages/Sailing_StringMessages_fr.properties | 1 + .../stringmessages/Sailing_StringMessages_it.properties | 1 + .../stringmessages/Sailing_StringMessages_ja.properties | 1 + .../stringmessages/Sailing_StringMessages_pt.properties | 1 + .../stringmessages/Sailing_StringMessages_ru.properties | 1 + .../stringmessages/Sailing_StringMessages_sl.properties | 1 + .../stringmessages/Sailing_StringMessages_zh.properties | 1 + 10 files changed, 10 insertions(+) diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_cs.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_cs.properties index b9ef293d07e..de9361ebec5 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_cs.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_cs.properties @@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Závodníci na výsledkových tabulích SmoothedSpeed=Vyhlazená rychlost RatioDistanceLongVsShortTack=Poměr délky dlouhého/krátkého obratu RatioDurationLongVsShortTack=Poměr doby trvání dlouhého/krátkého obratu +Discarded=Vyřazeno diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_da.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_da.properties index 9124376a241..8cf16f11e69 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_da.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_da.properties @@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Deltagere på rangliste SmoothedSpeed=Udjævnet hastighed RatioDistanceLongVsShortTack=Forholdsafstand lang stagvende/kort stagvende RatioDurationLongVsShortTack=Forholdsvarighed lang stagvende/kort stagvende +Discarded=Kasseret diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_es.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_es.properties index fd29b9929da..2f10ed5b8a0 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_es.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_es.properties @@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Competidores en tablas de clasificación SmoothedSpeed=Velocidad suavizada RatioDistanceLongVsShortTack=Ratio de distancia de bordo largo/corto RatioDurationLongVsShortTack=Ratio de duración de bordo largo/corto +Discarded=Rechazado diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_fr.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_fr.properties index a5069a9fb14..85c5aa56441 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_fr.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_fr.properties @@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Concurrents dans les palmarès SmoothedSpeed=Vitesse lissée RatioDistanceLongVsShortTack=Ratio de distance tronçon long/tronçon court RatioDurationLongVsShortTack=Ratio de durée tronçon long/tronçon court +Discarded=Retiré diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_it.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_it.properties index d67b42e85af..092648f5100 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_it.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_it.properties @@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Concorrenti nelle classifiche SmoothedSpeed=Velocità media di movimento RatioDistanceLongVsShortTack=Distanza in rapporto tra bordo lungo/corto RatioDurationLongVsShortTack=Durata in rapporto tra bordo lungo/corto +Discarded=Scartato diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_ja.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_ja.properties index 0a3b5d95ee9..178c2c38d3d 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_ja.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_ja.properties @@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=リーダーボード上の競技者 SmoothedSpeed=平滑化速度 RatioDistanceLongVsShortTack=ロングタック/ショートタック距離比率 RatioDurationLongVsShortTack=ロングタック/ショートタック時間比率 +Discarded=破棄済み diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_pt.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_pt.properties index 33916625f54..49ec975ea1f 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_pt.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_pt.properties @@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Competidores nos painéis de classificaç SmoothedSpeed=Velocidade suavizada RatioDistanceLongVsShortTack=Proporção distância cambada longa/cambada curta RatioDurationLongVsShortTack=Proporção duração cambada longa/cambada curta +Discarded=Descartado diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_ru.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_ru.properties index 6e0c3e662d9..5d069ca108f 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_ru.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_ru.properties @@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Участники в таблицах л SmoothedSpeed=Сглаженная скорость RatioDistanceLongVsShortTack=Соотношение расстояния длинного и короткого галса RatioDurationLongVsShortTack=Соотношение продолжительности длинного и короткого галса +Discarded=Сброшено diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_sl.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_sl.properties index 05a3ba6aae5..33bfed82fa4 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_sl.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_sl.properties @@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Tekmovalci na lestvicah vodilnih SmoothedSpeed=Umirjena hitrost RatioDistanceLongVsShortTack=Razmerje razdalje dolgo prečenje/kratko prečenje RatioDurationLongVsShortTack=Razmerje trajanja dolgo prečenje/kratko prečenje +Discarded=Opuščeno diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_zh.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_zh.properties index b6c3a04e02f..4209686911e 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_zh.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_zh.properties @@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=积分榜中的参赛队 SmoothedSpeed=平滑速度 RatioDistanceLongVsShortTack=长程迎风转向/短程迎风转向距离比率 RatioDurationLongVsShortTack=长程迎风转向/短程迎风转向持续时间比率 +Discarded=已放弃 From 6a0db30f9a40af8a0ef2f5f9d552cc0d9969ebf6 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 23 Aug 2024 00:52:29 +0200 Subject: [PATCH 2/5] organize sapsailing/com merging into github/main such that it can trigger workflows --- .github/workflows/merge-sapsailing-com-main.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/merge-sapsailing-com-main.yml b/.github/workflows/merge-sapsailing-com-main.yml index c281acde98e..d0a6c431b73 100644 --- a/.github/workflows/merge-sapsailing-com-main.yml +++ b/.github/workflows/merge-sapsailing-com-main.yml @@ -25,7 +25,14 @@ jobs: git remote add sapsailing ssh://trac@sapsailing.com/home/trac/git git remote -v GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git fetch sapsailing - git config --global user.email "github@sapsailing.com" - git config --global user.name "Github Auto-Merger" - git merge sapsailing/main - git push + - name: Merge sapsailing/main into main + uses: devmasx/merge-branch@master + env: + GH_TOKEN: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }} + with: + type: now + from_branch: sapsailing/main + target_branch: main + message: Auto-merging sapsailing/main into github/main + github_token: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }} + From 371ca3d2e473957986ad84925352a2011402eb35 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 23 Aug 2024 01:04:08 +0200 Subject: [PATCH 3/5] trying with a temporary branch sapsailing_main for merging --- .github/workflows/merge-sapsailing-com-main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-sapsailing-com-main.yml b/.github/workflows/merge-sapsailing-com-main.yml index d0a6c431b73..aa2e9a737fb 100644 --- a/.github/workflows/merge-sapsailing-com-main.yml +++ b/.github/workflows/merge-sapsailing-com-main.yml @@ -24,14 +24,14 @@ jobs: chmod 600 ~/.ssh/id_ed25519 git remote add sapsailing ssh://trac@sapsailing.com/home/trac/git git remote -v - GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git fetch sapsailing + GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git fetch sapsailing main:sapsailing_main - name: Merge sapsailing/main into main uses: devmasx/merge-branch@master env: GH_TOKEN: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }} with: type: now - from_branch: sapsailing/main + from_branch: sapsailing_main target_branch: main message: Auto-merging sapsailing/main into github/main github_token: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }} From 467658e49626a97bf057b7b99e72ef676f0a592e Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 23 Aug 2024 01:14:05 +0200 Subject: [PATCH 4/5] working on letting sapsailing.com main branch merge trigger workflows --- .github/workflows/merge-sapsailing-com-main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge-sapsailing-com-main.yml b/.github/workflows/merge-sapsailing-com-main.yml index aa2e9a737fb..0b069e751f0 100644 --- a/.github/workflows/merge-sapsailing-com-main.yml +++ b/.github/workflows/merge-sapsailing-com-main.yml @@ -25,6 +25,7 @@ jobs: git remote add sapsailing ssh://trac@sapsailing.com/home/trac/git git remote -v GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git fetch sapsailing main:sapsailing_main + GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git push -f sapsailing_main:sapsailing_main - name: Merge sapsailing/main into main uses: devmasx/merge-branch@master env: From 93c4f84f750a1c8e6fcfa54d3aeb0d1df6716b9a Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 23 Aug 2024 01:28:57 +0200 Subject: [PATCH 5/5] use origin as push target --- .github/workflows/merge-sapsailing-com-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-sapsailing-com-main.yml b/.github/workflows/merge-sapsailing-com-main.yml index 0b069e751f0..b4a9129da8f 100644 --- a/.github/workflows/merge-sapsailing-com-main.yml +++ b/.github/workflows/merge-sapsailing-com-main.yml @@ -25,7 +25,7 @@ jobs: git remote add sapsailing ssh://trac@sapsailing.com/home/trac/git git remote -v GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git fetch sapsailing main:sapsailing_main - GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git push -f sapsailing_main:sapsailing_main + GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git push -f origin sapsailing_main:sapsailing_main - name: Merge sapsailing/main into main uses: devmasx/merge-branch@master env: