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-08-09 01:44:40 +00:00
parent 7e72879845
commit 4c3613088d
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

@ -46,6 +46,7 @@
} }
], ],
"Description": "Synchronize Contacts from the Connected Device to the Desktop", "Description": "Synchronize Contacts from the Connected Device to the Desktop",
"Description[ar]": "زامن المتراسلين بين سطح المكتب والجهاز المتصل",
"Description[az]": "Əlaqələri qoşulmuş cihazdan iş masasına eyniləşdirin", "Description[az]": "Əlaqələri qoşulmuş cihazdan iş masasına eyniləşdirin",
"Description[bg]": "Синхронизиране на контактите между свързаното устройство и компютъра", "Description[bg]": "Синхронизиране на контактите между свързаното устройство и компютъра",
"Description[ca@valencia]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori", "Description[ca@valencia]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori",