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
aeb4eeff73
commit
6f224477e7
1 changed files with 1 additions and 1 deletions
|
@ -51,7 +51,7 @@ Comment[da]=Vis bekendtgørelser fra dine enheder med KDE Connect
|
|||
Comment[de]=Zeigt Benachrichtigungen von Ihren Geräten mit KDE-Connect
|
||||
Comment[el]=Προβολή ειδοποιήσεων από τις συσκευές σας με το KDE Connect
|
||||
Comment[en_GB]=Show notifications from your devices using KDE Connect
|
||||
Comment[es]=Mostrar notificaciones de sus dispositivos usando KDE Connect
|
||||
Comment[es]=KDE Connect muestra las notificaciones de sus dispositivos
|
||||
Comment[et]=Seadmete märguannete näitamine KDE Connecti vahendusel
|
||||
Comment[eu]=Ikusi zure gailuetako jakinarazpenak KDE Connect erabiliz
|
||||
Comment[fi]=Näytä laitteidesi ilmoitukset KDE Connectilla
|
||||
|
|
Loading…
Reference in a new issue