From 3efaae6f88b915cb578359c55c43214553af8b9f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 May 2015 10:29:27 +0000 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index f169bb7c1..dc309c062 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -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