From 3e7b2bb5d4e761f0d9d0326daae99319dbbfa510 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 29 Sep 2018 06:03:22 +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 831a5a5fb..9403a9d81 100644 --- a/agents/unifiedmailboxagent/unifiedmailboxagent.desktop +++ b/agents/unifiedmailboxagent/unifiedmailboxagent.desktop @@ -4,6 +4,7 @@ Name[ca]=Agent de la bústia unificada Name[ca@valencia]=Agent de la bústia unificada Name[es]=Agente de bandeja de correo unificada Name[fr]=Agent de boîte aux lettres unifiée +Name[it]=Agente per la casella di posta unificata Name[nl]=Geünificeerde e-mailboxagent Name[pt]=Agente de Caixas de Correio Unificadas Name[pt_BR]=Agente de Caixas de Mensagens Unificadas @@ -16,6 +17,7 @@ Comment[ca]=Agent de la bústia unificada Comment[ca@valencia]=Agent de la bústia unificada Comment[es]=Agente de bandeja de correo unificada Comment[fr]=Agent de boîte aux lettres unifiée +Comment[it]=Agente per la casella di posta unificata Comment[nl]=Geünificeerde e-mailboxagent Comment[pt]=Agente de Caixas de Correio Unificadas Comment[pt_BR]=Agente de Caixas de Mensagens Unificadas