From 051bb3d6e911f17950757a1d88b7a5901d4aa6ee Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 20 Jul 2021 02:18:07 +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"
---
 app/org.kde.kdeconnect.app.desktop             | 2 +-
 indicator/org.kde.kdeconnect.nonplasma.desktop | 2 +-
 plugins/kdeconnect.notifyrc                    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index 4087b83df..6c6b6ee63 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -130,7 +130,7 @@ Comment[ta]=உங்கள் சாதனங்களை ஒன்றாக்
 Comment[tr]=Tüm aygıtlarınızı birleştirin
 Comment[uk]=Поєднайте усі ваші пристрої
 Comment[x-test]=xxMake all your devices onexx
-Comment[zh_CN]=连接您所有设备
+Comment[zh_CN]=将您的所有设备合而为一
 Comment[zh_TW]=讓您的裝置內容全面同步
 Exec=kdeconnect-app
 Icon=kdeconnect
diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop
index 09bcd7da4..2bf0aefc5 100644
--- a/indicator/org.kde.kdeconnect.nonplasma.desktop
+++ b/indicator/org.kde.kdeconnect.nonplasma.desktop
@@ -78,7 +78,7 @@ Comment[ta]=உங்கள் சாதனங்களைப் பற்றி
 Comment[tr]=Aygıtlarınız hakkında bilgi görüntüleyin
 Comment[uk]=Показати дані щодо ваших пристроїв
 Comment[x-test]=xxDisplay information about your devicesxx
-Comment[zh_CN]=显示您设备的信息
+Comment[zh_CN]=显示设备信息
 Comment[zh_TW]=顯示關於您的裝置資訊
 Exec=kdeconnect-indicator
 Icon=kdeconnect
diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index d546c3ace..b20def7c3 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -271,7 +271,7 @@ Comment[ta]=யாரோ உங்களைக் கூப்பிடுகி
 Comment[tr]=Biri sizi arıyor
 Comment[uk]=Хтось телефонує вам
 Comment[x-test]=xxSomeone is calling youxx
-Comment[zh_CN]=某人正在呼叫您
+Comment[zh_CN]=有人正在呼叫您
 Comment[zh_TW]=有人打電話給您
 Action=Popup
 
@@ -319,7 +319,7 @@ Name[ta]=தவறிய அழைப்பு
 Name[tr]=Cevapsız Çağrı
 Name[uk]=Пропущений дзвінок
 Name[x-test]=xxMissed Callxx
-Name[zh_CN]=错过的呼叫
+Name[zh_CN]=未接来电
 Name[zh_TW]=未接來電
 Comment=You have a missed call
 Comment[ar]=لقد فاتتك مكالمة