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 2023-02-09 03:47:00 +00:00
parent 6fdcbf181f
commit 427e95a103
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

@ -53,6 +53,7 @@
"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[cs]": "Synchronizovat kontakty z připojeného zařízení do pracovního prostředí",
"Description[de]": "Abgleich von Kontakten vom angeschlossenen Gerät zum Arbeitsplatz",
"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",