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"

kcms/navigation/kcm_navigation.json

@@ -57,6 +57,7 @@
         "Name[ar]": "التّنقّل",
         "Name[ca@valencia]": "Navegueu",
         "Name[ca]": "Navegació",
+        "Name[cs]": "Navigace",
         "Name[es]": "Navegación",
         "Name[eu]": "Nabigazioa",
         "Name[fi]": "Navigointi",