From 6ae10c5d92f861e40410c04a6959112478054efc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 4 Aug 2019 08:42: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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index b9fe43401..13e4a8fd6 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -10,7 +10,7 @@ Name[en_GB]=Send file via KDE Connect service Name[es]=Enviar archivo a través del servicio KDE Connect Name[fi]=Lähetä tiedosto KDE Connect -palvelulla Name[fr]=Envoyer un fichier via le service KDE Connect -Name[gl]=Enviar o ficheiro mediante o servizo de KDE Connect +Name[gl]=Enviar o ficheiro polo servizo de KDE Connect Name[it]=Invia il file tramite il servizio KDE Connect Name[ko]=KDE Connect 서비스로 파일 보내기 Name[nl]=Bestand via KDE Connect-service versturen