From 9681ae6849831d7d57bb4950b62ecef3ba450b6e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Mar 2017 04:15:34 +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" --- packageplugins/aurorae/kwin-packagestructure-aurorae.desktop | 2 +- plugins/kdecorations/aurorae/src/aurorae.knsrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop index 6d0833cd49..a9c1c7677f 100644 --- a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop +++ b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop @@ -7,7 +7,7 @@ Name[es]=Aurorae de KWin Name[hu]=KWin Aurorae Name[nl]=KWin Aurorae Name[pt]=Aurora do KWin -Name[sv]=Kwin-aurora +Name[sv]=Kwin Aurora Name[uk]=KWin Aurorae Name[x-test]=xxKWin Auroraexx Name[zh_CN]=KWin 极光 diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc index 8a8f6f548d..2320e4d7ab 100644 --- a/plugins/kdecorations/aurorae/src/aurorae.knsrc +++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc @@ -21,7 +21,7 @@ Name[sr]=Декорације прозора за Ауроре Name[sr@ijekavian]=Декорације прозора за Ауроре Name[sr@ijekavianlatin]=Dekoracije prozora za Aurore Name[sr@latin]=Dekoracije prozora za Aurore -Name[sv]=Aurorae-fönsterdekorationer +Name[sv]=Aurora-fönsterdekorationer Name[uk]=Обрамлення вікон Aurorae Name[x-test]=xxAurorae Window Decorationsxx Name[zh_CN]=Aurorae 窗口装饰