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"
10 years ago · 6631c69b2d
parent b107bd8a90
commit 6631c69b2d
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -17,6 +17,7 @@ Name[ca@valencia]=Idioma
 Name[cs]=Jazyk
 Name[de]=Sprache
 Name[el]=Γλώσσα
+Name[en_GB]=Language
 Name[es]=Idioma
 Name[it]=Lingua
 Name[nl]=Taal