Commit 2093c2dd authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

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"
parent 8f1660d5
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment