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"

colors/BreezeClassic.colors

@@ -110,6 +110,7 @@ Name[ca]=Brisa clàssica
 Name[cs]=Breeze Classic
 Name[de]=Breeze Klassisch
 Name[el]=Breeze κλασικό
+Name[en_GB]=Breeze Classic
 Name[es]=Brisa clásico
 Name[eu]=Breeze klasikoa
 Name[fr]=Breeze classique

wallpapers/Next/metadata.desktop

@@ -6,6 +6,7 @@ Name[cs]=Patak
 Name[da]=Patak
 Name[de]=Patak
 Name[el]=Patak
+Name[en_GB]=Patak
 Name[es]=Patak
 Name[eu]=Patak
 Name[fr]=Patak