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"

effects/resize/resize_config.desktop

@@ -49,7 +49,7 @@ Name[mr]=चौकट आकार बदल
 Name[nb]=Endre størrelse på vinduet
 Name[nds]=Finstergrött ännern
 Name[nl]=Afmeting venster aanpassen
-Name[nn]=Endra storleik på vindauget
+Name[nn]=Skaler vindauge
 Name[pa]=ਵਿੰਡੋ ਮੁੜ-ਆਕਾਰ
 Name[pl]=Zmiana rozmiaru okien
 Name[pt]=Dimensionar a Janela