From 5237d20ad922abd4814c9462bb4910c9f93bc494 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 28 Jul 2024 01:23:22 +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" --- .../org.kde.plasma.mobile.defaultNavigationPanel/metadata.json | 2 ++ .../org.kde.plasma.mobile.defaultStatusBar/metadata.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/layout-templates/org.kde.plasma.mobile.defaultNavigationPanel/metadata.json b/layout-templates/org.kde.plasma.mobile.defaultNavigationPanel/metadata.json index 48547f87..c1cddf72 100644 --- a/layout-templates/org.kde.plasma.mobile.defaultNavigationPanel/metadata.json +++ b/layout-templates/org.kde.plasma.mobile.defaultNavigationPanel/metadata.json @@ -32,6 +32,7 @@ "Description[uk]": "Типова панель навігації для мобільних", "Description[x-test]": "xxDefault navigation panel for mobilexx", "Description[zh_CN]": "手机的默认导航面板", + "Description[zh_TW]": "手機用的預設導覽面板", "EnabledByDefault": true, "Id": "org.kde.plasma.mobile.defaultNavigationPanel", "License": "LGPLv2+", @@ -55,6 +56,7 @@ "Name[uk]": "Типова панель навігації для мобільних", "Name[x-test]": "xxDefault Mobile Navigation Panelxx", "Name[zh_CN]": "默认手机导航面板", + "Name[zh_TW]": "預設手機導覽面板", "Website": "https://www.kde.org/plasma-desktop" }, "X-Plasma-ContainmentCategories": [ diff --git a/layout-templates/org.kde.plasma.mobile.defaultStatusBar/metadata.json b/layout-templates/org.kde.plasma.mobile.defaultStatusBar/metadata.json index 8a6cc832..60122e43 100644 --- a/layout-templates/org.kde.plasma.mobile.defaultStatusBar/metadata.json +++ b/layout-templates/org.kde.plasma.mobile.defaultStatusBar/metadata.json @@ -32,6 +32,7 @@ "Description[uk]": "Типова смужка стану для мобільних", "Description[x-test]": "xxDefault status bar for mobilexx", "Description[zh_CN]": "手机的默认状态栏", + "Description[zh_TW]": "手機用的預設狀態列", "EnabledByDefault": true, "Id": "org.kde.plasma.mobile.defaultStatusBar", "License": "LGPLv2+", @@ -55,6 +56,7 @@ "Name[uk]": "Типова смужка стану для мобільних", "Name[x-test]": "xxDefault Mobile Status Barxx", "Name[zh_CN]": "默认手机状态栏", + "Name[zh_TW]": "預設手機狀態列", "Website": "https://www.kde.org/plasma-desktop" }, "X-Plasma-ContainmentCategories": [