tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2022-07-07 01:42:28 +00:00
parent ad01ef1695
commit 30d7abbb76
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/contacts/kdeconnect_contacts.json
View file

@ -90,7 +90,7 @@
"Name": "Contacts",
"Name[ar]": "المتراسلون",
"Name[ast]": "Contautos",
"Name[az]": "Kontaktlar",
"Name[az]": "Əlaqələr",
"Name[bg]": "Контакти",
"Name[ca@valencia]": "Contactes",
"Name[ca]": "Contactes",