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-07-23 08:31:55 +02:00
parent 8f1660d580
commit 2093c2dd1c
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fileitemactionplugin/kdeconnectsendfile.desktop
View file

@ -17,6 +17,7 @@ Name[nn]=Send fil med KDE Connect-tenesta
Name[pl]=Wyślij plik przez usługę KDE Connect
Name[pt]=Enviar o ficheiro pelo serviços KDE Connect
Name[pt_BR]=Enviar arquivo pelo serviço KDE Connect
Name[ru]=Отправка файла через KDE Connect
Name[sk]=Poslať súbor cez službu KDE Connect
Name[sv]=Skicka via tjänsten KDE-anslut
Name[uk]=Надсилання файла за допомогою служби з’єднання KDE