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 2015-05-03 10:29:27 +00:00
parent 326fecad6f
commit 3efaae6f88
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.desktop
View file

@ -17,7 +17,7 @@ Name[ko]=KDE Connect 서비스로 파일 보내기
Name[nl]=Bestand via de service KDE Connect versturen
Name[pl]=Wyślij plik przez usługę KDE Connect
Name[pt]=Enviar um ficheiro pelo serviço KDE Connect
Name[pt_BR]=Enviar um arquivo pelo serviço KDE Connect
Name[pt_BR]=Enviar arquivo pelo serviço KDE Connect
Name[sk]=Poslať súbor cez službu KDE Connect
Name[sv]=Skicka fil via KDE:s anslutningstjänst
Name[uk]=Надсилання файла за допомогою служби з’єднання KDE