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
653a8e34a3
commit
b39bd70fac
2 changed files with 7 additions and 1 deletions
|
@ -115,7 +115,7 @@
|
|||
"Name[sk]": "Veľká obrazovka",
|
||||
"Name[sl]": "Veliki zaslon",
|
||||
"Name[sv]": "Storskärm",
|
||||
"Name[tr]": "Bigscreen",
|
||||
"Name[tr]": "Büyük Ekran",
|
||||
"Name[uk]": "Великий екран",
|
||||
"Name[x-test]": "xxBigscreenxx",
|
||||
"Name[zh_CN]": "大屏幕",
|
||||
|
|
|
@ -46,6 +46,12 @@
|
|||
}
|
||||
],
|
||||
"Description": "Synchronize Contacts from the Connected Device to the Desktop",
|
||||
"Description[ca]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori",
|
||||
"Description[nl]": "Contactpersonen synchroniseren uit het verbonden apparaat naar het bureaublad",
|
||||
"Description[pt]": "Sincronizar os Contactos do Dispositivo Ligado para o Sistema",
|
||||
"Description[tr]": "Bağlı Aygıttaki Kişileri Masaüstüne Eşzamanla",
|
||||
"Description[uk]": "Синхронізація контактів зі з'єднаного пристрою на комп'ютер",
|
||||
"Description[x-test]": "xxSynchronize Contacts from the Connected Device to the Desktopxx",
|
||||
"EnabledByDefault": true,
|
||||
"Icon": "tag-people",
|
||||
"Id": "kdeconnect_contacts",
|
||||
|
|
Loading…
Reference in a new issue