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-05-01 03:08:30 +00:00
parent 3e0705fbed
commit a05449cc1d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fileitemactionplugin/kdeconnectsendfile.json
View file

@ -4,7 +4,7 @@
"Description": "Send file to other device using KDE Connect",
"Description[ar]": "أرسل ملف إلى جهاز أخر باستعمال كدي المتصل",
"Description[az]": "Digər cihazlara KDE Connect ilə fayl göndərin",
"Description[ca@valencia]": "Envia fitxers a un altre dispositiu mitjançant KDE Connect",
"Description[ca@valencia]": "Envia fitxers a un atre dispositiu mitjançant KDE Connect",
"Description[ca]": "Envia fitxers a un altre dispositiu mitjançant el KDE Connect",
"Description[cs]": "Poslat soubor na jiné zařízení přes KDE Connect",
"Description[da]": "Send fil til en anden enhed med brug af KDE Connect",