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 2019-04-18 06:04:21 +02:00
parent 5cbc921f97
commit da6da3f5d1
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fileitemactionplugin/kdeconnectsendfile.desktop
View file

@ -2,6 +2,8 @@
Type=Service
Name=Send file via KDE Connect service
Name[ca]=Envia el fitxer a través del servei KDE Connect
Name[nl]=Bestand via KDE Connect-service versturen
Name[sv]=Skicka fil via KDE:s anslutningstjänst
Name[uk]=Надіслати файл за допомогою служби KDE Connect
Name[x-test]=xxSend file via KDE Connect servicexx
Name[zh_TW]=使用 KDE Connect 服務傳送檔案