From 879a1ee3672ccada50310c1af9ee893f6e237f45 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 25 Dec 2016 05:53:01 +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 5afa870b75..497c8616a9 100644 --- a/kcmkwin/kwincompositing/kwineffect.knsrc +++ b/kcmkwin/kwincompositing/kwineffect.knsrc @@ -1,6 +1,7 @@ [KNewStuff3] Name=Window Manager Effects Name[ca]=Efectes del gestor de finestres +Name[es]=Efectos del gestor de ventanas Name[it]=Effetti del gestore delle finestre Name[nl]=Effecten van vensterbeheerder Name[pt]=Efeitos do Gestor de Janelas diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc index b59ab60c35..54772beedb 100644 --- a/kcmkwin/kwinscripts/kwinscripts.knsrc +++ b/kcmkwin/kwinscripts/kwinscripts.knsrc @@ -1,6 +1,7 @@ [KNewStuff3] Name=Window Manager Scripts Name[ca]=Scripts del gestor de finestres +Name[es]=Guiones del gestor de ventanas Name[it]=Script del gestore delle finestre Name[nl]=Scripts van vensterbeheerder Name[pt]=Programas do Gestor de Janelas diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc index c5b4566d00..d4b221ed5a 100644 --- a/kcmkwin/kwintabbox/kwinswitcher.knsrc +++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc @@ -1,6 +1,7 @@ [KNewStuff3] Name=Window Manager Switching Layouts Name[ca]=Disposicions del commutador del gestor de finestres +Name[es]=Esquemas de cambio del gestor de ventanas Name[it]=Disposizione scambiafinestre del gestore delle finestre Name[nl]=Omschakelende indelingen van vensterbeheerder Name[pt]=Disposições da Mudança de Janelas do KWin diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc index e7782d82bf..ad692d3c73 100644 --- a/plugins/kdecorations/aurorae/src/aurorae.knsrc +++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc @@ -1,6 +1,7 @@ [KNewStuff3] Name=Aurorae Window Decorations Name[ca]=Decoracions de finestra Aurorae +Name[es]=Decoración de ventanas Aurorae Name[it]=Decorazioni delle finestre Aurorae Name[nl]=Aurorea-vensterdecoraties Name[pt]=Decorações das Janelas do Aurorae