From 286ad7104d29f4368c6957f0aad7925b5455ddcd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 23 Dec 2016 05:44:53 +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" --- kcmkwin/kwincompositing/kwineffect.knsrc | 1 + kcmkwin/kwinscripts/kwinscripts.knsrc | 1 + kcmkwin/kwintabbox/kwinswitcher.knsrc | 1 + plugins/kdecorations/aurorae/src/aurorae.knsrc | 1 + 4 files changed, 4 insertions(+) diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc index b7da6b7a0f..903591e06d 100644 --- 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 diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc index 8fce86bd6f..0bb2784287 100644 --- 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 diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc index ecfb691491..cbdac6a463 100644 --- 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 diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc index 2dda15edef..bb788165dc 100644 --- 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