From e11eca64afde23011bc437006846e427f29504d6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 2 Dec 2019 05:30:09 +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 624831e8e..5e7745ab5 100644 --- a/fileitemactionplugin/kdeconnectsendfile.json +++ b/fileitemactionplugin/kdeconnectsendfile.json @@ -3,6 +3,7 @@ "Category": "Utilities", "Description": "Send file to other device using KDE Connect", "Description[ca]": "Envia fitxers a un altre dispositiu mitjançant el KDE Connect", + "Description[en_GB]": "Send file to other device using KDE Connect", "Description[et]": "Faili saatmine teise seadmesse KDE Connecti kaudu", "Description[gl]": "Enviar o ficheiro a outro dispositivo usando KDE Connect", "Description[it]": "Invia file a un altro dispositivo utilizzando KDE Connect", @@ -21,6 +22,7 @@ ], "Name": "Send file via KDE Connect", "Name[ca]": "Envia el fitxer a través del KDE Connect", + "Name[en_GB]": "Send file via KDE Connect", "Name[et]": "Faili saatmine KDE Connecti kaudu", "Name[gl]": "Enviar o ficheiro por KDE Connect", "Name[it]": "Invia file tramite KDE Connect",