From 09a1152196fdb76dfd3b4ae8f9ef2dfe940eb527 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 12 Sep 2018 06:11:34 +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" --- .../unifiedmailboxagent/unifiedmailboxagent.desktop | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/agents/unifiedmailboxagent/unifiedmailboxagent.desktop b/agents/unifiedmailboxagent/unifiedmailboxagent.desktop index 8a84c0ee6..7ce07b7f4 100644 --- a/agents/unifiedmailboxagent/unifiedmailboxagent.desktop +++ b/agents/unifiedmailboxagent/unifiedmailboxagent.desktop @@ -1,6 +1,18 @@ [Desktop Entry] Name=Unified Mailbox Agent +Name[ca]=Agent de la bústia unificada +Name[nl]=Geünificeerde e-mailboxagent +Name[pt]=Agente de Caixas de Correio Unificadas +Name[pt_BR]=Agente de Caixas de Mensagens Unificadas +Name[uk]=Агент уніфікованої поштової скриньки +Name[x-test]=xxUnified Mailbox Agentxx Comment=Unified Mailbox Agent +Comment[ca]=Agent de la bústia unificada +Comment[nl]=Geünificeerde e-mailboxagent +Comment[pt]=Agente de Caixas de Correio Unificadas +Comment[pt_BR]=Agente de Caixas de Mensagens Unificadas +Comment[uk]=Агент уніфікованої поштової скриньки +Comment[x-test]=xxUnified Mailbox Agentxx Type=AkonadiAgent Exec=akonadi_unifiedmailbox_agent Icon=folder-mail