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"
This commit is contained in:
parent
1662179bd6
commit
d09dae15a7
1 changed files with 0 additions and 44 deletions
|
@ -104,50 +104,6 @@ Comment[zh_CN]=连接并同步您的设备
|
|||
Comment[zh_TW]=連線並且同步您的裝置
|
||||
|
||||
X-KDE-Keywords=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[ar]=شبكة,أندرويد,اندرويد,جهاز,أجهزة
|
||||
X-KDE-Keywords[ast]=Rede,Android,Preseos
|
||||
X-KDE-Keywords[az]=Network,Android,Devices,Şəbəkə,Cihazlar
|
||||
X-KDE-Keywords[bg]=Мрежа,Андроид,Устройства
|
||||
X-KDE-Keywords[bs]=Mreža,Android,Uređaji
|
||||
X-KDE-Keywords[ca]=Xarxa,Android,Dispositius
|
||||
X-KDE-Keywords[ca@valencia]=Xarxa,Android,Dispositius
|
||||
X-KDE-Keywords[cs]=Síť,Android,Zařízení
|
||||
X-KDE-Keywords[da]=Netværk,Android,Enheder
|
||||
X-KDE-Keywords[de]=Netzwerk,Android,Geräte
|
||||
X-KDE-Keywords[el]=Δίκτυο,Android,Συσκευές
|
||||
X-KDE-Keywords[en_GB]=Network,Android,Devices
|
||||
X-KDE-Keywords[es]=Red,Android,Dispositivos
|
||||
X-KDE-Keywords[et]=Võrk,Android,Seadmed
|
||||
X-KDE-Keywords[eu]=Sarea,Android,Gailuak
|
||||
X-KDE-Keywords[fi]=Verkko,Android,Laitteet
|
||||
X-KDE-Keywords[fr]=Réseau, Android, Périphériques
|
||||
X-KDE-Keywords[gl]=rede,Android,dispositivos
|
||||
X-KDE-Keywords[he]=Network,Android,Devices,רשתות,אנדרואיד,התקנים,מכשירים
|
||||
X-KDE-Keywords[hu]=Hálózat,Android,Eszközök
|
||||
X-KDE-Keywords[id]=Jaringan,Android,Perangkat
|
||||
X-KDE-Keywords[it]=Rete,Android,Dispositivi
|
||||
X-KDE-Keywords[ko]=Network,Android,Devices,네트워크,안드로이드,장치
|
||||
X-KDE-Keywords[lt]=Tinklas,Android,Įrenginiai
|
||||
X-KDE-Keywords[nl]=Netwerk,Android,Apparaten
|
||||
X-KDE-Keywords[nn]=nettverk,Android,einingar,smarttelefon
|
||||
X-KDE-Keywords[pl]=Sieć,Android,Urządzenia
|
||||
X-KDE-Keywords[pt]=Rede,Android,Dispositivos
|
||||
X-KDE-Keywords[pt_BR]=Rede,Android,Dispositivos
|
||||
X-KDE-Keywords[ro]=Rețea,Android,Dispozitive
|
||||
X-KDE-Keywords[ru]=Network,Android,Devices,сеть,Андроид,устройства,мобильные устройства
|
||||
X-KDE-Keywords[sk]=Sieť,Android,Zariadenia
|
||||
X-KDE-Keywords[sl]=Network,Android,Devices,omrežje,naprave
|
||||
X-KDE-Keywords[sr]=Network,Android,Devices,мрежа,Андроид,уређаји
|
||||
X-KDE-Keywords[sr@ijekavian]=Network,Android,Devices,мрежа,Андроид,уређаји
|
||||
X-KDE-Keywords[sr@ijekavianlatin]=Network,Android,Devices,mreža,Android,uređaji
|
||||
X-KDE-Keywords[sr@latin]=Network,Android,Devices,mreža,Android,uređaji
|
||||
X-KDE-Keywords[sv]=Nätverk, Android, apparater
|
||||
X-KDE-Keywords[ta]=Network,Android,Devices,பிணையம்,ஆண்ட்ராய்டு,சாதனங்கள்,இணையம்
|
||||
X-KDE-Keywords[tr]=Ağ,Android,Cihazlar,Aygıtlar
|
||||
X-KDE-Keywords[uk]=Network,Android,Devices,мережа,андроїд,пристрої
|
||||
X-KDE-Keywords[x-test]=xxNetworkxx,xxAndroidxx,xxDevicesxx
|
||||
X-KDE-Keywords[zh_CN]=Network,Android,Devices,网络,安卓,设备
|
||||
X-KDE-Keywords[zh_TW]=網路,Android,裝置,設備,網絡
|
||||
|
||||
X-DocPath=kdeconnect/index.html
|
||||
|
||||
|
|
Loading…
Reference in a new issue