From a94a605741a55cfdf854959f5a3f17d2d5f68113 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 18 Dec 2019 09:26:45 +0100 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.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fileitemactionplugin/kdeconnectsendfile.json b/fileitemactionplugin/kdeconnectsendfile.json index a8ae8fc1c..365180b82 100644 --- a/fileitemactionplugin/kdeconnectsendfile.json +++ b/fileitemactionplugin/kdeconnectsendfile.json @@ -7,6 +7,7 @@ "Description[en_GB]": "Send file to other device using KDE Connect", "Description[es]": "Enviar archivo a otro dispositivo usando KDE Connect", "Description[et]": "Faili saatmine teise seadmesse KDE Connecti kaudu", + "Description[fr]": "Envoyer le fichier vers un autre appareil KDE Connect", "Description[gl]": "Enviar o ficheiro a outro dispositivo usando KDE Connect", "Description[it]": "Invia file a un altro dispositivo utilizzando KDE Connect", "Description[lt]": "Siųsti failą į kitą įrenginį naudojant KDE Connect", @@ -28,6 +29,7 @@ "Name[en_GB]": "Send file via KDE Connect", "Name[es]": "Enviar archivo con KDE Connect", "Name[et]": "Faili saatmine KDE Connecti kaudu", + "Name[fr]": "Envoyer le fichier via KDE Connect", "Name[gl]": "Enviar o ficheiro por KDE Connect", "Name[it]": "Invia file tramite KDE Connect", "Name[lt]": "Siųsti failą per KDE Connect",