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/scale/package/metadata.desktop

@@ -1,5 +1,31 @@
 [Desktop Entry]
 Name=Scale
+Name[ca]=Escala
+Name[ca@valencia]=Escala
+Name[cs]=Měřítko
+Name[de]=Skalieren
+Name[el]=Κλιμάκωση
+Name[en_GB]=Scale
+Name[es]=Escalar
+Name[eu]=Eskalatu
+Name[fi]=Skaalaa
+Name[fr]=Échelle
+Name[gl]=Cambiar as dimensións
+Name[id]=Scale
+Name[it]=Scala
+Name[ko]=크기 조정
+Name[nl]=Schalen
+Name[nn]=Skalering
+Name[pl]=Skala
+Name[pt]=Escala
+Name[pt_BR]=Escala
+Name[ru]=Масштабирование
+Name[sk]=Škálovať
+Name[sv]=Skala
+Name[uk]=Масштабування
+Name[x-test]=xxScalexx
+Name[zh_CN]=缩放
+Name[zh_TW]=縮放
 Icon=preferences-system-windows-effect-scale
 Comment=Make windows smoothly scale in and out when they are shown or hidden