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-27 01:46:11 +00:00
parent 7f21dd910d
commit c658c8eefd
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/contacts/kdeconnect_contacts.json
View file

@ -47,6 +47,7 @@
],
"Description": "Synchronize Contacts from the Connected Device to the Desktop",
"Description[az]": "Əlaqələri qoşulmuş cihazdan iş masasına eyniləşdirin",
"Description[ca@valencia]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori",
"Description[ca]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori",
"Description[fr]": "Synchroniser les contacts du périphérique connecté avec ceux du bureau",
"Description[nl]": "Contactpersonen synchroniseren uit het verbonden apparaat naar het bureaublad",