From 37e490d7cc8e9f5fffb236061d554dfc60028703 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 8 Aug 2023 02:20:18 +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" --- .../kdecorations/aurorae/src/config/kcm_auroraeconfig.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json b/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json index 3970d674f2..8785f5a843 100644 --- a/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json +++ b/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json @@ -24,6 +24,7 @@ "Description[uk]": "Рушій тем обрамлення вікон", "Description[x-test]": "xxWindow Decoration Theme Enginexx", "Description[zh_CN]": "窗口装饰主题引擎", + "Description[zh_TW]": "視窗裝飾主題引擎", "Name": "Aurorae", "Name[ar]": "أورورا", "Name[bg]": "Aurorae", @@ -48,6 +49,7 @@ "Name[tr]": "Aurorae", "Name[uk]": "Aurorae", "Name[x-test]": "xxAuroraexx", - "Name[zh_CN]": "Aurorae 极光" + "Name[zh_CN]": "Aurorae 极光", + "Name[zh_TW]": "Aurorae" } }