From 9f313f94c2a56fe2f63499a7371bacefb1bb49d6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 23 Jul 2017 05:44:59 +0200 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" --- indicator/org.kde.kdeconnect.nonplasma.desktop | 1 + plugins/remotekeyboard/kdeconnect_remotekeyboard.json | 2 ++ urlhandler/org.kde.kdeconnect.telhandler.desktop | 1 + 3 files changed, 4 insertions(+) diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop index 7bb2fed90..78cbed03e 100755 --- a/indicator/org.kde.kdeconnect.nonplasma.desktop +++ b/indicator/org.kde.kdeconnect.nonplasma.desktop @@ -6,6 +6,7 @@ Name[es]=Indicador de KDE Connect Name[fr]=Indicateur de KDE Connect Name[it]=Indicatore di KDE Connect Name[nl]=KDE-Connect-indicator +Name[nn]=KDE Connect-indikator Name[pl]=Wskaźnik KDE Connect Name[pt]=Indicador do KDE Connect Name[sk]=KDE Connect indikátor diff --git a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json index 4b9fd68fb..5b3eda3e5 100644 --- a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json +++ b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json @@ -20,6 +20,7 @@ "Description[fr]": "Utiliser votre clavier pour envoyer des évènements de touche au périphérique associé", "Description[it]": "Utilizza la tua tastiera per inviare eventi di pressione dei tasti al dispositivo associato", "Description[nl]": "Uw toetsenbord gebruiken om toetsgebeurtenissen naar uw gepaarde apparaat te verzenden", + "Description[nn]": "Bruk tastaturet til å senda tastetrykk til den para eininga", "Description[pl]": "Użyj swojej klawiatury do wysyłania naciśnięć klawiszy do swojego sparowanego urządzenia", "Description[pt]": "Use o seu teclado para enviar eventos de teclado para o seu dispositivo emparelhado", "Description[sk]": "Použite vašu klávesnicu na posielanie klávesových udalostí vášmu spárovanému zariadeniu", @@ -42,6 +43,7 @@ "Name[fr]": "Clavier distant depuis le bureau", "Name[it]": "Tastiera remota dal desktop", "Name[nl]": "Toetsenbord op afstand vanaf het bureaublad", + "Name[nn]": "Fjerntastatur frå skrivebordet", "Name[pl]": "Zdalna klawiatura z pulpitu", "Name[pt]": "Teclado remoto no ecrã", "Name[sk]": "Vzdialená klávesnica z plochy", diff --git a/urlhandler/org.kde.kdeconnect.telhandler.desktop b/urlhandler/org.kde.kdeconnect.telhandler.desktop index 486df4703..80a9bc3b6 100644 --- a/urlhandler/org.kde.kdeconnect.telhandler.desktop +++ b/urlhandler/org.kde.kdeconnect.telhandler.desktop @@ -6,6 +6,7 @@ Name[es]=Administrador de URL de KDE Connect Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect Name[it]=Gestore URL del telefono di KDE Connect Name[nl]=KDE-Connect behandelaar van telefoon-URL +Name[nn]=Telefon-URL-handsamar for KDE Connect Name[pl]=KDE Connect - obsługa URL telefonu Name[pt]=Tratamento de URL's no Telefone do KDE Connect Name[sk]=Spracovač KDE Connect Phone URL