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"

src/kcms/scripts/kwinscripts.knsrc

@@ -17,7 +17,7 @@ Name[et]=Aknahalduri skriptid
 Name[eu]=Leiho kudeatzailearen scriptak
 Name[fi]=Ikkunointiohjelman skriptit
 Name[fr]=Scripts du gestionnaire de fenêtres
-Name[gl]=Scripts do xestor de xanelas
+Name[gl]=Guións do xestor de xanelas
 Name[hu]=Ablakkezelő szkriptek
 Name[ia]=Gerente de scripts de fenestra 
 Name[id]=Skrip Pengelola Jendela

src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json

@@ -5,6 +5,7 @@
         "Description[bg]": "Основна програма (енджин) на темата за декорации на прозорци",
         "Description[ca@valencia]": "Motor del tema de decoració de les finestres",
         "Description[ca]": "Motor de tema de decoració de les finestres",
+        "Description[cs]": "Stroj motivů dekorace oken",
         "Description[en_GB]": "Window Decoration Theme Engine",
         "Description[eo]": "Fenestrodekora Etosmotoro",
         "Description[es]": "Motor de temas de decoraciones de las ventanas",
@@ -23,6 +24,7 @@
         "Name[bg]": "Aurorae",
         "Name[ca@valencia]": "Aurorae",
         "Name[ca]": "Aurorae",
+        "Name[cs]": "Aurorae",
         "Name[de]": "Aurorae",
         "Name[en_GB]": "Aurorae",
         "Name[eo]": "Aurorae",