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-10-16 01:56:08 +00:00
parent e30b59744c
commit ab054f060d
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

@ -55,6 +55,7 @@
"Description[en_GB]": "Synchronise Contacts from the Connected Device to the Desktop",
"Description[es]": "Sincronizar contactos desde el dispositivo conectado al equipo de escritorio",
"Description[eu]": "Sinkronizatu kontaktuak konektatutako gailutik mahaigainera",
"Description[fi]": "Synkronoi yhteystiedot yhdistetyltä laitteelta työpöydälle",
"Description[fr]": "Synchroniser les contacts du périphérique connecté avec ceux du bureau",
"Description[is]": "Samstilltu tengiliði af tengda tækinu yfir á tölvuna",
"Description[it]": "Sincronizza i contatti dal dispositivo connesso al desktop",