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"
9 years ago · 286ad7104d
parent 8e32dd4fdc
commit 286ad7104d
4 changed files with 4 additions and 0 deletions
--- a/kcmkwin/kwincompositing/kwineffect.knsrc
+++ b/kcmkwin/kwincompositing/kwineffect.knsrc
@ -6,6 +6,7 @@ Name[pt]=Efeitos do Gestor de Janelas
 Name[sv]=Fönsterhanteringseffekter
 Name[uk]=Ефекти засобу керування вікнами
 Name[x-test]=xxWindow Manager Effectsxx
+Name[zh_CN]=窗口管理器效果

 ProvidersUrl=http://download.kde.org/ocs/providers.xml
 Categories=KWin Effects
--- a/kcmkwin/kwinscripts/kwinscripts.knsrc
+++ b/kcmkwin/kwinscripts/kwinscripts.knsrc
@ -6,6 +6,7 @@ Name[pt]=Programas do Gestor de Janelas
 Name[sv]=Fönsterhanteringsskript
 Name[uk]=Скрипти засобу керування вікнами
 Name[x-test]=xxWindow Manager Scriptsxx
+Name[zh_CN]=窗口管理器脚本

 ProvidersUrl=http://download.kde.org/ocs/providers.xml
 Categories=KWin Scripts
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@ -6,6 +6,7 @@ Name[pt]=Disposições da Mudança de Janelas do KWin
 Name[sv]=Fönsterbyteslayouter
 Name[uk]=Компонування засобу перемикання вікон
 Name[x-test]=xxWindow Manager Switching Layoutsxx
+Name[zh_CN]=窗口切换器布局

 ProvidersUrl=http://download.kde.org/ocs/providers.xml
 Categories=KWin Switching Layouts
--- a/plugins/kdecorations/aurorae/src/aurorae.knsrc
+++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc
@ -6,6 +6,7 @@ Name[pt]=Decorações das Janelas do Aurorae
 Name[sv]=Aurorae-fönsterdekorationer
 Name[uk]=Обрамлення вікон Aurorae
 Name[x-test]=xxAurorae Window Decorationsxx
+Name[zh_CN]=Aurorae 窗口装饰

 ProvidersUrl=http://download.kde.org/ocs/providers.xml
 Categories=Window Decoration Aurorae