From ac9d470ab87e39874209888b4d79c06536e61177 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 16 Feb 2024 01:15:32 +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/outputlocator/metadata.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/outputlocator/metadata.json b/src/plugins/outputlocator/metadata.json index bc16dae463..1471d2fb27 100644 --- a/src/plugins/outputlocator/metadata.json +++ b/src/plugins/outputlocator/metadata.json @@ -67,6 +67,7 @@ "Description[tr]": "Ekran adlarını göster", "Description[uk]": "Показувати назви екранів", "Description[x-test]": "xxShow screen namesxx", + "Description[zh_TW]": "顯示螢幕名稱", "EnabledByDefault": true, "License": "GPL", "Name": "Output Locator", @@ -85,7 +86,8 @@ "Name[sl]": "Lokator izhoda", "Name[tr]": "Çıktı Bulucusu", "Name[uk]": "Локатор виведення", - "Name[x-test]": "xxOutput Locatorxx" + "Name[x-test]": "xxOutput Locatorxx", + "Name[zh_TW]": "輸出位置檢測器" }, "org.kde.kwin.effect": { "internal": true