From 10be58f745eaede1a95007dd5ce8dbbcc472b6a9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 26 Jun 2016 12:46:39 +0000
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"
---
 kioslave/desktop/Home.desktop                         | 2 ++
 kioslave/desktop/desktopnotifier.desktop              | 2 ++
 kioslave/desktop/directory.trash                      | 2 ++
 runners/baloo/plasma-runner-baloosearch.desktop       | 1 +
 templates/ion-dataengine/src/ion-%{APPNAMELC}.desktop | 2 ++
 xembed-sni-proxy/xembedsniproxy.desktop               | 1 +
 6 files changed, 10 insertions(+)

diff --git a/kioslave/desktop/Home.desktop b/kioslave/desktop/Home.desktop
index 97d03e551..44c29a3bd 100644
--- a/kioslave/desktop/Home.desktop
+++ b/kioslave/desktop/Home.desktop
@@ -37,6 +37,7 @@ Name[tr]=Başlangıç
 Name[uk]=Домівка
 Name[x-test]=xxHomexx
 Name[zh_CN]=主文件夹
+Name[zh_TW]=家目錄
 GenericName=Personal Files
 GenericName[ast]=Ficheros personales
 GenericName[ca]=Fitxers personals
@@ -75,6 +76,7 @@ GenericName[tr]=Kişisel Dosyalar
 GenericName[uk]=Особисті файли
 GenericName[x-test]=xxPersonal Filesxx
 GenericName[zh_CN]=个人文件
+GenericName[zh_TW]=個人檔案
 URL[$e]=$HOME
 Icon=user-home
 Type=Link
diff --git a/kioslave/desktop/desktopnotifier.desktop b/kioslave/desktop/desktopnotifier.desktop
index e7655cc80..7932902a6 100644
--- a/kioslave/desktop/desktopnotifier.desktop
+++ b/kioslave/desktop/desktopnotifier.desktop
@@ -37,6 +37,7 @@ Name[tr]=Dizin İzleyici
 Name[uk]=Спостереження за каталогами
 Name[x-test]=xxDirectory Watcherxx
 Name[zh_CN]=目录监视器
+Name[zh_TW]=目錄監控器
 ServiceTypes=KDEDModule
 X-KDE-ServiceTypes=KDEDModule
 X-KDE-Library=desktopnotifier
@@ -80,4 +81,5 @@ Comment[tr]=Dizinleri değişiklik için izler
 Comment[uk]=Веде спостереження за змінами у каталогах
 Comment[x-test]=xxMonitors directories for changesxx
 Comment[zh_CN]=监视目录的更改
+Comment[zh_TW]=監控目錄的改變
 
diff --git a/kioslave/desktop/directory.trash b/kioslave/desktop/directory.trash
index 841b0335e..946961d70 100644
--- a/kioslave/desktop/directory.trash
+++ b/kioslave/desktop/directory.trash
@@ -38,6 +38,7 @@ Name[tr]=Çöp
 Name[uk]=Смітник
 Name[x-test]=xxTrashxx
 Name[zh_CN]=回收站
+Name[zh_TW]=資源回收筒
 Comment=Contains removed files
 Comment[ast]=Contién ficheros desaniciaos
 Comment[ca]=Conté els fitxers eliminats
@@ -76,6 +77,7 @@ Comment[tr]=Silinen dosyaları içerir
 Comment[uk]=Містить вилучені файли
 Comment[x-test]=xxContains removed filesxx
 Comment[zh_CN]=储存已删除的文件
+Comment[zh_TW]=包含已移除的檔案
 Icon=user-trash-full
 EmptyIcon=user-trash
 Type=Link
diff --git a/runners/baloo/plasma-runner-baloosearch.desktop b/runners/baloo/plasma-runner-baloosearch.desktop
index 439f9a331..49a4ef731 100644
--- a/runners/baloo/plasma-runner-baloosearch.desktop
+++ b/runners/baloo/plasma-runner-baloosearch.desktop
@@ -70,6 +70,7 @@ Comment[sv]=Söker igenom filer, e-post och kontakter
 Comment[uk]=Засіб пошуку у файлах, повідомленнях електронної пошти та записах контактів
 Comment[x-test]=xxSearches through files, emails and contactsxx
 Comment[zh_CN]=在文件、电子邮件和联系人中进行搜索
+Comment[zh_TW]=搜尋檔案、電子郵件與聯絡人
 X-KDE-ServiceTypes=Plasma/Runner
 Type=Service
 Icon=baloo
diff --git a/templates/ion-dataengine/src/ion-%{APPNAMELC}.desktop b/templates/ion-dataengine/src/ion-%{APPNAMELC}.desktop
index 98a6b48e7..409a35b45 100644
--- a/templates/ion-dataengine/src/ion-%{APPNAMELC}.desktop
+++ b/templates/ion-dataengine/src/ion-%{APPNAMELC}.desktop
@@ -28,6 +28,7 @@ Name[sv]=%{APPNAME} väderdataleverantör
 Name[uk]=Засіб надання даних щодо погоди %{APPNAME}
 Name[x-test]=xx%{APPNAME} Weather Data Providerxx
 Name[zh_CN]=%{APPNAME} 天气数据提供商
+Name[zh_TW]=%{APPNAME} 天氣資料提供者
 Comment=Access to the weather data provider %{APPNAME}
 Comment[ca]=Accés al proveïdor de dades meteorològiques per al {APPNAME}}
 Comment[ca@valencia]=Accés al proveïdor de dades meteorològiques per al {APPNAME}}
@@ -56,6 +57,7 @@ Comment[sv]=Åtkomst till väderdataleverantören %{APPNAME}
 Comment[uk]=Доступ до засобу надання даних щодо погоди %{APPNAME}
 Comment[x-test]=xxAccess to the weather data provider %{APPNAME}xx
 Comment[zh_CN]=访问天气数据提供商 %{APPNAME}
+Comment[zh_TW]=存取天氣資料提供者 %{APPNAME}
 X-KDE-ServiceTypes=Plasma/DataEngine
 X-KDE-ParentApp=weatherengine
 Type=Service
diff --git a/xembed-sni-proxy/xembedsniproxy.desktop b/xembed-sni-proxy/xembedsniproxy.desktop
index 8f46afc20..1da47c635 100644
--- a/xembed-sni-proxy/xembedsniproxy.desktop
+++ b/xembed-sni-proxy/xembedsniproxy.desktop
@@ -34,6 +34,7 @@ Name[sv]=XembedSniProxy
 Name[uk]=XembedSniProxy
 Name[x-test]=xxXembedSniProxyxx
 Name[zh_CN]=XembedSniProxy
+Name[zh_TW]=XembedSniProxy
 Type=Application
 X-KDE-StartupNotify=false
 OnlyShowIn=KDE;