From e9155286e8155f22ac7277d1a7ccabac986c6e51 Mon Sep 17 00:00:00 2001 From: l10n daemon script <scripty@kde.org> Date: Sun, 12 Feb 2017 07:29:42 +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 + packageplugins/scripts/kwin-packagestructure-scripts.desktop | 1 + .../windowswitcher/kwin-packagestructure-windowswitcher.desktop | 1 + plugins/kdecorations/aurorae/src/aurorae.knsrc | 1 + 6 files changed, 6 insertions(+) diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc index f206e0d512..79eacf103d 100644 --- a/kcmkwin/kwincompositing/kwineffect.knsrc +++ b/kcmkwin/kwincompositing/kwineffect.knsrc @@ -2,6 +2,7 @@ Name=Window Manager Effects Name[ca]=Efectes del gestor de finestres Name[ca@valencia]=Efectes del gestor de finestres +Name[da]=Vindueshåndteringseffekter Name[de]=Fensterverwaltungs-Effekte Name[el]=Εφέ διαχειριστή παραθύρων Name[en_GB]=Window Manager Effects diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc index a95dff9be9..df1cba27d8 100644 --- a/kcmkwin/kwinscripts/kwinscripts.knsrc +++ b/kcmkwin/kwinscripts/kwinscripts.knsrc @@ -2,6 +2,7 @@ Name=Window Manager Scripts Name[ca]=Scripts del gestor de finestres Name[ca@valencia]=Scripts del gestor de finestres +Name[da]=Vindueshåndteringsscripts Name[de]=Fensterverwaltungs-Skripte Name[el]=Σενάρια διαχειριστή παραθύρων Name[en_GB]=Window Manager Scripts diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc index 2fa4e6ffbe..b4f324e399 100644 --- a/kcmkwin/kwintabbox/kwinswitcher.knsrc +++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc @@ -2,6 +2,7 @@ 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[da]=Skifterlayouts til vindueshåndtering Name[de]=Wechsel-Layout für Fensterverwaltung Name[el]=Διατάξεις εναλλαγής διαχειριστή παραθύρων Name[en_GB]=Window Manager Switching Layouts diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop index 8847f44c0f..de4ce2c729 100644 --- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop +++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop @@ -2,6 +2,7 @@ Name=KWin Script Name[ca]=Script del KWin Name[ca@valencia]=Script del KWin +Name[da]=KWin-script Name[el]=Σενάριο KWin Name[en_GB]=KWin Script Name[es]=Guion de KWin diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop index 5789929d38..f168d38cd6 100644 --- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop +++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop @@ -2,6 +2,7 @@ Name=KWin Window Switcher Name[ca]=Commutador de finestres del KWin Name[ca@valencia]=Commutador de finestres del KWin +Name[da]=KWin vinduesskifter Name[el]=Εφαρμογή εναλλαγής παραθύρων Kwin Name[en_GB]=KWin Window Switcher Name[es]=Cambiador de ventanas de KWin diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc index f874d63d6b..50e5daabd5 100644 --- a/plugins/kdecorations/aurorae/src/aurorae.knsrc +++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc @@ -2,6 +2,7 @@ Name=Aurorae Window Decorations Name[ca]=Decoracions de finestra Aurorae Name[ca@valencia]=Decoracions de finestra Aurorae +Name[da]=Aurorae vinduesdekorationer Name[de]=Aurorae-Fensterdekoration Name[el]=Διακοσμήσεις παραθύρου Aurorae Name[en_GB]=Aurorae Window Decorations