From 8b12612bbf8ae4500a84634087a074d94a495eec Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 13 May 2015 11:01:45 +0000
Subject: 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"
---
 src/org.kde.dolphin.desktop | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/org.kde.dolphin.desktop')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index fc417b7d7..2d099cd6c 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -29,6 +29,7 @@ Name[sv]=Dolphin
 Name[uk]=Dolphin
 Name[x-test]=xxDolphinxx
 Name[zh_CN]=Dolphin
+Name[zh_TW]=Dolphin
 Exec=dolphin %u
 Icon=system-file-manager
 Type=Application
@@ -64,6 +65,7 @@ GenericName[sv]=Filhanterare
 GenericName[uk]=Менеджер файлів
 GenericName[x-test]=xxFile Managerxx
 GenericName[zh_CN]=文件管理器
+GenericName[zh_TW]=檔案管理員
 Terminal=false
 MimeType=inode/directory;
 InitialPreference=10
-- 
cgit v1.3