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
1dd453dee7
commit
21f610bd47
1 changed files with 1 additions and 0 deletions
|
@ -55,6 +55,7 @@
|
|||
"Description[ca]": "Mostra les notificacions dels vostres dispositius emprant el KDE Connect",
|
||||
"Description[cs]": "Zobrazit oznámení z vašich zařízení pomocí KDE Connect",
|
||||
"Description[de]": "Zeigt Benachrichtigungen von Ihren Geräten mit KDE Connect",
|
||||
"Description[en_GB]": "Show notifications from your devices using KDE Connect",
|
||||
"Description[eo]": "Montri sciigojn de viaj aparatoj per KDE Connect",
|
||||
"Description[es]": "Mustra notificaciones de sus otros dispositivos usando KDE Connect",
|
||||
"Description[eu]": "Erakutsi zure gailuetako jakinarazpenak KDE Connect erabiliz",
|
||||
|
|
Loading…
Reference in a new issue