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
c5b955fe10
commit
5485f743e0
1 changed files with 2 additions and 0 deletions
|
@ -40,6 +40,7 @@
|
|||
"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[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",
|
||||
"Description[gl]": "Amosar as notificacións dos dispositivos con KDE Connect.",
|
||||
"Description[ia]": "Monstra notificationes ex tu dispositivos usante KDE Connect",
|
||||
|
@ -52,6 +53,7 @@
|
|||
"Description[tr]": "KDE Bağlan'ı kullanarak aygıtınızdan gelen bildirimleri gösterin",
|
||||
"Description[uk]": "Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE»",
|
||||
"Description[x-test]": "xxShow notifications from your devices using KDE Connectxx",
|
||||
"Description[zh_CN]": "通过 KDE Connect 显示来自其他设备的通知",
|
||||
"EnabledByDefault": true,
|
||||
"Icon": "kdeconnect",
|
||||
"Id": "org.kde.kdeconnect",
|
||||
|
|
Loading…
Reference in a new issue