From 0130b531260722bb2a58e2f9006d49701a471b3e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 6 May 2022 01:45:37 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/effects/blendchanges/metadata.json | 2 ++ src/effects/windowview/metadata.json | 2 +- src/kcmkwin/kwinscripts/kwinscripts.json | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/effects/blendchanges/metadata.json b/src/effects/blendchanges/metadata.json index 339742f449..042bcb421b 100644 --- a/src/effects/blendchanges/metadata.json +++ b/src/effects/blendchanges/metadata.json @@ -16,6 +16,7 @@ "Description[pl]": "Animuje zmiany wyglądu systemu", "Description[pt]": "Anima as mudanças de estilo do sistema", "Description[pt_BR]": "Animar alterações de estilo do sistema", + "Description[ro]": "Animează schimbările de stil al sistemului", "Description[sl]": "Animiraj spremembe sloga sistema", "Description[sv]": "Animerar systemets stiländringar", "Description[tr]": "Sistem biçemi değişikliklerini canlandırır", @@ -41,6 +42,7 @@ "Name[pl]": "Przenikanie zmian", "Name[pt]": "Misturar as Alterações", "Name[pt_BR]": "Misturar alterações", + "Name[ro]": "Îmbină schimbările", "Name[sl]": "Zmešaj spremembe", "Name[sv]": "Blanda ändringar", "Name[tr]": "Değişiklikleri Harmanla", diff --git a/src/effects/windowview/metadata.json b/src/effects/windowview/metadata.json index a596d42bd2..ff32e09602 100644 --- a/src/effects/windowview/metadata.json +++ b/src/effects/windowview/metadata.json @@ -4,7 +4,7 @@ "Description": "Zoom out until all opened windows can be displayed side-by-side", "Description[ar]": "بعِّد إلى أن يصير بالإمكان عرض كل النوافذ المفتوحة جبناً إلى جنب", "Description[az]": "Bütün açıq pəncərələrin miniatürünü yan-yana göstərir", - "Description[ca@valencia]": "Redueix fins que totes les finestres obertes es poden mostrar una al costat de l'altra", + "Description[ca@valencia]": "Redueix fins que totes les finestres obertes es poden mostrar una al costat de l'atra", "Description[ca]": "Redueix fins que totes les finestres obertes es poden mostrar una al costat de l'altra", "Description[cs]": "Oddálí plochu, aby byla vidět všechna okna", "Description[de]": "Verkleinert Fenster auf der Arbeitsfläche, sodass sie alle nebeneinander sichtbar sind", diff --git a/src/kcmkwin/kwinscripts/kwinscripts.json b/src/kcmkwin/kwinscripts/kwinscripts.json index 7c8d0a7bb7..8d2b9e50ac 100644 --- a/src/kcmkwin/kwinscripts/kwinscripts.json +++ b/src/kcmkwin/kwinscripts/kwinscripts.json @@ -9,10 +9,12 @@ "Description[fr]": "Gérer les scripts pour KWin", "Description[ia]": "Gere scriptos de KWin", "Description[it]": "Gestisci gli script di KWin", + "Description[ko]": "KWin 스크립트 관리", "Description[nl]": "KWin-scripts beheren", "Description[pl]": "Zarządzanie skryptami KWin", "Description[pt]": "Gerir os programas do KWin", "Description[pt_BR]": "Gerencia os scripts do KWin", + "Description[ro]": "Gestionare scripturi KWin", "Description[sl]": "Upravljaj KWin Scripte", "Description[sv]": "Hantera Kwin-skript", "Description[tr]": "KWin Betiklerini Yönet", @@ -29,10 +31,12 @@ "Name[fr]": "Scripts pour KWin", "Name[ia]": "Script de KWin", "Name[it]": "Script di KWin", + "Name[ko]": "KWin 스크립트", "Name[nl]": "KWin-scripts", "Name[pl]": "Skrypty KWin", "Name[pt]": "Programas do KWin", "Name[pt_BR]": "Scripts do KWin", + "Name[ro]": "Scripturi KWin", "Name[sl]": "KWin Scripti", "Name[sv]": "Kwin-skript", "Name[tr]": "KWin Betikleri",