From 6eab8757b5111482ff1d24be1ca1926f9fe4c1f2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 6 Apr 2018 05:23:24 +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" --- src/plugins/dummy/pmdummybackendplugin.json | 2 ++ src/plugins/libparted/pmlibpartedbackendplugin.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/plugins/dummy/pmdummybackendplugin.json b/src/plugins/dummy/pmdummybackendplugin.json index 5bb0fb6..f79b94b 100644 --- a/src/plugins/dummy/pmdummybackendplugin.json +++ b/src/plugins/dummy/pmdummybackendplugin.json @@ -19,6 +19,7 @@ "Description[sv]": "Ett bakgrundsprogram till KDE:s partitionshanterare i testsyfte.", "Description[uk]": "Тестовий додаток сервера Керування розділами KDE.", "Description[x-test]": "xxA KDE Partition Manager dummy backend for testing purposes.xx", + "Description[zh_CN]": "测试用的 KDE 分区管理器的虚拟后端", "EnabledByDefault": true, "Icon": "preferences-plugin", "Id": "pmdummybackendplugin", @@ -40,6 +41,7 @@ "Name[sv]": "KDE:s partitionshanterare bakgrundsprogram för test", "Name[uk]": "Тестовий додаток сервера Керування розділами KDE", "Name[x-test]": "xxKDE Partition Manager Dummy Backendxx", + "Name[zh_CN]": "KDE 分区管理器虚拟后端", "ServiceTypes": [ "PartitionManager/Plugin" ], diff --git a/src/plugins/libparted/pmlibpartedbackendplugin.json b/src/plugins/libparted/pmlibpartedbackendplugin.json index 38526f3..16ba62b 100644 --- a/src/plugins/libparted/pmlibpartedbackendplugin.json +++ b/src/plugins/libparted/pmlibpartedbackendplugin.json @@ -19,6 +19,7 @@ "Description[sv]": "LibParted bakgrundsprogrammet till KDE:s partitionshanterare", "Description[uk]": "Сервер LibParted для Керування розділами KDE", "Description[x-test]": "xxThe LibParted backend for KDE Partition Managerxx", + "Description[zh_CN]": "KDE 分区管理器的 LibParted 后端", "EnabledByDefault": true, "Icon": "preferences-plugin", "Id": "pmlibpartedbackendplugin", @@ -40,6 +41,7 @@ "Name[sv]": "KDE:s partitionshanterare LibParted bakgrundsprogram", "Name[uk]": "Сервер LibParted Керування розділами KDE", "Name[x-test]": "xxKDE Partition Manager LibParted Backendxx", + "Name[zh_CN]": "KDE 分区管理器 LibParted 后端", "ServiceTypes": [ "PartitionManager/Plugin" ],