From bd10d78e1e843ca969c4c9c5d4177a06f5d0a54f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 22 Jan 2016 09:52:02 +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"
---
 examples/applets/qmltasks/metadata.desktop                      | 2 ++
 examples/applets/samegame/metadata.desktop                      | 2 ++
 examples/applets/testshaders/metadata.desktop                   | 2 ++
 examples/applets/widgetgallery/metadata.desktop                 | 1 +
 examples/applets/windowthumbnails/metadata.desktop              | 2 ++
 .../simpleEngine/plasma-dataengine-example-simpleEngine.desktop | 1 +
 .../plasma-dataengine-example-sourcesOnRequest.desktop          | 2 ++
 examples/developerguide/basic/metadata.desktop                  | 1 +
 src/plasma/data/servicetypes/plasma-lookandfeel.desktop         | 1 +
 templates/cpp-plasmoid/src/package/metadata.desktop             | 2 ++
 templates/qml-plasmoid/package/metadata.desktop                 | 2 ++
 11 files changed, 18 insertions(+)

diff --git a/examples/applets/qmltasks/metadata.desktop b/examples/applets/qmltasks/metadata.desktop
index 84019329c..4e341d126 100644
--- a/examples/applets/qmltasks/metadata.desktop
+++ b/examples/applets/qmltasks/metadata.desktop
@@ -35,6 +35,7 @@ Name[sv]=Fattigmans aktiviteter
 Name[tr]=Zavallı Adam Görevleri
 Name[uk]=Задачі для початківців
 Name[x-test]=xxPoor Man's Tasksxx
+Name[zh_CN]=穷人的任务栏
 Name[zh_TW]=窮人的工作
 Comment=Example showing how to write your own tasks Widget
 Comment[ar]=مثال يُظهر كيفية كتابة ودجات المهام
@@ -71,6 +72,7 @@ Comment[sv]=Exempel som visar hur man skriver en egen grafisk komponent för akt
 Comment[tr]=Kendi görev uygulamalarınızın nasıl yazılacağını gösteren örnek
 Comment[uk]=Приклад, який демонструє створення власного віджета задач
 Comment[x-test]=xxExample showing how to write your own tasks Widgetxx
+Comment[zh_CN]=展示如何实现您自己的任务部件的例子
 Comment[zh_TW]=顯示如何寫您自己的工作元件
 Icon=preferences-system-windows
 Encoding=UTF-8
diff --git a/examples/applets/samegame/metadata.desktop b/examples/applets/samegame/metadata.desktop
index e5e51d0ce..ae2baeb9d 100644
--- a/examples/applets/samegame/metadata.desktop
+++ b/examples/applets/samegame/metadata.desktop
@@ -34,6 +34,7 @@ Name[sv]=Samegame (QML)
 Name[tr]=Aynı oyun (QML)
 Name[uk]=Та сама гра (QML)
 Name[x-test]=xxSame game (QML)xx
+Name[zh_CN]=相同游戏 (QML)
 Name[zh_TW]=Same game (QML)
 Comment=The Same game QML Qt demo converted as plasmoid
 Comment[bs]=Ista igra QML Qt demo preobraćen kao plazmoid
@@ -69,6 +70,7 @@ Comment[sv]=Samegame QML Qt-demonstrationen konverterad till Plasmoid
 Comment[tr]=Aynı oyunun QML Qt plasmoid olarak çevrilmiş halinin tanıtımı
 Comment[uk]=Плазмоїд-демонстрація тієї самої гри на основі QML
 Comment[x-test]=xxThe Same game QML Qt demo converted as plasmoidxx
+Comment[zh_CN]=相同游戏 QML 的 Qt demo 转化成的小部件
 Comment[zh_TW]=Same game QML Qt 展示轉換為元件
 
 Type=Service
diff --git a/examples/applets/testshaders/metadata.desktop b/examples/applets/testshaders/metadata.desktop
index 9394cb5ac..524c82869 100644
--- a/examples/applets/testshaders/metadata.desktop
+++ b/examples/applets/testshaders/metadata.desktop
@@ -36,6 +36,7 @@ Name[sv]=Skuggningstest
 Name[tr]=Gölgelendirici Testi
 Name[uk]=Тестування підпрограм побудови тіней
 Name[x-test]=xxShader Testxx
+Name[zh_CN]=着色器测试
 Name[zh_TW]=陰影測試
 Comment=Futzing with Visual Effects
 Comment[bs]=Futzing sa vizuelnim efektima
@@ -72,6 +73,7 @@ Comment[sv]=Greja med visuella effekter
 Comment[tr]=Görsel efektler ile Müdahale
 Comment[uk]=Маніпулювання візуальними ефектами
 Comment[x-test]=xxFutzing with Visual Effectsxx
+Comment[zh_CN]=玩玩视觉效果
 Comment[zh_TW]=視覺效果
 Type=Service
 Icon=plasma
diff --git a/examples/applets/widgetgallery/metadata.desktop b/examples/applets/widgetgallery/metadata.desktop
index 2d10f4138..0e2b16814 100644
--- a/examples/applets/widgetgallery/metadata.desktop
+++ b/examples/applets/widgetgallery/metadata.desktop
@@ -71,6 +71,7 @@ Comment[sv]=galleri av grafiska komponenter skapade med Plasma Qt-komponenter
 Comment[tr]=Plasma QtComponents ile yapılmış parçacık galerisi
 Comment[uk]=Галерея віджетів, створених за допомогою QtComponent-ів Плазми
 Comment[x-test]=xxgallery of widgets done with Plasma QtComponentsxx
+Comment[zh_CN]=Plasma Qt 部件实现的部件展示
 Comment[zh_TW]=Plasma QtComponents 的元件集
 Type=Service
 ServiceTypes=Plasma/Applet
diff --git a/examples/applets/windowthumbnails/metadata.desktop b/examples/applets/windowthumbnails/metadata.desktop
index 57b5d2b27..878ea2ec5 100644
--- a/examples/applets/windowthumbnails/metadata.desktop
+++ b/examples/applets/windowthumbnails/metadata.desktop
@@ -33,6 +33,7 @@ Name[sv]=Exempel på miniatyrbilder av fönster
 Name[tr]=Örnek pencere küçük resim listesi
 Name[uk]=Приклад списку мініатюр вікон
 Name[x-test]=xxExample window thumbnails listxx
+Name[zh_CN]=窗口缩略图的例子
 Name[zh_TW]=視窗縮圖列表的範例
 Comment=Example showing how to display window thumbnails
 Comment[bs]=Primjer prikazuje kako prikazati prozor sličica
@@ -68,6 +69,7 @@ Comment[sv]=Exempel som visar hur miniatyrbilder av fönster visas
 Comment[tr]=Pencere küçük resim listesinin nasıl görüntüleneceğini gösteren örnek
 Comment[uk]=Приклад, який демонструє показ мініатюр вікон
 Comment[x-test]=xxExample showing how to display window thumbnailsxx
+Comment[zh_CN]=如何显示窗口缩略图的例子
 Comment[zh_TW]=顯示視窗縮圖的範例
 Icon=preferences-system-windows
 Encoding=UTF-8
diff --git a/examples/dataengines/simpleEngine/plasma-dataengine-example-simpleEngine.desktop b/examples/dataengines/simpleEngine/plasma-dataengine-example-simpleEngine.desktop
index 4014a183a..2eeaf91e9 100644
--- a/examples/dataengines/simpleEngine/plasma-dataengine-example-simpleEngine.desktop
+++ b/examples/dataengines/simpleEngine/plasma-dataengine-example-simpleEngine.desktop
@@ -70,6 +70,7 @@ Comment[sv]=En mycket grundläggande implementering av DataEngine
 Comment[tr]=Çok basit bir VeriMotoru gerçekleştirimi
 Comment[uk]=Базова реалізація рушія даних
 Comment[x-test]=xxA very basic DataEngine implementationxx
+Comment[zh_CN]=非常基础的数据引擎实现
 Comment[zh_TW]=非常基本的 DataEngine 實作
 Type=Service
 Icon=plasma
diff --git a/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop b/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop
index 849db6416..3735fa981 100644
--- a/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop
+++ b/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop
@@ -33,6 +33,7 @@ Name[sv]=Källor på begäran
 Name[tr]=İstekteki Kaynaklar
 Name[uk]=Джерела за запитом
 Name[x-test]=xxSources On Requestxx
+Name[zh_CN]=按需请求源
 Name[zh_TW]=要求來源
 Comment=A DataEngine example showing how to respond to requests for source creation and updates
 Comment[bs]=Primjer pogona podataka prikazuje kako odgovoriti na zahtjeve za kreiranje izvora i ažuriranja
@@ -68,6 +69,7 @@ Comment[sv]=Ett exempel på en DataEngine som visar hur man svara på en begära
 Comment[tr]=Kaynak oluşturma ve güncelleme için isteklere nasıl cevap verilmesi gerektiğini gösteren bir veri-motoru örneği
 Comment[uk]=Приклад рушія даних, який демонструє способи відповіді на запити щодо створення джерела і оновлень
 Comment[x-test]=xxA DataEngine example showing how to respond to requests for source creation and updatesxx
+Comment[zh_CN]=数据引擎样例显示如何响应源的创建和更新请求
 Comment[zh_TW]=DataEngine 回應要求建立來源與更新的範例
 Type=Service
 Icon=plasma
diff --git a/examples/developerguide/basic/metadata.desktop b/examples/developerguide/basic/metadata.desktop
index 4c666c94f..bda3b2147 100644
--- a/examples/developerguide/basic/metadata.desktop
+++ b/examples/developerguide/basic/metadata.desktop
@@ -21,6 +21,7 @@ Comment[sr@latin]=Osnovni program
 Comment[sv]=Enkel applikation
 Comment[uk]=Базова програма
 Comment[x-test]=xxBasic Appxx
+Comment[zh_CN]=基础小程序
 Name=Bug
 Name[ast]=Fallu
 Name[ca]=Error
diff --git a/src/plasma/data/servicetypes/plasma-lookandfeel.desktop b/src/plasma/data/servicetypes/plasma-lookandfeel.desktop
index 15c3c3dd7..2790d538f 100644
--- a/src/plasma/data/servicetypes/plasma-lookandfeel.desktop
+++ b/src/plasma/data/servicetypes/plasma-lookandfeel.desktop
@@ -74,6 +74,7 @@ Comment[sv]=Definierar det visuella språket för Plasma skal
 Comment[tr]=Plazma Kabukları için Sanal Dili tanımlar
 Comment[uk]=Визначає візуальну мову для оболонок Плазми
 Comment[x-test]=xxDefines the Visual Language for Plasma Shellsxx
+Comment[zh_CN]=定义 Plasma Shell 的视觉语言
 Comment[zh_TW]=定義 Plasma Shells 的視覺語言
 
 
diff --git a/templates/cpp-plasmoid/src/package/metadata.desktop b/templates/cpp-plasmoid/src/package/metadata.desktop
index 2b04efafd..70782e397 100644
--- a/templates/cpp-plasmoid/src/package/metadata.desktop
+++ b/templates/cpp-plasmoid/src/package/metadata.desktop
@@ -24,6 +24,7 @@ Name[sr@latin]=%{APPNAME}
 Name[sv]=%{APPNAME}
 Name[uk]=%{APPNAME}
 Name[x-test]=xx%{APPNAME}xx
+Name[zh_CN]=%{APPNAME}
 Comment=what your app does in a few words
 Comment[ca]=Què fa aquesta aplicació en poques paraules
 Comment[ca@valencia]=Què fa esta aplicació en poques paraules
@@ -48,6 +49,7 @@ Comment[sr@latin]=Ukratko o tome šta vaš program radi
 Comment[sv]=vad programmet gör med några få ord
 Comment[uk]=призначення вашої програми у декількох словах
 Comment[x-test]=xxwhat your app does in a few wordsxx
+Comment[zh_CN]=简单几个词概括您的小程序的功能
 
 
 Icon=applications-system
diff --git a/templates/qml-plasmoid/package/metadata.desktop b/templates/qml-plasmoid/package/metadata.desktop
index 78cbd92be..20652f879 100644
--- a/templates/qml-plasmoid/package/metadata.desktop
+++ b/templates/qml-plasmoid/package/metadata.desktop
@@ -24,6 +24,7 @@ Name[sr@latin]=%{APPNAME}
 Name[sv]=%{APPNAME}
 Name[uk]=%{APPNAME}
 Name[x-test]=xx%{APPNAME}xx
+Name[zh_CN]=%{APPNAME}
 Comment=what your app does in a few words
 Comment[ca]=Què fa aquesta aplicació en poques paraules
 Comment[ca@valencia]=Què fa esta aplicació en poques paraules
@@ -48,6 +49,7 @@ Comment[sr@latin]=Ukratko o tome šta vaš program radi
 Comment[sv]=vad programmet gör med några få ord
 Comment[uk]=призначення вашої програми у декількох словах
 Comment[x-test]=xxwhat your app does in a few wordsxx
+Comment[zh_CN]=简单几个词概括您的小程序的功能
 
 Icon=applications-system
 Type=Service