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"

kcm/kcm_kdeconnect.json

@@ -104,6 +104,7 @@
     "X-KDE-Keywords[tr]": "ağ,kde connect,kde bağlan,bağlan,telefon,eşzamanla,mobil,taşınabilir,cep,android,ios,dosya gönder,dosya paylaş,dosya aktar,dosya transfer et,dosya al,aygıt,cihaz,aygıtlar,cihazlar,aygıt eşzamanlaması,aygıt senkronizasyonu,aramalar,çağrılar,telefon,akıllı telefon,smartphone,kişiler,kontaklar,sms,bildirimler,sesi aç,sesi kapat,sistem se düzeyi,zil tonu,ses çal,sunum,resim çek,fotoğraf çek,paylaşılan pano,bağlantı monitorü,uzak giriş,uzak fare,uzak klavye,telefon entegrasyonu,telefon tümleştirmesi,komut,komutlar,aygıtı kilitle,cihazı kilitle,ortam denetimi,multimedya denetimi,sftp,telefona göz at,paylaş",
     "X-KDE-Keywords[uk]": "network,kde connect,connect,phone,sync,mobile,android,ios,send files,share files,transfer files,receive files,devices,device,synchronization,calls,telephone,smartphone,contacts,sms,phone notifications,control volume,system volume,ringtone,play sound,presentation,take picture,take photo,shared clipboard,conectivity monitor,remote input,remote mouse,remote keyboard,mpris,phone integration,commands,lock device,multimedia control,sftp,browse phone,share,мережа,конект,телефон,синхронізація,синхронізувати,мобільний,андроїд,айос,надсилати,файли,оприлюднювати,спільні,передавати,передавання,отримувати,отримання,пристрої,пристрій,виклики,телефон,смартфон,контакт,есемес,сповіщення,гучність,дзвінок,мелодія,звук,презентація,знімок,знімати,фото,буфер,обміну,спостереження,введення,миша,клавіатура,інтеграція,команди,блокування,мультимедіа,навігація,спільне",
     "X-KDE-Keywords[x-test]": "xxnetworkxx,xxkde connectxx,xxconnectxx,xxphonexx,xxsyncxx,xxmobilexx,xxandroidxx,xxiosxx,xxsend filesxx,xxshare filesxx,xxtransfer filesxx,xxreceive filesxx,xxdevicesxx,xxdevicexx,xxsynchronizationxx,xxcallsxx,xxtelephonexx,xxsmartphonexx,xxcontactsxx,xxsmsxx,xxphone notificationsxx,xxcontrol volumexx,xxsystem volumexx,xxringtonexx,xxplay soundxx,xxpresentationxx,xxtake picturexx,xxtake photoxx,xxshared clipboardxx,xxconectivity monitorxx,xxremote inputxx,xxremote mousexx,xxremote keyboardxx,xxmprisxx,xxphone integrationxx,xxcommandsxx,xxlock devicexx,xxmultimedia controlxx,xxsftpxx,xxbrowse phonexx,xxsharexx",
+    "X-KDE-Keywords[zh_CN]": "network,kde connect,connect,phone,sync,mobile,android,ios,send files,share files,transfer files,receive files,devices,device,synchronization,calls,telephone,smartphone,contacts,sms,phone notifications,control volume,system volume,ringtone,play sound,presentation,take picture,take photo,shared clipboard,conectivity monitor,remote input,remote mouse,remote keyboard,mpris,phone integration,commands,lock device,multimedia control,sftp,browse phone,share,wangluo,lianjie,dianhua,tongbu,shouji,yidong,anzhuo,pingguo,fasongwenjian,chuanshuwenjian,jieshouwenjian,shebei,hujiao,tonghua,dianhua,zhinengshouji,lianxiren,duanxin,dianhuatongzhi,kongzhiyinliang,xitongyinliang,lingsheng,bofangshengyin,yanshi,paishezhaopian,jiantiebangongxiang,lianjiejiankong,liuliangjiankong,wangluojiankong,yuanchengshuru,yuanchengshubiao,yuanchengjianpan,yaokong,shoujizhenghe,mingling,zhiling,suodingshebei,duomeitikongzhi,liulanshouji,gongxiang,fenxiang,网络,连接,电话,同步,手机,移动,安卓,苹果,发送文件,传输文件,接收文件,设备,呼叫,通话,电话,智能手机,联系人,短信,电话通知,控制音量,系统音量,铃声,播放声音,演示,拍摄照片,剪贴板共享,连接监控,流量监控,网络监控,远程输入,远程鼠标,远程键盘,遥控,手机整合,命令,指令,锁定设备,多媒体控制,浏览手机,共享,分享",
     "X-KDE-Keywords[zh_TW]": "網路,網絡,kde 連線,連線,連接,同步,手機,傳送檔案,分享檔案,傳輸檔案,接收檔案,裝置,電話,打電話,聯絡人,簡訊,手機通知,控制音量,系統音量,鈴聲,播放聲音,簡報,拍照,分享剪貼簿,連線狀態監控,遠端輸入,遠端滑鼠,遠端鍵盤,手機整合,指令,命令,鎖定裝置,多媒體控制,瀏覽手機,分享",
     "X-KDE-System-Settings-Parent-Category": "hardware",
     "X-KDE-Weight": 60