16 files changed, 409 insertions, 129 deletions
diff --git a/i18n/es/aqpkg.ts b/i18n/es/aqpkg.ts
index ff7600b..08f2319 100644
--- a/i18n/es/aqpkg.ts
+++ b/i18n/es/aqpkg.ts
@@ -197,53 +197,67 @@
         <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>
+        <translation type="obsolete">No pude abrir :</translation>
     </message>
     <message>
         <source>Creating directory </source>
-        <translation>Creando directorio </translation>
+        <translation type="obsolete">Creando directorio </translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation>Enlazando %1 a %2</translation>
+        <translation type="obsolete">Enlazando %1 a %2</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
-        <translation>Fallo al enlazar %1 a %2</translation>
+        <translation type="obsolete">Fallo al enlazar %1 a %2</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation>Eliminado %1</translation>
+        <translation type="obsolete">Eliminado %1</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation>Fallo al borrar %1</translation>
+        <translation type="obsolete">Fallo al borrar %1</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation>Eliminado </translation>
+        <translation type="obsolete">Eliminado </translation>
     </message>
     <message>
         <source>Failed to remove </source>
-        <translation>Fallo al borrar </translation>
+        <translation type="obsolete">Fallo al borrar </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking failed!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking succeeded.
+</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestor de Paquetes</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Escriba aquí el texto a buscar.</translation>
     </message>
diff --git a/i18n/es/backup.ts b/i18n/es/backup.ts
index 70d3389..6f28060 100644
--- a/i18n/es/backup.ts
+++ b/i18n/es/backup.ts
@@ -95,25 +95,45 @@
         <translation>Seleccionar fuente</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Columna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restaurar</translation>
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>Actualizar lista ficheros</translation>
+        <translation type="obsolete">Actualizar lista ficheros</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </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>
diff --git a/i18n/es/calibrate.ts b/i18n/es/calibrate.ts
index 2626c86..d0f19a3 100644
--- a/i18n/es/calibrate.ts
+++ b/i18n/es/calibrate.ts
@@ -1,15 +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>
+        <translation type="obsolete">Bienvenido a Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/fifteen.ts b/i18n/es/fifteen.ts
index 36c0d12..e63a22e 100644
--- a/i18n/es/fifteen.ts
+++ b/i18n/es/fifteen.ts
@@ -1,31 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FifteenConfigDialog</name>
+    <message>
+        <source>All Images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select board background</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FifteenConfigDialogBase</name>
+    <message>
+        <source>Configure Fifteen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use a Custom Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Path:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Revolver</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation type="obsolete">Resolver</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Juego</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quince piezas</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quince piezas</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>¡Enhorabuena!
 ¡Ganaste el juego!</translation>
diff --git a/i18n/es/language.ts b/i18n/es/language.ts
index f35e0b3..f0a12b5 100644
--- a/i18n/es/language.ts
+++ b/i18n/es/language.ts
@@ -1,23 +1,32 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Inglés</translation>
     </message>
     <message>
         <source>default</source>
         <translation>predefinido</translation>
     </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Attention, all windows will be closed by changing the language
+without saving the Data.&lt;br&gt;&lt;br&gt;Go on?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Select language</source>
         <translation>Seleccione idioma</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>Configuración del Idioma</translation>
     </message>
 </context>
diff --git a/i18n/es/libaboutapplet.ts b/i18n/es/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/es/libaboutapplet.ts
+++ b/i18n/es/libaboutapplet.ts
@@ -12,62 +12,63 @@
 </context>
 <context>
     <name>AboutDialog</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
 &lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
 &lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
 &lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
 &lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
+&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libcardmonapplet.ts b/i18n/es/libcardmonapplet.ts
index ecfbc47..87b7c2e 100644
--- a/i18n/es/libcardmonapplet.ts
+++ b/i18n/es/libcardmonapplet.ts
@@ -20,22 +20,14 @@
     <message>
         <source>Eject SD/MMC card</source>
         <translation>Expulsar tarjeta SD/MMC</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>Expulsar tarjeta 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Expulsar tarjeta 1: %1</translation>
     </message>
-    <message>
-        <source>New card: SD/MMC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ejected: SD/MMC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/es/libmailwrapper.ts b/i18n/es/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/es/libmailwrapper.ts
+++ b/i18n/es/libmailwrapper.ts
@@ -36,24 +36,28 @@
     <message>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error copy mails: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error copy mail: %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Server has no TLS support!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LoginDialogUI</name>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -109,24 +113,32 @@
     <message>
         <source>Error fetching mail %i</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error retrieving status</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3wrapper</name>
     <message>
         <source>Mailbox contains %1 mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -211,24 +223,52 @@
     <message>
         <source>Unknown error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error sending queued mail - breaking</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Starttls not supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;%1&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error init SMTP connection: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error init SMTP tls: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login aborted - storing mail to localfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentification failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error sending mail: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>progressMailSend</name>
     <message>
         <source>%1 of %2 bytes send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail %1 of %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/es/libopiepim2.ts b/i18n/es/libopiepim2.ts
index 57b1583..34e293e 100644
--- a/i18n/es/libopiepim2.ts
+++ b/i18n/es/libopiepim2.ts
@@ -100,39 +100,24 @@
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Más</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Más...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Diálogo Fichero</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Guardar</translation>
-    </message>
-</context>
-<context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nombre:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nombre</translation>
     </message>
@@ -156,39 +141,24 @@
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mediana</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequeña</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamaño</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Cita repetitiva </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ninguno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Día</translation>
@@ -618,24 +588,54 @@ y </translation>
         <translation type="obsolete">Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Tomar hora:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Diálogo Fichero</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Guardar</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Estilo</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Tamaño</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Ficheros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Todos los ficheros</translation>
diff --git a/i18n/es/libopiesecurity2.ts b/i18n/es/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/es/libopiesecurity2.ts
+++ b/i18n/es/libopiesecurity2.ts
@@ -1,15 +1,15 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MultiauthMainWindow</name>
+    <name>Opie::Security::MultiauthMainWindow</name>
     <message>
         <source>Welcome to Opie Multi-authentication Framework</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22,19 +22,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have not succeeded enough authentication steps!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note: if &apos;allow to bypass&apos; was uncheck in Security config, you would have to go back through all the steps now.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SecOwnerDlg</name>
+    <name>Opie::Security::SecOwnerDlg</name>
     <message>
         <source>Please contact the owner (directions follow), or try again clicking of this screen (and waiting for the penalty time) if you are the legitimate owner</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopieui2.ts b/i18n/es/libopieui2.ts
index e3c754f..5e941f4 100644
--- a/i18n/es/libopieui2.ts
+++ b/i18n/es/libopieui2.ts
@@ -100,36 +100,36 @@
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Más</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Más...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>Diálogo Fichero</translation>
+        <translation type="unfinished">Diálogo Fichero</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Abrir</translation>
+        <translation type="unfinished">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Guardar</translation>
+        <translation type="unfinished">Guardar</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nombre:</translation>
     </message>
@@ -160,36 +160,36 @@
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mediana</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequeña</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Estilo</translation>
+        <translation type="unfinished">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Tamaño</translation>
+        <translation type="unfinished">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>
+        <translation type="unfinished">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Nombre</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
@@ -437,31 +437,61 @@ y </translation>
         <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo mime</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Diálogo Fichero</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Guardar</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nombre:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Estilo</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Tamaño</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/es/libwlan.ts b/i18n/es/libwlan.ts
index 783fa2a..37fdc29 100644
--- a/i18n/es/libwlan.ts
+++ b/i18n/es/libwlan.ts
@@ -1,148 +1,153 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AWLan</name>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WLAN</name>
+</context>
+<context>
+    <name>WLanGUI</name>
     <message>
-        <source>Wireless Configuration</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MAC</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Access Point</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Channel</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>any</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infrastructure</source>
+        <source>ESS-ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>Specify Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>MAC</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>
+        <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Accept</source>
+        <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</source>
+        <source>Accept Non-Encrypted packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan Neighbourhood</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WlanInfo</name>
     <message>
-        <source>Interface Information</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>802.11b</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>Link Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AP</source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WLanNetNode</name>
     <message>
-        <source>Noise</source>
+        <source>WLan Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>WlanInfo</name>
+</context>
 </TS>
diff --git a/i18n/es/minesweep.ts b/i18n/es/minesweep.ts
index 0046d87..3396887 100644
--- a/i18n/es/minesweep.ts
+++ b/i18n/es/minesweep.ts
@@ -2,32 +2,36 @@
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>¡Ganaste!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>¡Explotaste!</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>Busca Minas</translation>
+        <translation type="obsolete">Busca Minas</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Principiante</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Experto</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Nivel</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/opiemail.ts b/i18n/es/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/es/opiemail.ts
+++ b/i18n/es/opiemail.ts
@@ -65,24 +65,52 @@
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Receiver spezified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store message into drafts?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -210,51 +238,55 @@
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use SSL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>ssh $SERVER exec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use secure sockets:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -294,24 +326,64 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>NNTPGroupsDlg</name>
+    <message>
+        <source>Subscribed newsgroups</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NNTPGroupsUI</name>
+    <message>
+        <source>newsgroupslist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Newsgroups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List of groups from the server. On start, only subscribed groups are listed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Groupfilter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a filter string here.
+Then hit &quot;get newsgroup list&quot; again and only groups starting 
+with that filter will be listet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get newsgroup list from server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Retrieve the list of groups from server</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
@@ -331,24 +403,36 @@
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Newsgroup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get newsgroup list from server</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -385,24 +469,36 @@
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -436,28 +532,24 @@
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use SSL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -471,24 +563,32 @@
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use secure sockets:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ssh $SERVER exec</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -603,24 +703,28 @@
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -648,24 +752,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>selectsmtp</name>
+    <message>
+        <source>Select SMTP Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index f24f7e3..03fda50 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -81,25 +81,25 @@
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">Pulse las crucecitas firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="unfinished">Bienvenido a Opie</translation>
+        <translation type="obsolete">Bienvenido a Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Ver como iconos</translation>
     </message>
@@ -166,28 +166,24 @@ Por favor cárguela.</translation>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FirstUseBackground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
diff --git a/i18n/es/sysinfo.ts b/i18n/es/sysinfo.ts
index 6e6e06f..4ff30e2 100644
--- a/i18n/es/sysinfo.ts
+++ b/i18n/es/sysinfo.ts
@@ -49,29 +49,29 @@
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Compare To:</source>
+        <source>error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>error</source>
+        <source>Compare:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Este gráfico representa la memoria usada actualmente es esta tarjeta de memoria Compact Flash.</translation>