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
f35ce9c16f
commit
8859aa7dc3
1 changed files with 17 additions and 0 deletions
|
@ -5,5 +5,22 @@ Terminal=false
|
|||
Exec=kcmshell5 kcm_kdeconnect
|
||||
Name=KDE Connect Settings
|
||||
GenericName=Connect and sync your devices
|
||||
GenericName[ca]=Connecta i sincronitza els vostres dispositius
|
||||
GenericName[cs]=Připojte a synchronizujte svá zařízení
|
||||
GenericName[de]=Verbinden und Abgleichen Ihrer Geräte
|
||||
GenericName[es]=Conectar y sincronizar sus dispositivos
|
||||
GenericName[fi]=Yhdistä ja synkronoi laitteitasi
|
||||
GenericName[gl]=Conecte e sincronice os seus dispositivos
|
||||
GenericName[it]=Connetti e sincronizza i tuoi dispositivi
|
||||
GenericName[nl]=Uw apparaten verbinden en synchroniseren
|
||||
GenericName[pl]=Podłącz i zsynchronizuj swoje urządzenia
|
||||
GenericName[pt]=Ligue e sincronize os seus dispositivos
|
||||
GenericName[pt_BR]=Conecta e sincroniza seus dispositivos
|
||||
GenericName[sk]=Pripojiť a synchronizovať vaše zariadenia
|
||||
GenericName[sv]=Anslut och synkronisera dina apparater
|
||||
GenericName[tr]=Aygıtlarınıza bağlanın ve eşitleyin
|
||||
GenericName[uk]=З’єднання і синхронізація ваших пристроїв
|
||||
GenericName[x-test]=xxConnect and sync your devicesxx
|
||||
GenericName[zh_CN]=连接并同步您的设备
|
||||
Categories=Qt;KDE;Settings;HardwareSettings;
|
||||
NotShowIn=KDE;
|
||||
|
|
Loading…
Reference in a new issue