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-01-04 02:00:19 +00:00
parent f2cfcc82da
commit 51da8a9d9a
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcm/kcm_kdeconnect.json
View file

@ -20,6 +20,7 @@
"Name[ar]": "كدي المتّصل",
"Name[ca@valencia]": "KDE Connect",
"Name[ca]": "KDE Connect",
"Name[cs]": "KDE Connect",
"Name[en_GB]": "KDE Connect",
"Name[es]": "KDE Connect",
"Name[eu]": "KDE Connect",

1
plugins/contacts/kdeconnect_contacts.json
View file

@ -53,6 +53,7 @@
"Description[bg]": "Синхронизиране на контактите между свързаното устройство и компютъра",
"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[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",