From a0aa62dd041d9eb4ebb191d24eab475bcebc917f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 29 Jul 2015 09:16:57 +0000 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/lockdevice/kdeconnect_lockdevice.json | 2 ++ plugins/remotecontrol/kdeconnect_remotecontrol.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json index 0a909ac3e..80013cd93 100644 --- a/plugins/lockdevice/kdeconnect_lockdevice.json +++ b/plugins/lockdevice/kdeconnect_lockdevice.json @@ -10,6 +10,7 @@ "Description": "Locks your systems", "Description[ca]": "Bloqueja els vostres sistemes", "Description[de]": "Sperrt Ihre Systeme", + "Description[es]": "Bloquear sus sistemas", "Description[gl]": "Bloquea os seus sistemas.", "Description[nl]": "Vergrendeld uw systemen", "Description[pl]": "Zablokuj swoje systemy", @@ -25,6 +26,7 @@ "Name": "LockDevice", "Name[ca]": "Bloqueja el dispositiu", "Name[de]": "Gerätesperrung", + "Name[es]": "Bloquear dispositivo", "Name[gl]": "Bloqueo do dispositivo", "Name[nl]": "Apparaat vergrendelen", "Name[pl]": "ZablokujUrządzenie", diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json index 4600a86b9..53f3ecfca 100644 --- a/plugins/remotecontrol/kdeconnect_remotecontrol.json +++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json @@ -9,6 +9,7 @@ ], "Description": "Control Remote systems", "Description[ca]": "Sistemes de control remot", + "Description[es]": "Controlar sistemas remotos", "Description[gl]": "Controla sistemas remotos.", "Description[nl]": "Systemen op afstand bedienen", "Description[pl]": "Sterowanie zdalnymi systemami", @@ -23,6 +24,7 @@ "License": "GPL", "Name": "RemoteControl", "Name[ca]": "Control remot", + "Name[es]": "Control remoto", "Name[gl]": "Mando a distancia", "Name[nl]": "Afstandsbediening", "Name[pl]": "ZdalneSterowanie",