From 648b2a5bf3c39119e78ecd2cd4128ed960b2a116 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 16 Feb 2022 01:49: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" --- .../aurorae/themes/plastik/package/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop b/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop index 56fbb382e9..2d3977d36a 100644 --- a/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop +++ b/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop @@ -85,7 +85,7 @@ Name[uz@cyrillic]=Пластик Name[vi]=Plastik Name[wa]=Plastike Name[x-test]=xxPlastikxx -Name[zh_CN]=Plastik 塑料 +Name[zh_CN]=Plastik 百相 Name[zh_TW]=Plastik Comment=The classic theme known from KDE 3 Comment[ar]=السّمة الكلاسيكيّة المعروفة من كدي 3