From 9d6db94f7d4f411cc4ba774a1ad781cc7538e7a3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 17 Feb 2020 05:44:55 +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 d91aa9392..673e98c40 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[ru]": "Передача файлов на другое устройство с использованием KDE Connect", @@ -44,6 +45,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[ru]": "Передача файла с помощью KDE Connect",