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

@@ -2,6 +2,7 @@
 Name=Milky Way
 Name[az]=Süd Yolu
 Name[ca]=Via Làctia
+Name[el]=Ο Γαλαξίας μας
 Name[en_GB]=Milky Way
 Name[es]=Vía Láctea
 Name[eu]=Esne-Bidea
@@ -9,6 +10,7 @@ Name[fr]=Voie lactée
 Name[nl]=Melkweg
 Name[nn]=Mjølkevegen
 Name[pt]=Via Láctea
+Name[pt_BR]=Via Láctea
 Name[ru]=Млечный Путь
 Name[sv]=Vintergatan
 Name[uk]=Чумацький Шлях