From 2093c2dd1c620963f4cc76d7c189300dc0238f3d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 23 Jul 2019 08:31:55 +0200 Subject: [PATCH] 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" --- fileitemactionplugin/kdeconnectsendfile.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index 89e0866bb..b13e3a485 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -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