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
784b2853ca
commit
7ed4aa8d13
1 changed files with 1 additions and 0 deletions
|
@ -67,6 +67,7 @@
|
|||
"Description[pl]": "Pokazuje powiadomienia z urządzeń z KDE Connect",
|
||||
"Description[pt_BR]": "Mostrar notificações dos seus dispositivos usando o KDE Connect",
|
||||
"Description[ro]": "Arată notificări de pe dispozitivele dumneavoastră folosind KDE Connect",
|
||||
"Description[ru]": "Просмотр уведомлений с мобильных устройств с помощью KDE Connect",
|
||||
"Description[sl]": "Pošljite obvestila iz drugih naprav s pomočjo KDE Connect",
|
||||
"Description[sv]": "Visa underrättelser från apparater med KDE anslut",
|
||||
"Description[tr]": "KDE Bağlan'ı kullanarak aygıttan gelen bildirimleri göster",
|
||||
|
|
Loading…
Reference in a new issue