From 4f3ff42d41cbb30e6f840b34eaec9b257b54c0d1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 20 Jan 2019 05:48:50 +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 3f8b6e260..c0a01224d 100644
--- a/agents/unifiedmailboxagent/unifiedmailboxagent.desktop
+++ b/agents/unifiedmailboxagent/unifiedmailboxagent.desktop
@@ -17,6 +17,7 @@ Name[sv]=Förenad brevlådemodul
 Name[uk]=Агент уніфікованої поштової скриньки
 Name[x-test]=xxUnified Mailbox Agentxx
 Name[zh_CN]=聚合邮箱代理
+Name[zh_TW]=整合信箱代理程式
 Comment=Unified Mailbox Agent
 Comment[ca]=Agent de la bústia unificada
 Comment[ca@valencia]=Agent de la bústia unificada
@@ -35,6 +36,7 @@ Comment[sv]=Förenad brevlådemodul
 Comment[uk]=Агент уніфікованої поштової скриньки
 Comment[x-test]=xxUnified Mailbox Agentxx
 Comment[zh_CN]=聚合邮箱代理
+Comment[zh_TW]=整合信箱代理程式
 Type=AkonadiAgent
 Exec=akonadi_unifiedmailbox_agent
 Icon=folder-mail