From f538cdaa9e54230bc38a2d7f6fa09b205f86325d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 8 Nov 2015 10:43:39 +0000 Subject: [PATCH] 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" --- xembed-sni-proxy/xembedsniproxy.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/xembed-sni-proxy/xembedsniproxy.desktop b/xembed-sni-proxy/xembedsniproxy.desktop index a9f95487e..eb4fb5bcd 100644 --- 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