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

@@ -1,7 +1,9 @@
 [Desktop Entry]
 Comment=Squash windows when they are minimized
 Comment[ca]=Amuntega les finestres quan estan minimitzades
+Comment[ca@valencia]=Amuntega les finestres quan estan minimitzades
 Comment[gl]=Xuntar as xanelas cando estean minimizadas
+Comment[id]=Sesakkan jendela ketika mereka diminimalkan
 Comment[nl]=Krimp vensters wanneer ze geminimaliseerd zijn
 Comment[pt]=Esmagar as janelas quando são minimizadas
 Comment[sv]=Kläm fönster när de minimeras
@@ -10,7 +12,9 @@ Comment[x-test]=xxSquash windows when they are minimizedxx
 Icon=preferences-system-windows-effect-squash
 Name=Squash
 Name[ca]=Amuntega
+Name[ca@valencia]=Amuntega
 Name[gl]=Xuntar
+Name[id]=Squash
 Name[nl]=Krimpen
 Name[pt]=Esmagar
 Name[sv]=Kläm

plugins/platforms/virtual/virtual.json

@@ -37,7 +37,6 @@
         "Description[zh_TW]": "成像到虛擬影格緩衝區。",
         "Id": "KWinWaylandVirtualBackend",
         "Name": "virtual",
-        "Name[ast]": "virtual",
         "Name[ca@valencia]": "Virtual",
         "Name[ca]": "Virtual",
         "Name[cs]": "virtuální",