From 7d72aeda5c4a4f54ccb8897d5a8c2c7f32e29136 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 29 Mar 2017 05:17:37 +0200 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 | 2 ++ kcmkwin/kwinscripts/kwinscripts.knsrc | 2 ++ kcmkwin/kwintabbox/kwinswitcher.knsrc | 2 ++ packageplugins/scripts/kwin-packagestructure-scripts.desktop | 2 ++ .../windowswitcher/kwin-packagestructure-windowswitcher.desktop | 2 ++ plugins/kdecorations/aurorae/src/aurorae.knsrc | 2 ++ 6 files changed, 12 insertions(+) diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc index f5697d5c8d..1ae1936a1c 100644 --- a/kcmkwin/kwincompositing/kwineffect.knsrc +++ b/kcmkwin/kwincompositing/kwineffect.knsrc @@ -1,5 +1,7 @@ [KNewStuff3] Name=Window Manager Effects +Name[ca]=Efectes del gestor de finestres +Name[ca@valencia]=Efectes del gestor de finestres Name[de]=Fensterverwaltungs-Effekte Name[it]=Effetti del gestore delle finestre Name[pt]=Efeitos do Gestor de Janelas diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc index 624f1e0e2b..4dc8757042 100644 --- a/kcmkwin/kwinscripts/kwinscripts.knsrc +++ b/kcmkwin/kwinscripts/kwinscripts.knsrc @@ -1,5 +1,7 @@ [KNewStuff3] Name=Window Manager Scripts +Name[ca]=Scripts del gestor de finestres +Name[ca@valencia]=Scripts del gestor de finestres Name[de]=Fensterverwaltungs-Skripte Name[it]=Script del gestore delle finestre Name[pt]=Programas do Gestor de Janelas diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc index c4acee33ea..8086369ccc 100644 --- a/kcmkwin/kwintabbox/kwinswitcher.knsrc +++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc @@ -1,5 +1,7 @@ [KNewStuff3] Name=Window Manager Switching Layouts +Name[ca]=Disposicions del commutador del gestor de finestres +Name[ca@valencia]=Disposicions del commutador del gestor de finestres Name[de]=Wechsel-Layout für Fensterverwaltung Name[it]=Disposizione scambiafinestre del gestore delle finestre Name[pt]=Disposições de Mudança do Gestor de Janelas diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop index ebae866821..ae420a4043 100644 --- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop +++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop @@ -1,5 +1,7 @@ [Desktop Entry] Name=KWin Script +Name[ca]=Script del KWin +Name[ca@valencia]=Script del KWin Name[de]=KWin-Skript Name[it]=Script di KWin Name[pt]=Programa do KWin diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop index c459948ade..a9e5073bcb 100644 --- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop +++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop @@ -1,5 +1,7 @@ [Desktop Entry] Name=KWin Window Switcher +Name[ca]=Commutador de finestres del KWin +Name[ca@valencia]=Commutador de finestres del KWin Name[de]=KWin-Fensterwechsler Name[it]=Scambiafinestre di KWin Name[pt]=Mudança de Janelas do KWin diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc index 4a6c23a2f5..5314ce8169 100644 --- a/plugins/kdecorations/aurorae/src/aurorae.knsrc +++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc @@ -1,5 +1,7 @@ [KNewStuff3] Name=Aurorae Window Decorations +Name[ca]=Decoracions de finestra Aurorae +Name[ca@valencia]=Decoracions de finestra Aurorae Name[de]=Aurorae-Fensterdekoration Name[it]=Decorazioni delle finestre Aurorae Name[pt]=Decorações das Janelas do Aurorae