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 2020-11-08 06:17:29 +01:00
parent 78fa88db0a
commit 86212a11b2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/mousepad/kdeconnect_mousepad.json
View file

@ -48,7 +48,7 @@
],
"Description": "Use your phone as a touchpad and keyboard",
"Description[ar]": "استخدم الهاتف كفأرة ولوحة مفاتيح",
"Description[ast]": "Usa'l preséu como panel táutil y tecláu",
"Description[ast]": "Usa'l preséu como panel táctil y tecláu",
"Description[az]": "Telefonunuzu toxunma paneli və klaviatura kimi istifadə edin",
"Description[ca@valencia]": "Empra el telèfon com un ratolí tàctil i teclat",
"Description[ca]": "Empra el telèfon com un ratolí tàctil i teclat",