From 24fce123870de2a8b380383e7018aeec802a6093 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 16 Apr 2019 09:03:15 +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 436ccf789..46d1d8afa 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -5,6 +5,7 @@ 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[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[it]=Invia il file tramite il servizio KDE Connect