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
62660bab88
commit
332f234eea
1 changed files with 15 additions and 1 deletions
|
@ -3,7 +3,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "bhyoram@protonmail.com",
|
||||
"Name": "Yoram Bar-Haim"
|
||||
"Name": "Yoram Bar-Haim",
|
||||
"Name[ca]": "Yoram Bar-Haim",
|
||||
"Name[ka]": "Yoram Bar-Haim",
|
||||
"Name[nl]": "Yoram Bar-Haim",
|
||||
"Name[pl]": "Yoram Bar-Haim",
|
||||
"Name[pt]": "Yoram Bar-Haim",
|
||||
"Name[uk]": "Йорам Бар-Хаїм",
|
||||
"Name[x-test]": "xxYoram Bar-Haimxx"
|
||||
}
|
||||
],
|
||||
"Description": "Show notifications for incoming calls",
|
||||
|
@ -52,6 +59,13 @@
|
|||
"Id": "kdeconnect_mmtelephony",
|
||||
"License": "GPL",
|
||||
"Name": "ModemManager Telephony integration",
|
||||
"Name[ca]": "Integració amb la telefonia del ModemManager",
|
||||
"Name[ka]": "ModemManager -ის ტელეფონის ინტეგრაცია",
|
||||
"Name[nl]": "Modembeheerder telefoonintegratie",
|
||||
"Name[pl]": "Integracja z telefonią zarządzania modemem",
|
||||
"Name[pt]": "Integração telefónica com o ModemManager",
|
||||
"Name[uk]": "Інтеграція телефонії ModemManager",
|
||||
"Name[x-test]": "xxModemManager Telephony integrationxx",
|
||||
"ServiceTypes": [
|
||||
"KdeConnect/Plugin"
|
||||
],
|
||||
|
|
Loading…
Reference in a new issue