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-07-04 01:47:05 +00:00
parent 58cc209582
commit 2da891b312
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/contacts/kdeconnect_contacts.json
View file

@ -47,7 +47,7 @@
],
"Description": "Synchronize Contacts Between the Desktop and the Connected Device",
"Description[ar]": "زامن المتراسلين بين سطح المكتب والجهاز المتصل",
"Description[az]": "Kontakları Qoşulmuş Cihaz və İş Masası arasında eyniləşdirmək",
"Description[az]": "Kontakları Qoşulmuş Cihaz və İş masası arasında eyniləşdirmək",
"Description[bg]": "Синхронизиране на контакти между компютъра и свързаното устройство",
"Description[ca@valencia]": "Sincronitza els contactes entre l'escriptori i el dispositiu connectat",
"Description[ca]": "Sincronitza els contactes entre l'escriptori i el dispositiu connectat",

2
plugins/remotekeyboard/kdeconnect_remotekeyboard.json
View file

@ -98,7 +98,7 @@
"License": "GPL",
"Name": "Remote keyboard from the desktop",
"Name[ar]": "لوحة مفاتيح بعيده من سطح المكتب",
"Name[az]": "İş Masasından uzaq klaviatura",
"Name[az]": "İş masasından uzaq klaviatura",
"Name[bg]": "Отдалечена клавиатура от работния плот",
"Name[ca@valencia]": "Teclat remot des de l'escriptori",
"Name[ca]": "Teclat remot des de l'escriptori",