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"

krfb/org.kde.krfb.desktop

@@ -145,5 +145,75 @@ GenericName[zh_CN]=桌面共享
 GenericName[zh_HK]=桌面分享
 GenericName[zh_TW]=桌面分享
 Comment=Desktop Sharing
+Comment[af]=Werkskerm Deeling
+Comment[ar]=مشاركة سطح المكتب
+Comment[ast]=Compartición d'escritoriu
+Comment[bg]=Споделяне на работния плот
+Comment[bn]=ডেস্কটপ ভাগাভাগি
+Comment[br]=Rannañ ar vurev
+Comment[bs]=Dijeljenje radne površine
+Comment[ca]=Compartir l'escriptori
+Comment[ca@valencia]=Compartir l'escriptori
+Comment[cs]=Sdílení pracovní plochy
+Comment[cy]=Rhannu Penbwrdd
+Comment[da]=Skrivebordsdeling
+Comment[de]=Arbeitsflächen-Freigabe
+Comment[el]=Κοινή χρήση επιφάνειας εργασίας
+Comment[en_GB]=Desktop Sharing
+Comment[eo]=Tabula komunigado
+Comment[es]=Escritorio compartido
+Comment[et]=Töölaua jagamine
+Comment[eu]=Mahaigaina partekatzea
+Comment[fi]=Työpöydän jakaminen
+Comment[fr]=Partage de bureaux
+Comment[ga]=Roinnt Deisce
+Comment[gl]=Compartición do escritorio
+Comment[he]=שיתוף שולחנות עבודה
+Comment[hi]=डेस्कटॉप साझेदारी
+Comment[hne]=डेस्कटाप साझेदारी
+Comment[hr]=Dijeljenje radne površine
+Comment[hu]=Munkaasztal-megosztás
+Comment[ia]=Compartir de scriptorio
+Comment[is]=Skjáborðamiðlun
+Comment[it]=Condivisione del desktop
+Comment[ja]=デスクトップ共有
+Comment[kk]=Үстелді ортақтастыру
+Comment[km]=ការ​ចែក​រំលែក​ផ្ទែ​តុ
+Comment[ko]=데스크톱 공유
+Comment[lt]=Dalinimasis darbalaukiu
+Comment[lv]=Darbvirsmas koplietošana
+Comment[mk]=Делење на работната површина
+Comment[ml]=പണിയിടം പങ്കുവെക്കല്‍
+Comment[mr]=डेस्कटॉप शेअरींग
+Comment[ms]=Perkongsian Ruang Kerja
+Comment[nb]=Delte skrivebord
+Comment[nds]=Schriefdisch-Freegaav
+Comment[nl]=Bureaublad delen
+Comment[nn]=Skrivebordsdeling
+Comment[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ
+Comment[pl]=Współdzielenie pulpitu
+Comment[pt]=Partilha do Ecrã
+Comment[pt_BR]=Compartilhamento do ambiente de trabalho
+Comment[ro]=Partajare birou
+Comment[ru]=Параметры общего рабочего стола
+Comment[si]=වැඩතල හවුල්
+Comment[sk]=Zdieľanie pracovnej plochy
+Comment[sl]=Souporaba namizja
+Comment[sr]=Дељење површи
+Comment[sr@ijekavian]=Дијељење површи
+Comment[sr@ijekavianlatin]=Dijeljenje površi
+Comment[sr@latin]=Deljenje površi
+Comment[sv]=Dela ut skrivbordet
+Comment[ta]=பணிமேடை பகிர்வு
+Comment[tg]=Истифодаи Муштараки Мизи Корӣ
+Comment[th]=ใช้งานพื้นที่ทำงานร่วมกัน
+Comment[tr]=Masaüstü Paylaşımı
+Comment[ug]=ئۈستەلئۈستىنى ھەمبەھىرلەش
+Comment[uk]=Спільні стільниці
+Comment[xh]=Ulwahlulelano lwe Desktop
+Comment[x-test]=xxDesktop Sharingxx
+Comment[zh_CN]=桌面共享
+Comment[zh_HK]=桌面分享
+Comment[zh_TW]=桌面分享
 Categories=Qt;KDE;System;Network;RemoteAccess;
 X-DBUS-ServiceName=org.kde.krfb