From cf09395d6e9022dfe083d30b223ffa0cd68a57c0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 19 Sep 2018 05:57:09 +0200 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" --- agents/unifiedmailboxagent/unifiedmailboxagent.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agents/unifiedmailboxagent/unifiedmailboxagent.desktop b/agents/unifiedmailboxagent/unifiedmailboxagent.desktop index 7f1b680e6..cb0bde66c 100644 --- a/agents/unifiedmailboxagent/unifiedmailboxagent.desktop +++ b/agents/unifiedmailboxagent/unifiedmailboxagent.desktop @@ -7,6 +7,7 @@ Name[fr]=Agent de boîte aux lettres unifiée Name[nl]=Geünificeerde e-mailboxagent Name[pt]=Agente de Caixas de Correio Unificadas Name[pt_BR]=Agente de Caixas de Mensagens Unificadas +Name[sv]=Förenad brevlådemodul Name[uk]=Агент уніфікованої поштової скриньки Name[x-test]=xxUnified Mailbox Agentxx Comment=Unified Mailbox Agent @@ -17,6 +18,7 @@ Comment[fr]=Agent de boîte aux lettres unifiée Comment[nl]=Geünificeerde e-mailboxagent Comment[pt]=Agente de Caixas de Correio Unificadas Comment[pt_BR]=Agente de Caixas de Mensagens Unificadas +Comment[sv]=Förenad brevlådemodul Comment[uk]=Агент уніфікованої поштової скриньки Comment[x-test]=xxUnified Mailbox Agentxx Type=AkonadiAgent