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

@@ -127,7 +127,7 @@ Comment[sv]=Gör alla enheter till en
 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

indicator/org.kde.kdeconnect.nonplasma.desktop

@@ -77,7 +77,7 @@ Comment[sv]=Visa information om enheter
 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

plugins/connectivity-report/kdeconnect_connectivity_report.json

@@ -6,7 +6,9 @@
                 "Name": "David Shlemayev",
                 "Name[az]": "David Shlemayev",
                 "Name[ca]": "David Shlemayev",
+                "Name[nl]": "David Shlemayev",
                 "Name[pt]": "David Shlemayev",
+                "Name[sk]": "David Shlemayev",
                 "Name[sv]": "David Shlemayev",
                 "Name[uk]": "Давид Шлемаєв",
                 "Name[x-test]": "xxDavid Shlemayevxx"
@@ -15,7 +17,9 @@
         "Description": "Show your phone's network signal strength",
         "Description[az]": "Telefonunuzun şəbəkə siqnalı gücü göstərilsin",
         "Description[ca]": "Mostra la intensitat del senyal de xarxa del vostre telèfon",
+        "Description[nl]": "Signaalsterkte van het netwerk van uw telefoon tonen",
         "Description[pt]": "Mostrar a potência do sinal da rede do seu telefone",
+        "Description[sk]": "Zobraziť silu signálu vášho telefónu",
         "Description[sv]": "Visa telefonens nätverkssignalstyrka",
         "Description[uk]": "Показ потужності сигналу мережі на вашому телефоні",
         "Description[x-test]": "xxShow your phone's network signal strengthxx",
@@ -26,7 +30,9 @@
         "Name": "Connectivity monitor",
         "Name[az]": "Bağlantı monitoru",
         "Name[ca]": "Monitor de la connectivitat",
+        "Name[nl]": "Monitor van connectiviteit",
         "Name[pt]": "Monitor de conectividade",
+        "Name[sk]": "Monitor pripojenia",
         "Name[sv]": "Anslutningsövervakare",
         "Name[uk]": "Монітор з'єднання",
         "Name[x-test]": "xxConnectivity monitorxx",

plugins/kdeconnect.notifyrc

@@ -265,7 +265,7 @@ Comment[sv]=Någon ringer till dig
 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
 
@@ -312,7 +312,7 @@ Name[sv]=Missat samtal
 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]=لقد فاتتك مكالمة