From 49ac81c4b75abdad13f06862c1b1f30c657dea7c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 17 Feb 2020 09:39:32 +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 79b97e40c..254e1d4ee 100644 --- a/fileitemactionplugin/kdeconnectsendfile.json +++ b/fileitemactionplugin/kdeconnectsendfile.json @@ -16,6 +16,7 @@ "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[nn]": "Send fil til anna eining via KDE Connect", "Description[pt]": "Envia o ficheiro para outro dispositivo através do KDE Connect", "Description[pt_BR]": "Envia o arquivo para outro dispositivo usando o KDE Connect", "Description[sk]": "Poslať súbor na iné zariadenie cez KDE Connect", @@ -43,6 +44,7 @@ "Name[ko]": "KDE Connect로 파일 보내기", "Name[lt]": "Siųsti failą per KDE Connect", "Name[nl]": "Bestand via KDE Connect versturen", + "Name[nn]": "Send fil via KDE Connect", "Name[pt]": "Enviar o ficheiro pelo KDE Connect", "Name[pt_BR]": "Enviar arquivo via KDE Connect", "Name[sk]": "Poslať súbor cez KDE Connect",