From 1d622fbbc300b2cf84af68c47d1928b860dda030 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 22 Dec 2016 05:55:50 +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 | 6 ++++++ kcmkwin/kwinscripts/kwinscripts.knsrc | 6 ++++++ kcmkwin/kwintabbox/kwinswitcher.knsrc | 6 ++++++ plugins/kdecorations/aurorae/src/aurorae.knsrc | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc index 04e6efcf47..b7da6b7a0f 100644 --- a/kcmkwin/kwincompositing/kwineffect.knsrc +++ b/kcmkwin/kwincompositing/kwineffect.knsrc @@ -1,5 +1,11 @@ [KNewStuff3] Name=Window Manager Effects +Name[ca]=Efectes del gestor de finestres +Name[nl]=Effecten van vensterbeheerder +Name[pt]=Efeitos do Gestor de Janelas +Name[sv]=Fönsterhanteringseffekter +Name[uk]=Ефекти засобу керування вікнами +Name[x-test]=xxWindow Manager Effectsxx ProvidersUrl=http://download.kde.org/ocs/providers.xml Categories=KWin Effects diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc index bbfbc6394a..8fce86bd6f 100644 --- a/kcmkwin/kwinscripts/kwinscripts.knsrc +++ b/kcmkwin/kwinscripts/kwinscripts.knsrc @@ -1,5 +1,11 @@ [KNewStuff3] Name=Window Manager Scripts +Name[ca]=Scripts del gestor de finestres +Name[nl]=Scripts van vensterbeheerder +Name[pt]=Programas do Gestor de Janelas +Name[sv]=Fönsterhanteringsskript +Name[uk]=Скрипти засобу керування вікнами +Name[x-test]=xxWindow Manager Scriptsxx ProvidersUrl=http://download.kde.org/ocs/providers.xml Categories=KWin Scripts diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc index c1b87fc10f..ecfb691491 100644 --- a/kcmkwin/kwintabbox/kwinswitcher.knsrc +++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc @@ -1,5 +1,11 @@ [KNewStuff3] Name=Window Manager Switching Layouts +Name[ca]=Disposicions del commutador del gestor de finestres +Name[nl]=Omschakelende indelingen van vensterbeheerder +Name[pt]=Disposições da Mudança de Janelas do KWin +Name[sv]=Fönsterbyteslayouter +Name[uk]=Компонування засобу перемикання вікон +Name[x-test]=xxWindow Manager Switching Layoutsxx 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 e3d7fc4f69..2dda15edef 100644 --- a/plugins/kdecorations/aurorae/src/aurorae.knsrc +++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc @@ -1,5 +1,11 @@ [KNewStuff3] Name=Aurorae Window Decorations +Name[ca]=Decoracions de finestra Aurorae +Name[nl]=Aurorea-vensterdecoraties +Name[pt]=Decorações das Janelas do Aurorae +Name[sv]=Aurorae-fönsterdekorationer +Name[uk]=Обрамлення вікон Aurorae +Name[x-test]=xxAurorae Window Decorationsxx ProvidersUrl=http://download.kde.org/ocs/providers.xml Categories=Window Decoration Aurorae