79 files changed, 4904 insertions, 447 deletions

diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index f80798a..a2ebab3 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -1,389 +1,446 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostrar ficheros ocultos</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Crear directorio</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Ejecutar comando</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Ejecutar comando con salida</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>No puedo renombrar</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Ese directorio no existe</translation>
+        <translation type="obsolete">Ese directorio no existe</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copiar como</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Salida Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Emisión del Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Envío IR.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Cambiar directorio</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Ejecutar</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Abrir como texto</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Crear enlace simbólico</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Info fichero</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Fijar permisos</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Emitir fichero</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copiar </translation>
     </message>
     <message>
         <source> As</source>
         <translation> Como</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copiar misma carpeta</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
-        <translation>No pude copiar
+        <translation type="obsolete">No pude copiar
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>a
+        <translation type="obsolete">a
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>No puede mover
+        <translation type="obsolete">No puede mover
 </translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Añadir a Documentos</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acciones</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>¿Confirma el borrado
+        <translation type="obsolete">¿Confirma el borrado
 de los ficheros %1?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>¿Borrar directorio?</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>¿Confirma la copia
+        <translation type="obsolete">¿Confirma la copia
 de los ficheros %1?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>¡El fichero existe!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 existe. ¿Lo sobrescribo?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation> ya existe.
+        <translation type="obsolete"> ya existe.
 ¿Seguro que quiere borrarlo?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 existe. ¿Lo sobreescribo?</translation>
+        <translation type="obsolete">%1 existe. ¿Lo sobreescribo?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>No pude copiar %1 a %2</translation>
+        <translation type="obsolete">No pude copiar %1 a %2</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
-        <translation>Advanced FileManager
+        <translation type="obsolete">Advanced FileManager
 copyright 2002-2003 por
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 y está bajo licencia GPL
 </translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>Directorio de favoritos</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Borrar el directorio actual de los favoritos</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>No pude borrar el directorio actual
+        <translation type="obsolete">No pude borrar el directorio actual
 de los favoritos.
 ¡No está marcado como favorito!</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Buscar archivo</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>¿Seguro que quiere borrar %1
+        <translation type="obsolete">¿Seguro que quiere borrar %1
 y todo su contenido?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>¿Confirma el borrado
+        <translation type="obsolete">¿Confirma el borrado
 de %1?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished">Gestor de Ficheros Avanzado :: </translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"> kB libres</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
+        <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Advanced FileManager is copyright 2002-2003 by L.J.Potter&lt;llornkcor@handhelds.org&gt; and is licensed by the GPL&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot remove current directory from bookmarks. It is not bookmarked!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy %1 As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salvar salida en fichero(sólo nombre)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Salida</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>El proceso no pudo empezar</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Error
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Finalizado
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fijar Permisos Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos para el fichero:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lectura</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escritura</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecución</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Error - sin usuario</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Error - sin grupo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Error fijando propietario o grupo</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Error fijando modo</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/backup.ts b/i18n/es/backup.ts
index 6f28060..96d5c4a 100644
--- a/i18n/es/backup.ts
+++ b/i18n/es/backup.ts
@@ -1,145 +1,169 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Copiar y restaurar... trabajando...</translation>
+        <translation type="obsolete">Copiar y restaurar... trabajando...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Copiar y Restaurar</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Error del Sistema:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Mensaje</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>¡Copia fallida!</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Copia y restauración.. ¡¡Falló!!</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
         <translation type="obsolete">Copia exitosa.</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>Por favor, seleccione algo a restaurar.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Restauración fallida.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Incapaz de abrir fichero: %1</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
         <translation type="obsolete">Restauración exitosa.</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Backing up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Backup...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Copiar y Restaurar</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Copia de seguridad</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
         <source>Save To</source>
-        <translation>Guardar en</translation>
+        <translation type="obsolete">Guardar en</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Copia de seguridad</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restaurar</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Seleccionar fuente</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Columna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restaurar</translation>
     </message>
     <message>
         <source>Update Filelist</source>
         <translation type="obsolete">Actualizar lista ficheros</translation>
     </message>
     <message>
         <source>Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Información de error</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Mensaje de error:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/bartender.ts b/i18n/es/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/es/bartender.ts
+++ b/i18n/es/bartender.ts
@@ -1,169 +1,174 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BacDialog</name>
     <message>
         <source>Blood Alcohol Estimator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source># Drinks Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kilos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Period of Time (hours)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type of drink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Bartender</name>
     <message>
         <source>Bartender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Drink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Drink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find by Drink Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of Drink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drink database not opened sucessfully.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search by drink name
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drink Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ingredients</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Show_Drink</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/bluetooth-manager.ts b/i18n/es/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/es/bluetooth-manager.ts
+++ b/i18n/es/bluetooth-manager.ts
@@ -1,334 +1,334 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rescan sevices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan for Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooh Basic Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rfcomm Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Bluetooth Basic Config</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devicename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>change settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change device 
 name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default PIN 
 Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/dagger.ts b/i18n/es/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/es/dagger.ts
+++ b/i18n/es/dagger.ts
@@ -1,281 +1,289 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigureDlg</name>
     <message>
         <source>Configure Dagger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Path where Sword texts are located:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the path where the Sword modules (Bible texts, commentaries, etc.) can be found.  This path should contain either the &apos;mods.conf&apos; file or &apos;mods.d&apos; sub-directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the path where the Sword texts (Bibles, commentaries, etc.) can be found.  This path should contain either the &apos;mods.conf&apos; file or &apos;mods.d&apos; sub-directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to select the path where the Sword texts (Bibles, commentaries, etc.) can be found.  This path should contain either the &apos;mods.conf&apos; file or &apos;mods.d&apos; sub-directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Note: Dagger must be restarted for this option to take affect.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always open texts in new window?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to always open texts in a new window.  If this option is not selected, only one copy of a Sword text will be opened.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number of verses to display at a time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the number of verses to display at a time.  This also affects how far the scroll to previous/next page buttons on the Navigation bar scroll.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable automatic screen power-down?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to disable Opie&apos;s automatic power management feature which will dim and turn off the screen after a specified time.  This will only be effective while Dagger is running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the format used when copying the current verse to the clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select copy format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;Verse (Book cc:vv, text)&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;Verse (Book cc:vv)&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;Verse&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;Book cc:vv&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Example:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the font, style and size used for displaying texts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KJV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In the beginning God created the heaven and the earth.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gen 1:1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Dagger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Navigation toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
     <message>
         <source>Previous page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to scroll backward one page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous verse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to scroll backward one verse.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter location to display here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next verse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to scroll forward one verse.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to scroll forward one page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adjust auto-scroll rate here.  A larger value represents a slower scrolling rate.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to start or stop auto-scrolling.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenTextDlg</name>
     <message>
         <source>Open text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Commentaries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lexicons/Dictionaries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Biblical Texts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchBar</name>
     <message>
         <source>Enter text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here search the current module for the text entered to the left.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to view the previous search result.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired search result here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to view the next search result.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/launchersettings.ts b/i18n/es/launchersettings.ts
index fb4fa19..f40d14d 100644
--- a/i18n/es/launchersettings.ts
+++ b/i18n/es/launchersettings.ts
@@ -1,270 +1,278 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Configuración del Lanzador</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Barra de tareas</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>Menú O</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Cargar applets en el Menú O:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Mostrar pestañas del lanzador en el Menú O</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Verificar los applets que quiere incluir en el Menú O.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Añadir el contenido de las pestañas del Lanzador como menú en el Menú O.</translation>
     </message>
     <message>
         <source>Show Applications in Subpopups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Muestra 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Muestra 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Muestra 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Pestaña Editar</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fondo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Inconos</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Vista previa %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Esta es una somera visión de como se verá la pestaña seleccionada.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Usar una letra personalizada</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Reglado</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Color sólido</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagen</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Seleccionar...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Predeterminado</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Tamaño:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeño</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Color:</translation>
     </message>
+    <message>
+        <source>Columns:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Pestañas del Lanzador:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>barra tonta</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Habilitar indicador de ocupado grande</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation type="obsolete">Habilitar indicador de ocupado parpadeante</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Seleccione la pestaña del lanzador que quiere editar o borrar.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Añadir una nueva pestaña al Lanzador.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Abrir un nuevo diálogo para personalizar la pestaña seleccionada.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Borra una pestaña del Lanzador.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Active esto si quiere un gran indicador de ocupado en el medio de la pantalla en vez de el de la barra de tareas.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation type="obsolete">Active esto si quiere un indicador de ocupado parpadeante al iniciar aplicaciones en el Lanzador.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Todas las pestañas</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>No implementado todavía</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Cargar applets el la barra de tareas:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Compruebe los applets que quiere ver en la barra de tareas.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libGPRS.ts b/i18n/es/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/es/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libaboutapplet.ts b/i18n/es/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/es/libaboutapplet.ts
+++ b/i18n/es/libaboutapplet.ts
@@ -1,74 +1,74 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
-&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
-&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
-&lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
-&lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
+&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
+&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
+&lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
+&lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libbatteryapplet.ts b/i18n/es/libbatteryapplet.ts
index 6ef6522..f1ff417 100644
--- a/i18n/es/libbatteryapplet.ts
+++ b/i18n/es/libbatteryapplet.ts
@@ -1,97 +1,110 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Close</source>
         <translation type="obsolete">Cerrar</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Cargando</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Porcentaje batería restante</translation>
+        <translation type="obsolete">Porcentaje batería restante</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Estado batería:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Bueno</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Bajo</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Muy bajo</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Crítico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Alimentación emergencia</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Alimentación conectada</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Alimentación externa desconectada</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Duración batería restante</translation>
+        <translation type="obsolete">Duración batería restante</translation>
     </message>
     <message>
         <source>Battery status</source>
         <translation type="obsolete">Estado de la batería</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallo</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>no pude abrir fichero</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Cargando ambos dispositivos</translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Porcentaje batería restante:</translation>
+        <translation type="obsolete">Porcentaje batería restante:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Duración batería restante:</translation>
+        <translation type="obsolete">Duración batería restante:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Sin chaqueta con batería insertada</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <source>Remaining Power: %1%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remaining Time: %1m %2s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remaing Power: %1 %2
+Remaining Time: %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libbluetooth.ts b/i18n/es/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/es/libbluetooth.ts
+++ b/i18n/es/libbluetooth.ts
@@ -1,77 +1,92 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BluetoothBNEPEdit</name>
     <message>
         <source>&lt;p&gt;No bluetooth device addresses specified&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBNEPGUI</name>
     <message>
         <source>Bluetooth-bnep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any available PAN device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BDAddress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBNEPNetNode</name>
     <message>
         <source>Bluetooth PAN/NAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Sets up a bluetooth link using the bluetooth Network profile.&lt;/p&gt;&lt;p&gt;Use this to connect two computing devices.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothRFCOMMGUI</name>
     <message>
         <source>Bluetooth-rfcomm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothRFCOMMNetNode</name>
     <message>
         <source>Bluetooth serial link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Sets up a bluetooth link using the bluetooth serial profile.&lt;/p&gt;&lt;p&gt;Use this to connect to a GSM.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libbrightnessapplet.ts b/i18n/es/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libcable.ts b/i18n/es/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/es/libcable.ts
+++ b/i18n/es/libcable.ts
@@ -1,167 +1,167 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CableEdit</name>
     <message>
         <source>Device filename needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CableGUI</name>
     <message>
         <source>Cable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lock file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Serial settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2400</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9600</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>19200</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>38400</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>57600</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>115200</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>230400</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>460800</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>500000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>921600</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1000000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1152000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1500000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2000000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2500000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3000000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3500000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4000000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Even</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Odd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libcardmonapplet.ts b/i18n/es/libcardmonapplet.ts
index 87b7c2e..ecfbc47 100644
--- a/i18n/es/libcardmonapplet.ts
+++ b/i18n/es/libcardmonapplet.ts
@@ -1,33 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>¡Fallo al expulsar tarjeta CF/PCMCIA!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>¡Fallo al expulsar tarjeta SD/MMC!</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Nueva tarjeta:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Expulsada:</translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>Expulsar tarjeta SD/MMC</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>Expulsar tarjeta 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Expulsar tarjeta 1: %1</translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libexample_applet.ts b/i18n/es/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/es/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libexample_board.ts b/i18n/es/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/es/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libexample_vpn.ts b/i18n/es/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/es/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libinterfaces.ts b/i18n/es/libinterfaces.ts
index 48fb2c5..976c5e1 100644
--- a/i18n/es/libinterfaces.ts
+++ b/i18n/es/libinterfaces.ts
@@ -1,162 +1,169 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished">Reiniciando interfaz</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation>Información Avanzada del Interfaz</translation>
     </message>
     <message>
         <source>eth0</source>
         <translation>eth0</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>Dirección IP</translation>
     </message>
     <message>
         <source>Interface</source>
         <translation>Interfaz</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Máscara de subred</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>DHCP Information</source>
         <translation>Información DHCP</translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation>Servidor DHCP</translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation>Alquiler expira</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation>Alquiler obtenido</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Difusión</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>Dirección MAC</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:00</translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
         <translation>Información del Interfaz</translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
         <translation>&amp;Refrescar</translation>
     </message>
     <message>
         <source>S&amp;top</source>
         <translation>&amp;Parar</translation>
     </message>
     <message>
         <source>R&amp;estart</source>
         <translation>Re&amp;iniciar</translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation>&amp;Empezar</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>Dirección IP</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Máscara de subred</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>Dirección MAC</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Difusión</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:00</translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
         <translation>&amp;Ver información avanzada</translation>
     </message>
     <message>
         <source>be &amp;silent</source>
         <translation>ser &amp;silencioso</translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
         <translation>Configuración del Interfaz</translation>
     </message>
     <message>
         <source>Automatically bring up</source>
         <translation>Levantar automáticamente</translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation>DHCP</translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
         <translation>Configuración IP estática</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Máscara de subred</translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation>Primer DNS</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>Dirección IP</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Pasarela</translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation>Segundo DNS</translation>
     </message>
     <message>
         <source>255.255.255.0</source>
         <translation>255.255.255.0</translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
         <translation>Reiniciando interfaz</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libkppp.ts b/i18n/es/libkppp.ts
index b184b3f..79213ec 100644
--- a/i18n/es/libkppp.ts
+++ b/i18n/es/libkppp.ts
@@ -1,1263 +1,1267 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountWidget</name>
     <message>
         <source>Allows you to modify the selected account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new dialup connection
 to the Internet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Makes a copy of the selected account. All
 settings of the selected account are copied
 to a new account, that you can modify to fit your
 needs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Deletes the selected account
 
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you want to delete
 the account &quot;%1&quot;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Account: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Login Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DNS Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute Programs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must enter a unique account name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AuthWidget</name>
     <message>
         <source>Authentication: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Script-based</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal-based</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAP/CHAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies the method used to identify yourself to
 the PPP server. Most universities still use
 &lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
 while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
 unsure, contact your ISP.
 
 If you can choose between PAP and CHAP,
 choose CHAP, because it&apos;s much safer. If you don&apos;t know
 whether PAP or CHAP is right, choose PAP/CHAP.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your username here...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your password here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;When this is turned on, your ISP password
 will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
 you do not need to type it in every time.
 
 &lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
 plain text in the config file, which is
 readable only to you. Make sure nobody
 gains access to this file!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ChooserWidget</name>
     <message>
         <source>&amp;Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Co&amp;py</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>De&amp;lete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DNSWidget</name>
     <message>
         <source>Domain name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enter a domain name here, this domain
 name is used for your computer while you are
 connected. When the connection is closed, the
 original domain name of your computer is
 restored.
 
 If you leave this field blank, no changes are
 made to the domain name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DNS IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Allows you to specify a new DNS server to be
 used while you are connected. When the
 connection is closed, this DNS entry will be
 removed again.
 
 To add a DNS server, type in the IP address of
 the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click this button to add the DNS server
 specified in the field above. The entry
 will then be added to the list below</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click this button to remove the selected DNS
 server entry from the list below</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DNS address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;This shows all defined DNS servers to use
 while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
 &lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable DNS servers during connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;When this option is selected, all DNS
 servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
 temporary disabled while the dialup connection
 is established. After the connection is
 closed, the servers will be re-enabled
 
 Typically, there is no reason to use this
 option, but it may become useful under 
 some circumstances.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DevicesWidget</name>
     <message>
         <source>No devices selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you want to delete
 the device &quot;%1&quot;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Device: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allows you to modify the selected device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Makes a copy of the selected device. All
 settings of the selected device are copied
 to a new device, that you can modify to fit your
 needs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Deletes the selected device
 
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
     <message>
         <source>Connection name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type in a unique name for this connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies the phone numbers to dial. You
 can supply multiple numbers here, simply
 click on &quot;Add&quot;. You can arrange the
 order the numbers are tried by using the
 arrow buttons.
 
 When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
 try the next number and so on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customize pppd Arguments...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ExecWidget</name>
     <message>
         <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Before connect:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
 is established. It is called immediately before
 dialing has begun.
 
 This might be useful, e.g. to stop HylaFAX blocking the
 modem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upon connect:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
 is established. When your program is called, all
 preparations for an Internet connection are finished.
 
 Very useful for fetching mail and news</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Before disconnect:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
 is closed. The connection will stay open until
 the program exits.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upon disconnect:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
 has been closed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GatewayWidget</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This makes the PPP peer computer (the computer
 you are connected to with your modem) to act as
 a gateway. Your computer will send all packets not
 going to a computer inside your local net to this
 computer, which will route these packets.
 
 This is the default for most ISPs, so you should
 probably leave this option on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Static gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Allows you to specify which computer you want
 to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assign the default route to this gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If this option is enabled, all packets not
 going to the local net are routed through
 the PPP connection.
 
 Normally, you should turn this on</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IPWidget</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dynamic IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select this option when your computer gets an
 internet address (IP) every time a
 connection is made.
 
 Almost every Internet Service Provider uses
 this method, so this should be turned on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Static IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select this option when your computer has a
 fixed internet address (IP). Most computers
 don&apos;t have this, so you should probably select
 dynamic IP addressing unless you know what you
 are doing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If your computer has a permanent internet
 address, you must supply your IP address here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet mask:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;If your computer has a static Internet address,
 you must supply a network mask here. In almost
 all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
 but your mileage may vary.
 
 If unsure, contact your Internet Service Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-configure hostname from this IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Whenever you connect, this reconfigures
 your hostname to match the IP address you
 got from the PPP server. This may be useful
 if you need to use a protocol which depends
 on this information, but it can also cause several
 &lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
 
 Don&apos;t enable this unless you really need it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
 For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InterfacePPP</name>
     <message>
         <source>No password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username defined but no password
  Please enter a password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModemTransfer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModemWidget</name>
     <message>
         <source>Modem &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem de&amp;vice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This specifies the serial port your modem is attached 
 to. On Linux/x86, typically this is either /dev/ttyS0 
 (COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
 
 If you have an internal ISDN card with AT command
 emulation (most cards under Linux support this), you
 should select one of the /dev/ttyIx devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Flow control:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware [CRTSCTS]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software [XON/XOFF]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how the serial port and modem
 communicate. You should not change this unless
 you know what you are doing.
 
 &lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Line termination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how AT commands are sent to your
 modem. Most modems will work fine with the
 default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
 to the init string, you should try different
 settings here
 
 &lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Co&amp;nnection speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specifies the speed your modem and the serial
 port talk to each other. You should begin with
 the default of 38400 bits/sec. If everything
 works you can try to increase this value, but to
 no more than 115200 bits/sec (unless you know
 that your serial port supports higher speeds).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Use lock file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;To prevent other programs from accessing the
 modem while a connection is established, a
 file can be created to indicate that the modem
 is in use. On Linux an example file would be
 &lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
 Here you can select whether this locking will
 be done.
 
 &lt;b&gt;Default&lt;/b&gt;: On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
 &lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
 recommended value is 30 seconds.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModemWidget2</name>
     <message>
         <source>Busy wait:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Wait for dial tone before dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Normally the modem waits for a dial tone
 from your phone line, indicating that it can
 start to dial a number. If your modem does not
 recognize this sound, or your local phone system
 does not emit such a tone, uncheck this option
 
 &lt;b&gt;Default:&lt;/b&gt;: On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specifies the number of seconds to wait before
 redial if all dialed numbers are busy. This is
 necessary because some modems get stuck if the
 same number is busy too often.
 
 The default is 0 seconds, you should not change
 this unless you need to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem &amp;volume:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Most modems have a speaker which makes
 a lot of noise when dialing. Here you can
 either turn this completely off or select a
 lower volume.
 
 If this does not work for your modem,
 you must modify the modem volume command.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem asserts CD line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
 is not responding. Unless you are having
 problems with this, do not modify this setting.
 
 &lt;b&gt;Default&lt;/b&gt;: Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mod&amp;em Commands...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allows you to change the AT command for
 your modem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Query Modem...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Most modems support the ATI command set to
 find out vendor and revision of your modem.
 
 Press this button to query your modem for
 this information. It can be useful to help
 you setup the modem</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPConfigWidget</name>
     <message>
         <source>Configure Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A critical failure appeard while testing the modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Devices</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPdArguments</name>
     <message>
         <source>Customize pppd Arguments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argument:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PhoneNumberDialog</name>
     <message>
         <source>Add Phone Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a phone number:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>PPP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>generic ppp device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open modem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to detect state of CD line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The modem is not ready.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The modem is busy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem Ready.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t restore tty settings: tcsetattr()
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The modem does not respond.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATI Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create modem lock file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Looking for modem...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem Query timed out.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem device is locked.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One moment please...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem Query Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not allowed to dial out with kppp.
 Contact your system administrator.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot find the PPP daemon!
 Make sure that pppd is installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You do not have the permission to start pppd!
 Contact your system administrator and ask to get access to pppd.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You don&apos;t have sufficient permission to run
 %1
 Please make sure that kppp is owned by root and has the SUID bit set.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is missing or can&apos;t be read!
 Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Modem Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pre-init delay (sec/100):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization string %1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Post-init delay (sec/100):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing speed (sec/100):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Init response:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dial tone detection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial string:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect response:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Busy response:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No carrier response:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dial tone response:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hangup string:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hangup response:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Answer string:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ring response:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Answer response:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Escape string:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Escape response:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guard time (sec/50):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume off/low/high:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time connected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Session Bill:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Bill:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting to: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting to: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running pre-startup command...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing modem...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setting </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setting speaker volume...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turning off dial tone waiting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line busy. Hanging up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line busy. Waiting: %1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Carrier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scanning %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saving %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expecting %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pause %1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout %1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hangup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Answer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ID %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prompting %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PW Prompt %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop Start %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ERROR: Nested too deep, ignored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loops nested too deeply!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop End %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LoopEnd without matching Start! Line: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting pppd...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan Var: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Looping: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Script timed out!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scanning: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expecting: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logging on to network...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running startup command...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must specify a telephone number!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScriptWidget</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/liblancard.ts b/i18n/es/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/es/liblancard.ts
+++ b/i18n/es/liblancard.ts
@@ -1,40 +1,47 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanCardGUI</name>
     <message>
         <source>LAN card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any available LAN card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MACAddress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanCardNetNode</name>
     <message>
         <source>LAN card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Sets up a wired regular LAN card.&lt;/p&gt;&lt;p&gt;Use this to set up 10/100/1000 MBit LAN cards.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/liblockapplet.ts b/i18n/es/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/es/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libmailwrapper.ts b/i18n/es/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/es/libmailwrapper.ts
+++ b/i18n/es/libmailwrapper.ts
@@ -1,286 +1,303 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error deleting mail: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot create folder %1 for holding subfolders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error copy mails: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error copy mail: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server has no TLS support!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginDialogUI</name>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MBOXwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching mail %i</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error deleting Mailbox.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MHwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching mail %i</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error retrieving status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>POP3wrapper</name>
     <message>
         <source>Mailbox contains %1 mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error deleting mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error getting folder info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transaction failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error sending queued mail - breaking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starttls not supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;%1&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init SMTP connection: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init SMTP tls: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login aborted - storing mail to localfolder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentification failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error sending mail: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>progressMailSend</name>
     <message>
         <source>%1 of %2 bytes send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail %1 of %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>progressMailSendUI</name>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress of mail</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libmemoryapplet.ts b/i18n/es/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/es/libmemoryapplet.ts
+++ b/i18n/es/libmemoryapplet.ts
@@ -1,160 +1,160 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb,16 Mb,32 Mb,64 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libnetworksettings2.ts b/i18n/es/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/es/libnetworksettings2.ts
+++ b/i18n/es/libnetworksettings2.ts
@@ -1,71 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>System</name>
     <message>
         <source>Command : </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>State should be off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State should at least be off</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TheNSResources</name>
     <message>
         <source>Network Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Character device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Devices that can handle IP packets&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Devices that can handle single bytes&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <source>&lt;p&gt;Nodes that provide working IP connection&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Fully configured network profile&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection to GPRS device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Connection to a GPRS capable device&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <source>Today Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>networksettings2</name>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopiemm2.ts b/i18n/es/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/es/libopiemm2.ts
+++ b/i18n/es/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libopiepim2.ts b/i18n/es/libopiepim2.ts
index 34e293e..9699a2b 100644
--- a/i18n/es/libopiepim2.ts
+++ b/i18n/es/libopiepim2.ts
@@ -1,1059 +1,1190 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botón Calendario</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botón Contactos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botón Menú</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botón Correo</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botón Inicio</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botón Grabación</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotación de la pantalla</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Minúscula+Arriba</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Minúscula+Abajo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Minúscula+Derecha</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Minúscula+Izquierda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Mayúscula+Arriba</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Mayúscula+Abajo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Mayúscula+Derecha</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Mayúscula+Izquierda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Tono:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Saturación:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Valor:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rojo:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Seleccione color</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Más</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Más...</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nombre:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mediana</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequeña</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Cita repetitiva </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ninguno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Finalizar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sin fecha final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">VarSemana</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sin fecha final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">días</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">mes</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">años</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">año</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, y </translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">en </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">día(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">mese(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">año(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Cada</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Cita repetitiva </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ninguno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Finalizar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sin fecha final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">VarSemana</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sin fecha final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">días</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mes</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">años</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">año</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete"> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, y </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">día(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mese(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">año(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">en </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Tomar hora:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::OPimMainWindow</name>
+    <message>
+        <source>Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to create a new item.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to edit the selected item.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to duplicate the selected item.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to delete the selected item.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to transmit the selected item.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an item.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set your preferences for this application.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">Diálogo Fichero</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Guardar</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Ficheros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Todos los ficheros</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Muy alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baja</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Muy baja</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progreso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Fecha lí­mite:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Correo-e preferido: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Oficina: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Web trabajo: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Teléfono trabajo: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax trabajo: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Móvil trabajo: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Busca trabajo: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Página web personal: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Teléfono casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Móvil personal: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Todos correos-e: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profesión: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Ayudante: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Superior: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Mujer</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Género: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Cónyuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Cumpleaños: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversario: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Hijos: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apodo: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas: </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localidad: </translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Esta cita dura todo el día</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Esta cita dura varios días</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Inicio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Final:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 cada </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>El %1 cada </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Cada </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>El %1 %2 de cada</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Has a due-date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No due-date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No reccurrence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No start-date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No completed-date</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>º</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>º</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>º</translation>
     </message>
     <message>
         <source>th</source>
         <translation>º</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopiesecurity2.ts b/i18n/es/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/es/libopiesecurity2.ts
+++ b/i18n/es/libopiesecurity2.ts
@@ -1,40 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <source>Note: this &apos;exit&apos; button only appears during &lt;b&gt;simulations&lt;/b&gt;, like the one we are in. If you don&apos;t succeed a step, remember you can &lt;b&gt;skip&lt;/b&gt; it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: if &apos;allow to bypass&apos; was uncheck in Security config, you would have to go back through all the steps now.</source>
+        <source>Be careful: if this was not a &lt;b&gt;simulation&lt;/b&gt;, you would have to go back through all the steps now.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Security::SecOwnerDlg</name>
     <message>
         <source>Please contact the owner (directions follow), or try again clicking of this screen (and waiting for the penalty time) if you are the legitimate owner</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopietooth2.ts b/i18n/es/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/es/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libopietooth2applet.ts b/i18n/es/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/es/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libopieui2.ts b/i18n/es/libopieui2.ts
index 5e941f4..854ddfe 100644
--- a/i18n/es/libopieui2.ts
+++ b/i18n/es/libopieui2.ts
@@ -1,829 +1,829 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botón Calendario</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botón Contactos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botón Menú</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botón Correo</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botón Inicio</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botón Grabación</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotación de la pantalla</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Minúscula+Arriba</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Minúscula+Abajo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Minúscula+Derecha</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Minúscula+Izquierda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Mayúscula+Arriba</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Mayúscula+Abajo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Mayúscula+Derecha</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Mayúscula+Izquierda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Tono:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Saturación:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Valor:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rojo:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Seleccione color</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Más</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Más...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="unfinished">Diálogo Fichero</translation>
+        <translation type="obsolete">Diálogo Fichero</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished">Abrir</translation>
+        <translation type="obsolete">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Guardar</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Guardar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nombre:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mediana</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequeña</translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Estilo</translation>
+        <translation type="obsolete">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished">Tamaño</translation>
+        <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="unfinished">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
+        <translation type="obsolete">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Nombre</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Cita repetitiva </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ninguno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Finalizar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sin fecha final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">VarSemana</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sin fecha final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">días</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mes</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">años</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">año</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete"> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, y </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">día(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mese(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">año(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">en </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Tomar hora:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo mime</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">Diálogo Fichero</translation>
+        <translation type="unfinished">Diálogo Fichero</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
+        <translation type="unfinished">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Guardar</translation>
+        <translation type="unfinished">Guardar</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nombre:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
+        <translation type="unfinished">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Tamaño</translation>
+        <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
+        <translation type="unfinished">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nombre</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo mime</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Todos los ficheros</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioridad:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Muy alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Baja</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Muy baja</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Progreso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Fecha lí­mite:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoría:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Correo-e preferido: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Oficina: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Web trabajo: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Teléfono trabajo: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax trabajo: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Móvil trabajo: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Busca trabajo: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Página web personal: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Teléfono casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Móvil personal: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Todos correos-e: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Profesión: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Ayudante: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Superior: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Mujer</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Género: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Cónyuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Cumpleaños: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Aniversario: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Hijos: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="obsolete">Apodo: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Notas: </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Localidad: </translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">Esta cita dura todo el día</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">Esta cita dura varios días</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Inicio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">Final:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">%1 %2 cada </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">El %1 cada </translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">Cada </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Domingo</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">El %1 %2 de cada</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ninguno</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="obsolete">º</translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="obsolete">º</translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="obsolete">º</translation>
     </message>
     <message>
         <source>th</source>
         <translation type="obsolete">º</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libphasestyle.ts b/i18n/es/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/es/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libppp.ts b/i18n/es/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/es/libppp.ts
+++ b/i18n/es/libppp.ts
@@ -1,218 +1,291 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PPPAuthEdit</name>
     <message>
         <source>Login send missing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login expect missing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password send missing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password expect missing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pap/Chap/EAP client id missing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pap/Chap/EAP server id missing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pap/Chap/EAP secret id missing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPAuthGUI</name>
     <message>
         <source>PPPAuth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ogin:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>assword:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>EAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Secret</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDNSEdit</name>
     <message>
         <source>Domainname needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DNS Servers needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDNSGUI</name>
     <message>
         <source>PPPDNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DomainName</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway address not valid</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPIPGUI</name>
     <message>
         <source>PPPIP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set as default</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server Overrules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only if not yet set</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PPPNetNode</name>
     <message>
-        <source>PPP Connection</source>
+        <source>&lt;p&gt;Sets up IP using PPP.&lt;/p&gt;&lt;p&gt;Use this for dialup devices or serial setups&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up IP using PPP.&lt;/p&gt;&lt;p&gt;Use this for dialup devices or serial setups&lt;/p&gt;</source>
+        <source>PPP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPRunGUI</name>
+    <message>
+        <source>PPPRun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>After</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;UL&gt;
+&lt;LI&gt;Commands run under your &lt;b&gt;real&lt;/b&gt; user id (&lt;b&gt;not&lt;/b&gt; as root)&lt;/LI&gt;
+&lt;LI&gt;Supply the whole path&lt;/LI&gt;
+&lt;/UL&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libprofile.ts b/i18n/es/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/es/libprofile.ts
+++ b/i18n/es/libprofile.ts
@@ -1,140 +1,152 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ProfileGUI</name>
     <message>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>eth0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Multicast, Up)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>P-t-P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Traffic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receiving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dropped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bytes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>ODO</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset ODO</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProfileNetNode</name>
     <message>
         <source>Regular connection profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Define use of an IP connection.&lt;/p&gt;&lt;p&gt;Configure if and when this connection needs to be established&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libqpickboard.ts b/i18n/es/libqpickboard.ts
index 7eef6c6..eb06783 100644
--- a/i18n/es/libqpickboard.ts
+++ b/i18n/es/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Pickboard</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libscreenshotapplet.ts b/i18n/es/libscreenshotapplet.ts
index 3273a9e..0972bbd 100644
--- a/i18n/es/libscreenshotapplet.ts
+++ b/i18n/es/libscreenshotapplet.ts
@@ -1,49 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Name of screenshot </source>
         <translation>Nombre del pantallazo </translation>
     </message>
     <message>
         <source>Delay</source>
         <translation>Retraso</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>seg</translation>
     </message>
     <message>
         <source>Save named</source>
         <translation>Grabar nombrado</translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation>Grabar pantallazo como...</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Scap</source>
         <translation>Captura</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Éxito</translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation>Pantallazo subido a %1</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Connection to %1 failed.</source>
         <translation>Conexión fallida a %1.</translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libtodayaddressbookplugin.ts b/i18n/es/libtodayaddressbookplugin.ts
index c38da0c..82b2c50 100644
--- a/i18n/es/libtodayaddressbookplugin.ts
+++ b/i18n/es/libtodayaddressbookplugin.ts
@@ -1,114 +1,114 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Máx líneas:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Fija el número máximo de líneas que se mostrarán en cada aniversario/cumpleaños</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>Cortar línea tras X caracteres: </translation>
+        <translation type="obsolete">Cortar línea tras X caracteres: </translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
-        <translation>Después de cuantos caracteres la información sobre la tarea debe ser cortada</translation>
+        <translation type="obsolete">Después de cuantos caracteres la información sobre la tarea debe ser cortada</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Dias siguientes: </translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Cuantos días después debemos buscar</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="unfinished">Para activar configuración: ¡Reinicie la aplicación!</translation>
+        <translation type="obsolete">Para activar configuración: ¡Reinicie la aplicación!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Fijar color cabecera: </translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>¡Colores de las cabeceras!</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Fijar color de entrada: </translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>¡Este color será usado al mostrar cumpleaños/aniversarios!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Fijar urgente
 Color si debajo</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>Días: </translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>¡Este color urgente será usado si estamos cerca de la cita!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>¡El color urgente será usado si el cumpleaños/aniversario está más próximo que los días dados!</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Módulo LibretaDirecciones</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Próximos cumpleaños en &lt;b&gt; %1 &lt;/b&gt; días:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>¡Sin cumpleaños en &lt;b&gt; %1 &lt;/b&gt; días!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Próximos aniversarios en &lt;b&gt; %1 &lt;/b&gt; días:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>¡Sin aniversarios en &lt;b&gt; %1 &lt;/b&gt; días!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>¡La base de datos no facilita esta petición de búsqueda! ¡Por favor, actualice libOpie!&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libtodayexampleplugin.ts b/i18n/es/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/es/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libtodayweatherplugin.ts b/i18n/es/libtodayweatherplugin.ts
index 00be11a..ca37a4c 100644
--- a/i18n/es/libtodayweatherplugin.ts
+++ b/i18n/es/libtodayweatherplugin.ts
@@ -1,117 +1,121 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>Módulo Tiempo</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>Introduzca identificador de localidad ICAO:</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>Introduzca el código de 4 letras de la localización deseada. Vea http://www.nws.noaa.gov/tg/siteloc.shtml para buscar una localidad próxima.</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>Visite http://www.nws.noaa.gov/tg/siteloc.shtml para buscar la locaridad más cercana.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Usar unidades métricas</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
         <translation>Pulse aquí para seleccionar el tipo de unidades mostradas.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>Frecuencia de ctualización (en minutos): </translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>Seleccione la frecuencia (en minutos) con la que quiere que el Tiempo sea actualizado.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>Recuperando información meteorológica actual.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Temp: </translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>Viento: </translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>
 Pres: </translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>Datos meteorológicos actuales no disponibles.</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/d</translation>
     </message>
     <message>
         <source>E </source>
         <translation>E</translation>
     </message>
     <message>
         <source>NE </source>
         <translation>NE</translation>
     </message>
     <message>
         <source>N </source>
         <translation>N</translation>
     </message>
     <message>
         <source>NW </source>
         <translation>NO</translation>
     </message>
     <message>
         <source>W </source>
         <translation>O</translation>
     </message>
     <message>
         <source>SW </source>
         <translation>SO</translation>
     </message>
     <message>
         <source>S </source>
         <translation>S</translation>
     </message>
     <message>
         <source>SE </source>
         <translation>SE</translation>
     </message>
     <message>
         <source> KPH</source>
         <translation>kph</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation>mph</translation>
     </message>
     <message>
         <source> hPa</source>
-        <translation>hPa</translation>
+        <translation type="obsolete">hPa</translation>
     </message>
     <message>
         <source> Hg</source>
         <translation>Hg</translation>
     </message>
+    <message>
+        <source> kPa</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libvolumeapplet2.ts b/i18n/es/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libvpn.ts b/i18n/es/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/es/libvpn.ts
+++ b/i18n/es/libvpn.ts
@@ -1,36 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>VPNGUI</name>
     <message>
         <source>VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm before start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <source>&lt;p&gt;Configure private IP connection.&lt;/p&gt;&lt;p&gt;Defines Secure tunnels over non secure IP sessions&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure private IP connection.&lt;/p&gt;&lt;p&gt;Defines Secure tunnels over non secure IP sessions&lt;/p&gt;</source>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libwebstyle.ts b/i18n/es/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/es/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libwlan.ts b/i18n/es/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/es/libwlan.ts
+++ b/i18n/es/libwlan.ts
@@ -1,157 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/main-tab.ts b/i18n/es/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/es/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/multiauth.ts b/i18n/es/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/networksettings2.ts b/i18n/es/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/es/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/opie-console.ts b/i18n/es/opie-console.ts
index ea03f7f..ee9bf26 100644
--- a/i18n/es/opie-console.ts
+++ b/i18n/es/opie-console.ts
@@ -1,878 +1,932 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
         <translation>Configuración de parametros de marcado</translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation>Configuraciones1</translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation>Configuraciones2</translation>
     </message>
     <message>
         <source>Init string </source>
         <translation>Cadena de inicio</translation>
     </message>
     <message>
         <source>Reset string </source>
         <translation>Cadena de reinicio</translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
         <translation>Prefijo de marcado #1 </translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
         <translation>Sufijo de marcado #1 </translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
         <translation>Prefijo de marcado #2 </translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
         <translation>Sufijo de marcado #2 </translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
         <translation>Prefijo de marcado #3 </translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
         <translation>Sufijo de marcado #3 </translation>
     </message>
     <message>
         <source>Connect string </source>
         <translation>Cadena de conexión</translation>
     </message>
     <message>
         <source>Hang-up string </source>
         <translation>Cadena de colgar</translation>
     </message>
     <message>
         <source>Dial time </source>
         <translation>Tiempo de marcado</translation>
     </message>
     <message>
         <source>Delay before redial </source>
         <translation>Retardo antes de remarcar</translation>
     </message>
     <message>
         <source>Number of tries </source>
         <translation>Número de intentos</translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
         <translation>Tiempo bajada DTR (0=no)</translation>
     </message>
     <message>
         <source>Auto bps detect </source>
         <translation>Detectar bps auto</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
         <translation>Modem tiene línea DCD</translation>
     </message>
     <message>
         <source>Multi-line untag </source>
         <translation>Desetiquetar multilínea</translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
         <source>Or peer mac address</source>
         <translation>O par de direcciones MAC</translation>
     </message>
 </context>
 <context>
     <name>ConfigDialog</name>
     <message>
         <source>Edit Connection Profile</source>
         <translation>Editar perfil de conexión</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nueva conexión</translation>
     </message>
 </context>
 <context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Profile Name</source>
         <translation>Nombre perfil</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Añadir</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>Elimina&amp;r</translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
         <translation>Comando a ejecutar</translation>
     </message>
     <message>
         <source>Environment Variables</source>
         <translation>Variables de entorno</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Value</source>
         <translation>Valor</translation>
     </message>
     <message>
         <source>Name :</source>
         <translation>Nombre :</translation>
     </message>
     <message>
         <source>Value :</source>
         <translation>Valor :</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
         <translation>Introducta número</translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
         <translation>Introduzca el número que quiere marcar. Cuando termine, pulse ok</translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
         <translation>Editor base</translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
         <translation>Emulación de terminal:</translation>
     </message>
     <message>
         <source>IO Layer:</source>
         <translation>Capa IO:</translation>
     </message>
     <message>
         <source>Look</source>
         <translation>Aspecto</translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation>Primer plano:</translation>
     </message>
     <message>
         <source>Black</source>
         <translation>Negro</translation>
     </message>
     <message>
         <source>White</source>
         <translation>Blanco</translation>
     </message>
     <message>
         <source>Gray</source>
         <translation>Gris</translation>
     </message>
     <message>
         <source>Background:</source>
         <translation>Fondo:</translation>
     </message>
     <message>
         <source>Font:</source>
         <translation>Letra:</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeña</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Mediana</translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
         <translation>No puede empezar</translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation>Incapaz de desdoblarme</translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation>No puede empezar</translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation>Dimensiones</translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation>Editar tecla</translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation>Velocidad</translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation>Control flujo</translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation>Hardware</translation>
     </message>
     <message>
         <source>Software</source>
         <translation>Software</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
     <message>
         <source>Parity</source>
         <translation>Paridad</translation>
     </message>
     <message>
         <source>Odd</source>
         <translation>Impar</translation>
     </message>
     <message>
         <source>Even</source>
         <translation>Par</translation>
     </message>
     <message>
         <source>Data Bits</source>
         <translation>Bits de datos</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>Stop Bits</source>
         <translation>Bits de parada</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>1.5</source>
         <translation>1.5</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation>115200 baudios</translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation>57600 baudios</translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation>38400 baudios</translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation>19200 baudios</translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation>9600 baudios</translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished">4800 baudios</translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished">2400 baudios</translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished">1200 baudios</translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation>No conectado</translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation>Tasa de baudios inválida</translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation>Dispositivo ya conectado</translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>Configuración de perfiles</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nueva conexión</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>Salvar conexión</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Conectar</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>LanzadorRápido</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>El botón de la concha lanza el perfil preferido. Si no hay ninguno se toman los valores por defecto</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>Transferir fichero...</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Cortar líneas</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>Guardar historial</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>Cerrar ventana</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>Ejecutar script</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>Regisrar script</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>Salvar script</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>Abrir teclado...</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>Nuevo del perfil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Conexión</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>Scripts</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>Script</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;No hay conexión.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Historial</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nuevo perfil</translation>
     </message>
     <message>
         <source>Save Profile</source>
         <translation>Guardar perfil</translation>
     </message>
+    <message>
+        <source>Start log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>Modem unido a:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>Introduzca aquí el nº de teléfono:</translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>Comandos AT</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>Introducta número</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>Este módulo no puede configurarse</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation>Conexión</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>Auto conectar tras la carga</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Consola local</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nuevo perfil</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>Consola Opie</translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>Falló</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>Conexión fallida para esta sesión.</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>Sesión fallida</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;No pude abrir la sesión: No dueron encotrados todos los componentes.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>Modo transferencia</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>Recibir</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>Enviar fichero</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>Protocolo transferencia</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Progreso</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>Preparado</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>Iniciar transferencia</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>Transferencia fichero</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Atención</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>Ningún fichero especificado.</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>Enviando...</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>Recibiendo...</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>Cancelado</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>La transferencia de ficheros ha sido cancelada.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>Operación no adminitida.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>La transferencia no pudo ser iniciada.</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>Sin error.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>Ocurrió un error indefinido.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>Transferencia incompleta.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>Ocurrió un error desconocido.</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>Fichero enviato.</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>Recibido</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>Fichero recibido.</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>Nombre perfil</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Conexión</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>Teclas especiales</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>Perfil no válido</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>Por favor, introduzca un nombre de perfil.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>Serie</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Consola local</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>Terminal preferido</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>Teclaro preferido</translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation>Fichero sincronizado</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>Numero marcado: %1</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallo</translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation>Falló la marcación del número.</translation>
+        <translation type="obsolete">Falló la marcación del número.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation>Cancelando...</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>Buscando modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>Inicializando...</translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation>Reinicial altavoces</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>Apagando tono marcado</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>Marcar número</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>Línea ocupada, remarcando número</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Conexión establecida</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>Olvidar</translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Dialing the number failed.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixing up Embedix</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>Tipo de terminal</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>Esquema de color</translation>
     </message>
     <message>
         <source>Font size</source>
-        <translation>Tamaño letra</translation>
+        <translation type="obsolete">Tamaño letra</translation>
     </message>
     <message>
         <source>small</source>
-        <translation>pequeña</translation>
+        <translation type="obsolete">pequeña</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation>mediana</translation>
+        <translation type="obsolete">mediana</translation>
     </message>
     <message>
         <source>large</source>
-        <translation>grande</translation>
+        <translation type="obsolete">grande</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
         <translation>Conversiones ruptura de línea</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation>Bajo límites</translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation>Fuera de límites</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>Eco local</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Cortar líneas</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>Consola Linux</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>Terminal X</translation>
     </message>
     <message>
         <source>black on white</source>
         <translation>negro sobre blanco</translation>
     </message>
     <message>
         <source>white on black</source>
         <translation>blanco sobre negro</translation>
     </message>
     <message>
         <source>green on black</source>
         <translation>verde sobre negro</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>ambar sobre negro</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/opie-eye.ts b/i18n/es/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/es/opie-eye.ts
+++ b/i18n/es/opie-eye.ts
@@ -1,72 +1,288 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>BaseSetup</name>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size of thumbnails:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show toolbar on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save status of fullscreen/autorotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageView</name>
+    <message>
+        <source>View Image Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle autorotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle autoscale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to next image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to previous image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle thumbnail</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>the Image %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <source>Opie Eye - Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Imageinfo Keyboard Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Imageview Keyboard Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go dir up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show imageinfo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnail and Imageinfo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnail and name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show images fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto rotate images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show images unscaled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show zoomer window when unscaled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select filesystem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <source>Opie Eye</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocView</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Directory View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show files recursive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recursion depth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Digital Camera View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error no Camera Dir found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ViewModeButton</name>
+    <message>
+        <source>Thumbnail and Imageinfo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnail and Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageinfo</name>
+    <message>
+        <source>View Full Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/opie-eye_slave.ts b/i18n/es/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/es/opie-eye_slave.ts
+++ b/i18n/es/opie-eye_slave.ts
@@ -1,369 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copyright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creation Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disclaimer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grayscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RGB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grayscale/Alpha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RGB/Alpha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deflate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adam7</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Not a GIF file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimensions: %1x%2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Depth: %1 bits
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort Flag: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size of Global Color Table: %1 colors
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background Color Index: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pixel Aspect Ratio: %1 (Aspect Ratio %2)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Depth: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ColorMode: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compression: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>InterlaceMode: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/opie-login.ts b/i18n/es/opie-login.ts
index 3ed76f7..6961a38 100644
--- a/i18n/es/opie-login.ts
+++ b/i18n/es/opie-login.ts
@@ -1,105 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Pulse las cruces firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Bienvenido a Opie</translation>
+        <translation type="obsolete">Bienvenido a Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Ingreso</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Bienvenido a Opie&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Usuario</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Suspender</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menú</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Contraseña incorrecta</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>La contraseña es incorrecta.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="obsolete">Opie ha terminado por
 una señal no capturada
 (%1)
 </translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallo</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
         <translation type="obsolete">No pude iniciar Opie.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>No pude pasar a la nueva identidad de usuario</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation>Opie fue terminado por
 una señal no capturada
 (%1)
 </translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>No pude iniciar Opie.</translation>
     </message>
+</context>
+<context>
+    <name>PasswordDialog</name>
+    <message>
+        <source>Set Password</source>
+        <comment>Caption of the password dialog</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;h2&gt;Please set a password for the Superuser.&lt;/h2&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Password:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PasswordDialogImpl</name>
+    <message>
+        <source>Trying to leave without password set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Passwords don&apos;t match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password not legal</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/opie-sheet.ts b/i18n/es/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/es/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Inconsistency error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File cannot be saved!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File cannot be opened!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid file format!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save the current file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UnnamedFile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Excel file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import E&amp;xcel file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cell Selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cell &amp;Selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cu&amp;t</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste Contents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste Cont&amp;ents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;lear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Sheets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sheets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>H&amp;eight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Adjust Row</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Adjust</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Row</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide Row</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Adjust Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>R&amp;emove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Equal To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Equal To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Addition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subtraction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Subtraction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiplication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Multiplication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Division</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Division</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open Paranthesis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Paranthesis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close Paranthesis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Comma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Row</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colum&amp;n</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Simple</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABS(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CEILING(x,acc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FACT(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FLOOR(x,acc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>INT(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MOD(x,y)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ROUND(x,digits)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SIGN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EXP(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LOG(x,b)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LOG10(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>POWER(x,y)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQRT(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DEGREES(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RADIANS(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PI()</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAND()</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RANDBETWEEN(a,b)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S&amp;tandard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AND(x1,x2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NOT(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OR(x1,x2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IF(compare,val1,val2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>INDEX(range,index)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ISBLANK(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ISNUMBER(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EVEN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ISEVEN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ODD(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ISODD(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logical-&amp;Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SIN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>COS(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TAN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ASIN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ACOS(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATAN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATAN2(x,y)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SINH(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>COSH(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TANH(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ACOSH(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ASINH(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATANH(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Trigonometric</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LEN(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LEFT(s,num)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RIGHT(s,num)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MID(s,pos,len)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CONCATENATE(s1,s2..)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EXACT(s1,s2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FIND(what,where,pos)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>REPLACE(s,pos,len,ns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>REPT(s,n)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UPPER(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LOWER(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Strings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AVERAGE(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>COUNT(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>COUNTIF(range,eqls)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAX(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MIN(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SUM(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SUMSQ(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VAR(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VARP(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>STDEV(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>STDEVP(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SKEW(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KURT(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sta&amp;tistical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BESSELI(x,n)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BESSELJ(x,n)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BESSELK(x,n)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BESSELY(x,n)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BETAI(x,a,b)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERF(a,b)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERFC(a,b)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GAMMALN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GAMMAP(x,a)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GAMMAQ(x,a)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scienti&amp;fic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BETADIST(z,a,b,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHI2DIST(x,n,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHIDIST(x,n,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FDIST(z,deg1,deg2,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GAMMADIST(x,a,b,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NORMALDIST(x,m,s,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PHI(x,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>POISSON(x,n,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Distributions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Functions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Number of rows:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Number of columns:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Number of sheets:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Height of each row:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width of each column:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;td&gt;Unable to open or parse file!&lt;/td&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sheet Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There is only one sheet!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift cells &amp;down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift cells &amp;right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entire ro&amp;w</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entire &amp;column</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Sheet</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/opie-update-symlinks.ts b/i18n/es/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/opieirc.ts b/i18n/es/opieirc.ts
index ffd48f8..044b2b8 100644
--- a/i18n/es/opieirc.ts
+++ b/i18n/es/opieirc.ts
@@ -1,556 +1,722 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>Hablando de canales</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Discusión de canales</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Escriba aquí sus mensajes para participar en la dicusión de canales</translation>
     </message>
     <message>
         <source>CTCP</source>
-        <translation>CTCP</translation>
+        <translation type="obsolete">CTCP</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>Petición</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Vesión</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>Quien es</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Desconectado</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Conectado, registrándome ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Registrado con éxito.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Error de conexión: </translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Conexión cerrada</translation>
     </message>
 </context>
 <context>
+    <name>IRCHistoryLineEdit</name>
+    <message>
+        <source>Next Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command : </source>
         <translation type="obsolete">Recibido comando numérico desatendido : </translation>
     </message>
     <message>
         <source>Received unhandled ctcp command : </source>
         <translation type="obsolete">Recibido comando ctcp desatendido : </translation>
     </message>
     <message>
         <source>Received unhandled literal command : </source>
         <translation type="obsolete">Recibido comando literal desatendido : </translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Unión de canal inexistente - ¿desincronizado?</translation>
     </message>
     <message>
         <source> joined channel </source>
         <translation type="obsolete">canal unido</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Persona ya se ha unido al canal - ¿desincronizado?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Ya te has unido al canal - ¿desincronizado?</translation>
     </message>
     <message>
         <source>You left channel </source>
         <translation type="obsolete">Deja el canal</translation>
     </message>
     <message>
         <source> left channel </source>
         <translation type="obsolete">dejar canal</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Persona separación no encontrada - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>No encontré canal para la parte - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Mensaje del canal de emisor desconocido</translation>
     </message>
     <message>
         <source>Channel message with unknown channel </source>
         <translation type="obsolete">Mensaje del canal con canal desconocido</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Recibido PRIVMSG de tipo desconocido</translation>
     </message>
     <message>
         <source>You are now known as </source>
         <translation type="obsolete">Ahora es conocido como </translation>
     </message>
     <message>
         <source> is now known as </source>
         <translation type="obsolete">es ahora conocimo como</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation>Cambio de apodo de una persona desconocida</translation>
+        <translation type="obsolete">Cambio de apodo de una persona desconocida</translation>
     </message>
     <message>
         <source> has quit </source>
         <translation type="obsolete">ha salido </translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Ha salido persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>cambió asunto a </translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Asundo del canal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Recibido un CTCP PING de </translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation>Recibido un CTCP VERSION de </translation>
+        <translation type="obsolete">Recibido un CTCP VERSION de </translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION con persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION con canal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION con mal destinatario</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>Cambio de modo de tipo desconocido</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Cambio de modo con persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Cambio de modo con indicador desconocido</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Cambio de modo con kanal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Modos de usuario no implentados todavía</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Ha sido expulsado de </translation>
     </message>
     <message>
         <source> by </source>
         <translation>por </translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>fue expulsado de </translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Expulsión de persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Expulsión de canal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Mensaje del servidor con canal desconocido</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Unido al canal</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Apodo en uso, por favor, reconectese con uno diferente</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>No hay tal apodo</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Recibido comando numérico no manejado: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Recibido comando ctcp no manejado: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Recibido comando literal no manejado: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 unido al canal %2</translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation>Ha dejado el canal %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 dejó el canal %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Mensaje del canal con canal desconocido %1</translation>
     </message>
     <message>
         <source>You are now known as %1</source>
-        <translation>Ahora es conocido como %1</translation>
+        <translation type="obsolete">Ahora es conocido como %1</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
-        <translation>%1 es ahora conocido como %2</translation>
+        <translation type="obsolete">%1 es ahora conocido como %2</translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 ha salido (%2)</translation>
     </message>
+    <message>
+        <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There are %1 operators connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There are %1 unknown connection(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There are %1 channels formed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait a while and try again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Whois %1 (%2@%3)
+Real name: %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is using server %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is on channels: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Names for %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time on server %1 is %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel or nick %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There is no history information for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change nick to %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not on channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has been idle for %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 signed on %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CTCP PING with unknown person - Desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CTCP PING with unknown channel - Desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CTCP PING with bad recipient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received a CTCP VERSION request from </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Malformed DCC request from </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Hablando con </translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Discusión privada</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Escriba aquí su texto para enviar un mensaje a la otra persona</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Desconectado</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Nombre del perfil :</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>El nombre de este perfil del servidor en el vistazo</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Máquina :</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>El servidor al que conectarse - puede ser un nombre de máquina válido o dirección IP</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Puerto :</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>El puerto del servidor al que conectarse. Usualmente 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Apodo :</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Su apodo en la red IRC</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Nombre real :</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Su nombre real</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Clave :</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Clave para conectarte al servidor (si es requerida)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Canales :</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Lista de todos los canales, seperados por comas, a los que le gustaría unirse automáticamente</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Editar información del servidor</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Nombre de perfil requerido</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Nombre de máquina requerido</translation>
     </message>
     <message>
         <source>Port required</source>
-        <translation>Puerto requerido</translation>
+        <translation type="obsolete">Puerto requerido</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>Apodo requerido</translation>
     </message>
     <message>
         <source>Realname required</source>
-        <translation>Nombre real requerido</translation>
+        <translation type="obsolete">Nombre real requerido</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>La lista del canal necesita contener una
 lista separada por comas de nombres
 de canales que empiezan por &apos;#&apos; o &apos;+&apos;</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>Navegador lista servidores</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Por favor, elija un perfil de servidor</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Seleccione un perfil de servidor de esta lista y entonces pulse Ok en la esquina uperior derecha</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Borrar el perfil de servidor actualmente seleccionado</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Editar el perfil de servidor actualmente seleccionado</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Añadir un nuevo perfil de servidor</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation>Conexión a</translation>
+        <translation type="obsolete">Conexión a</translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation>Mensajes del servidor</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Escriba aquí comandos. Una lista de comandos disponibles puede encontrarse en la ayuda de OpieRC</translation>
     </message>
+    <message>
+        <source>Connecting to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRCSession</name>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished">Ahora es conocido como %1</translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished">Cambio de apodo de una persona desconocida</translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished">%1 es ahora conocido como %2</translation>
+    </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Líneas mostradas :</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Cantidad de líneas mostradas en los chats antes de que sean borradas la viejas - es necesario para restringir el consumo de memoria. Fíjelo en 0 si no neceista esto</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Color de fondo :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Color del fondo que se usará en los chats</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Color del texto normal :</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Color del texto que se usará en los chats</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Color de error :</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Color del texto que se usará al mostrar errores</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Texto propio :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Color del texto que se usará para identificar el texto escrito por si mismo</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Texto ajeno :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Color del texto que se usará para identificar el texto escrito por otros</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Texto escrito por el servidor :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Color del texto que se usará para identificar el texto escrito por el servidor</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Notificaciones :</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Color del texto que se usará al mostrar notificaciones</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
+    <message>
+        <source>Display time in chat log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyboard Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Descripción perdida</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Descripción del contenido de la pestaña</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Cerrar esta pestaña</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>Ciente IRC</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Conexiones al sevidor, canales, peticiones y otras cosas serán colocadas aquí</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nueva conexión</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Crear una nueva conexión a un servidor IRC</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Configurar OpieIRC</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source> User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie IRC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> gives channel operator status to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> removes channel operator status from </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> gives voice to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> removes voice from </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/opiemail.ts b/i18n/es/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/es/opiemail.ts
+++ b/i18n/es/opiemail.ts
@@ -1,801 +1,817 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>No Receiver specified</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of groups from the server. On start, only subscribed groups are listed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groupfilter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter a filter string here.
-Then hit &quot;get newsgroup list&quot; again and only groups starting 
-with that filter will be listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <source>Enter a filter string here.
+Then hit &quot;get newsgroup list&quot; again and only groups starting 
+with that filter will be listed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Define a smtp account first</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this posting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit this mail</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>ask before downloading large mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large mail size (kb):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/opieplayer2.ts b/i18n/es/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/es/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Lib</name>
+    <message>
+        <source>Progress: %1 %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediaPlayer</name>
+    <message>
+        <source>OpiePlayer: Initializating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add  URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add File to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Files from Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opieplayer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Opieplayer2 skin not found!&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please install an opieplayer2 skin package.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidgetGui</name>
+    <message>
+        <source>Play Operations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SkinLoader</name>
+    <message>
+        <source>Loading of Skin finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VideoWidget</name>
+    <message>
+        <source>OpiePlayer - Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error on file &apos;%1&apos; with reason: </source>
+        <comment>Error when playing a file</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No input plugin found for this media type&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No demux plugin found for this media type&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Demuxing failed for this media type&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Malformed MRL&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Input failed&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Some other error&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/opierec.ts b/i18n/es/opierec.ts
index 3f66985..f07079f 100644
--- a/i18n/es/opierec.ts
+++ b/i18n/es/opierec.ts
@@ -1,220 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation>Atrás</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Adelante</translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation>Grabadora Opie</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheros</translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation>Tasa muestreo</translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="obsolete">44100</translation>
     </message>
     <message>
         <source>32000</source>
         <translation type="obsolete">32000</translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="obsolete">22050</translation>
     </message>
     <message>
         <source>16000</source>
         <translation type="obsolete">16000</translation>
     </message>
     <message>
         <source>11025</source>
         <translation type="obsolete">11025</translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="obsolete">8000</translation>
     </message>
     <message>
         <source>Limit Size</source>
         <translation>Tamaño límite</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Ilimitado</translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation>Directorio archivo</translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation>Bits de muestreo</translation>
     </message>
     <message>
         <source>16</source>
         <translation type="obsolete">16</translation>
     </message>
     <message>
         <source>8</source>
         <translation type="obsolete">8</translation>
     </message>
     <message>
         <source>In</source>
         <translation>Entrada</translation>
     </message>
     <message>
         <source>Out</source>
         <translation>Salida</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
         <source>Low Disk Space</source>
         <translation>Poco espacio en disco</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation>Está grabando con poco
 espacio, o una tarjeta
 no ha sido reconocida</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation>segundos</translation>
+        <translation type="obsolete">segundos</translation>
     </message>
     <message>
         <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
 the selected file?</source>
         <translation>¿Seguro que quiere &lt;font size=+2&gt;&lt;B&gt;borrar&lt;/B&gt;&lt;/font&gt;
 el fichero seleccionado?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation>No pude borrar el fichero.</translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation>Opierec</translation>
     </message>
     <message>
         <source>Please select file to  play</source>
         <translation>Por favor, seleccione el fichero a reproducir</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>No pude abrir el fichero de audio.
 </translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Enviar por IR</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>Emitir por IR</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Enviado por IR.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Rec</source>
-        <translation>Gra</translation>
+        <translation type="obsolete">Gra</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation>Lugar</translation>
+        <translation type="obsolete">Lugar</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Fecha</translation>
+        <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Compresión de onda (ocupa menos)</translation>
     </message>
     <message>
         <source>auto Mute</source>
         <translation type="obsolete">Mudo auto</translation>
     </message>
     <message>
         <source>mute</source>
         <translation>mudo</translation>
     </message>
     <message>
         <source>Stop</source>
-        <translation>Parar</translation>
+        <translation type="obsolete">Parar</translation>
     </message>
     <message>
         <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/opimconverter.ts b/i18n/es/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/es/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/osearch.ts b/i18n/es/osearch.ts
index d3bff16..774377d 100644
--- a/i18n/es/osearch.ts
+++ b/i18n/es/osearch.ts
@@ -1,151 +1,171 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>OSearch</source>
         <translation>Buscador O</translation>
     </message>
     <message>
         <source>adressbook</source>
         <translation type="obsolete">contactos</translation>
     </message>
     <message>
         <source>todo</source>
         <translation type="obsolete">tareas</translation>
     </message>
     <message>
         <source>datebook</source>
         <translation type="obsolete">calendario</translation>
     </message>
     <message>
         <source>applications</source>
         <translation type="obsolete">aplicaciones</translation>
     </message>
     <message>
         <source>documents</source>
         <translation type="obsolete">documentos</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Buscar todo</translation>
     </message>
     <message>
         <source>Case sensitiv</source>
-        <translation>Sensible may/min</translation>
+        <translation type="obsolete">Sensible may/min</translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation>Usar comodines</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Los detalles del resultado actual</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Introduzca aquí sus términos de búsqueda</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Tareas</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Resultados</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>mostrar</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>editar</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecutar</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>abrir en el Gestor de Ficheros</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>abrir con</translation>
     </message>
     <message>
         <source>show completed tasks</source>
-        <translation>mostrar tareas completadas</translation>
+        <translation type="obsolete">mostrar tareas completadas</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>mostrar sucesos pasados</translation>
+        <translation type="obsolete">mostrar sucesos pasados</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>buscar en fechas</translation>
+        <translation type="obsolete">buscar en fechas</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Fichero: </translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Enlace: </translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Tipo MIME: </translation>
     </message>
     <message>
         <source>search content</source>
-        <translation>buscar contenido</translation>
+        <translation type="obsolete">buscar contenido</translation>
     </message>
     <message>
         <source>searching %1</source>
         <translation>buscando %1</translation>
     </message>
+    <message>
+        <source>Show completed tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show past events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search in dates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search content</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/oxygen.ts b/i18n/es/oxygen.ts
index 9dea650..28fbcff 100644
--- a/i18n/es/oxygen.ts
+++ b/i18n/es/oxygen.ts
@@ -1,574 +1,578 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Calcular</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Peso molecular</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Fórmula química</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Peso molecular (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composición elemental (%):</translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Block</source>
         <translation>Bloque</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Electronegatividad</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Radio atómico</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="obsolete">Energía ionización</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>Densidad</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="obsolete">Punto ebullición</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="obsolete">Punto fusión</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
         <source>Ionization Energy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boiling point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Melting point</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Datos</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Cálculos</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Hidrógeno</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Helio</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Litio</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Berilio</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Boro</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Carbono</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Nitrógeno</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Fluor</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Neón</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Sodio</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnesio</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Aluminio</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silicio</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Fósforo</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Azufre</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Cloro</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argón</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Potasio</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Calcio</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Escandio</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titánio</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadio</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Cromo</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Manganeso</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Hierro</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Cobalto</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Niquel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Cobre</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zinc</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Galio</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanio</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsénico</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selenio</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Bromo</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Kriptón</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidio</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Estroncio</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Ytrio</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirconio</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niobio</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molibdeno</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Tecnecio</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Rutenio</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rodio</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Paladio</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Plata</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmio</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indio</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Estaño</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimonio</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Teluro</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Yodo</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xenón</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Césio</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Bario</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lantano</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cerio</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praseodimio</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Neodimio</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Prometio</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samario</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europio</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinio</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbio</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Disprosio</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Holmio</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbio</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Tulio</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Yterbio</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutecio</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Hafnio</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tántalo</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Wolframio</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Renio</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmio</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridio</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platino</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Oro</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Mercurio</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Talio</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Plomo</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismuto</translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation>Polonio</translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation>Astato</translation>
     </message>
     <message>
         <source>Radon</source>
         <translation>Radón</translation>
     </message>
     <message>
         <source>Francium</source>
         <translation>Francio</translation>
     </message>
     <message>
         <source>Radium</source>
         <translation>Radio</translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation>Actinio</translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation>Torio</translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation>Protactinio</translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation>Uranio</translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation>Neptuno</translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation>Plutonio</translation>
     </message>
     <message>
         <source>Americium</source>
         <translation>Americio</translation>
     </message>
     <message>
         <source>Curium</source>
         <translation>Curio</translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation>Berquelio</translation>
     </message>
     <message>
         <source>Californium</source>
         <translation>Californio</translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation>Einstenio</translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation>Fermio</translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation>Mendelevio</translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation>Nobelio</translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation>Laurencio</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation>Rutherfordio</translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation>Dubnio</translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation>Seaborgio</translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation>Bohrio</translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation>Hassio</translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation>Meitnerio</translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation>Sistema Periódico</translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation>ERROR: 
 </translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation>Datos Químicos</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/oyatzee.ts b/i18n/es/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/es/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/packagemanager.ts b/i18n/es/packagemanager.ts
index 27a2a84..244c904 100644
--- a/i18n/es/packagemanager.ts
+++ b/i18n/es/packagemanager.ts
@@ -1,1033 +1,1283 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="obsolete">Filtro de Categorías</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="obsolete">Seleccione uno o más grupos</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="obsolete">Leyendo configuración...</translation>
     </message>
 </context>
 <context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
         <translation type="unfinished">Todo</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished">Categoría:</translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished">Nombres que contengan:</translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished">Con el estado:</translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished">Disponible en el siguiente servidor:</translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished">Instalado en el dispositivo en:</translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Cancelar</translation>
     </message>
 </context>
 <context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished">Destino</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished">Espacio disponible</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished">Salida</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Empezar</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">Opciones</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished">instalar</translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished">eliminar</translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished">actualizar</translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished">descargar</translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished">Desconocido</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished">%1 Kb</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished">Abortar</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished">Cerrar</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished">Guardar salida</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Texto</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="obsolete">Cerrar</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="obsolete">Borrar
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="obsolete">Instalar</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="obsolete">Renovar</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="obsolete">(Reinstalar)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="obsolete">(Renovar)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="obsolete">Destino</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="obsolete">Espacio disponible</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="obsolete">Salida</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="obsolete">Empezar</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="obsolete">Opciones</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Texto</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="obsolete">Abortar</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="obsolete">
 **** Usuario pulsó ABORTAR ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="obsolete">**** Proceso abortado ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="obsolete">Guardar salida</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="obsolete">Desconocido</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="obsolete">%1 Kb</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="obsolete">Opciones</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="obsolete">Forzar dependencias</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="obsolete">Forzar reinstalar</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="obsolete">Forzar borrar</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="obsolete">Forzar sobreescribir</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="obsolete">Nivel de información</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="obsolete">Sólo errores</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="obsolete">Mensajes normales</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="obsolete">Mensajes informativos</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="obsolete">Salida de soluciones</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="obsolete">Tratando con el paquete %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="obsolete">Eliminando enlaces simbólicos...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="obsolete">Creando enlaces simbólicos para %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="obsolete">Creando enlaces simbólicos para %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="obsolete">Finalizado</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="obsolete">Eliminando entrada de estado...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="obsolete">fichero de estado - </translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="obsolete">paquete - </translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="obsolete">No pude abrir fichero de estado - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="obsolete">No pude crear fichero temporal de estado - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="obsolete">No pude iniciar proceso ipkg</translation>
     </message>
     <message>
         <source>Could not open :</source>
         <translation type="obsolete">No pude abrir :</translation>
     </message>
     <message>
         <source>Creating directory </source>
         <translation type="obsolete">Creando directorio </translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
         <translation type="obsolete">Enlazando %1 a %2</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
         <translation type="obsolete">Fallo al enlazar %1 a %2</translation>
     </message>
     <message>
         <source>Removed %1</source>
         <translation type="obsolete">Eliminado %1</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
         <translation type="obsolete">Fallo al borrar %1</translation>
     </message>
     <message>
         <source>Removed </source>
         <translation type="obsolete">Eliminado </translation>
     </message>
     <message>
         <source>Failed to remove </source>
         <translation type="obsolete">Fallo al borrar </translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="obsolete">AQPkg - Gestor de Paquetes</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Escriba aquí el texto a buscar.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="obsolete">Pulse aquí para esconder la barra Salto Rápido.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Actualizar listas</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Pulse aquí para actualizar las lista de paquetes de los servidores.</translation>
+        <translation type="obsolete">Pulse aquí para actualizar las lista de paquetes de los servidores.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Renovar</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation>Pulse aquí para actualizar todos los paquetes instalados si se dispone de una nueva versión.</translation>
+        <translation type="obsolete">Pulse aquí para actualizar todos los paquetes instalados si se dispone de una nueva versión.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Pulse aquí para descargar los paquetes seleccionados actualmente.</translation>
+        <translation type="obsolete">Pulse aquí para descargar los paquetes seleccionados actualmente.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Aplicar cambios</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation>Pulse aquí para instalar, borrar o renovar los paquetes instalados actualmente.</translation>
+        <translation type="obsolete">Pulse aquí para instalar, borrar o renovar los paquetes instalados actualmente.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acciones</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Mostrar paquetes no instalados</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation>Pulse aquí para mostrar los paquetes disponibles que no han sido instalados.</translation>
+        <translation type="obsolete">Pulse aquí para mostrar los paquetes disponibles que no han sido instalados.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Mostrar paquetes instalados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation>Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo.</translation>
+        <translation type="obsolete">Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Mostrar paquetes actualizados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation>Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo que tienen una versión más nueva disponible.</translation>
+        <translation type="obsolete">Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo que tienen una versión más nueva disponible.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="obsolete">Filtrar por categoría</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="obsolete">Pulse aquí para listar paquetes que pertenecen a una categoría.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="obsolete">Fijar categoría del filtro</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="obsolete">Pulse aquí para cambiar la categoría de paquetes que serán filtrados.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>Pulse aquí para buscar texto en el nombre de los paquetes.</translation>
+        <translation type="obsolete">Pulse aquí para buscar texto en el nombre de los paquetes.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation>Pulse aquí para buscar el siguiente nombre de paquete que contenga el texto que está buscando.</translation>
+        <translation type="obsolete">Pulse aquí para buscar el siguiente nombre de paquete que contenga el texto que está buscando.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="obsolete">Teclas de Salto Rápido</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="obsolete">Pulse aquí para mostrar/esconder el teclado que permite moverse rápidamente a través de la lista de paquetes.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Pulse aquí para configurar esta aplicación.</translation>
+        <translation type="obsolete">Pulse aquí para configurar esta aplicación.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation>Pulse aquí para esconder la barra de búsqueda.</translation>
+        <translation type="obsolete">Pulse aquí para esconder la barra de búsqueda.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="obsolete">Servidores:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="obsolete">Pulse aquí para seleccionar una fuente de paquetes.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Paquetes</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="obsolete">Ésta es una lista de todos los paquetes del servidor selecionado arriba.
 
 Un punto azul junto al nombre del paquete indica que está instalado actualmente.
 
 Un punto azul con una estrella indica que hay una versión más moderna disponible.
 
 Pulse en el recuadro de la izquierda para seleccionar un paquete.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="obsolete">Pulse aquí para desinstalar los paquetes seleccionados.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="obsolete">Construyendo lista del servidor:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="obsolete">Construyendo lista de paquetes para:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="obsolete">Refrescando listas de paquetes del servidor</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="obsolete">ATENCIÓN: ¡No se recomienda
 actualizar mientras
 Opie/Qtopia está corriendo!
 
 ¿Está seguro?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="obsolete">Aviso</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="obsolete">Renovando paquetes instalados</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="obsolete">¿Está seguro que desea borrar
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="obsolete">¿Está seguro?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="obsolete">Descargar a dónde</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="obsolete">Introduzca carpeta donde descargar</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="obsolete">Instalar paquete remoto</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="obsolete">Introduzca localización del paquete</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>No hay nada que hacer</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>No hay paquetes seleccionados</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="obsolete">¿Desea borrar o reinstalar
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="obsolete">Borrar o reinstalar</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="obsolete">Reinstalar</translation>
     </message>
     <message>
         <source>R</source>
         <translation type="obsolete">R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="obsolete">¿Desea borrar o actualizar
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="obsolete">Borrar o actualizar</translation>
     </message>
     <message>
         <source>U</source>
         <translation type="obsolete">U</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="obsolete">Actualizando lanzador...</translation>
     </message>
     <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished">Gestor de Paquetes</translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter path to download package to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is a listing of all packages.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
-Click inside the box at the left to select a package.</source>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished">Gestor de Paquetes</translation>
+        <source>Install local package</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished">Configuración</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished">Servidores</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished">Destinos</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished">Proxies</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">Opciones</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Nuevo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Borrar</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished">Servidor</translation>
+        <translation type="obsolete">Servidor</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">Nombre:</translation>
+        <translation type="obsolete">Nombre:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished">Dirección:</translation>
+        <translation type="obsolete">Dirección:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished">Servidor activo</translation>
+        <translation type="obsolete">Servidor activo</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Actualizar</translation>
+        <translation type="obsolete">Actualizar</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished">Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished">Habilitada</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished">Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished">Nombre usuario:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished">Clave:</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished">Forzar dependencias</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished">Forzar reinstalar</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished">Forzar borrar</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished">Forzar sobreescribir</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished">Nivel de información</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished">Sólo errores</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished">Mensajes normales</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished">Mensajes informativos</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished">Salida de soluciones</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nombre:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Posición:</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nombre:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Dirección:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;b&gt;Descripción&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;Instalado en&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;Tamaño&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;Selección&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;Nombre de fichero&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;Versión instalada&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;Versión disponible&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation type="obsolete">Información del paquete</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation type="obsolete">No dispongo de información del paquete</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="obsolete">Cerrar</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation type="obsolete">Paquetes instalados</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation type="obsolete">Paquetes locales</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation type="obsolete">N/D</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation type="obsolete">Paquete - %1
              versión - %2</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation type="obsolete">
              versión inst - %1</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation type="obsolete">Cadena de versión vacía.</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation type="obsolete">Época en versión no numérica.</translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation type="obsolete">Nada después del punto en el número de verisión.</translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation type="obsolete">Borrar</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="obsolete">Configuración</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="obsolete">Servidores</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="obsolete">Destinos</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="obsolete">Proxies</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Nuevo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Borrar</translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="obsolete">Servidor</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nombre:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="obsolete">Dirección:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="obsolete">Servidor activo</translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="obsolete">Actualizar</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="obsolete">Destino</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Posición:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="obsolete">Enlazar a root</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="obsolete">Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="obsolete">Habilitada</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="obsolete">Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="obsolete">Nombre usuario:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="obsolete">Clave:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/powerchord.ts b/i18n/es/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/es/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/pyquicklauncher.ts b/i18n/es/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index 03fda50..36c0f5e 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -1,580 +1,594 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">Pulse las crucecitas firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="obsolete">Bienvenido a Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Ver como lista</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">La batería está muy baja.</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">¡El nivel de la batería es crítico!
 ¡Apágueme o enchúfeme!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">La batería de respaldo está muy baja.
 Por favor cárguela.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">tarjeta de visita</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Información</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;La fecha del sistema parece no ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Estado de la Batería</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">Lanzador</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Lanzador</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Sin aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;No se ha definido una aplicación para este documento.&lt;p&gt; Tipo %1%.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Buscando documentos</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Buscando documentos</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Documentos</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Ver como lista</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 ficheros</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Todos los tipos de ficheros</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Ver como documentos</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Medio insertado</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Qué ficheros</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Vídeo</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Enlace a aplicaciones</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Limitar búsqueda al directorio: (no se usa aún)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Añadir</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">Su decisión será guardada en el medio.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">No preguntar otra vez por este medio</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Qué ficheros</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Todos</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">Vídeo</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">Añadir</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Estado de la Batería</translation>
     </message>
 </context>
 <context>
+    <name>QueuedRequestRunner</name>
+    <message>
+        <source>Processing Queued Requests</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Server</name>
+    <message>
+        <source>USB Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Información</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;La fecha del sistema parece no ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">¡El nivel de la batería es crítico!
 ¡Apágueme o enchúfeme!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">La batería de respaldo está muy baja.
 Por favor cárguela.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">tarjeta de visita</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Terminar Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Reiniciar</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Reiniciar Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished">&lt;p&gt;
 Estas opciones de terminación se usan principalmente en las pruebas y desarrollo del sistema Opie. En un entorno normal, estos conceptos son innecesarios.</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Apagar...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Conexión de sincronización</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Denegar</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Permitir</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Un sistema no reconocido está pidiendo acceso a este dispositivo.&lt;p&gt;Si acaba de empezar su primera sincronización, esto es normal.</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Sincronizando</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Contactos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Cancelar</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/security.ts b/i18n/es/security.ts
index 5c5be3c..176457c 100644
--- a/i18n/es/security.ts
+++ b/i18n/es/security.ts
@@ -1,376 +1,408 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished">Identificación</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished">Identificación automática</translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished">Identificación</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>192.168.129.0/24</source>
-        <translation type="unfinished">192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished">192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished">192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished">172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished">10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished">Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ninguna</translation>
     </message>
+    <message>
+        <source>Important notice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one &lt;em&gt;opie-multiauth-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Testing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Test the authentication now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="obsolete">Fijar código</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="obsolete">Cambiar código</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="obsolete">Introducir código</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="obsolete">Código Incorrecto</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="obsolete">El código introducido es incorrecto.
 Acceso denegado</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ninguna</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="obsolete">Teclee nuevo código</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="obsolete">Reintroduzca nuevo código</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="obsolete">Configuración de Seguridad</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="obsolete">Cambiar código</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="obsolete">Borrar código</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="obsolete">Solicitar código al encender</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="obsolete">Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="obsolete">Sincronización desde red:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (predefinido)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ninguna</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="obsolete">&lt;P&gt;Elegir un código proporciona un mínimo nivel de protección contra accesos ocasionales al dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation type="obsolete">Código</translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="obsolete">Identificación</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="obsolete">Identificación automática</translation>
     </message>
 </context>
 <context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Sincronización desde red:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/sfcave-sdl.ts b/i18n/es/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/sfcave.ts b/i18n/es/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/es/sfcave.ts
+++ b/i18n/es/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/simple-icon.ts b/i18n/es/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/es/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/simple-main.ts b/i18n/es/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/es/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/simple-pim.ts b/i18n/es/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/es/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <message>
+        <source>Start </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/simple.ts b/i18n/es/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/es/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/stocktickertest.ts b/i18n/es/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/es/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/sysinfo.ts b/i18n/es/sysinfo.ts
index 4ff30e2..2426b1f 100644
--- a/i18n/es/sysinfo.ts
+++ b/i18n/es/sysinfo.ts
@@ -1,401 +1,405 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Este gráfico representa la memoria usada actualmente es esta tarjeta de memoria Compact Flash.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Este gráfico representa el almacenamiento usado en este disco duro.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Este gráfico representa cuanta memoria se usa actualmente en esta tarjeta Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>En</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Este gráfico representa cuanta memoria se usa actualmente de la memoria incorporada (p.e. Flash) en este dispositivo.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Este gráfico representa cuánta memoria usa actualmente el disco RAM temporal.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uso de CPU por la aplicación (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uso de CPU por el sistema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Esta página muestra el procesador que está siendo usado.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memoria total: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">Está página muestra cuanta memoria (p.e. RAM) está siendo asignada.
 La memoria se cataloga como sigue:
 
 1. Usada - memoria usada por Opie y cualquier aplicación en ejecución.
 2. Buffers - almacenamiento temporal usada para mejorar el rendimiento.
 3. Cached - información usada recientemente, pero aún no liberada.
 4. Libre - memoria actualmente no usada por ninguna aplicación.</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uso#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Usado por</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Esta es una lista de todos los módulos del kernel actualmente cargados.
 
 Mantenga pulsado un módulo para ver información adicional sobre el módulo, o descargarlo.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Seleccione un comando aquí y luego pulse el botón Enviar de la derecha para que lo reciba el módulo seleccionado arriba.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Pulse aquí para enviar el comando selecciondo al módulo seleccionado arriba.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Seguro que quiere ejecutar
 </translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Esta área muestra información detallada sobre este módulo.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Usado por</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="obsolete">¿Seguro que quiere ejecutar %1 para este módulo?</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Libre (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tiempo</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Esta es una lista de todos los procesos de este dispositivo.
 
 Mantenga pulsado un proceso para ver información adicional, o para enviarle una señal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Seleccione aquí una señal y luego pulse el botón Enviar de la derecha para enviárselo a este proceso.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Pulse aquí para enviar la señal seleccionada a este proceso.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Esta área muestra información detallada sobre este proceso.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
         <translation type="obsolete">Seguro que quiere enviar
 </translation>
     </message>
     <message>
         <source>You really want to send %1 to this process?</source>
         <translation type="obsolete">¿Seguro que quiere enviar %1 a este proceso?</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Información del Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memoria</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Almacenamiento</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Procesos</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versión</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Módulos</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel Linux&lt;/b&gt;&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Fecha compilación: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation type="obsolete">&lt;p&gt;Modelo: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation type="obsolete">&lt;p&gt;Proveedor: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Esta página muestra la versión actual de Opie, del kernel Linux y de la distribución corriendo es este dispositivo.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Built against Qt/E </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/tableviewer.ts b/i18n/es/tableviewer.ts
index a00b6f1..308cd84 100644
--- a/i18n/es/tableviewer.ts
+++ b/i18n/es/tableviewer.ts
@@ -1,69 +1,69 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>KeyList::addKey() No puedo dar un valor por omisión al tipo %1, Clave no añadida.</translation>
+        <translation type="obsolete">KeyList::addKey() No puedo dar un valor por omisión al tipo %1, Clave no añadida.</translation>
     </message>
     <message>
         <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation>DataElem::setField(%1, %2) No encontrado tipo válido</translation>
+        <translation type="obsolete">DataElem::setField(%1, %2) No encontrado tipo válido</translation>
     </message>
 </context>
 <context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>key</source>
         <translation>clave</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>Visor Base Datos - Editar claves</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Nombre clave</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Tipo clave</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Eliminar</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Borrar todo</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Ver lista</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Visor de tabla</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>no puedo cargar documento</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/textedit.ts b/i18n/es/textedit.ts
index 3546cc3..af727be 100644
--- a/i18n/es/textedit.ts
+++ b/i18n/es/textedit.ts
@@ -1,277 +1,281 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Guardar como</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Buscar...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Acercar</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Alejar</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Cortar líneas</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Empezar con Nuevo</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Cerrar Buscar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor de Textos</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>Fichero .desktop</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Documento enlazado</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>Insertar hora y fecha</translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>Opciones avanzadas</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>Preguntar al salir</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>Abrir siempre fichero enlazado</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Permisos fichero</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>Barra de búsqueda abierta</translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation>Ir a línea...</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation>Autograbar 5 min.</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation>Editor de Textos ha detectado que &lt;BR&gt;seleccionó un fichero &lt;B&gt;.desktop&lt;/B&gt;. ¿Abro el fichero &lt;B&gt;.desktop&lt;/B&gt; o su &lt;B&gt;enlace&lt;/B&gt;?</translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation>Editor de Textos</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation>Fallo al escribir</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Sin nombre</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Permisos</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation>Elegir Letra</translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="obsolete">¿Seguro que quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
 del disco?&lt;BR&gt;¡¡Es &lt;B&gt;irreversible&lt;/B&gt;!!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation>Text Edit tiene copyright&lt;BR&gt;2000 Trolltech AS, y&lt;BR&gt;2002 &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;, y está bajo licencia GPL</translation>
     </message>
     <message>
         <source>Textedit</source>
         <translation>Editor de Textos</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation>Editor de Textos ha detectado que
 tiene cambios sin salvar.
 ¿Los guardo?</translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation>No guardar</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation>Líneas insuficientes</translation>
     </message>
     <message>
         <source>%1 - Text Editor</source>
         <translation>%1 - Editor de Textos</translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
         <translation>¿Seguro que quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
 del disco?&lt;BR&gt;¡Es &lt;B&gt;irreversible&lt;/B&gt;!</translation>
     </message>
+    <message>
+        <source>Save Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fije los Permisos del Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos fichero para:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>leer</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escribir</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecutar</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Error - sin usuario</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Error - sin grupo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Error fijando propietario o grupo</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Error fijando modo</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Permisos fichero</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/today.ts b/i18n/es/today.ts
index c7d2fcb..9ed5b37 100644
--- a/i18n/es/today.ts
+++ b/i18n/es/today.ts
@@ -1,182 +1,190 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Hoy</translation>
+        <translation type="unfinished">Hoy</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Pertenece a </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Por favor, rellene su información personal</translation>
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>No encontré módulos</translation>
+        <translation type="obsolete">No encontré módulos</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Ningún módulo activado</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Piche aquí para lanzar la aplicación asociada</translation>
     </message>
+    <message>
+        <source>Today Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Pinche aquí para obtener el diálogo de configuración</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Hoy por Maximilian Reiß</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Cargar qué módulos en qué orden:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Mover arriba</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Mover abajo</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>activa/orden</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="obsolete">minutos inactivo</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="obsolete">Marque aquí si HOY debe ser autoarrancado al arrancar.</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="obsolete">Cuantos minutos ha estado suspendidad la PDA antes que se active la opción de autoarranque</translation>
     </message>
     <message>
         <source>Icon size</source>
         <translation type="obsolete">Tamaño del icono</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="obsolete">Fijar el tamaño del icono en pixel</translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="obsolete">¿Arrancar
 al encender?
 (sólo Opie)</translation>
     </message>
     <message>
         <source>Refresh</source>
         <translation type="obsolete">Actualizar</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="obsolete">Con qué frecuencia debe Hoy actualizarse</translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="obsolete"> seg</translation>
     </message>
     <message>
         <source>never</source>
         <translation type="obsolete">nunca</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Pulse en las casillas para activar un módulo o use los botones de desplazamiento para cambiar el orden de aparición</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Configuración de Hoy</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Marque aquí si HOY debe ser autoarrancado al arrancar.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>¿arrancar al encender?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>mini-avisos</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Tiene aviso pequeño</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Cuantos minutos ha estado suspendidad la PDA antes que se active la opción de autoarranque</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minutos inactivo</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Fijar el tamaño del icono en pixel</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>tamaño del icono</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> seg</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nunca</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Con qué frecuencia debe Hoy actualizarse</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>actualizar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/todolist.ts b/i18n/es/todolist.ts
index ad0e93a..25c72f3 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -1,624 +1,658 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>&lt;h1&gt;Alarma en %1&lt;/h1&gt;&lt;br&gt;</translation>
     </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished">En blanco</translation>
+    </message>
+</context>
+<context>
+    <name>NewTaskDlg</name>
+    <message>
+        <source>New Task</source>
+        <translation type="unfinished">Nueva tarea</translation>
+    </message>
+    <message>
+        <source>Blank task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Using template:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation>Alarmas</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Información</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Repetición</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation>Editor de tarear</translation>
     </message>
 </context>
 <context>
+    <name>Opie</name>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished">Lista de Tareas</translation>
+    </message>
+    <message>
+        <source>Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarea</translation>
     </message>
     <message>
         <source>Enter Task</source>
         <translation>Introducir Tarea</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>silenciosa</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>sonora</translation>
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation>Tareas Opie</translation>
+        <translation type="obsolete">Tareas Opie</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Nuevo desde plantilla</translation>
+        <translation type="obsolete">Nuevo desde plantilla</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Nueva tarea</translation>
+        <translation type="obsolete">Nueva tarea</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Pulse aquí para crear una nueva tarea.</translation>
+        <translation type="obsolete">Pulse aquí para crear una nueva tarea.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Editar Tarea</translation>
+        <translation type="obsolete">Editar Tarea</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Pulse aquí para modificar la tarea actual.</translation>
+        <translation type="obsolete">Pulse aquí para modificar la tarea actual.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Ver tarea</translation>
+        <translation type="obsolete">Ver tarea</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Eliminar...</translation>
+        <translation type="obsolete">Eliminar...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Pulse aquí para borrar la tarea actual.</translation>
+        <translation type="obsolete">Pulse aquí para borrar la tarea actual.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Borrar todo...</translation>
+        <translation type="obsolete">Borrar todo...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation>Borrado completado</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>Emitir</translation>
+        <translation type="obsolete">Emitir</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Pulse aquí para enviar la tarea actual a otro dispositivo.</translation>
+        <translation type="obsolete">Pulse aquí para enviar la tarea actual a otro dispositivo.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Buscar</translation>
+        <translation type="obsolete">Buscar</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation>Mostrar tareas completadas</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Mostrar sólo tareas fuera de fecha</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Mostrar fecha límite</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Mostrar barra de tareas rápida</translation>
     </message>
     <message>
         <source>Data</source>
-        <translation>Datos</translation>
+        <translation type="obsolete">Datos</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Categoría</translation>
+        <translation type="obsolete">Categoría</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Opciones</translation>
+        <translation type="obsolete">Opciones</translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation>EditorRápido</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Este es un listado de todas las tareas actuales:
 
 La lista muestra la siguiente información:
 1. Completada - una marca verde indica tarea finalizada. Pulse aquí para completar una tarea.
 2. Prioridad - una representación gráfica de la prioridad de una tarea. Haga un click doble aquí para modificarla.
 3. Descripción - descripción de la tarea. Pulse aquí para seleccionar la tarea.
 4. Fecha límite - muestra cuando vence una tarea. Esta columna puede mostrarse o esconderse en las opciones del menú.</translation>
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Todas</translation>
+        <translation type="obsolete">Todas</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Tareas fue incapaz de
 salvar sus cambios.
 Libere algo de espacio
 e inténtelo de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Tareas</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>¿todas las tareas?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>¿todas las tareas completadas?</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>En blanco</translation>
+        <translation type="obsolete">En blanco</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation>&lt;P&gt;Han llegado %1 nuevas tareas.&lt;p&gt;¿Desea añadirlas a su lista de tareas?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nuevas tareas</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Duplicar</translation>
+        <translation type="obsolete">Duplicar</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioridad</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="obsolete">Descripción</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Fecha lí­mite</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Configurar Platillas</translation>
+        <translation type="obsolete">Configurar Platillas</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Editor de plantillas</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nueva plantilla %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para fijar la prioridad de la nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Introduzca aquí la descripción de la nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Más</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para introducir información adicional en una nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Introducir</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para añadir una nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para reiniciar la información de una nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Los datos no pueden ser editados, estoy sincronizando</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Los datos no pueden ser editados, estoy sincronizando</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Vista de tablas</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dia(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Introduzca aquí una breve descripción de la tarea.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Completar </translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>En marcha </translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Comprar </translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organizar </translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Conseguir </translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Actualizar </translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Crear </translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Planificar </translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Llamar </translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Seleccione aquí la prioridad de la tarea.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Muy alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baja</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Muy baja</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Seleccione la categoría con la que organizar esta tarea.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Tarea repetitiva</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Pulse aquí si la tarea ocurre regularmente. Si lo selecciona, la frecuencia puede fijarse en la etiqueta Repetición.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Introduzca aquí cualquier información adicional sobre esta tarea.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Lista de Tareas</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation>Sumario:</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Estado:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Pulse aquí para fijar el estado actual de esta tarea.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Iniciada</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Pospuesta</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Finalizada</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>No iniciada</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progreso:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Seleccione aquí el progreso hecho es esta tarea.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Fecha inicio:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Pulse aquí para fijar la fecha en la que fue empezada esta tarea.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Fecha vencimiento:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Pulse aquí para fijar la fecha en la que esta tarea necesita estar completada.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Completada:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Pulse aquí para marcar esta tarea como completada.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Pulse aquí para fijar la fecha en la que esta tarea se completó.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Modo mantenedor:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Pulse aquí para fijar el papel de mantenedor.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Nada</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Hecho por</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Coordinador</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Mantenedor:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Este es el nombre del mantenedor actual de la tarea.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Pulse aquí para seleccionar mantenedor de la tarea.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/wellenreiter.ts b/i18n/es/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/es/wellenreiter.ts
+++ b/i18n/es/wellenreiter.ts
@@ -1,768 +1,768 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MScanListView</name>
     <message>
         <source>Net/Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manufacturer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Seen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Seen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MStatWindow</name>
     <message>
         <source>Protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProtocolListView</name>
     <message>
         <source>Protocol Family</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Perform Action</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Wellenreiter: trying to run as non-root!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have started Wellenreiter II
 as non-root. You will have
 only limited functionality.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have a dhcp client running.
 (PID = %1)
 This can severly limit scanning!
 Should I kill it for you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart your dhcp client?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Wellenreiter</name>
     <message>
         <source>Your wireless card
 should now be usable again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No device configured.
 Please reconfigure!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The configured device (%1)
 is not available on this system
 . Please reconfigure!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t bring interface &apos;%1&apos; up:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t set interface &apos;%1&apos;
 into monitor mode:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Continue with limited functionality?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t open packet capturer for
 &apos;%1&apos;:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wellenreiter II - replaying capture file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Got packet with protocol &apos;%1&apos;</source>
         <comment>Protocol Name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t do that!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No wireless
 interface available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop sniffing before
 joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
     <message>
         <source>Wellenreiter/Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wellenreiter/X11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hex</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Networks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;select&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cisco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wlan-ng</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hostap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>orinoco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;manual&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;file&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the type of driver used for sniffing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Driver:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the interface used for sniffing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Perform Autodetection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrigger the autodetection algorithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use additional PRISM header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use additional PRISM headers, if available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hop Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this, if you want to start a channel hopper.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the channel hop interval.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Adaptive(TM) Hop Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>An adaptive hopping interval dynamically changes the channel hopping parameters to listen longer on channels where traffic comes in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the channels which should be included in the channel hopping scheme. Note that due to the 802.11 channel overlay scheme you may receive data on neighbour channels of channels, even if they&apos;re not checked here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>13</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to open a file requester to choose a capture file name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Capture Files To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this to write an ethereal compatible capture file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/tmp/capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure the name of the capture file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hex View Buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>limited to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>UI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lookup MAC vendor names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this to lookup MAC vendor names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Tree On New Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this to automatically make a tree visible when a new station is detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Power Management</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this to disable power management while scanning.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action on detecting a new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wired Station:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;Ignore&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Click</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose an action to perform when a new wireless station is detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The command line to execute when a script action is performed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wireless Station:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the action to perform when a new wired station is detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose an action to perform when a new network is detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Intrusion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fake Mac:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44:44:44:44:44:44</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Try to authenticate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable active scanning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request DHCP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fake IP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.125.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable GPS logging w/ gpsd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this to log GPS coordinates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>localhost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostadress where the gps daemon listens on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port number where the gps daemon listens on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start gpsd on localhost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to start the GPS daemon on localhost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gpsd -p /dev/ttyS3 -s 4800</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
     <message>
         <source>Click here to start scanning.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to stop scanning.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to open the configure dialog.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upload a capture session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Session...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Text Log...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Hex Log...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Upload Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Configure...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sto&amp;p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Expand All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Collapse All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add something</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sniffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Demo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ready.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GPS said:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sniffing in progress!
 Please stop sniffing before closing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upload Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comments: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Logfile &apos;%1&apos; doesn&apos;t exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Can&apos;t open Logfile &apos;%1&apos;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Capture Dump was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection to %1 failed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/zlines.ts b/i18n/es/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/es/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/zsafe.ts b/i18n/es/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/es/zsafe.ts
+++ b/i18n/es/zsafe.ts
@@ -1,822 +1,832 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
         <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
         <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
         <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
         <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
         <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
         <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
         <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
         <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/zsame.ts b/i18n/es/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/es/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>