Merge from BRANCH_1_0.

1 files changed, 48 insertions, 1 deletions

diff --git a/i18n/es/networksettings.ts b/i18n/es/networksettings.ts
index 1b9de72..230682f 100644
--- a/i18n/es/networksettings.ts
+++ b/i18n/es/networksettings.ts
@@ -1,88 +1,135 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation>Añadir Conexión de Red</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Añadir</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>Servicios</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation>Configuración de Red</translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>Conexiones</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>t</source>
         <translation>t</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>in</source>
         <translation>en</translation>
     </message>
     <message>
         <source>IP</source>
         <translation>IP</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Añadir</translation>
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>&amp;Información</translation>
+        <translation type="obsolete">&amp;Información</translation>
     </message>
     <message>
         <source>&amp;Configure</source>
         <translation>&amp;Configurar</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>&amp;Eliminar</translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation>Perfil</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
         <translation>&amp;Fijar actual</translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation>Perfil actual</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nuevo perfil</translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation>Una lista de configuraciones de red entre las que elegir</translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation>Añadir un nuevo interfaz a la lista.</translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation>&amp;Iniciar/Parar</translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation>Iniciar y parar el interfaz actual, da información adicional sobre el interfaz.</translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation>Configurar el interfaz actual</translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation>Eliminar el interfaz actual de la lista.</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation>Desconectado</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation>Incapaz de eliminar.</translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation>Lo siento</translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation>Por favor, seleccione un interfaz primero.</translation>
+    </message>
 </context>
 </TS>