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"
2017-02-12 05:49:00 +01:00 · 2017-02-12 05:49:00 +01:00 · 56767ad31a
parent 40de5fa75f
commit 56767ad31a
6 changed files with 6 additions and 0 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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