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"
11 years ago · f538cdaa9e
parent 38095521cc
commit f538cdaa9e
1 changed files with 1 additions and 0 deletions
--- a/xembed-sni-proxy/xembedsniproxy.desktop
+++ b/xembed-sni-proxy/xembedsniproxy.desktop
@ -3,6 +3,7 @@ Exec=xembedsniproxy
 Name=XembedSniProxy
 Name[ca]=XembedSniProxy
 Name[ca@valencia]=XembedSniProxy
+Name[en_GB]=XembedSniProxy
 Name[es]=XembedSniProxy
 Name[fi]=XembedSniProxy
 Name[ko]=XembedSniProxy