From e362d80c83a55fa43b66c19b62b8afad9059c5dd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 25 May 2019 05:20:22 +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 18671ac40..9a87b2859 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -4,6 +4,7 @@ Name=Send file via KDE Connect service Name[ca]=Envia el fitxer a través del servei KDE Connect Name[ca@valencia]=Envia el fitxer a través del servei KDE Connect Name[cs]=Poslat soubor přes službu KDE Connect +Name[de]=Datei mit KDE-Connect -Dienst versenden 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