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"

wallpapers/Next/metadata.json

@@ -5,6 +5,7 @@
                 "Email": "anditosan@kde.org",
                 "Name": "Andy Betts",
                 "Name[bg]": "Andy Betts",
+                "Name[ca@valencia]": "Andy Betts",
                 "Name[ca]": "Andy Betts",
                 "Name[cs]": "Andy Betts",
                 "Name[de]": "Andy Betts",
@@ -28,6 +29,7 @@
         "License": "CC-BY-SA-4.0",
         "Name": "Mountain",
         "Name[bg]": "Планина",
+        "Name[ca@valencia]": "Muntanya",
         "Name[ca]": "Muntanya",
         "Name[cs]": "Hora",
         "Name[de]": "Berg",