From 812c61c5ff2226c4bb8ba64beead8750ea08f502 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 27 Sep 2017 09:12:08 +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 2471b751..f1ba5600 100644 --- a/applets/quicksettings/package/metadata.desktop +++ b/applets/quicksettings/package/metadata.desktop @@ -14,6 +14,7 @@ Name[pt]=Configuração Rápida Name[sv]=Snabbinställningar Name[uk]=Швидке налаштовування Name[x-test]=xxQuick Settingsxx +Name[zh_TW]=快速設定 Comment=A panel to quickly access most important settings Comment[ast]=Un panel p'acceder rápidamente a les opciones más importantes @@ -27,6 +28,7 @@ Comment[pt]=Um painel para aceder rapidamente às configurações mais important Comment[sv]=En panel för att snabbt komma åt de viktigaste inställningarna Comment[uk]=Панель для пришвидшення доступу до найважливіших параметрів Comment[x-test]=xxA panel to quickly access most important settingsxx +Comment[zh_TW]=快速存取重要設定的面板 Icon=systemsettings Type=Service diff --git a/touchscreentest/org.kde.touchtest.desktop b/touchscreentest/org.kde.touchtest.desktop index 54180a81..6b28ac41 100755 --- a/touchscreentest/org.kde.touchtest.desktop +++ b/touchscreentest/org.kde.touchtest.desktop @@ -7,6 +7,7 @@ Name[pt]=Teste de Toque Name[sv]=Beröringsprov Name[uk]=Тестування дотику Name[x-test]=xxTouch Testxx +Name[zh_TW]=觸控測試 Categories=Qt;KDE;System;Development; @@ -20,6 +21,7 @@ GenericName[pt]=Terminal GenericName[sv]=Terminal GenericName[uk]=Термінал GenericName[x-test]=xxTerminalxx +GenericName[zh_TW]=終端機 Icon=input-touchpad MimeType=