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

@@ -14,6 +14,7 @@
                 "Name[it]": "Andy Betts",
                 "Name[ka]": "ენდი ბეთსი",
                 "Name[nl]": "Andy Betts",
+                "Name[nn]": "Andy Betts",
                 "Name[pl]": "Andy Betts",
                 "Name[pt_BR]": "Andy Betts",
                 "Name[sl]": "Andy Betts",
@@ -36,6 +37,7 @@
         "Name[it]": "Montagna",
         "Name[ka]": "მთა",
         "Name[nl]": "Berg",
+        "Name[nn]": "Fjell",
         "Name[pl]": "Góra",
         "Name[pt_BR]": "Montanha",
         "Name[sl]": "Gora",