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
74c3292004
commit
038356e752
1 changed files with 1 additions and 0 deletions
|
@ -41,6 +41,7 @@
|
|||
"Description[bg]": "Показване на известия от вашите устройства чрез KDE Connect",
|
||||
"Description[ca@valencia]": "Mostra les notificacions dels vostres dispositius emprant KDE Connect",
|
||||
"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[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