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 2018-04-29 05:21:10 +02:00
parent 9f0024a475
commit 659ed39edf
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

@ -11,6 +11,7 @@
"Description": "Synchronize Contacts Between the Desktop and the Connected Device", "Description": "Synchronize Contacts Between the Desktop and the Connected Device",
"Description[ca]": "Sincronitza els contactes entre l'escriptori i el dispositiu connectat", "Description[ca]": "Sincronitza els contactes entre l'escriptori i el dispositiu connectat",
"Description[cs]": "Synchronizovat kontakty mezi pracovní plochou a připojeným zařízením", "Description[cs]": "Synchronizovat kontakty mezi pracovní plochou a připojeným zařízením",
"Description[en_GB]": "Synchronise Contacts Between the Desktop and the Connected Device",
"Description[gl]": "Sincronizar contactos entre o escritorio e o dispositivo conectado", "Description[gl]": "Sincronizar contactos entre o escritorio e o dispositivo conectado",
"Description[nl]": "Contactpersonen synchroniseren tussen het bureaublad en het verbonden apparaat", "Description[nl]": "Contactpersonen synchroniseren tussen het bureaublad en het verbonden apparaat",
"Description[pt]": "Sincronizar os Contactos entre o Sistema e o Dispositivo Ligado", "Description[pt]": "Sincronizar os Contactos entre o Sistema e o Dispositivo Ligado",