From 1006a8daeb0de882107481a366adc476b4933c0c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 27 Feb 2022 01:56:05 +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/plugins/dummy/pmdummybackendplugin.json | 4 ++-- src/plugins/sfdisk/pmsfdiskbackendplugin.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/dummy/pmdummybackendplugin.json b/src/plugins/dummy/pmdummybackendplugin.json index 2fb2c0d..db9a899 100644 --- a/src/plugins/dummy/pmdummybackendplugin.json +++ b/src/plugins/dummy/pmdummybackendplugin.json @@ -68,7 +68,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 分区管理器虚拟后端。", + "Description[zh_CN]": "用于测试的 KDE 分区管理器虚拟后端程序。", "Description[zh_TW]": "使用虛設後端的 KDE 磁碟分割區管理員，可用來測試。", "EnabledByDefault": true, "Icon": "preferences-plugin", @@ -104,7 +104,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 分区管理器（虚拟后端）", + "Name[zh_CN]": "KDE 分区管理器虚拟后端程序", "Name[zh_TW]": "KDE 磁碟分割區管理員 (虛設後端)", "Version": "1", "Website": "http://www.partitionmanager.org" diff --git a/src/plugins/sfdisk/pmsfdiskbackendplugin.json b/src/plugins/sfdisk/pmsfdiskbackendplugin.json index 8063dac..505a780 100644 --- a/src/plugins/sfdisk/pmsfdiskbackendplugin.json +++ b/src/plugins/sfdisk/pmsfdiskbackendplugin.json @@ -68,7 +68,7 @@ "Description[sv]": "Ett sfdisk bakgrundsprogram till KDE:s partitionshanterare", "Description[uk]": "Додаток sfdisk сервера Керування розділами KDE.", "Description[x-test]": "xxA KDE Partition Manager sfdisk backend.xx", - "Description[zh_CN]": "使用 sfdisk 作为后端的 KDE 分区管理器。", + "Description[zh_CN]": "KDE 分区管理器 sfdisk 后端程序。", "Description[zh_TW]": "使用 sfdisk 作為後端的 KDE 磁碟分割區管理員。", "EnabledByDefault": true, "Icon": "preferences-plugin", @@ -103,7 +103,7 @@ "Name[sv]": "KDE:s partitionshanterare sfdisk bakgrundsprogram", "Name[uk]": "Додаток sfdisk сервера Керування розділами KDE", "Name[x-test]": "xxKDE Partition Manager sfdisk Backendxx", - "Name[zh_CN]": "KDE 分区管理器（sfdisk 后端）", + "Name[zh_CN]": "KDE 分区管理器 sfdisk 后端程序", "Name[zh_TW]": "KDE 磁碟分割區管理員 (sfdisk 後端)", "Version": "1", "Website": "http://www.partitionmanager.org"