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-03-22 04:02:11 +01:00 · 2017-03-22 04:02:11 +01:00 · 5f0b92bac5
parent b128c634c4
commit 5f0b92bac5
4 changed files with 4 additions and 0 deletions
--- a/effects/eyeonscreen/package/metadata.desktop
+++ b/effects/eyeonscreen/package/metadata.desktop
@ -2,6 +2,7 @@
 Name=eye On Screen
 Name[ca]=Ull a la pantalla
 Name[ca@valencia]=Ull a la pantalla
+Name[cs]=oko na obrazovce
 Name[da]=øjet på skærmen
 Name[de]=Ansicht der Arbeitsfläche
 Name[el]=μάτι Στην Οθόνη
--- a/effects/logout/package/metadata.desktop
+++ b/effects/logout/package/metadata.desktop
@ -2,6 +2,7 @@
 Name=logout
 Name[ca]=sortida
 Name[ca@valencia]=eixida
+Name[cs]=odhlášení
 Name[es]=cerrar la sesión
 Name[hu]=Kijelentkezés
 Name[nl]=afmelden
--- a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
+++ b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
@ -2,6 +2,7 @@
 Name=KWin Aurorae
 Name[ca]=Aurorae del KWin
 Name[ca@valencia]=Aurorae del KWin
+Name[cs]=KWin Aurorae
 Name[es]=Aurorae de KWin
 Name[hu]=KWin Aurorae
 Name[nl]=KWin Aurorae
--- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop
+++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop
@ -2,6 +2,7 @@
 Name=KWin Decoration
 Name[ca]=Decoració del KWin
 Name[ca@valencia]=Decoració del KWin
+Name[cs]=Dekorace KWin
 Name[es]=Decoración de KWin
 Name[hu]=KWin dekoráció
 Name[nl]=KWin-decoraties