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-04 06:02:51 +01:00
parent 0b72150ed8
commit 8d831d018b
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/kdeconnect-thunar.desktop
View file

@ -5,3 +5,9 @@ Encoding=UTF-8
Exec=kdeconnect-handler %F Exec=kdeconnect-handler %F
Icon=kdeconnect Icon=kdeconnect
Name=Send via KDE Connect Name=Send via KDE Connect
Name[ca]=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[uk]=Надіслати за допомогою KDE Connect
Name[x-test]=xxSend via KDE Connectxx