From c1acf75d7b6141f6292867f7293cc5a6b6fbac29 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 24 Oct 2017 05:15:41 +0200 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" --- applets/quicksettings/package/metadata.desktop | 2 ++ touchscreentest/org.kde.touchtest.desktop | 2 ++ 2 files changed, 4 insertions(+) diff --git a/applets/quicksettings/package/metadata.desktop b/applets/quicksettings/package/metadata.desktop index f1ba5600..23b76f1e 100644 --- a/applets/quicksettings/package/metadata.desktop +++ b/applets/quicksettings/package/metadata.desktop @@ -12,6 +12,7 @@ Name[nn]=Snøgginnstillingar Name[pl]=Szybkie ustawienia Name[pt]=Configuração Rápida Name[sv]=Snabbinställningar +Name[tr]=Hızlı Ayarlar Name[uk]=Швидке налаштовування Name[x-test]=xxQuick Settingsxx Name[zh_TW]=快速設定 @@ -26,6 +27,7 @@ Comment[nn]=Panel for rask tilgang til dei viktigaste innstillingane Comment[pl]=Panel szybkiego dostępu do najważniejszych ustawień Comment[pt]=Um painel para aceder rapidamente às configurações mais importantes Comment[sv]=En panel för att snabbt komma åt de viktigaste inställningarna +Comment[tr]=Önemli ayarların hızlıca yapılabildiği bir panel Comment[uk]=Панель для пришвидшення доступу до найважливіших параметрів Comment[x-test]=xxA panel to quickly access most important settingsxx Comment[zh_TW]=快速存取重要設定的面板 diff --git a/touchscreentest/org.kde.touchtest.desktop b/touchscreentest/org.kde.touchtest.desktop index 799b68a4..4b07a296 100755 --- a/touchscreentest/org.kde.touchtest.desktop +++ b/touchscreentest/org.kde.touchtest.desktop @@ -7,6 +7,7 @@ Name[nl]=Aanraaktest Name[pl]=Próba dotyku Name[pt]=Teste de Toque Name[sv]=Beröringsprov +Name[tr]=Dokunma Testi Name[uk]=Тестування дотику Name[x-test]=xxTouch Testxx Name[zh_TW]=觸控測試 @@ -23,6 +24,7 @@ GenericName[nl]=Terminal GenericName[pl]=Terminal GenericName[pt]=Terminal GenericName[sv]=Terminal +GenericName[tr]=Uçbirim GenericName[uk]=Термінал GenericName[x-test]=xxTerminalxx GenericName[zh_TW]=終端機