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 2018-11-05 05:36:20 +01:00
parent 7c89338deb
commit 39c8603e54
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/kdeconnect-thunar.desktop
View file

@ -6,8 +6,10 @@ Exec=kdeconnect-handler %F
Icon=kdeconnect
Name=Send via KDE Connect
Name[ca]=Envia a través del KDE Connect
Name[ca@valencia]=Envia a través del KDE Connect
Name[gl]=Enviar mediante KDE Connect
Name[nl]=Via KDE Connect versturen
Name[pt]=Enviar pelo KDE Connect
Name[sv]=Skicka via KDE-anslut
Name[uk]=Надіслати за допомогою KDE Connect
Name[x-test]=xxSend via KDE Connectxx