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.desktop

@@ -5,6 +5,7 @@ Name[ca]=Altai
 Name[cs]=Altai
 Name[de]=Altai
 Name[es]=Altai
+Name[fr]=Altai
 Name[it]=Altai
 Name[ko]=알타이
 Name[nl]=Altai
@@ -16,6 +17,7 @@ Name[sl]=Altaj
 Name[sv]=Altai
 Name[uk]=Алтай
 Name[x-test]=xxAltaixx
+Name[zh_CN]=Altai 远山
 
 X-KDE-PluginInfo-Name=Next
 X-KDE-PluginInfo-Author=Alesya Khoteeva