From 29986ac5ac8f8afd091c2827497e73999a53b78f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 31 Jan 2017 12:41:30 +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" --- plugins/remotekeyboard/kdeconnect_remotekeyboard.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json index 818033c51..8f9022c73 100644 --- a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json +++ b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json @@ -11,6 +11,7 @@ "Description": "Use your keyboard to send key-events to your paired device", "Description[ca@valencia]": "Useu el vostre teclat per enviar esdeveniments de tecla al dispositiu enllaçat", "Description[ca]": "Useu el vostre teclat per enviar esdeveniments de tecla al dispositiu enllaçat", + "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[pl]": "Użyj swojej klawiatury do wysyłania naciśnięć klawiszy do swojego sparowanego urządzenia", "Description[pt]": "Usar o seu teclado para enviar eventos de teclas para o seu dispositivo emparelhado", @@ -24,6 +25,7 @@ "Name": "Remote keyboard from the desktop", "Name[ca@valencia]": "Teclat remot des de l'escriptori", "Name[ca]": "Teclat remot des de l'escriptori", + "Name[it]": "Tastiera remota dal desktop", "Name[nl]": "Toetsenbord op afstand vanaf het bureaublad", "Name[pl]": "Zdalna klawiatura z pulpitu", "Name[pt]": "Teclado remoto do ambiente de trabalho",