From ed72b1de7edac062a2bd77efc37c301829ab2db8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 22 Feb 2020 05:47:39 +0100 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" --- themes/qtplastique.themerc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/qtplastique.themerc b/themes/qtplastique.themerc index 62734ca8a..a08968f59 100644 --- a/themes/qtplastique.themerc +++ b/themes/qtplastique.themerc @@ -69,7 +69,7 @@ Name[zh_TW]=Plastique Comment=Built-in unthemed style similar to Plastik from KDE3 Comment[bg]=Вграден стил, подобен на Plastik от KDE3 Comment[bs]=Ugrađeni bestematski stil nalik na Plastiku iz KDE‑a 3 -Comment[ca]=Un estil sense tema integrat, similar Plastik del KDE3 +Comment[ca]=Un estil sense tema integrat, similar Plastik del KDE 3 Comment[ca@valencia]=Un estil sense tema integrat, similar a Plastik de KDE3 Comment[cs]=Zabudovaný styl bez motivu podobný Plastik z KDE3 Comment[csb]=Wbùdowóny sztél szlachùjący za Plastikã z KDE3