Merge from BRANCH_1_0.

80 files changed, 4680 insertions, 3731 deletions

diff --git a/i18n/es/.directory b/i18n/es/.directory
index d93b296..84db6e9 100644
--- a/i18n/es/.directory
+++ b/i18n/es/.directory
@@ -6,3 +6,5 @@ Name[it]=Spagnolo
 Name[pt]=Espanhol
 Name[pt_PT]=Espanhol
 Name[sl]=Španščina
+Name[de]=Spanisch
+Name[nl]=Spaans
\ No newline at end of file
diff --git a/i18n/es/addressbook.ts b/i18n/es/addressbook.ts
index 6046f8b..4271ed1 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -145,8 +145,7 @@ inténtelo de nuevo.
         <translation>&amp;No</translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
+        <source>Unable to find a contact for this search pattern!</source>
         <translation>¡Incapaz de encontrar un contacto
 con ese patrón de búsqueda!</translation>
     </message>
diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index 9a05c97..3a70159 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -194,12 +194,6 @@ de los ficheros %1?</translation>
         <translation>¿Borrar directorio?</translation>
     </message>
     <message>
-        <source>Really delete
-</source>
-        <translation>Confirme borrado
-</translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation>¿Confirma la copia
@@ -241,14 +235,6 @@ y está bajo licencia GPL
 </translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!!</source>
-        <translation>No puedo borrar el directorio
-actual de los favoritos.
-¡No está entre los favoritos!</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Directorio de favoritos</translation>
     </message>
@@ -260,6 +246,42 @@ actual de los favoritos.
         <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
+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
+y todo su contenido?</translation>
+    </message>
+    <message>
+        <source>Really delete
+%1?</source>
+        <translation>¿Confirma el borrado
+de %1?</translation>
+    </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="obsolete">Gestor de Ficheros Avanzado :: </translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="obsolete"> kB libres</translation>
+    </message>
+    <message>
+        <source>Copy &apos;%1&apos; As</source>
+        <translation type="obsolete">Copiar &quot;%1&quot; como</translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -271,6 +293,24 @@ actual de los favoritos.
         <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>
@@ -314,5 +354,25 @@ actual de los favoritos.
         <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>
 </context>
 </TS>
diff --git a/i18n/es/appskey.ts b/i18n/es/appskey.ts
deleted file mode 100644
index 93d95bf..0000000
--- a/i18n/es/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation>Teclas de Aplicación</translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation>Contactos</translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation>Inicio</translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation>Menú emergente</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>Correo</translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation>Calendario</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/aqpkg.ts b/i18n/es/aqpkg.ts
index c387fa2..ff7600b 100644
--- a/i18n/es/aqpkg.ts
+++ b/i18n/es/aqpkg.ts
@@ -108,6 +108,10 @@
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation>%1 Kb</translation>
+    </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
@@ -153,6 +157,87 @@
     </message>
 </context>
 <context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation>Tratando con el paquete %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation>Eliminando enlaces simbólicos...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation>Creando enlaces simbólicos para %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation>Creando enlaces simbólicos para %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation>Finalizado</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation>Eliminando entrada de estado...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation>fichero de estado - </translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation>paquete - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation>No pude abrir fichero de estado - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation>No pude crear fichero temporal de estado - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation>No pude iniciar proceso ipkg</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation>No pude abrir :</translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation>Creando directorio </translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation>Enlazando %1 a %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation>Fallo al enlazar %1 a %2</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation>Eliminado %1</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation>Fallo al borrar %1</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation>Eliminado </translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation>Fallo al borrar </translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
@@ -331,34 +416,6 @@ Pulse en el recuadro de la izquierda para seleccionar un paquete.</translation>
 <byte value="x9"/>%1</translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="obsolete">Instalado en - %1</translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="obsolete">Descripción - %1</translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="obsolete">Tamaño - %1</translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="obsolete">Sección - %1</translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="obsolete">Nombre fichero - %1</translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="obsolete">Ver. instalada - %1</translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="obsolete">Ver. disponible - %1</translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation>Refrescando listas de paquetes del servidor</translation>
     </message>
@@ -445,7 +502,7 @@ Opie/Qtopia está corriendo!
     </message>
     <message>
         <source>R</source>
-        <translation>R</translation>
+        <translation type="obsolete">R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
@@ -459,7 +516,7 @@ Opie/Qtopia está corriendo!
     </message>
     <message>
         <source>U</source>
-        <translation>U</translation>
+        <translation type="obsolete">U</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
@@ -510,6 +567,52 @@ Opie/Qtopia está corriendo!
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation>Paquetes instalados</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation>Paquetes locales</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/D</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation>Paquete - %1
+             versión - %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation>
+             versión inst - %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation>Cadena de versión vacía.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation>Época en versión no numérica.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation>Nada después del punto en el número de verisión.</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation>Borrar</translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
diff --git a/i18n/es/backgammon.ts b/i18n/es/backgammon.ts
index 4eb9e18..7526bef 100644
--- a/i18n/es/backgammon.ts
+++ b/i18n/es/backgammon.ts
@@ -1,2 +1,170 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation>Configuración</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Rescatar&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation>?</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Eliminar&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Exponer&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Proteger&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Seguro&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Vacío&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation>Valores predefinidos</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Ayuda</translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation>Traer las piezas fuera de la zona final</translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation>Eliminar una pieza del oponente</translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation>Exponer sus propias piezas.
+Después de ese movimiento sólo una pieza permanecerá en la casilla</translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation>Proteger una sóla pieza
+colocando otra en esta casilla</translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation>Mover pieza a una casilla ya
+ocupada por el jugador</translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation>Mover pieza a una casilla vacía</translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation>Pulse y mantenga el botón ?
+junto a un campo para obtener ayuda</translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation>Backgammon</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nuevo</translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation>Cargar</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation>Juego</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Predefinidos</translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation>Tema</translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation>Jugador</translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation>IA</translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation>Reglas</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opciones</translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation>¿tema borrado %1?</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation>Cargar tema</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation>&lt;b&gt;sin movimiento&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Ganó el jugador 1. Pulse en el tablero para jugar de nuevo.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Ganó el jugador 2. Pulse en el tablero para jugar de nuevo.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>&lt;b&gt;Turno J2&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>&lt;b&gt;Turno J1&lt;/b&gt;</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/backup.ts b/i18n/es/backup.ts
index f1b0f41..e04d750 100644
--- a/i18n/es/backup.ts
+++ b/i18n/es/backup.ts
@@ -9,6 +9,52 @@
         <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>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>Restauración exitosa.</translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
@@ -48,5 +94,24 @@
         <source>&amp;Restore</source>
         <translation>&amp;Restaurar</translation>
     </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation>Actualizar lista ficheros</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/bounce.ts b/i18n/es/bounce.ts
index 7e3c9d3..27f6f3a 100644
--- a/i18n/es/bounce.ts
+++ b/i18n/es/bounce.ts
@@ -103,5 +103,29 @@ You get %2 lives this time!</source>
         <translation>En el nivel %1.
 ¡Tiene %2 vidas esta vez!</translation>
     </message>
+    <message>
+        <source>About</source>
+        <translation>Sobre</translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation>Escrito por: Stefan Schimanski
+Migración por: Martin Imobersteg
+
+Haga clic para formar paredes.
+Espacio para conmutar la dirección.
+Intente reducir el espacio total un 75%.
+
+Este programa se distribuye bajo
+los términos de la GPL v2.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/calibrate.ts b/i18n/es/calibrate.ts
new file mode 100644
index 0000000..2626c86
--- a/dev/null
+++ b/i18n/es/calibrate.ts
@@ -0,0 +1,15 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation>Pulse sobre las cruces firmemente y con
+pecisión para calibrar la pantalla.</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation>Bienvenido a Opie</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/checkbook.ts b/i18n/es/checkbook.ts
index b50c010..1c55e32 100644
--- a/i18n/es/checkbook.ts
+++ b/i18n/es/checkbook.ts
@@ -450,7 +450,7 @@ El valor introducido debe siempre ser positivo.</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>Electrónica</translation>
+        <translation type="obsolete">Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
@@ -516,5 +516,9 @@ El valor introducido debe siempre ser positivo.</translation>
         <source>Cash</source>
         <translation>Efectivo</translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation>Electrónica</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/clock.ts b/i18n/es/clock.ts
index 1b8789b..9e7ae6f 100644
--- a/i18n/es/clock.ts
+++ b/i18n/es/clock.ts
@@ -49,6 +49,10 @@
         <source>Clock: Alarm was missed.</source>
         <translation>Reloj: alarma perdida.</translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation>Alarma ajustada: %1</translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
diff --git a/i18n/es/datebook.ts b/i18n/es/datebook.ts
index 499010d..0dad7a2 100644
--- a/i18n/es/datebook.ts
+++ b/i18n/es/datebook.ts
@@ -94,6 +94,10 @@ Libere espacio y vuelva a intentarlo.
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation>diálogo de error</translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
@@ -191,6 +195,10 @@ Libere espacio y vuelva a intentarlo.
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>Emitir esta aparición</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
@@ -356,6 +364,14 @@ Libere espacio y vuelva a intentarlo.
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation>LMXJVSDL</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
@@ -376,43 +392,43 @@ Libere espacio y vuelva a intentarlo.
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
+        <source>p</source>
+        <translation>p</translation>
+    </message>
+    <message>
+        <source>Mo</source>
         <comment>Monday</comment>
-        <translation>L</translation>
+        <translation type="obsolete">Lu</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Tu</source>
         <comment>Tuesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">Ma</translation>
     </message>
     <message>
-        <source>W</source>
+        <source>We</source>
         <comment>Wednesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">Mi</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Th</source>
         <comment>Thursday</comment>
-        <translation>J</translation>
+        <translation type="obsolete">Ju</translation>
     </message>
     <message>
-        <source>F</source>
+        <source>Fr</source>
         <comment>Friday</comment>
-        <translation>V</translation>
+        <translation type="obsolete">Vi</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Sa</source>
         <comment>Saturday</comment>
-        <translation>S</translation>
+        <translation type="obsolete">Sa</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Su</source>
         <comment>Sunday</comment>
-        <translation>D</translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation>p</translation>
+        <translation type="obsolete">Do</translation>
     </message>
 </context>
 <context>
@@ -546,6 +562,13 @@ Libere espacio y vuelva a intentarlo.
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
@@ -706,6 +729,10 @@ y </translation>
         <source>, and </source>
         <translation>, y </translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>en </translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
diff --git a/i18n/es/drawpad.ts b/i18n/es/drawpad.ts
index 8b702ae..0ed1e49 100644
--- a/i18n/es/drawpad.ts
+++ b/i18n/es/drawpad.ts
@@ -270,6 +270,10 @@ las páginas?</translation>
         <source>DrawPad - Export</source>
         <translation>Pizarra - Exportar</translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation>Todas las imágenes</translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
@@ -285,6 +289,10 @@ las páginas?</translation>
         <source>DrawPad - Import</source>
         <translation>Pizarra - Importar</translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation>Todas las imágenes</translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
diff --git a/i18n/es/euroconv.ts b/i18n/es/euroconv.ts
index 4eb9e18..5f508d1 100644
--- a/i18n/es/euroconv.ts
+++ b/i18n/es/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation>Euroconv</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/filebrowser.ts b/i18n/es/filebrowser.ts
deleted file mode 100644
index 2587045..0000000
--- a/i18n/es/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation>Gestor Ficheros</translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation>Carpeta</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>Ordenar</translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation>por nombre </translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation>por tamaño </translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation>por fecha </translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation>por tipo </translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation>Ascendente</translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation>Oculto</translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation>Enlaces</translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation>Miniaturas</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Vista</translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation>Carpeta anterior</translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation>Carpeta superior</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nueva carpeta</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>/</source>
-        <translation>/</translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation>Gestor Ficheros</translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation>No puedo mostar /dev/.</translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation>Renombrar fichero</translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation>¡Renombrar falló!</translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation>Pegar fichero</translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation>¡Pegar falló!</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation>Cortar fichero</translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation>¡Cortar falló!</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation>¿Está seguro?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Sí</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation>¡Borrar falló!</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nueva carpeta</translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation>¡Crear carpeta falló!</translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation>Lanzar aplicación</translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation>¡Aplicación falló!</translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation>Añadir a documentos</translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation>Ejecutar</translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation>Ver como texto</translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation>Renombrar</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>Change Permissions</source>
-        <translation>Cambiar permisos</translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation>Seleccionar todo</translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation>Deseleccionar todo</translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation>Cambiar permisos</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 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>
-</context>
-</TS>
diff --git a/i18n/es/formatter.ts b/i18n/es/formatter.ts
index 6ce0ea0..7838566 100644
--- a/i18n/es/formatter.ts
+++ b/i18n/es/formatter.ts
@@ -26,7 +26,7 @@
 Changing parameters on this 
 page may cause your system 
 to stop functioning properly!!</source>
-        <translation>Atención:
+        <translation type="obsolete">Atención:
 ¡¡Cambiar los parámetros de esta página
 puede causar que susistema deje de
 funcionar correctamente!!</translation>
@@ -53,7 +53,7 @@ funcionar correctamente!!</translation>
     </message>
     <message>
         <source>Format?!?</source>
-        <translation>¿¡¿Formatear?!?</translation>
+        <translation type="obsolete">¿¡¿Formatear?!?</translation>
     </message>
     <message>
         <source>Really format
@@ -64,13 +64,13 @@ funcionar correctamente!!</translation>
     <message>
         <source>
 with </source>
-        <translation>
+        <translation type="obsolete">
 con </translation>
     </message>
     <message>
         <source> filesystem?!?
 You will loose all data!!</source>
-        <translation> sistema de ficheros?!?
+        <translation type="obsolete"> sistema de ficheros?!?
 ¡¡Perderá todos sus datos!!</translation>
     </message>
     <message>
@@ -129,7 +129,7 @@ ha sido formateado con éxito.</translation>
     </message>
     <message>
         <source>Trying to mount.</source>
-        <translation>Intentando montar.</translation>
+        <translation type="obsolete">Intentando montar.</translation>
     </message>
     <message>
         <source>Card mount failed!</source>
@@ -138,7 +138,7 @@ ha sido formateado con éxito.</translation>
     <message>
         <source>
 has been successfully mounted.</source>
-        <translation>
+        <translation type="obsolete">
 ha sido montado con éxito.</translation>
     </message>
     <message>
@@ -151,7 +151,7 @@ ha sido montado con éxito.</translation>
     </message>
     <message>
         <source>Storage Type : </source>
-        <translation>Tipo almacenamiento : </translation>
+        <translation type="obsolete">Tipo almacenamiento : </translation>
     </message>
     <message>
         <source>Total: %1 kB ( %d mB)
@@ -169,5 +169,53 @@ ha sido montado con éxito.</translation>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Disponible: %1 KB ( %d MB)</translation>
     </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
+        <translation>ATENCIÓN:
+¡Cambiar parámetros en esta página
+puede causar que su sistema
+deje de funcionar correctamente!</translation>
+    </message>
+    <message>
+        <source>Format?</source>
+        <translation>¿Formato?</translation>
+    </message>
+    <message>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation>
+con el sistema de ficheros %1?
+¡¡Perderá todos los datos!!</translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation>Intentando desmontar %1.</translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation>Intentando montar %1.</translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation>%1
+ha sido montado con éxito.</translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation>Tipo de almacenamiento: %1</translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
+        <translation>Tipo: %1
+Formateado con %2
+%3, %4, %5</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/helpbrowser.ts b/i18n/es/helpbrowser.ts
index d3c4fb5..fc370a9 100644
--- a/i18n/es/helpbrowser.ts
+++ b/i18n/es/helpbrowser.ts
@@ -30,8 +30,8 @@
         <translation>Navegador de ayuda</translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
-        <translation>NavegadorAyuda</translation>
+        <source>Go</source>
+        <translation>Ir</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/kpacman.ts b/i18n/es/kpacman.ts
index f26d434..959e492 100644
--- a/i18n/es/kpacman.ts
+++ b/i18n/es/kpacman.ts
@@ -95,14 +95,8 @@ Quiero agradecer a mi novia Elke Krueers sus
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation>Error de configuración</translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation>No hay esquemas definidos, o
-no seleccionó ningún esquema.</translation>
+        <source>KPacman</source>
+        <translation>KPacman</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/es/launchersettings.ts b/i18n/es/launchersettings.ts
index 23a7e6f..1b26e47 100644
--- a/i18n/es/launchersettings.ts
+++ b/i18n/es/launchersettings.ts
@@ -38,7 +38,7 @@
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Muestra 1</translation>
diff --git a/i18n/es/libfreetypefactory.ts b/i18n/es/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/es/libfreetypefactory.ts
+++ b/i18n/es/lib.ts
diff --git a/i18n/es/libbatteryapplet-ipaq.ts b/i18n/es/libbatteryapplet-ipaq.ts
deleted file mode 100644
index e63cf3d..0000000
--- a/i18n/es/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation>Estado Batería iPAQ</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>Charging</source>
-        <translation>Cargando</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation>Porcentaje batería restante</translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation>Estado batería:</translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation>Bien</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation>Baja</translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation>Muy baja</translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation>Crítica</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>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation>Porcentaje batería restante:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation>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>Close</source>
-        <translation>Cerrar</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/libclockapplet.ts b/i18n/es/libclockapplet.ts
index 4eb9e18..db92457 100644
--- a/i18n/es/libclockapplet.ts
+++ b/i18n/es/libclockapplet.ts
@@ -1,2 +1,5 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+</context>
 </TS>
diff --git a/i18n/es/libdialup.ts b/i18n/es/libdialup.ts
deleted file mode 100644
index 152b51d..0000000
--- a/i18n/es/libdialup.ts
+++ b/dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>Dial-up </source>
-        <translation>Marcación </translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation>Cuenta</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nombre usuario:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Contraseña:</translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation>Teléfono:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation>Módem</translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation>AT-dial:</translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation>ATDT</translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation>ATDP</translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation>Velocidad:</translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation>4800</translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation>9600</translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation>19200</translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation>38400</translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation>57600</translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation>115200</translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation>Tiempo espera:</translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation>1</translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation>seg</translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation>Control flujo:</translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation>Control flujo hardware</translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation>Petición marcado</translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation>Conexión y desconexión manual</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation> segundos</translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation>Interrupción inactivo:</translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation>Conexión y desconexión automática</translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation>Conexión manual, desconexión automática</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Red</translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation>Autodetectar nombre servidores</translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation>Pasarela</translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation>Autodetectar encaminamineto</translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation>Primer DNS</translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation>Segundo DNS</translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation>Proxies</translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation>Dispositivo:</translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation>IrDa</translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation>PCMCIA</translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation>Serie</translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation>Esperando actividad</translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation>Inicializando módem</translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation>Conectando</translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation>Autentificando</translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation>Sin tono marcado</translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation>Sin portadora</translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation>Número ocupado</translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation>Espera agotada</translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation>Falló la conexión</translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation>Falló la autentificación</translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation>Conectado</translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation>Configuración proxy</translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation>Sin proxies</translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation>Autoconfigurar proxies</translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation>Fijar proxies</translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation>Configuración:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Puerto:</translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation>HTTP:</translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation>FTP:</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation>Máquina:</translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation>Sin proxies para:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/libflatstyle.ts b/i18n/es/libflatstyle.ts
index 4eb9e18..6e69a24 100644
--- a/i18n/es/libflatstyle.ts
+++ b/i18n/es/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation>Plano</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libinterfaces.ts b/i18n/es/libinterfaces.ts
index 76088b2..48fb2c5 100644
--- a/i18n/es/libinterfaces.ts
+++ b/i18n/es/libinterfaces.ts
@@ -104,6 +104,10 @@
         <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>
@@ -143,6 +147,10 @@
         <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>
diff --git a/i18n/es/libkppp.ts b/i18n/es/libkppp.ts
new file mode 100644
index 0000000..b184b3f
--- a/dev/null
+++ b/i18n/es/libkppp.ts
@@ -0,0 +1,1263 @@
+<!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>
+</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/liblan.ts b/i18n/es/liblan.ts
deleted file mode 100644
index 16748cc..0000000
--- a/i18n/es/liblan.ts
+++ b/dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Lan</name>
-    <message>
-        <source>LAN Setup</source>
-        <translation>Configurar red local</translation>
-    </message>
-    <message>
-        <source>This name already
-exists. Please choose a
-different name.</source>
-        <translation>Este nombre ya
-existe. Por favor, elija
-uno diferente.</translation>
-    </message>
-</context>
-<context>
-    <name>LanBase</name>
-    <message>
-        <source>LAN </source>
-        <translation>LAN </translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation>Cuenta</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-    <message>
-        <source>Specify TCP/IP Information</source>
-        <translation>Especificar información TCP/IP</translation>
-    </message>
-    <message>
-        <source>Obtain TCP/IP Information Automatically</source>
-        <translation>Obtener información TCP/IP automáticamente</translation>
-    </message>
-    <message>
-        <source>TCP/IP</source>
-        <translation>TCP/IP</translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation>Dirección IP</translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation>Pasarela</translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation>Máscare subred</translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation>Difusión</translation>
-    </message>
-    <message>
-        <source>DNS</source>
-        <translation>DNS</translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation>Primer DNS</translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation>Segundo DNS</translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation>Proxies</translation>
-    </message>
-</context>
-<context>
-    <name>LanState</name>
-    <message>
-        <source>Form2</source>
-        <translation>Impreso2</translation>
-    </message>
-    <message>
-        <source>Service:</source>
-        <translation>Servicio:</translation>
-    </message>
-    <message>
-        <source>IP address:</source>
-        <translation>Dirección IP:</translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation>0.0.0.0</translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation>Configurar proxies</translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation>Sin proxies</translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation>Auto-configurar proxies</translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation>Fijar proxies</translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation>Configuración:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Puerto:</translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation>HTTP:</translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation>FTP:</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation>Máquina:</translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation>Sin proxies para:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/libliquid.ts b/i18n/es/libliquid.ts
index 953197c..a124a27 100644
--- a/i18n/es/libliquid.ts
+++ b/i18n/es/libliquid.ts
@@ -14,7 +14,7 @@
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Sin transparencias</translation>
+        <translation>Sin transparencia</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
@@ -50,15 +50,15 @@
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Usar texto del menú sombreado</translation>
+        <translation>Usar texto del munú sombreado</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Botones planos en barra herramientas</translation>
+        <translation>Botones de barra de herramientas planos</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Puntear contraste</translation>
+        <translation>Contraste punteado</translation>
     </message>
 </context>
 <context>
@@ -69,7 +69,7 @@
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Estilo Líquido de alto rendimiento por Mosfet</translation>
+        <translation>Estilo de alto rendimiento Liquid por Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libmpeg3plugin.ts b/i18n/es/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/es/libmpeg3plugin.ts
+++ b/i18n/es/libmodplugin.ts
diff --git a/i18n/es/libnetmonapplet.ts b/i18n/es/libnetmonapplet.ts
deleted file mode 100644
index 12984a7..0000000
--- a/i18n/es/libnetmonapplet.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>NetMonitor</name>
-    <message>
-        <source>Network Offline</source>
-        <translation>Red desconectada</translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation>Desconectar</translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation>Conectar</translation>
-    </message>
-</context>
-<context>
-    <name>NetPassword</name>
-    <message>
-        <source>Network Password</source>
-        <translation>Contraseña de red</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation>Conectar</translation>
-    </message>
-    <message>
-        <source>Enter password for %1:</source>
-        <translation>Contraseña para %1:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/libopie.ts b/i18n/es/libopie.ts
index f40571d..328e2dd 100644
--- a/i18n/es/libopie.ts
+++ b/i18n/es/libopie.ts
@@ -1,5 +1,185 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation>Botón Calendario</translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation>Botón Contactos</translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation>Botón Menú</translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation>Botón Correo</translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation>Botón Inicio</translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation>Botón Grabación</translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation>Rotación de la pantalla</translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation>Minúscula+Arriba</translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation>Minúscula+Abajo</translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation>Minúscula+Derecha</translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation>Minúscula+Izquierda</translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation>Mayúscula+Arriba</translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation>Mayúscula+Abajo</translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation>Mayúscula+Derecha</translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation>Mayúscula+Izquierda</translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation>Tono:</translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation>Saturación:</translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation>Valor:</translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation>Rojo:</translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation>Verde:</translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation>Azul:</translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation>Canal alfa:</translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation>Seleccione color</translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation>Más</translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation>Más...</translation>
+    </message>
+</context>
+<context>
+    <name>OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation>Diálogo Fichero</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation>Nombre:</translation>
+    </message>
+</context>
+<context>
+    <name>OFileViewFileListView</name>
+    <message>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Tamaño</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
+        <translation>Tipo mime</translation>
+    </message>
+</context>
+<context>
+    <name>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation>Grande</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation>Mediana</translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation>Pequeña</translation>
+    </message>
+</context>
+<context>
+    <name>OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation>Estilo</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Tamaño</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation>El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
+    </message>
+</context>
+<context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
@@ -91,6 +271,131 @@
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation>Sin fecha final</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation>días</translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation>día</translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation>semanas</translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation>semana</translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation>meses</translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation>mes</translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation>años</translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation>año</translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation> y </translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation>,
+y </translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation>, y </translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation>No repetir</translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation>día(s)</translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation>Repetir el</translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation>Lun</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation>Mar</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation>Mie</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation>Jue</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation>Vie</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation>Sáb</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation>Dom</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation>semana(s)</translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation>Repetir cada</translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation>Día</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation>mese(s)</translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation>año(s)</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Cada</translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation>en </translation>
+    </message>
+</context>
+<context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
@@ -105,4 +410,250 @@
         <translation>Tomar hora:</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>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>&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>&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>
+</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/libopieobex.ts b/i18n/es/libopieobex.ts
index d006e47..a9c5d94 100644
--- a/i18n/es/libopieobex.ts
+++ b/i18n/es/libopieobex.ts
@@ -1,54 +1,6 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ObexDlg</name>
-    <message>
-        <source>OBEX Sending</source>
-        <translation type="obsolete">OBEX Enviando</translation>
-    </message>
-    <message>
-        <source>Sending:</source>
-        <translation type="obsolete">Enviando:</translation>
-    </message>
-    <message>
-        <source>filename</source>
-        <translation type="obsolete">fichero</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Cancelar</translation>
-    </message>
-</context>
-<context>
-    <name>ObexInc</name>
-    <message>
-        <source>OBEX Receiving</source>
-        <translation type="obsolete">OBEX Recibiendo</translation>
-    </message>
-    <message>
-        <source>TextLabel1</source>
-        <translation type="obsolete">EtiquetaTexto1</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="obsolete">Fichero</translation>
-    </message>
-    <message>
-        <source>A file was beamed 
-to you.</source>
-        <translation type="obsolete">Se emitió un fichero
-para usted.</translation>
-    </message>
-    <message>
-        <source>Insert</source>
-        <translation type="obsolete">Insertar</translation>
-    </message>
-    <message>
-        <source>Reject</source>
-        <translation type="obsolete">Rechazar</translation>
-    </message>
-</context>
-<context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Recibido:&lt;/b&gt;&lt;/qt&gt;</translation>
@@ -67,7 +19,7 @@ para usted.</translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;h1&gt;Enviando:&lt;/h1&gt;&lt;/qt&gt;</translation>
@@ -78,7 +30,7 @@ para usted.</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>¡Infrarojos no habilitados!</translation>
+        <translation>¡Infrarrojos no habilitados!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
@@ -86,7 +38,7 @@ para usted.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth no está disponible</translation>
+        <translation>Bluetooth no disponible</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
diff --git a/i18n/es/libqpe.ts b/i18n/es/libqpe.ts
index 38b016f..a90b130 100644
--- a/i18n/es/libqpe.ts
+++ b/i18n/es/libqpe.ts
@@ -398,6 +398,17 @@ editando las categorías.</translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation>Sí</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
@@ -466,7 +477,7 @@ Libere memoria e intételo de nuevo.</translation>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
-        <translation>¿Seguro que quiere borrar
+        <translation type="obsolete">¿Seguro que quiere borrar
 %1?</translation>
     </message>
     <message>
@@ -769,27 +780,6 @@ Libere memoria e intételo de nuevo.</translation>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
-    <message>
-        <source>%1 document</source>
-        <translation>%1 documento</translation>
-    </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
-    <message>
-        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation>&lt;Qt&gt;No se dispone de ayuda exhaustiva para esta aplicación, sin embargo hay ayuda sensible al contexto.&lt;p&gt;Para usar esta ayuda:&lt;p&gt;&lt;ol&gt;&lt;li&gt;mantenga pulsado el botón de ayuda.&lt;li&gt;cuando la barra de título muestre &lt;b&gt;Qué es esto...&lt;/b&gt;, pulse en cualquier control.&lt;/ol&gt;&lt;/Qt&gt;</translation>
-    </message>
-    <message>
-        <source>What&apos;s this...</source>
-        <translation>Qué es esto...</translation>
-    </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>Pulse para cerrar esta ventana, descartando los cambios.</translation>
@@ -810,6 +800,75 @@ Libere memoria e intételo de nuevo.</translation>
         <source>Click to make this window use all available screen area.</source>
         <translation>Pulse para hacer que esta ventana use toda la pantalla disponible.</translation>
     </message>
+    <message>
+        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
+        <translation>&lt;Qt&gt;No se dispone de ayuda exhaustiva para esta aplicación, sin embargo hay ayuda sensible al contexto.&lt;p&gt;Para usar esta ayuda:&lt;p&gt;&lt;ol&gt;&lt;li&gt;mantenga pulsado el botón de ayuda.&lt;li&gt;cuando la barra de título muestre &lt;b&gt;Qué es esto...&lt;/b&gt;, pulse en cualquier control.&lt;/ol&gt;&lt;/Qt&gt;</translation>
+    </message>
+    <message>
+        <source>What&apos;s this...</source>
+        <translation>Qué es esto...</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;¿Seguro que quiere borrar
+%1?&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Jan</source>
+        <translation>Ene</translation>
+    </message>
+    <message>
+        <source>Feb</source>
+        <translation>Feb</translation>
+    </message>
+    <message>
+        <source>Mar</source>
+        <translation>Mar</translation>
+    </message>
+    <message>
+        <source>Apr</source>
+        <translation>Abr</translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation>May</translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation>Jun</translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation>Jul</translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation>Ago</translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation>Sep</translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation>Oct</translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation>Nov</translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation>Dic</translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
+        <translation>%1 documento</translation>
+    </message>
 </context>
 <context>
     <name>StorageInfo</name>
diff --git a/i18n/es/libtodayaddressbookplugin.ts b/i18n/es/libtodayaddressbookplugin.ts
index ac43bbc..d2824b6 100644
--- a/i18n/es/libtodayaddressbookplugin.ts
+++ b/i18n/es/libtodayaddressbookplugin.ts
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation>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>
diff --git a/i18n/es/libtodaydatebookplugin.ts b/i18n/es/libtodaydatebookplugin.ts
index b256d03..8d1a8f3 100644
--- a/i18n/es/libtodaydatebookplugin.ts
+++ b/i18n/es/libtodaydatebookplugin.ts
@@ -9,65 +9,124 @@
         <source>note</source>
         <translation>nota</translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation>Día completo</translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
     <message>
         <source>Show location</source>
-        <translation>Mostrar localidad</translation>
+        <translation type="obsolete">Mostrar localidad</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation>Verifique esto si la localización de una cita debe ser mostrada para cada una</translation>
+        <translation type="obsolete">Verifique esto si la localización de una cita debe ser mostrada para cada una</translation>
     </message>
     <message>
         <source>Show notes</source>
-        <translation>Mostrar notas</translation>
+        <translation type="obsolete">Mostrar notas</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation>Verifique esto si la nota adjunta a una cita debe ser mostrada en cada una</translation>
+        <translation type="obsolete">Verifique esto si la nota adjunta a una cita debe ser mostrada en cada una</translation>
     </message>
     <message>
         <source>Show only later
  appointments</source>
-        <translation>Mostrar sólo citas
+        <translation type="obsolete">Mostrar sólo citas
 posteriores</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
-        <translation>Verifique esto si sólo las citas porteriores al momento actual deben ser mostradas</translation>
+        <translation type="obsolete">Verifique esto si sólo las citas porteriores al momento actual deben ser mostradas</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should be 
 shown?</source>
-        <translation>¿Cuántas 
+        <translation type="obsolete">¿Cuántas 
 citas
 deben ser
 mostradas?</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation>Cuántas citas deben ser mostradas como máximo. En orden cronológico</translation>
+        <translation type="obsolete">Cuántas citas deben ser mostradas como máximo. En orden cronológico</translation>
     </message>
     <message>
         <source>How many more days</source>
-        <translation>Cuántos días mas</translation>
+        <translation type="obsolete">Cuántos días mas</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
-        <translation>Cuántos días más deben estar en el rango</translation>
+        <translation type="obsolete">Cuántos días más deben estar en el rango</translation>
     </message>
     <message>
         <source> day(s)</source>
-        <translation>día(s)</translation>
+        <translation type="obsolete">día(s)</translation>
+    </message>
+    <message>
+        <source>only today</source>
+        <translation type="obsolete">sólo hoy</translation>
+    </message>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation>DatebookPluginConfigBase</translation>
+    </message>
+    <message>
+        <source>Show location</source>
+        <translation>Mostrar localidad</translation>
+    </message>
+    <message>
+        <source>Check this if the location of an appointment should be shown for each one</source>
+        <translation>Verifique esto si la localización de una cita debe ser mostrada para cada una</translation>
+    </message>
+    <message>
+        <source>Show notes</source>
+        <translation>Mostrar notas</translation>
+    </message>
+    <message>
+        <source>Check this if the note attached to an appointment should be shown for each one</source>
+        <translation>Verifique esto si la nota adjunta a una cita debe ser mostrada en cada una</translation>
+    </message>
+    <message>
+        <source>Show only later appointments</source>
+        <translation>Mostrar sólo últimas citas</translation>
+    </message>
+    <message>
+        <source>Check this if only appointments later then current time should be shown</source>
+        <translation>Verifique esto si sólo las citas porteriores al momento actual deben ser mostradas</translation>
+    </message>
+    <message>
+        <source>Show time in extra line</source>
+        <translation>Mostrar hora en línea extra</translation>
+    </message>
+    <message>
+        <source>How many appointments should be shown maximal. In chronical order</source>
+        <translation>Cuántas citas deben ser mostradas como máximo. En orden cronológico</translation>
+    </message>
+    <message>
+        <source>How many appointment should be shown?</source>
+        <translation>¿Cuántas citas deben ser mostradas?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>sólo hoy</translation>
     </message>
+    <message>
+        <source>How many more days should be in the range</source>
+        <translation>Cuántos días más deben estar en el rango</translation>
+    </message>
+    <message>
+        <source>How many more days</source>
+        <translation>Cuántos días mas</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
diff --git a/i18n/es/libtodaytodolistplugin.ts b/i18n/es/libtodaytodolistplugin.ts
index 8a5f7e7..4a4fdd5 100644
--- a/i18n/es/libtodaytodolistplugin.ts
+++ b/i18n/es/libtodaytodolistplugin.ts
@@ -19,22 +19,41 @@
     </message>
 </context>
 <context>
+    <name>TodoPluginConfigBase</name>
+    <message>
+        <source>Set the maximum number of task that should be shown</source>
+        <translation>Fija el número máximo de tareas que deben mostrarse</translation>
+    </message>
+    <message>
+        <source>tasks shown</source>
+        <translation>tareas mostradas</translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation>Después de cuántos caracteres la información de la tarea debe ser cortada</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation>Cortar línea tras X caracteres</translation>
+    </message>
+</context>
+<context>
     <name>TodolistPluginConfig</name>
     <message>
         <source>tasks shown </source>
-        <translation>tareas mostradas </translation>
+        <translation type="obsolete">tareas mostradas </translation>
     </message>
     <message>
         <source>Set the maximum number of task that should be shown</source>
-        <translation>Fija el número máximo de tareas que deben mostrarse</translation>
+        <translation type="obsolete">Fija el número máximo de tareas que deben mostrarse</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 cuántos caracteres la información de la tarea debe ser cortada</translation>
+        <translation type="obsolete">Después de cuántos caracteres la información de la tarea debe ser cortada</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/librestartapplet.ts b/i18n/es/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/es/librestartapplet.ts
+++ b/i18n/es/libtremorplugin.ts
diff --git a/i18n/es/libwlan.ts b/i18n/es/libwlan.ts
new file mode 100644
index 0000000..868d0d1
--- a/dev/null
+++ b/i18n/es/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<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>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</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>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>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/libwlanplugin.ts b/i18n/es/libwlanplugin.ts
new file mode 100644
index 0000000..1bda8f0
--- a/dev/null
+++ b/i18n/es/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>Configuración Inalámbrica</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modo</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>ESS-ID</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>Especificar punto de &amp;acceso</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>Especificar &amp;canal</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>Gestionado</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>cualquiera</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Cifrado</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>Habilitar &amp;cifrado</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>Configuración &amp;clave</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>Clave &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>Clave &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>Clave &amp;3</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>Clave &amp;4</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>Paquetes no cifrados</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Aceptar</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>&amp;Rechazar</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Información del Interfaz</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>Canal</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modo</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>Estación</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>Tasa</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>Calidad</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Ruido</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>Señal</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/liquid-settings.ts b/i18n/es/liquid-settings.ts
deleted file mode 100644
index 5045398..0000000
--- a/i18n/es/liquid-settings.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSet</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation>Estilo Líquido</translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation>Sin transparencias</translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation>Punteado, color de fondo</translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation>Punteado, color de botón</translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation>Punteado translúcido, color de fondo</translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation>Punteado translúcido, color de botón</translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation>Transparencia propia</translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation>Color del menú</translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation>Color del texto</translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation>Opacidad</translation>
-    </message>
-    <message>
-        <source>Use shadowed text</source>
-        <translation>Usar texto sombreado</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/mailit.ts b/i18n/es/mailit.ts
index 0c8e680..f794c01 100644
--- a/i18n/es/mailit.ts
+++ b/i18n/es/mailit.ts
@@ -17,6 +17,10 @@
         <source>attach...</source>
         <translation>adjuntar...</translation>
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation>Añadiendo adjuntos</translation>
+    </message>
 </context>
 <context>
     <name>EditAccount</name>
@@ -169,6 +173,38 @@ associated to this mail
 asociada a este correo.
 No puede ser descargado</translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Respuesta desconocida del servidor&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;máquina&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;conexión reusada&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;error en paquete de conexión&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Ingreso fallido
+Verifique nombre de usuario y contraseña&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation>Reciviendo error</translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation>Ok
+</translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
@@ -203,7 +239,7 @@ El correo NO ha sido enviado</translation>
     </message>
     <message>
         <source>Examine mail</source>
-        <translation>Eximinar correo</translation>
+        <translation type="obsolete">Eximinar correo</translation>
     </message>
     <message>
         <source>Central view area</source>
@@ -221,6 +257,14 @@ has not been downloaded yet.
 no ha sido descargado todavía.
 ¿Desea hacerlo ahora?</translation>
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation>Enviarlo</translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation>Leer correo</translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
@@ -252,6 +296,10 @@ no ha sido descargado todavía.
         <source>No new messages</source>
         <translation>No hay mensajes nuevos</translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation>Búscando en DNS</translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
@@ -269,7 +317,7 @@ no ha sido descargado todavía.
     </message>
     <message>
         <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation>Este botón abre el selector de direcciones con todas las direcciones de correo de Contactos OPIE</translation>
+        <translation type="obsolete">Este botón abre el selector de direcciones con todas las direcciones de correo de Contactos OPIE</translation>
     </message>
     <message>
         <source>Enter your mail text here</source>
@@ -309,6 +357,10 @@ que puedan ser revisados con un doble clic.</translation>
         <source>Choose the recipients from this list</source>
         <translation>Elija los destinatarios de esta lista</translation>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation>Este botón abre un selector con todas las direcciones de correo en los Contactos Opie</translation>
+    </message>
 </context>
 <context>
     <name>ReadMail</name>
@@ -434,6 +486,30 @@ Mantángalo pulsado para más opciones.</translation>
         <source>Click here to install the attachment to your Documents</source>
         <translation>Pulsa aquí para instalar el adjunto en sus Documentos</translation>
     </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation>Explorando adjuntos</translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation>Adjunto</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation>Instalado</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sí</translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
@@ -549,5 +625,13 @@ y ser direcciones de correo válidas</translation>
         <source> wrote on </source>
         <translation> escrito en </translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation>Correo-e</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/mediummount.ts b/i18n/es/mediummount.ts
index c44d711..c0796e2 100644
--- a/i18n/es/mediummount.ts
+++ b/i18n/es/mediummount.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
-    <message>
-        <source>Global</source>
-        <translation>Global</translation>
-    </message>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
         <source>Medium Mount Settings</source>
         <translation>Configuración del Montador de Medios</translation>
     </message>
+    <message>
+        <source>Global</source>
+        <translation>Global</translation>
+    </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation>Si un medio se inserta en este dispositivo, Opie intenta buscar documentos en el medio. En medios grandes esto puede llevar algún tiempo. Puede elegir si Opie debe examinar globalmente o por medio. También puede reconfigurar cada medio.</translation>
+    </message>
     <message>
         <source>Enable medium checking</source>
         <translation>Habilitar comprobación medio</translation>
@@ -44,13 +48,13 @@
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
-    <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation>Si un medio se inserta en este dispositivo, Opie intenta buscar documentos en el medio. En medios grandes esto puede llevar algún tiempo. Puede elegir si Opie debe examinar globalmente o por medio. También puede reconfigurar cada medio.</translation>
-    </message>
 </context>
 <context>
-    <name>MediumMountWidget</name>
+    <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>Configurar este medio. Los cambios tendrán efecto cuando la aplicación sea cerrada. Para actualizar la etiqueta de documentos necesita quitar e insertar este medio.</translation>
+    </message>
     <message>
         <source>Which media files</source>
         <translation>Qué ficheros de medio</translation>
@@ -87,9 +91,5 @@
         <source>Always check this medium</source>
         <translation>Comprobar siempre este medio</translation>
     </message>
-    <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>Configurar este medio. Los cambios tendrán efecto cuando la aplicación sea cerrada. Para actualizar la etiqueta de documentos necesita quitar e insertar este medio.</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/es/mobilemsg.ts b/i18n/es/mobilemsg.ts
deleted file mode 100644
index 1924221..0000000
--- a/i18n/es/mobilemsg.ts
+++ b/dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <translation>Mensajes:</translation>
-    </message>
-</context>
-<context>
-    <name>MobileMsgBase</name>
-    <message>
-        <source>Mobile Messaging</source>
-        <translation>Mensajería Móvil</translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation>Número:</translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation>Enviar</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation>Texto</translation>
-    </message>
-    <message>
-        <source>Flash</source>
-        <translation>Parpadeo</translation>
-    </message>
-    <message>
-        <source>Unicode</source>
-        <translation>Unicode</translation>
-    </message>
-    <message>
-        <source>SMS: %1</source>
-        <translation>SMS: %1</translation>
-    </message>
-    <message>
-        <source>Nokia</source>
-        <translation>Nokia</translation>
-    </message>
-    <message>
-        <source>Country:</source>
-        <translation>País:</translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation>Logo</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>Grupo</translation>
-    </message>
-    <message>
-        <source>Picture</source>
-        <translation>Imagen</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Mensaje:</translation>
-    </message>
-    <message>
-        <source>EMS</source>
-        <translation>EMS</translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation>Tab</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/netsetup.ts b/i18n/es/netsetup.ts
deleted file mode 100644
index ef8a5a7..0000000
--- a/i18n/es/netsetup.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add Network Service</source>
-        <translation>Añadir servicio de red</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation>&lt;P&gt;Estos son los servicios de red disponibles para añadir.</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation>Añadir</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation>&lt;p&gt;Sólo un %1 puede ser añadido. Borre el actual, o cambie sus Propiedades&lt;p&gt;</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Red</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Network</source>
-        <translation>Red</translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation>Actual</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation>&lt;p&gt;Estado de los servicios de red en funcionamiento.</translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation>Servicios</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Añadir...</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation>&lt;P&gt;Estos son los servicios de red disponibles actualmente.</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Eliminar</translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation>Propiedades</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/networksettings.ts b/i18n/es/networksettings.ts
index 1b9de72..230682f 100644
--- a/i18n/es/networksettings.ts
+++ b/i18n/es/networksettings.ts
@@ -54,7 +54,7 @@
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>&amp;Información</translation>
+        <translation type="obsolete">&amp;Información</translation>
     </message>
     <message>
         <source>&amp;Configure</source>
@@ -84,5 +84,52 @@
         <source>New Profile</source>
         <translation>Nuevo perfil</translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation>Una lista de configuraciones de red entre las que elegir</translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation>Añadir un nuevo interfaz a la lista.</translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation>&amp;Iniciar/Parar</translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation>Iniciar y parar el interfaz actual, da información adicional sobre el interfaz.</translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation>Configurar el interfaz actual</translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation>Eliminar el interfaz actual de la lista.</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation>Desconectado</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation>Incapaz de eliminar.</translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation>Lo siento</translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation>Por favor, seleccione un interfaz primero.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/odict.ts b/i18n/es/odict.ts
index f3383a3..3dc261d 100644
--- a/i18n/es/odict.ts
+++ b/i18n/es/odict.ts
@@ -10,12 +10,16 @@
         <translation>Método de búsqueda</translation>
     </message>
     <message>
-        <source>General Settings</source>
-        <translation>Configuración General</translation>
+        <source>New</source>
+        <translation>Nuevo</translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation>Métodos de búsqueda</translation>
+        <source>Change</source>
+        <translation>Cambiar</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Borrar</translation>
     </message>
 </context>
 <context>
@@ -33,10 +37,6 @@
         <translation>&amp;Ok</translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation>Configurar</translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation>Métodos de búsqueda</translation>
     </message>
@@ -45,48 +45,32 @@
         <translation>&amp;Sensible a may/min</translation>
     </message>
     <message>
-        <source>Only &amp;complete Words</source>
-        <translation>Sólo parabras &amp;completas</translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation>Permitir expresiones &amp;reg.</translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation>0 Errores</translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation>1 Error</translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
-        <translation>2 Errores</translation>
+        <source>Settings</source>
+        <translation>Configuración</translation>
     </message>
     <message>
-        <source>3 Errors</source>
-        <translation>3 Errores</translation>
+        <source>Parameter</source>
+        <translation>Parámetro</translation>
     </message>
     <message>
-        <source>4 Errors</source>
-        <translation>4 Errores</translation>
+        <source>No dictionary defined</source>
+        <translation>Sin diccionario definido</translation>
     </message>
     <message>
-        <source>Until Hit</source>
-        <translation>Hasta acertar</translation>
+        <source>&amp;Define one</source>
+        <translation>&amp;Definir uno</translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
-        <translation>Tolerancia del &amp;error</translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <source>Parameter</source>
-        <translation>Parámetro</translation>
+        <source>Opie-Dictionary</source>
+        <translation>Diccionario-Opie</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/es/oipkg.ts b/i18n/es/oipkg.ts
deleted file mode 100644
index 48d3290..0000000
--- a/i18n/es/oipkg.ts
+++ b/dev/null
@@ -1,356 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation>Instalar</translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation>Opciones ipkg</translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation>-force-depends</translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation>-force-reinstall</translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation>-force-removal-of-essential-packages</translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation>Instalar</translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation>-force-overwrite</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation>Gestor de Paquetes</translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation>fuentes</translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation>Paquetes</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Ver</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Configurar</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation>Ayuda</translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation>Aplicar</translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation>Actualizar</translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation>Configurar</translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation>Servidores</translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation>Destinos</translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation>Cerrar sección</translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation>Secciones</translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation>Filtro: </translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation>Limpiar búsqueda</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation>Cerrar búsqueda</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation>Filtro</translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation>Limpiar búsqueda</translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation>Buscar</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Búsqueda</translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation>Destino: </translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation>Enlace</translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation>Cerrar destinos</translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation>Acciones sobre paquetes</translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation>Instalar</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation>Estado de paquetes</translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation>Nueva versión, instalada</translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation>Nueva versión, no instalada</translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation>Antigua versión, instalada</translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation>Antigua versión, no instalada</translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation>Antigua versión, la nueva instalada</translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation>Nueva versión, la antigua instalada</translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation>documentos</translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation>ipkgfind&amp;killefiz</translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation>Sección:</translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation>Buscar: </translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation>Paquete</translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation>Nuevo</translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation>Servidores de Paquetes</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Configuración</translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation>Destino instalación:</translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation>Enlazar al destino root</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation>Nuevo</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation>Servidores</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation>Destinos</translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation>enlazar a /</translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation>Borrar enlaces</translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation>volátil</translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation>borrable</translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation>Servidores usados: (Fuentes activas resaltadas)</translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation>
-Todo hecho.</translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation>Borrando</translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation>por favor espere</translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation>Error al eliminar </translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation>Instalando</translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation>Error al instalar</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation>Descripción: </translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation>Tamaño: </translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation>otros</translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation>Nombre instalación: </translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation> en </translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation>Nombre: </translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation>Enlace: </translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Sí</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation>Destino: </translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation>Estado: </translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation>Instalar en</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Borrar</translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation>procesando...</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/opie-console.ts b/i18n/es/opie-console.ts
index e61a865..ea03f7f 100644
--- a/i18n/es/opie-console.ts
+++ b/i18n/es/opie-console.ts
@@ -102,6 +102,17 @@
     </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>
@@ -469,6 +480,14 @@
         <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>
 </context>
 <context>
     <name>ModemConfigWidget</name>
@@ -514,6 +533,10 @@
         <source>Local Console</source>
         <translation>Consola local</translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation>Nuevo perfil</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
diff --git a/i18n/es/opie-login.ts b/i18n/es/opie-login.ts
index 0e75eb6..9ba6f1c 100644
--- a/i18n/es/opie-login.ts
+++ b/i18n/es/opie-login.ts
@@ -66,7 +66,7 @@ precisión para calibrar la pantalla.</translation>
 by an uncaught signal
 (%1)
 </source>
-        <translation>Opie ha terminado por
+        <translation type="obsolete">Opie ha terminado por
 una señal no capturada
 (%1)
 </translation>
@@ -77,11 +77,25 @@ una señal no capturada
     </message>
     <message>
         <source>Could not start OPIE.</source>
-        <translation>No pude iniciar Opie.</translation>
+        <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>
 </TS>
diff --git a/i18n/es/opie-sheet.ts b/i18n/es/opie-sheet.ts
deleted file mode 100644
index c9840e3..0000000
--- a/i18n/es/opie-sheet.ts
+++ b/dev/null
@@ -1,797 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation>&amp;Bordes</translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation>&amp;Fondo</translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation>&amp;Letra</translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation>A&amp;lineación</translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation>&amp;Ancho:</translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation>&amp;Color:</translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation>Bordes por &amp;defecto</translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation>&amp;Estilo:</translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation>F&amp;ondo por defecto</translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation>&amp;Letra:</translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation>&amp;Tamaño:</translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation>&amp;Negrilla</translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation>&amp;Cursiva</translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation>Letra por &amp;defecto</translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation>&amp;Vertical:</translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation>&amp;Horizontal:</translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation>Cortar &amp;líneas</translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation>&amp;Alineación por defecto</translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation>Formatear casillas</translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation>Hoja de Cálculo</translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation>&amp;Buscar &amp;&amp; reemplazar</translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation>&amp;Opciones</translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation>&amp;Buscar:</translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation>&amp;Reemplazar con:</translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation>&amp;Tipo</translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Buscar</translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation>&amp;Reemplazar</translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation>Reemplazar &amp;todo</translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation>&amp;Distinguir may/min</translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation>&amp;Selección actual sólo</translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation>&amp;Toda la casilla</translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation>Buscar &amp; reemplazar</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation>Hoja de Cálculo</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation>¡Error de inconsistencia!</translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation>¡El fichero no pudo grabarse!</translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation>¡El fichero no pudo abrirse!</translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation>¡Formato de fichero no válido!</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Grabar fichero</translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation>¿Quiere grabar el fichero actual?</translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation>N&amp;ombre fichero:</translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation>FichSinNombre</translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation>Nuevo fichero</translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation>&amp;Nuevo</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation>Abrir fichero</translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation>&amp;Abrir</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation>&amp;Grabar</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation>Grabar fichero como</translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation>Grabar &amp;como</translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation>Sobre Opie Sheet</translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation>Aceptar</translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation>&amp;Aceptar</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Cancelar</translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation>Selecionar celdilla</translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation>&amp;Selecionar celdilla</translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation>Cortar celdillas</translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation>Cor&amp;tar</translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation>Copiar celdillas</translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation>&amp;Copiar</translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation>Pegar celdillas</translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation>&amp;Pegar</translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation>Pegar contenidos</translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation>Pegar cont&amp;enidos</translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation>Borrar celdillas</translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation>&amp;Borrar</translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation>Insertar celdillas</translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation>C&amp;eldillas</translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation>Insertar filas</translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation>&amp;Filas</translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation>Insertar columnas</translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation>&amp;Columnas</translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation>Añadir hojas</translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation>&amp;Hojas</translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation>Celdillas</translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation>&amp;Celdillas</translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation>Altura filas</translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation>&amp;Altura</translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation>Ajustar filas</translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation>&amp;Ajustar filas</translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation>Mostrar fila</translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation>Mo&amp;star</translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation>Ocultar fila</translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation>&amp;Ocultar</translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation>Anchura columnas</translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation>&amp;Anchura</translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation>Ajustar columnas</translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation>Mostrar columna</translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation>Ocultar columna</translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation>Renombrar hoja</translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation>&amp;Renombrar</translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation>Eliminar hoja</translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation>&amp;Eliminar</translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation>Ordenar datos</translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation>&amp;Ordenar</translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation>Busrcar &amp;&amp; reemplazar</translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation>&amp;Buscar &amp;&amp; reemplazar</translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation>Igual a</translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation>&amp;Igual a</translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation>Adición</translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation>&amp;Adición</translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation>Substración</translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation>&amp;Substración</translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation>Multiplicación</translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation>&amp;Multiplicación</translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation>División</translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation>&amp;División</translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation>Abrir ParanthesistempCellData-&gt;fila+fila1, tempCellData-&gt;col+col1</translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation>&amp;Abrir paréntesis</translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation>Cerrar paréntesis</translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation>&amp;Cerrar paréntesis</translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation>Coma</translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation>&amp;Coma</translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation>&amp;Fichero</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation>&amp;Insertar</translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation>F&amp;ormato</translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation>&amp;Datos</translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation>Fil&amp;a</translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation>Colum&amp;na</translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation>&amp;Hoja</translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation>&amp;Función</translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation>E&amp;standard</translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation>Suma</translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation>&amp;Suma</translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation>Valor absoluto</translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation>&amp;Asoluto</translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation>Seno</translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation>Se&amp;no</translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation>Arco seno</translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation>A&amp;rco seno</translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation>Coseno</translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation>&amp;Coseno</translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation>Arco coseno</translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation>Arco cos&amp;eno</translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation>Tangente</translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation>&amp;Tangente</translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation>Arco tangente</translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation>Arco tan&amp;gente</translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation>Arco tangente de coordenadas</translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation>Arco tangente co&amp;or</translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation>Exponencial</translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation>&amp;Exponencial</translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation>Logaritmo</translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation>&amp;Logaritmo</translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation>Potencia</translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation>&amp;Potencia</translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation>&amp;Matemática</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation>Media</translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation>Medi&amp;a</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation>Máximo</translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation>Má&amp;ximo</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation>Mínimo</translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation>&amp;Mínimo</translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation>Contador</translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation>&amp;Contador</translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation>E&amp;stadístico</translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation>Funciones</translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation>&amp;Número de filas:</translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation>&amp;Número de columnas:</translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation>&amp;Número de hojas:</translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation>Hoja</translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation>&amp;Altura de cada fila:</translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation>A&amp;nchura de cada columna:</translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation>&amp;Nombre hoja:</translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation>¡Sólo hay una hoja!</translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation>¿Está seguro?</translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation>&amp;Tipo</translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation>Mover cel&amp;dillas abajo</translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation>Move&amp;r celdillas derecha</translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation>Toda la &amp;fila</translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation>Toda la &amp;columna</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>Opie Sheet
-Software de hoja de cálculo para Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Desarrolado por: Serdar Ozler
-Versión 1.0.2
-Fecha de publicación: 8 de octubre de 2002
-
-Este producto está bajo licencia GPL. Es distribuible libremente. Si quiere la última versión y el código fuente, por favor visite el sitio web.
-
-http://qtopia.sitebest.com</translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation>¡Error sintáctico!</translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation>¡Búsqueda no encotrada!</translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation>&amp;Ordenar</translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation>O&amp;pciones</translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation>&amp;Ordenar por</translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation>&amp;Luego por</translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation>Luego &amp;por</translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation>&amp;Distinguir may/min</translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation>Di&amp;rección</translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation>&amp;Bajando (filas)</translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation>De iqz a dch (&amp;columnas)</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>Ordenar</translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation>&amp;Ascendente</translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation>&amp;Descendente</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation>¡Una celdilla no puedo ser ordenada!</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/opieftp.ts b/i18n/es/opieftp.ts
index 9387991..196f943 100644
--- a/i18n/es/opieftp.ts
+++ b/i18n/es/opieftp.ts
@@ -70,10 +70,6 @@
         <translation>Cambiar a configurar</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="obsolete">Sobre</translation>
-    </message>
-    <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
diff --git a/i18n/es/opieirc.ts b/i18n/es/opieirc.ts
index 7f44f23..f3a195a 100644
--- a/i18n/es/opieirc.ts
+++ b/i18n/es/opieirc.ts
@@ -61,15 +61,15 @@
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command : </source>
-        <translation>Recivido comando numérico desatendido : </translation>
+        <translation type="obsolete">Recivido comando numérico desatendido : </translation>
     </message>
     <message>
         <source>Received unhandled ctcp command : </source>
-        <translation>Recivido comando ctcp desatendido : </translation>
+        <translation type="obsolete">Recivido comando ctcp desatendido : </translation>
     </message>
     <message>
         <source>Received unhandled literal command : </source>
-        <translation>Recivido comando literal desatendido : </translation>
+        <translation type="obsolete">Recivido comando literal desatendido : </translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
@@ -77,7 +77,7 @@
     </message>
     <message>
         <source> joined channel </source>
-        <translation>canal unido</translation>
+        <translation type="obsolete">canal unido</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
@@ -89,11 +89,11 @@
     </message>
     <message>
         <source>You left channel </source>
-        <translation>Deja el canal</translation>
+        <translation type="obsolete">Deja el canal</translation>
     </message>
     <message>
         <source> left channel </source>
-        <translation>dejar canal</translation>
+        <translation type="obsolete">dejar canal</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
@@ -109,7 +109,7 @@
     </message>
     <message>
         <source>Channel message with unknown channel </source>
-        <translation>Mensaje del canal con canal desconocido</translation>
+        <translation type="obsolete">Mensaje del canal con canal desconocido</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
@@ -117,11 +117,11 @@
     </message>
     <message>
         <source>You are now known as </source>
-        <translation>Ahora es conocido como </translation>
+        <translation type="obsolete">Ahora es conocido como </translation>
     </message>
     <message>
         <source> is now known as </source>
-        <translation>es ahora conocimo como</translation>
+        <translation type="obsolete">es ahora conocimo como</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
@@ -129,7 +129,7 @@
     </message>
     <message>
         <source> has quit </source>
-        <translation>ha salido </translation>
+        <translation type="obsolete">ha salido </translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
@@ -219,6 +219,46 @@
         <source>No such nickname</source>
         <translation>No hay tal apodo</translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation>Recivido comando numérico no manejado: %1</translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation>Recivido comando ctcp no manejado: %1</translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation>Recivido 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>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation>%1 es ahora conocido como %2</translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation>%1 ha salido (%2)</translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -462,6 +502,10 @@ de canales que empiezan por &apos;#&apos; o &apos;+&apos;</translation>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation>Configuración</translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
diff --git a/i18n/es/opiemail.ts b/i18n/es/opiemail.ts
deleted file mode 100644
index 3de7c15..0000000
--- a/i18n/es/opiemail.ts
+++ b/dev/null
@@ -1,345 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation>Responder</translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation>Resp todos</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Borrar</translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation>Impreso1</translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation>CC</translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation>Asunto</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation>Reiniciar</translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation>Cola</translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation>Enviar</translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation>De:</translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation>Para:</translation>
-    </message>
-</context>
-<context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation>Ver</translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation>Componer</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Configuración</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>Correo</translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation>Buzones</translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation>Configurar correo-e</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation>Configuración del correo-e</translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation>Carpetas</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Añadir</translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation>&amp;Modificar</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Borrar</translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation>Nombre carpeta</translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation>Identidad</translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation>Transporte</translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation>Entrada</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation>Carpeta</translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation>Usuario</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation>Servidor</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation>Protocolo</translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation>Salida</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation>Borrar buzón</translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation>¿Eliminar buzón?
-Su correos se borrarán.</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation>Configurar carpeta correo-e</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation>Descripción:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation>Identidad correo-e - Configurar</translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation>Firma:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation>Identidad:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation>Organización:</translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation>Correo-e:</translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation>Responder a</translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation>Usar para envío</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation>EntradaCorreoE</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation>Servidor:</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation>Protocolo</translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation>Carpeta destino</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nombre usuario:</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation>Clave</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation>Puerto</translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation>110</translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation>Activar intervalo comprobación.</translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation>Comprobar cada:</translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation> minutos</translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation>&amp;Borrar correo del servidor al borrar el local.</translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation>&amp;Mantener correo en el servidor</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation>SalidaCorreoE</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation>Protocolo</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation>Servidor:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nombre usuario:</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation>Clave</translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation>Servidor requiere autentificación</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation>Puerto</translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation>25</translation>
-    </message>
-</context>
-<context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation>Asunto</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Para</translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation>Remitente</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation>(Re)editar</translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation>Copiar a</translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation>Mover a</translation>
-    </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation>Impreso1</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/opieplayer.ts b/i18n/es/opieplayer.ts
index cd93d64..b1e11dd 100644
--- a/i18n/es/opieplayer.ts
+++ b/i18n/es/opieplayer.ts
@@ -205,13 +205,13 @@ Cerrando reproductor.</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>Sin espacio</translation>
+        <translation type="obsolete">Sin espacio</translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
-        <translation>Hubo un problema guardando la lista.
+        <translation type="obsolete">Hubo un problema guardando la lista.
 Su lista puede haber perdido alguna entrada
 la próxima vez que la inicie.</translation>
     </message>
diff --git a/i18n/es/opieplayer2.ts b/i18n/es/opieplayer2.ts
deleted file mode 100644
index 4c6e975..0000000
--- a/i18n/es/opieplayer2.ts
+++ b/dev/null
@@ -1,240 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation>Reproductor Opie</translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation>Reproductor Opie: Inicializando</translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation>Reproductor Opie: </translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation>Fichero: </translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation>, longitud: </translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation>Volumen </translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation>Título</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation>Tamaño</translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation>Medio</translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation>Ruta</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation>Selección lista</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation>Añadir a lista</translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation>Borrar de la lista</translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation>Reproducir</translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation>Aleatorio</translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation>Ciclo</translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation>Limpiar lista</translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation>Añadir todos los ficheros de audio</translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation>Añadir todos los ficheros de video</translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation>Añadir todos los ficheros</translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation>Salvar lista</translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation>Abrir fichero o URL</translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation>Reexaminar ficheros de audio</translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation>Reexaminar ficheros de video</translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation>Pantalla completa</translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation>Subir</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation>Bajar</translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation>Reproducir seleccionados</translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation>Fichero no válido</translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation>Hubo un problema obteniendo el fichero.</translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation>¿Borrar lista?</translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation>¿Seguro que quiere borrar
-esta lista de reproducción?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Sí</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation>Abrir fichero o URL</translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation>Reproductor Opie: </translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation>Salvar lista m3u</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation>Operaciones reproducción</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation>Fichero</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Ver</translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation>Carátulas</translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation>Gamma (vídeo)</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation>Audio</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation>Vídeo</translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation>Listas</translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation>Reproductor Opie - Vídeo</translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation>Fallo</translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation>No encontré módulo de entrada para este tipo de medio</translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation>No encontré módulo decodificador para este tipo de medio</translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation>Falló la descodificación de este tipo de medio</translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation>MRL incorrecta</translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation>Algún otro error</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/opierec.ts b/i18n/es/opierec.ts
new file mode 100644
index 0000000..f2e0470
--- a/dev/null
+++ b/i18n/es/opierec.ts
@@ -0,0 +1,212 @@
+<!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>44100</translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation>32000</translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation>22050</translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation>16000</translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation>11025</translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation>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>16</translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation>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>
+    </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>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation>Lugar</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>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>Mudo auto</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation>mudo</translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation>Parar</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/osearch.ts b/i18n/es/osearch.ts
new file mode 100644
index 0000000..474e393
--- a/dev/null
+++ b/i18n/es/osearch.ts
@@ -0,0 +1,143 @@
+<!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>
+    </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>
+</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>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation>mostrar sucesos pasados</translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation>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>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation>buscando %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/oxygen.ts b/i18n/es/oxygen.ts
index fe557e9..d489414 100644
--- a/i18n/es/oxygen.ts
+++ b/i18n/es/oxygen.ts
@@ -29,10 +29,6 @@
 <context>
     <name>OxydataWidget</name>
     <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Peso:</translation>
-    </message>
-    <message>
         <source>Block</source>
         <translation>Bloque</translation>
     </message>
diff --git a/i18n/es/patience.ts b/i18n/es/patience.ts
index f7f7ccc..00ea323 100644
--- a/i18n/es/patience.ts
+++ b/i18n/es/patience.ts
@@ -15,11 +15,11 @@
     </message>
     <message>
         <source>&amp;Change Card Backs</source>
-        <translation>Cambiar &amp;reverso cartas</translation>
+        <translation type="obsolete">Cambiar &amp;reverso cartas</translation>
     </message>
     <message>
         <source>&amp;Snap To Position</source>
-        <translation>&amp;Saltar a la posición</translation>
+        <translation type="obsolete">&amp;Saltar a la posición</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
@@ -39,15 +39,15 @@
     </message>
     <message>
         <source>Change Card Backs</source>
-        <translation>Cambiar reverso cartas</translation>
+        <translation type="obsolete">Cambiar reverso cartas</translation>
     </message>
     <message>
         <source>Snap To Position</source>
-        <translation>Saltar a la posición</translation>
+        <translation type="obsolete">Saltar a la posición</translation>
     </message>
     <message>
         <source>Turn One Card</source>
-        <translation>Volver una carta</translation>
+        <translation type="obsolete">Volver una carta</translation>
     </message>
     <message>
         <source>Settings</source>
@@ -55,7 +55,7 @@
     </message>
     <message>
         <source>Turn Three Cards</source>
-        <translation>Volver tres cartas</translation>
+        <translation type="obsolete">Volver tres cartas</translation>
     </message>
     <message>
         <source>Chicane</source>
@@ -69,5 +69,29 @@
         <source>Teeclub</source>
         <translation>Club de té</translation>
     </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation>&amp;Volver a cambiar la carta</translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation>&amp;Saltar a la posición</translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation>Volver a cambiar la carta</translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation>Saltar a la posición</translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation>Volver una carta</translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
+        <translation>Volver tres carta</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/qpdf.ts b/i18n/es/qpdf.ts
index 07323aa..0f93d08 100644
--- a/i18n/es/qpdf.ts
+++ b/i18n/es/qpdf.ts
@@ -95,7 +95,11 @@
     </message>
     <message>
         <source>File does not exist !</source>
-        <translation>El fichero no existe!</translation>
+        <translation type="obsolete">El fichero no existe!</translation>
+    </message>
+    <message>
+        <source>File does not exist!</source>
+        <translation>¡El fichero no existe!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index d4d69d8..2529f03 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -76,13 +76,6 @@ Por favor cárguela.</translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation>Estado de la Batería</translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
@@ -180,6 +173,13 @@ Por favor cárguela.</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>Estado de la Batería</translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
diff --git a/i18n/es/reader.ts b/i18n/es/reader.ts
index 57b8818..1936c7a 100644
--- a/i18n/es/reader.ts
+++ b/i18n/es/reader.ts
@@ -1,24 +1,47 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
     <message>
-        <source>Open</source>
-        <translation>Abrir</translation>
+        <source>Toolbar Settings</source>
+        <translation>Configuración barra herramientas</translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Cerrar</translation>
+        <source>File</source>
+        <translation>Fichero</translation>
     </message>
     <message>
-        <source>Info</source>
-        <translation>Info</translation>
+        <source>Navigation</source>
+        <translation>Navegación</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Ver</translation>
+    </message>
+    <message>
+        <source>Marks</source>
+        <translation>Marcas</translation>
+    </message>
+    <message>
+        <source>Indicators</source>
+        <translation>Indicadores</translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation>Política</translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation>Velocidad avance</translation>
     </message>
     <message>
-        <source>On Action...</source>
-        <translation>En acción...</translation>
+        <source>&lt;Nothing&gt;</source>
+        <translation>&lt;Nada&gt;</translation>
     </message>
     <message>
-        <source>Open File</source>
+        <source>Open file</source>
         <translation>Abrir fichero</translation>
     </message>
     <message>
@@ -26,106 +49,193 @@
         <translation>Autoavance</translation>
     </message>
     <message>
-        <source>Mark</source>
-        <translation>Marcar</translation>
+        <source>Bookmark</source>
+        <translation>Marcador</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Anotar</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
-        <source>Navigation</source>
-        <translation>Navegación</translation>
+        <source>Zoom in</source>
+        <translation>Acercar</translation>
     </message>
     <message>
-        <source>Scroll</source>
-        <translation>Avanzar</translation>
+        <source>Zoom out</source>
+        <translation>Alejar</translation>
     </message>
     <message>
-        <source>Jump</source>
-        <translation>Saltar</translation>
+        <source>Back</source>
+        <translation>Atrás</translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
-        <translation>Avanzar página/línea</translation>
+        <source>Forward</source>
+        <translation>Adelante</translation>
     </message>
     <message>
-        <source>Set Overlap</source>
-        <translation>Solapar</translation>
+        <source>Home</source>
+        <translation>Inicio</translation>
     </message>
     <message>
-        <source>Use Cursor</source>
-        <translation>Usar cursor</translation>
+        <source>Page up</source>
+        <translation>Retroceder página</translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
-        <translation>Diccionario</translation>
+        <source>Page down</source>
+        <translation>Avanzar página</translation>
     </message>
     <message>
-        <source>Two/One Touch</source>
-        <translation>Uno/dos toques</translation>
+        <source>Line up</source>
+        <translation>Retroceder línea</translation>
     </message>
     <message>
-        <source>Target</source>
-        <translation>Objetivo</translation>
+        <source>Line down</source>
+        <translation>Avanzar línea</translation>
     </message>
     <message>
-        <source>Annotation</source>
-        <translation>Anotación</translation>
+        <source>Beginning</source>
+        <translation>Principio</translation>
     </message>
     <message>
-        <source>Dictionary</source>
-        <translation>Diccionario</translation>
+        <source>End</source>
+        <translation>Fin</translation>
     </message>
     <message>
-        <source>Clipboard</source>
-        <translation>Portapapeles</translation>
+        <source>Escape Button</source>
+        <translation>Botón escape</translation>
     </message>
     <message>
-        <source>Up</source>
-        <translation>Arriba</translation>
+        <source>Space Button</source>
+        <translation>Botón espacio</translation>
     </message>
     <message>
-        <source>Down</source>
-        <translation>Abajo</translation>
+        <source>Return Button</source>
+        <translation>Botón return</translation>
     </message>
     <message>
-        <source>Find...</source>
-        <translation>Buscar...</translation>
+        <source>Left Arrow</source>
+        <translation>Flecha izquierda</translation>
     </message>
     <message>
-        <source>Continuous</source>
-        <translation>Contínuo</translation>
+        <source>Right Arrow</source>
+        <translation>Flecha derecha</translation>
     </message>
     <message>
-        <source>Markup</source>
-        <translation>Marcado</translation>
+        <source>Down Arrow</source>
+        <translation>Flecha abajo</translation>
     </message>
     <message>
-        <source>Auto</source>
-        <translation>Auto</translation>
+        <source>Up Arrow</source>
+        <translation>Flecha arriba</translation>
     </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
     <message>
-        <source>None</source>
-        <translation>Ninguno</translation>
+        <source>Tidy-up</source>
+        <translation>Ordenar</translation>
     </message>
     <message>
-        <source>Text</source>
-        <translation>Texto</translation>
+        <source>Delete</source>
+        <translation>Borrar</translation>
     </message>
     <message>
-        <source>HTML</source>
-        <translation>HTML</translation>
+        <source>Delete Bookmarks</source>
+        <translation>Borrar marcadores</translation>
     </message>
     <message>
-        <source>Peanut/PML</source>
-        <translation>Peanut/PML</translation>
+        <source>Delete Configuration</source>
+        <translation>Borrar configuración</translation>
     </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
-        <source>Layout</source>
-        <translation>Esquema</translation>
+        <source>Open</source>
+        <translation>Abrir</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Cerrar</translation>
     </message>
     <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>Dos/un
+toque</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Buscar</translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation>Anotación</translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation>Internacional</translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation>Ideogramas</translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation>Ancho ideograma</translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
+        <translation>Aplicar letra a
+diálogos</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>Codificación</translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation>Aplicación</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mensaje</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>Dos/un
+toque</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>Diccionario</translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation>Intercambiar acciones
+de las pulsaciones</translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
         <source>Strip CR</source>
         <translation>Eliminar CR</translation>
     </message>
@@ -142,7 +252,7 @@
         <translation>Eliminar tabuladores</translation>
     </message>
     <message>
-        <source>Re-paragraph</source>
+        <source>Reparagraph</source>
         <translation>Reconstruir párrafos</translation>
     </message>
     <message>
@@ -150,24 +260,280 @@
         <translation>Doble espacio</translation>
     </message>
     <message>
-        <source>Indent+</source>
-        <translation>Sangrado+</translation>
+        <source>Remap</source>
+        <translation>Reasignar</translation>
     </message>
     <message>
-        <source>Indent-</source>
-        <translation>Sangrado-</translation>
+        <source>Embolden</source>
+        <translation>Animar</translation>
     </message>
     <message>
-        <source>Repalm</source>
-        <translation>Re-palm</translation>
+        <source>Full Justify</source>
+        <translation>Alineación completa</translation>
     </message>
     <message>
-        <source>Remap</source>
-        <translation>Reasignar</translation>
+        <source>Text</source>
+        <translation>Texto</translation>
     </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
     <message>
-        <source>Embolden</source>
-        <translation>Animar</translation>
+        <source>Indent</source>
+        <translation>Tabular</translation>
+    </message>
+    <message>
+        <source>Page
+Overlap</source>
+        <translation>Solapar
+página</translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation>Zoom
+gráfico</translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation>Margen</translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation>Párrafo
+principal</translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation>Línea
+principal</translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation>Marcado</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>Letra</translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation>Marcador</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Anotar</translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation>Ir</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Borrar</translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation>Autogenerar</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Limpiar</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation>Ordenado</translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation>Marcar bloque</translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation>Copiar bloque</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation>Flotante</translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation>Barra sencilla</translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation>Barra menú/herramienta</translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation>Barra múltiple</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>Arriba</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>Abajo</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>Derecha</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>Izquierda</translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation>Minimizada</translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation>Móvil</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation>Anotación</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>Diccionario</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>Portapapeles</translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation>Despluckar</translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation>Despluckar</translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation>Contínuo</translation>
+    </message>
+    <message>
+        <source>Select Action</source>
+        <translation>Seleccionar acción</translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation>Plucker</translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation>Avanzar</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Retroceder</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Inicio</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Adelante</translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation>Retroceder página</translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation>Avanzar página</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Ir al principio</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Ir al final</translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation>Saltar</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>Avanzar página/línea</translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation>Configuración del Lector Opie</translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation>Esquema</translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation>Esquema(2)</translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation>Localización</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation>Misc</translation>
+    </message>
+    <message>
+        <source>Buttons</source>
+        <translation>Botones</translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation>Guardar URL</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>Portapapeles</translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation>Fichero local</translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation>Fichero global</translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Pantalla completa</translation>
     </message>
     <message>
         <source>Zoom In</source>
@@ -178,40 +544,79 @@
         <translation>Alejar</translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
-        <translation>Ideograma/palabra</translation>
-    </message>
-    <message>
-        <source>Set width</source>
-        <translation>Fijar anchura</translation>
+        <source>Set Font</source>
+        <translation>Fijar letra</translation>
     </message>
     <message>
         <source>Encoding</source>
         <translation>Codificación</translation>
     </message>
     <message>
-        <source>Ascii</source>
-        <translation>Ascii</translation>
+        <source>Ideogram</source>
+        <translation>Ideograma</translation>
     </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
     <message>
-        <source>UTF-8</source>
-        <translation>UTF-8</translation>
+        <source>Open</source>
+        <translation>Abrir</translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
-        <translation>UCS-2(BE)</translation>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
-        <translation>USC-2(LE)</translation>
+        <source>Fullscreen</source>
+        <translation>Pantalla completa</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation>Navegación</translation>
+    </message>
+    <message>
+        <source>Scroll</source>
+        <translation>Avanzar</translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation>Saltar</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>Avanzar página/línea</translation>
+    </message>
+    <message>
+        <source>Two/One Touch</source>
+        <translation>Uno/dos toques</translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation>Anotación</translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation>Arriba</translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation>Abajo</translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation>Buscar...</translation>
     </message>
     <message>
-        <source>Palm</source>
-        <translation>Palm</translation>
+        <source>Zoom In</source>
+        <translation>Acercar</translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
-        <translation>Windows(1252)</translation>
+        <source>Zoom Out</source>
+        <translation>Alejar</translation>
     </message>
     <message>
         <source>Set Font</source>
@@ -258,10 +663,6 @@
         <translation>Fichero</translation>
     </message>
     <message>
-        <source>Format</source>
-        <translation>Formato</translation>
-    </message>
-    <message>
         <source>Marks</source>
         <translation>Marcas</translation>
     </message>
@@ -281,6 +682,90 @@
         <source>Close Edit</source>
         <translation>Cerrar edición</translation>
     </message>
+    <message>
+        <source>View</source>
+        <translation>Ver</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Configuraciones</translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation>Configuración</translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation>Guardar configuración</translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation>Cargar configuración</translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation>Borrar configuración</translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation>Barras de herramientas</translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation>Ejecutar script</translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation>Exportar enlaces</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Ir al principio</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Ir al final</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Atrás</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Inicio</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Adelante</translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation>Avance</translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation>Fijar objetivo</translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation>Parar paras</translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation>Fijar codificación</translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation>Ideograma</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Marcador</translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation>Lector</translation>
+    </message>
 </context>
 <context>
     <name>fileBrowser</name>
diff --git a/i18n/es/rotation.ts b/i18n/es/rotation.ts
deleted file mode 100644
index d603276..0000000
--- a/i18n/es/rotation.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation>Configurar Rotación</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation>&lt;p&gt;Seleccione la orientación de entre las opciones a la izquierda.</translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation>¿Reiniciar Opie ahora?</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation>&lt;p&gt;Rotación no habilitada en esta demo, sin embargo en una capacidad de Qt/Empotrado.</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/security.ts b/i18n/es/security.ts
index 7b2601c..4702b56 100644
--- a/i18n/es/security.ts
+++ b/i18n/es/security.ts
@@ -102,5 +102,17 @@ Acceso denegado</translation>
         <source>1.0.0.0/8</source>
         <translation>1.0.0.0/8</translation>
     </message>
+    <message>
+        <source>Passcode</source>
+        <translation>Código</translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation>Identificación</translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation>Identificación automática</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/sfcave-sdl.ts b/i18n/es/sfcave-sdl.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/es/sfcave-sdl.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/es/snake.ts b/i18n/es/snake.ts
index 1bffea4..f40a6e2 100644
--- a/i18n/es/snake.ts
+++ b/i18n/es/snake.ts
@@ -23,7 +23,7 @@ contra muros, orillas o su cola.</translation>
     </message>
     <message>
         <source>Press Any Key To Start</source>
-        <translation>Pulse una tecla para empezar</translation>
+        <translation type="obsolete">Pulse una tecla para empezar</translation>
     </message>
     <message>
         <source>     Score :    %1   </source>
@@ -37,7 +37,15 @@ Puntuación: %1</translation>
     </message>
     <message>
         <source>Press Any Key to Begin a New Game.</source>
-        <translation>Pulse una tecla para empezar de nuevo.</translation>
+        <translation type="obsolete">Pulse una tecla para empezar de nuevo.</translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation>Pulse una tecla para empezar</translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation>Pulse una tecla para comenzar un nuevo juego.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/spreadsheet.ts b/i18n/es/spreadsheet.ts
deleted file mode 100644
index 037cef1..0000000
--- a/i18n/es/spreadsheet.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>PIMSpreadsheetWindow</name>
-    <message>
-        <source>Spreadsheet</source>
-        <translation>Hoja de cálculo</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation>Nueva</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Abrir</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Cerrar</translation>
-    </message>
-    <message>
-        <source>Equation</source>
-        <translation>Ecuación</translation>
-    </message>
-    <message>
-        <source>Clear Cell</source>
-        <translation>Borrar celda</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation>Fichero</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation>Editar</translation>
-    </message>
-</context>
-<context>
-    <name>SpreadsheetWidget</name>
-    <message>
-        <source>SpreadsheetWidget</source>
-        <translation>ControlHojaCálculo</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/stockticker.ts b/i18n/es/stockticker.ts
new file mode 100644
index 0000000..af213c9
--- a/dev/null
+++ b/i18n/es/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation>&amp;Abrir fichero</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation>&amp;Cerrar</translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation>&amp;Atrás</translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation>&amp;Adelante</translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation>&amp;Inicio</translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation>Añadir marcador</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Fichero</translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation>&amp;Adelante</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>Historial</translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation>Preferidos</translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation>Atrás</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Adelante</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Inicio</translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation>Búsqueda de Símbolo</translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation>Introduzca algo que buscar.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/sysinfo.ts b/i18n/es/sysinfo.ts
index d27efc5..94df81d 100644
--- a/i18n/es/sysinfo.ts
+++ b/i18n/es/sysinfo.ts
@@ -1,5 +1,52 @@
 <!DOCTYPE TS><TS>
 <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>
@@ -73,7 +120,7 @@ La memoria se cataloga como sigue:
     </message>
     <message>
         <source>Used By</source>
-        <translation>Usado por</translation>
+        <translation type="obsolete">Usado por</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
@@ -98,13 +145,21 @@ Mantenga pulsado un módulo para ver información adicional sobre el módulo, o
     <message>
         <source>You really want to execute
 </source>
-        <translation>Seguro que quiere ejecutar
+        <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>¿Seguro que quiere ejecutar %1 para este módulo?</translation>
+    </message>
 </context>
 <context>
     <name>MountInfo</name>
@@ -166,83 +221,12 @@ Mantenga pulsado un proceso para ver información adicional, o para enviarle una
     <message>
         <source>You really want to send
 </source>
-        <translation>Seguro que quiere enviar
+        <translation type="obsolete">Seguro que quiere enviar
 </translation>
     </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation>Tarjeta CF: </translation>
-    </message>
-    <message>
-        <source>Hard Disk </source>
-        <translation>Disco duro </translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation>Tarjeta SD </translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation>Disco duro /dev/hd </translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation>Disco duro SCSI /dev/sd </translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation>Almac. interno </translation>
-    </message>
-    <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>RAM disk</source>
-        <translation>Disco RAM</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>
+        <source>You really want to send %1 to this process?</source>
+        <translation>¿Seguro que quiere enviar %1 a este proceso?</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/es/systemtime.ts b/i18n/es/systemtime.ts
index 62f324b..eb259d6 100644
--- a/i18n/es/systemtime.ts
+++ b/i18n/es/systemtime.ts
@@ -69,18 +69,6 @@
         <translation>Predecir</translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation>Preguntó por un retraso de </translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation>minutos, pero sólo </translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation>minutos transcurrieron desde el último ajuste.&lt;br&gt;¿Continúo?</translation>
-    </message>
-    <message>
         <source>Continue?</source>
         <translation>¿Continúo?</translation>
     </message>
@@ -88,7 +76,7 @@
         <source>Running:
 ntpdate </source>
         <translation>Ejecutando:
-ntpdate</translation>
+ntpdate </translation>
     </message>
     <message>
         <source>Error</source>
@@ -110,16 +98,20 @@ ntpdate</translation>
         <source>Error while getting time from
  server: </source>
         <translation>Error al obtener la hora del
-servidor:</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation> segundos</translation>
+servidor: </translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation>No pude conectar con el servidor </translation>
     </message>
+    <message>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation>Preguntó por un retraso de %1 minutos, pero sólo %2 minutos transcurrieron desde el último ajuste.&lt;br&gt;¿Continúo?</translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
+        <translation>%1 segundos</translation>
+    </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
@@ -145,198 +137,6 @@ servidor:</translation>
     </message>
 </context>
 <context>
-    <name>Ntp</name>
-    <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="obsolete">time.fu-berlin.de</translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="obsolete">¿Ejecutar NTP?</translation>
-    </message>
-    <message>
-        <source>Running:</source>
-        <translation type="obsolete">Ejecutando:</translation>
-    </message>
-    <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="obsolete">Error al ejecutar ntpdate</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="obsolete"> segundos</translation>
-    </message>
-    <message>
-        <source>last [h]</source>
-        <translation type="obsolete">último [h]</translation>
-    </message>
-    <message>
-        <source>offset [s]</source>
-        <translation type="obsolete">corrección [s]</translation>
-    </message>
-    <message>
-        <source>shift [s/h]</source>
-        <translation type="obsolete">ajuste [s/h]</translation>
-    </message>
-    <message>
-        <source> s/h</source>
-        <translation type="obsolete"> s/h</translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="obsolete">Obtener hora de la Red</translation>
-    </message>
-    <message>
-        <source>Set predicted time: </source>
-        <translation type="obsolete">Fijar predicción de hora: </translation>
-    </message>
-    <message>
-        <source>Could not connect to server </source>
-        <translation type="obsolete">No pude conectar con el servidor </translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="obsolete">Predecir</translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="obsolete">Principal</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Configuración</translation>
-    </message>
-    <message>
-        <source>ntp error</source>
-        <translation type="obsolete">error ntp</translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
-        <translation type="obsolete">¡Error al obtener la hora de la Red!</translation>
-    </message>
-    <message>
-        <source>Error while getting time form
- server</source>
-        <translation type="obsolete">Error al obtener la hora del
-servidor</translation>
-    </message>
-    <message>
-        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
-        <translation type="obsolete">Pidió un retardo de %1 minutos, pero sólo %2 han pasado desde la última revisión. &lt;br&gt;¿Reejecuto NTP?</translation>
-    </message>
-</context>
-<context>
-    <name>NtpBase</name>
-    <message>
-        <source>Network Time</source>
-        <translation type="obsolete">Hora de la Red</translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="obsolete">Obtener hora de la Red</translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="obsolete">Hora inicio:</translation>
-    </message>
-    <message>
-        <source>nan</source>
-        <translation type="obsolete">nan</translation>
-    </message>
-    <message>
-        <source>Time Shift:</source>
-        <translation type="obsolete">Ajuste de hora:</translation>
-    </message>
-    <message>
-        <source>New Time:</source>
-        <translation type="obsolete">Nueva hora:</translation>
-    </message>
-    <message>
-        <source>Esimated Shift:</source>
-        <translation type="obsolete">Ajuste estimado:</translation>
-    </message>
-    <message>
-        <source>Predicted Time:</source>
-        <translation type="obsolete">Predicción de hora:</translation>
-    </message>
-    <message>
-        <source>Mean shift:</source>
-        <translation type="obsolete">Ajuste promedio:</translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="obsolete">Fijar predicción de hora</translation>
-    </message>
-    <message>
-        <source>Predict time</source>
-        <translation type="obsolete">Predicción de hora</translation>
-    </message>
-    <message>
-        <source>Use</source>
-        <translation type="obsolete">Usar</translation>
-    </message>
-    <message>
-        <source>as</source>
-        <translation type="obsolete">como</translation>
-    </message>
-    <message>
-        <source>NTP server to get the time from the network.</source>
-        <translation type="obsolete">servidor NTP para obtener la hora de la Red.</translation>
-    </message>
-    <message>
-        <source>Wait for </source>
-        <translation type="obsolete">Esperar </translation>
-    </message>
-    <message>
-        <source>minutes until</source>
-        <translation type="obsolete">minutos hasta que</translation>
-    </message>
-    <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
-        <translation type="obsolete">intentos NTP para sincronizar el reloj con la Red.</translation>
-    </message>
-    <message>
-        <source>Insure a delay of</source>
-        <translation type="obsolete">Asegurar un retraso de</translation>
-    </message>
-    <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
-        <translation type="obsolete">una nueva conexión NTP será usada para predecir la hora.</translation>
-    </message>
-    <message>
-        <source>Set time</source>
-        <translation type="obsolete">Fijar hora</translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="obsolete">Principal</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="obsolete">Manual</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Configuración</translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="obsolete">Predecir</translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
-    </message>
-    <message>
-        <source>Advanced settings</source>
-        <translation type="obsolete">Configuración avanzada</translation>
-    </message>
-</context>
-<context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
@@ -384,84 +184,6 @@ servidor</translation>
     </message>
 </context>
 <context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Time Zone</source>
-        <translation type="obsolete">Zona horaria</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Fecha</translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="obsolete">Formato hora</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="obsolete">24 horas</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="obsolete">12 horas</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="obsolete">Inicio semana</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Domingo</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Lunes</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="obsolete">Formato fecha</translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="obsolete">Formato icono</translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="obsolete">hh:mm</translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="obsolete">D/M hh:mm</translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="obsolete">M/D hh:mm</translation>
-    </message>
-    <message>
-        <source>System Time</source>
-        <translation type="obsolete">Hora del Sistema</translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Hora</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minuto</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-</context>
-<context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
diff --git a/i18n/es/tetrix.ts b/i18n/es/tetrix.ts
index aa89e9c..5ef6a40 100644
--- a/i18n/es/tetrix.ts
+++ b/i18n/es/tetrix.ts
@@ -1,5 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation>vacío</translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation>¡Introduzca su nombre!</translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation>Puntuaciones Máximas</translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation>Puntos</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation>Nivel</translation>
+    </message>
+</context>
+<context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
diff --git a/i18n/es/textedit.ts b/i18n/es/textedit.ts
index 2e2ca4b..3546cc3 100644
--- a/i18n/es/textedit.ts
+++ b/i18n/es/textedit.ts
@@ -156,7 +156,7 @@
     <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
+        <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>
@@ -196,6 +196,16 @@ tiene cambios sin salvar.
         <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>
 </context>
 <context>
     <name>filePermissions</name>
diff --git a/i18n/es/tictac.ts b/i18n/es/tictac.ts
index 9fb4dda..29fdca9 100644
--- a/i18n/es/tictac.ts
+++ b/i18n/es/tictac.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation>TicTac</translation>
+    </message>
+</context>
+<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
diff --git a/i18n/es/tinykate.ts b/i18n/es/tinykate.ts
new file mode 100644
index 0000000..0704e47
--- a/dev/null
+++ b/i18n/es/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation>MiniKATE</translation>
+    </message>
+    <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>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Fichero</translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation>Letra +</translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation>Letra -</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Ver</translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation>Utililidades</translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation>Resaltado</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Configuración</translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation>Sin nombre %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/today.ts b/i18n/es/today.ts
index 5fc1ac6..75e2b01 100644
--- a/i18n/es/today.ts
+++ b/i18n/es/today.ts
@@ -44,10 +44,6 @@
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation>Configuración de Hoy</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation>Cargar qué módulos en qué orden:</translation>
     </message>
@@ -65,7 +61,7 @@
     </message>
     <message>
         <source>minutes inactive</source>
-        <translation>minutos inactivo</translation>
+        <translation type="obsolete">minutos inactivo</translation>
     </message>
     <message>
         <source>Misc</source>
@@ -73,47 +69,114 @@
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
-        <translation>Marque aquí si HOY debe ser autoarrancado al arrancar.</translation>
+        <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>Cuantos minutos ha estado suspendidad la PDA antes que se active la opción de autoarranque</translation>
+        <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>Tamaño del icono</translation>
+        <translation type="obsolete">Tamaño del icono</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
-        <translation>Fijar el tamaño del icono en pixel</translation>
+        <translation type="obsolete">Fijar el tamaño del icono en pixel</translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
-        <translation>¿Arrancar
+        <translation type="obsolete">¿Arrancar
 al encender?
 (sólo Opie)</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation>Actualizar</translation>
+        <translation type="obsolete">Actualizar</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
-        <translation>Con qué frecuencia debe Hoy actualizarse</translation>
+        <translation type="obsolete">Con qué frecuencia debe Hoy actualizarse</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation> seg</translation>
+        <translation type="obsolete"> seg</translation>
     </message>
     <message>
         <source>never</source>
-        <translation>nunca</translation>
+        <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 695c27c..4f6a9d4 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -1,17 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OTaskEditor</name>
+    <name>MainWindow</name>
     <message>
-        <source>Alarms</source>
-        <translation>Alarmas</translation>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation>Recordatorios</translation>
+        <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>
+</context>
+<context>
+    <name>OTaskEditor</name>
     <message>
-        <source>X-Ref</source>
-        <translation>Ref.cruzadas</translation>
+        <source>Alarms</source>
+        <translation>Alarmas</translation>
     </message>
     <message>
         <source>Information</source>
@@ -25,6 +28,10 @@
         <source>Recurrence</source>
         <translation>Repetición</translation>
     </message>
+    <message>
+        <source>Task Editor</source>
+        <translation>Editor de tarear</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -36,6 +43,18 @@
         <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>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
@@ -167,7 +186,7 @@ e inténtelo de nuevo.
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>No puedo editar datos, estoy sincronizando</translation>
+        <translation type="obsolete">No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>all tasks?</source>
@@ -217,6 +236,110 @@ e inténtelo de nuevo.
         <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>
 </context>
 <context>
     <name>TableView</name>
@@ -247,6 +370,18 @@ e inténtelo de nuevo.
         <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>
@@ -340,7 +475,7 @@ e inténtelo de nuevo.
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notas:</translation>
+        <translation type="obsolete">Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
@@ -350,6 +485,10 @@ e inténtelo de nuevo.
         <source>Todo List</source>
         <translation>Lista de Tareas</translation>
     </message>
+    <message>
+        <source>Summary:</source>
+        <translation>Sumario:</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
@@ -478,109 +617,4 @@ e inténtelo de nuevo.
         <translation>Pulse aquí para seleccionar mantenedor de la tarea.</translation>
     </message>
 </context>
-<context>
-    <name>TemplateDialog</name>
-    <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>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation>Nueva plantilla %1</translation>
-    </message>
-</context>
-<context>
-    <name>Todo</name>
-    <message>
-        <source>More</source>
-        <translation>Más</translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation>Introducir</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancelar</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>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>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>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>
-</context>
 </TS>
diff --git a/i18n/es/ubrowser.ts b/i18n/es/ubrowser.ts
new file mode 100644
index 0000000..b10a6f5
--- a/dev/null
+++ b/i18n/es/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation>uBrowser</translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation>- uBrowser</translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation>%1 - uBrowser</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation>¡Error!</translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation>Dirección IP no encontrada</translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation>Error creando socket</translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation>Error conectando al socket</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/usermanager.ts b/i18n/es/usermanager.ts
index 0411777..d121696 100644
--- a/i18n/es/usermanager.ts
+++ b/i18n/es/usermanager.ts
@@ -14,6 +14,10 @@
     <name>UserConfig</name>
     <message>
         <source>OPIE User Manager</source>
+        <translation type="obsolete">Gestor de Usuarios de Opie</translation>
+    </message>
+    <message>
+        <source>Opie User Manager</source>
         <translation>Gestor de Usuarios de Opie</translation>
     </message>
 </context>
diff --git a/i18n/es/wellenreiter.ts b/i18n/es/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/es/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/es/wlansetup.ts b/i18n/es/wlansetup.ts
deleted file mode 100644
index c772dad..0000000
--- a/i18n/es/wlansetup.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless LAN Setting</source>
-        <translation>Configurar LAN inalámbrico</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation>Configurar</translation>
-    </message>
-    <message>
-        <source>ESS ID</source>
-        <translation>ESS ID</translation>
-    </message>
-    <message>
-        <source>Non-Spec ESSID: &quot;ANY&quot;</source>
-        <translation>Non-Spec ESSID: &quot;ANY&quot;</translation>
-    </message>
-    <message>
-        <source>Specific ESSID</source>
-        <translation>Specific ESSID</translation>
-    </message>
-    <message>
-        <source>Network Type</source>
-        <translation>Tipo de red</translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation>Infraestructura</translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation>Canal</translation>
-    </message>
-    <message>
-        <source>802.11 Ad-Hoc</source>
-        <translation>802.11 Ad-Hoc</translation>
-    </message>
-    <message>
-        <source>Wep</source>
-        <translation>Wep</translation>
-    </message>
-    <message>
-        <source>Key Setting</source>
-        <translation>Configurar clave</translation>
-    </message>
-    <message>
-        <source>Key 1</source>
-        <translation>Clave 1</translation>
-    </message>
-    <message>
-        <source>Key 2</source>
-        <translation>Clave 2</translation>
-    </message>
-    <message>
-        <source>Key 3</source>
-        <translation>Clave 3</translation>
-    </message>
-    <message>
-        <source>Key 4</source>
-        <translation>Clave 4</translation>
-    </message>
-    <message>
-        <source>Key Length</source>
-        <translation>Longitud clave</translation>
-    </message>
-    <message>
-        <source>40 Bits</source>
-        <translation>40 Bits</translation>
-    </message>
-    <message>
-        <source>128 Bits</source>
-        <translation>128 Bits</translation>
-    </message>
-    <message>
-        <source>Authentication Type</source>
-        <translation>Tipo autentificación</translation>
-    </message>
-    <message>
-        <source>Open System</source>
-        <translation>Sistema abierto</translation>
-    </message>
-    <message>
-        <source>Shared Key</source>
-        <translation>Clave compartida</translation>
-    </message>
-    <message>
-        <source>Enable Wep</source>
-        <translation>Habilitar Wep</translation>
-    </message>
-</context>
-</TS>