From fcebb14c2df44e093043988553d08a8f316f5bd8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 28 Jan 2020 09:35:53 +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 571f1cc42..ee526d39b 100644 --- a/fileitemactionplugin/kdeconnectsendfile.json +++ b/fileitemactionplugin/kdeconnectsendfile.json @@ -11,6 +11,7 @@ "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[ko]": "KDE Connect로 다른 장치에 파일 보내기", "Description[lt]": "Siųsti failą į kitą įrenginį naudojant KDE Connect", "Description[nl]": "Bestand naar ander apparaat versturen met KDE Connect", "Description[pt]": "Envia o ficheiro para outro dispositivo através do KDE Connect", @@ -35,6 +36,7 @@ "Name[fr]": "Envoyer le fichier via KDE Connect", "Name[gl]": "Enviar o ficheiro por KDE Connect", "Name[it]": "Invia file tramite KDE Connect", + "Name[ko]": "KDE Connect로 파일 보내기", "Name[lt]": "Siųsti failą per KDE Connect", "Name[nl]": "Bestand via KDE Connect versturen", "Name[pt]": "Enviar o ficheiro pelo KDE Connect",