From bc56eec4d5887e41ec28493094d26d3cf0d9f4f5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 29 Nov 2018 08:26:17 +0100 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 1c347c7d0..407d9971a 100644 --- a/agents/unifiedmailboxagent/unifiedmailboxagent.desktop +++ b/agents/unifiedmailboxagent/unifiedmailboxagent.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Agent de la bústia unificada Name[de]=Agent für einheitliches Postfach Name[en_GB]=Unified Mailbox Agent Name[es]=Agente de bandeja de correo unificada +Name[fi]=Yhdistetty postiagentti Name[fr]=Agent de boîte aux lettres unifiée Name[gl]=Axente de caixa de correo unificada Name[it]=Agente per la casella di posta unificata @@ -21,6 +22,7 @@ Comment[ca@valencia]=Agent de la bústia unificada Comment[de]=Agent für einheitliches Postfach Comment[en_GB]=Unified Mailbox Agent Comment[es]=Agente de bandeja de correo unificada +Comment[fi]=Yhdistetty postiagentti Comment[fr]=Agent de boîte aux lettres unifiée Comment[gl]=Axente de caixa de correo unificada Comment[it]=Agente per la casella di posta unificata