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/effects/blur/blur_config.desktop

@@ -37,7 +37,6 @@ Name[he]=טשטוש
 Name[hi]=धुंधला करें
 Name[hne]=धुंधला करव
 Name[hr]=Mrlja
-Name[hsb]=Młowojty
 Name[hu]=Elmosódás
 Name[ia]=Obscura (Blur)
 Name[id]=Buram

src/effects/login/package/metadata.desktop

@@ -32,7 +32,6 @@ Name[he]=כניסה
 Name[hi]=लॉगइन
 Name[hne]=लागइन
 Name[hr]=Prijava
-Name[hsb]=Přizjewjenje
 Name[hu]=Bejelentkezés
 Name[ia]=Accesso de identification
 Name[id]=Login

src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop

@@ -34,7 +34,6 @@ Name[he]=פלסטיק
 Name[hi]=प्लास्टिक
 Name[hne]=प्लास्टिक
 Name[hr]=Plastika
-Name[hsb]=Plastik
 Name[hu]=Plastik
 Name[ia]=Plastik
 Name[id]=Plastik