7 files changed, 405 insertions, 198 deletions

diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index b55c918..9095351 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -195,96 +195,104 @@ and is licensed by the GPL
         <translation>Acciones</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>¿Confirma el borrado
 de los ficheros %1?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>¿Borrar directorio?</translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation>Confirme borrado
 </translation>
     </message>
     <message>
         <source>Delete Directory</source>
         <translation>Borrar directorio</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
         <translation>¿Confirma la copia
 de los ficheros %1?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>¡El fichero existe!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>
 existe. ¿Lo sobrescribo?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation> ya existe.
 ¿Seguro que quiere borrarlo?</translation>
     </message>
+    <message>
+        <source>%1 exists. Ok to overwrite?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not copy %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salvar salida en fichero(sólo nombre)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Salida</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fijar Permisos Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos para el fichero:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lectura</translation>
     </message>
     <message>
         <source>write</source>
diff --git a/i18n/es/libhomeapplet.ts b/i18n/es/libhomeapplet.ts
index 0f95260..72ea7f3 100644
--- a/i18n/es/libhomeapplet.ts
+++ b/i18n/es/libhomeapplet.ts
@@ -1,13 +1,13 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
         <translation>Atajo Inicio</translation>
     </message>
     <message>
-        <source>Home</source>
-        <translation>Inicio</translation>
+        <source>Desktop</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopie.ts b/i18n/es/libopie.ts
index 91da93e..f40571d 100644
--- a/i18n/es/libopie.ts
+++ b/i18n/es/libopie.ts
@@ -48,65 +48,61 @@
     <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>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>VarSemana</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>TimePicker</source>
-        <translation>Tomar Hora</translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Tomar hora:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libscreenshotapplet.ts b/i18n/es/libscreenshotapplet.ts
index 9451a10..49aff7f 100644
--- a/i18n/es/libscreenshotapplet.ts
+++ b/i18n/es/libscreenshotapplet.ts
@@ -1,17 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Snapshot</source>
-        <translation>Pantallazo</translation>
+        <source>Name of screenshot </source>
+        <translation>Nombre del pantallazo </translation>
     </message>
     <message>
-        <source>scap</source>
-        <translation>scap</translation>
+        <source>Delay</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
-        <translation>Nombre del pantallazo </translation>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save named</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save screenshot as...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Success</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Screenshot was uploaded to %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection to %1 failed.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/oxygen.ts b/i18n/es/oxygen.ts
index 9fabbeb..f0800cc 100644
--- a/i18n/es/oxygen.ts
+++ b/i18n/es/oxygen.ts
@@ -58,509 +58,505 @@
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>Punto ebullición</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>Punto fusión</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Datos</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Cálculos</translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation>Sistema Periódico</translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation>ERROR: 
-</translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation>Datos Químicos</translation>
-    </message>
     <message>
         <source>Hydrogen</source>
-        <translation>Hidrógeno</translation>
+        <translation type="unfinished">Hidrógeno</translation>
     </message>
     <message>
         <source>Helium</source>
-        <translation>Helio</translation>
+        <translation type="unfinished">Helio</translation>
     </message>
     <message>
         <source>Lithium</source>
-        <translation>Litio</translation>
+        <translation type="unfinished">Litio</translation>
     </message>
     <message>
         <source>Beryllium</source>
-        <translation>Berilio</translation>
+        <translation type="unfinished">Berilio</translation>
     </message>
     <message>
         <source>Boron</source>
-        <translation>Boro</translation>
+        <translation type="unfinished">Boro</translation>
     </message>
     <message>
         <source>Carbon</source>
-        <translation>Carbono</translation>
+        <translation type="unfinished">Carbono</translation>
     </message>
     <message>
         <source>Nitrogen</source>
-        <translation>Nitrógeno</translation>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation>Oxígeno</translation>
+        <translation type="unfinished">Nitrógeno</translation>
     </message>
     <message>
         <source>Fluorine</source>
-        <translation>Fluor</translation>
+        <translation type="unfinished">Fluor</translation>
     </message>
     <message>
         <source>Neon</source>
-        <translation>Neón</translation>
+        <translation type="unfinished">Neón</translation>
     </message>
     <message>
         <source>Sodium</source>
-        <translation>Sodio</translation>
+        <translation type="unfinished">Sodio</translation>
     </message>
     <message>
         <source>Magnesium</source>
-        <translation>Magnesio</translation>
+        <translation type="unfinished">Magnesio</translation>
     </message>
     <message>
         <source>Aluminum</source>
-        <translation>Aluminio</translation>
+        <translation type="unfinished">Aluminio</translation>
     </message>
     <message>
         <source>Silicon</source>
-        <translation>Silicio</translation>
+        <translation type="unfinished">Silicio</translation>
     </message>
     <message>
         <source>Phosphorus</source>
-        <translation>Fósforo</translation>
+        <translation type="unfinished">Fósforo</translation>
     </message>
     <message>
         <source>Sulfur</source>
-        <translation>Azufre</translation>
+        <translation type="unfinished">Azufre</translation>
     </message>
     <message>
         <source>Chlorine</source>
-        <translation>Cloro</translation>
+        <translation type="unfinished">Cloro</translation>
     </message>
     <message>
         <source>Argon</source>
-        <translation>Argón</translation>
+        <translation type="unfinished">Argón</translation>
     </message>
     <message>
         <source>Potassium</source>
-        <translation>Potasio</translation>
+        <translation type="unfinished">Potasio</translation>
     </message>
     <message>
         <source>Calcium</source>
-        <translation>Calcio</translation>
+        <translation type="unfinished">Calcio</translation>
     </message>
     <message>
         <source>Scandium</source>
-        <translation>Escandio</translation>
+        <translation type="unfinished">Escandio</translation>
     </message>
     <message>
         <source>Titanium</source>
-        <translation>Titánio</translation>
+        <translation type="unfinished">Titánio</translation>
     </message>
     <message>
         <source>Vanadium</source>
-        <translation>Vanadio</translation>
+        <translation type="unfinished">Vanadio</translation>
     </message>
     <message>
         <source>Chromium</source>
-        <translation>Cromo</translation>
+        <translation type="unfinished">Cromo</translation>
     </message>
     <message>
         <source>Manganese</source>
-        <translation>Manganeso</translation>
+        <translation type="unfinished">Manganeso</translation>
     </message>
     <message>
         <source>Iron</source>
-        <translation>Hierro</translation>
+        <translation type="unfinished">Hierro</translation>
     </message>
     <message>
         <source>Cobalt</source>
-        <translation>Cobalto</translation>
+        <translation type="unfinished">Cobalto</translation>
     </message>
     <message>
         <source>Nickel</source>
-        <translation>Niquel</translation>
+        <translation type="unfinished">Niquel</translation>
     </message>
     <message>
         <source>Copper</source>
-        <translation>Cobre</translation>
+        <translation type="unfinished">Cobre</translation>
     </message>
     <message>
         <source>Zinc</source>
-        <translation>Zinc</translation>
+        <translation type="unfinished">Zinc</translation>
     </message>
     <message>
         <source>Gallium</source>
-        <translation>Galio</translation>
+        <translation type="unfinished">Galio</translation>
     </message>
     <message>
         <source>Germanium</source>
-        <translation>Germanio</translation>
+        <translation type="unfinished">Germanio</translation>
     </message>
     <message>
         <source>Arsenic</source>
-        <translation>Arsénico</translation>
+        <translation type="unfinished">Arsénico</translation>
     </message>
     <message>
         <source>Selenium</source>
-        <translation>Selenio</translation>
+        <translation type="unfinished">Selenio</translation>
     </message>
     <message>
         <source>Bromine</source>
-        <translation>Bromo</translation>
+        <translation type="unfinished">Bromo</translation>
     </message>
     <message>
         <source>Krypton</source>
-        <translation>Kriptón</translation>
+        <translation type="unfinished">Kriptón</translation>
     </message>
     <message>
         <source>Rubidium</source>
-        <translation>Rubidio</translation>
+        <translation type="unfinished">Rubidio</translation>
     </message>
     <message>
         <source>Strontium</source>
-        <translation>Estroncio</translation>
+        <translation type="unfinished">Estroncio</translation>
     </message>
     <message>
         <source>Yttrium</source>
-        <translation>Ytrio</translation>
+        <translation type="unfinished">Ytrio</translation>
     </message>
     <message>
         <source>Zirconium</source>
-        <translation>Zirconio</translation>
+        <translation type="unfinished">Zirconio</translation>
     </message>
     <message>
         <source>Niobium</source>
-        <translation>Niobio</translation>
+        <translation type="unfinished">Niobio</translation>
     </message>
     <message>
         <source>Molybdenum</source>
-        <translation>Molibdeno</translation>
+        <translation type="unfinished">Molibdeno</translation>
     </message>
     <message>
         <source>Technetium</source>
-        <translation>Tecnecio</translation>
+        <translation type="unfinished">Tecnecio</translation>
     </message>
     <message>
         <source>Ruthenium</source>
-        <translation>Rutenio</translation>
+        <translation type="unfinished">Rutenio</translation>
     </message>
     <message>
         <source>Rhodium</source>
-        <translation>Rodio</translation>
+        <translation type="unfinished">Rodio</translation>
     </message>
     <message>
         <source>Palladium</source>
-        <translation>Paladio</translation>
+        <translation type="unfinished">Paladio</translation>
     </message>
     <message>
         <source>Silver</source>
-        <translation>Plata</translation>
+        <translation type="unfinished">Plata</translation>
     </message>
     <message>
         <source>Cadmium</source>
-        <translation>Cadmio</translation>
+        <translation type="unfinished">Cadmio</translation>
     </message>
     <message>
         <source>Indium</source>
-        <translation>Indio</translation>
+        <translation type="unfinished">Indio</translation>
     </message>
     <message>
         <source>Tin</source>
-        <translation>Estaño</translation>
+        <translation type="unfinished">Estaño</translation>
     </message>
     <message>
         <source>Antimony</source>
-        <translation>Antimonio</translation>
+        <translation type="unfinished">Antimonio</translation>
     </message>
     <message>
         <source>Tellurium</source>
-        <translation>Teluro</translation>
+        <translation type="unfinished">Teluro</translation>
     </message>
     <message>
         <source>Iodine</source>
-        <translation>Yodo</translation>
+        <translation type="unfinished">Yodo</translation>
     </message>
     <message>
         <source>Xenon</source>
-        <translation>Xenón</translation>
+        <translation type="unfinished">Xenón</translation>
     </message>
     <message>
         <source>Cesium</source>
-        <translation>Césio</translation>
+        <translation type="unfinished">Césio</translation>
     </message>
     <message>
         <source>Barium</source>
-        <translation>Bario</translation>
+        <translation type="unfinished">Bario</translation>
     </message>
     <message>
         <source>Lanthanum</source>
-        <translation>Lantano</translation>
+        <translation type="unfinished">Lantano</translation>
     </message>
     <message>
         <source>Cerium</source>
-        <translation>Cerio</translation>
+        <translation type="unfinished">Cerio</translation>
     </message>
     <message>
         <source>Praseodymium</source>
-        <translation>Praseodimio</translation>
+        <translation type="unfinished">Praseodimio</translation>
     </message>
     <message>
         <source>Neodymium</source>
-        <translation>Neodimio</translation>
+        <translation type="unfinished">Neodimio</translation>
     </message>
     <message>
         <source>Promethium</source>
-        <translation>Prometio</translation>
+        <translation type="unfinished">Prometio</translation>
     </message>
     <message>
         <source>Samarium</source>
-        <translation>Samario</translation>
+        <translation type="unfinished">Samario</translation>
     </message>
     <message>
         <source>Europium</source>
-        <translation>Europio</translation>
+        <translation type="unfinished">Europio</translation>
     </message>
     <message>
         <source>Gadolinium</source>
-        <translation>Gadolinio</translation>
+        <translation type="unfinished">Gadolinio</translation>
     </message>
     <message>
         <source>Terbium</source>
-        <translation>Terbio</translation>
+        <translation type="unfinished">Terbio</translation>
     </message>
     <message>
         <source>Dysprosium</source>
-        <translation>Disprosio</translation>
+        <translation type="unfinished">Disprosio</translation>
     </message>
     <message>
         <source>Holmium</source>
-        <translation>Holmio</translation>
+        <translation type="unfinished">Holmio</translation>
     </message>
     <message>
         <source>Erbium</source>
-        <translation>Erbio</translation>
+        <translation type="unfinished">Erbio</translation>
     </message>
     <message>
         <source>Thulium</source>
-        <translation>Tulio</translation>
+        <translation type="unfinished">Tulio</translation>
     </message>
     <message>
         <source>Ytterbium</source>
-        <translation>Yterbio</translation>
+        <translation type="unfinished">Yterbio</translation>
     </message>
     <message>
         <source>Lutetium</source>
-        <translation>Lutecio</translation>
+        <translation type="unfinished">Lutecio</translation>
     </message>
     <message>
         <source>Hafnium</source>
-        <translation>Hafnio</translation>
+        <translation type="unfinished">Hafnio</translation>
     </message>
     <message>
         <source>Tantalum</source>
-        <translation>Tántalo</translation>
+        <translation type="unfinished">Tántalo</translation>
     </message>
     <message>
         <source>Tungsten</source>
-        <translation>Wolframio</translation>
+        <translation type="unfinished">Wolframio</translation>
     </message>
     <message>
         <source>Rhenium</source>
-        <translation>Renio</translation>
+        <translation type="unfinished">Renio</translation>
     </message>
     <message>
         <source>Osmium</source>
-        <translation>Osmio</translation>
+        <translation type="unfinished">Osmio</translation>
     </message>
     <message>
         <source>Iridium</source>
-        <translation>Iridio</translation>
+        <translation type="unfinished">Iridio</translation>
     </message>
     <message>
         <source>Platinum</source>
-        <translation>Platino</translation>
+        <translation type="unfinished">Platino</translation>
     </message>
     <message>
         <source>Gold</source>
-        <translation>Oro</translation>
+        <translation type="unfinished">Oro</translation>
     </message>
     <message>
         <source>Mercury</source>
-        <translation>Mercurio</translation>
+        <translation type="unfinished">Mercurio</translation>
     </message>
     <message>
         <source>Thallium</source>
-        <translation>Talio</translation>
+        <translation type="unfinished">Talio</translation>
     </message>
     <message>
         <source>Lead</source>
-        <translation>Plomo</translation>
+        <translation type="unfinished">Plomo</translation>
     </message>
     <message>
         <source>Bismuth</source>
-        <translation>Bismuto</translation>
+        <translation type="unfinished">Bismuto</translation>
     </message>
     <message>
         <source>Polonium</source>
-        <translation>Polonio</translation>
+        <translation type="unfinished">Polonio</translation>
     </message>
     <message>
         <source>Astatine</source>
-        <translation>Astato</translation>
+        <translation type="unfinished">Astato</translation>
     </message>
     <message>
         <source>Radon</source>
-        <translation>Radón</translation>
+        <translation type="unfinished">Radón</translation>
     </message>
     <message>
         <source>Francium</source>
-        <translation>Francio</translation>
+        <translation type="unfinished">Francio</translation>
     </message>
     <message>
         <source>Radium</source>
-        <translation>Radio</translation>
+        <translation type="unfinished">Radio</translation>
     </message>
     <message>
         <source>Actinium</source>
-        <translation>Actinio</translation>
+        <translation type="unfinished">Actinio</translation>
     </message>
     <message>
         <source>Thorium</source>
-        <translation>Torio</translation>
+        <translation type="unfinished">Torio</translation>
     </message>
     <message>
         <source>Protactinium</source>
-        <translation>Protactinio</translation>
+        <translation type="unfinished">Protactinio</translation>
     </message>
     <message>
         <source>Uranium</source>
-        <translation>Uranio</translation>
+        <translation type="unfinished">Uranio</translation>
     </message>
     <message>
         <source>Neptunium</source>
-        <translation>Neptuno</translation>
+        <translation type="unfinished">Neptuno</translation>
     </message>
     <message>
         <source>Plutonium</source>
-        <translation>Plutonio</translation>
+        <translation type="unfinished">Plutonio</translation>
     </message>
     <message>
         <source>Americium</source>
-        <translation>Americio</translation>
+        <translation type="unfinished">Americio</translation>
     </message>
     <message>
         <source>Curium</source>
-        <translation>Curio</translation>
+        <translation type="unfinished">Curio</translation>
     </message>
     <message>
         <source>Berkelium</source>
-        <translation>Berquelio</translation>
+        <translation type="unfinished">Berquelio</translation>
     </message>
     <message>
         <source>Californium</source>
-        <translation>Californio</translation>
+        <translation type="unfinished">Californio</translation>
     </message>
     <message>
         <source>Einsteinium</source>
-        <translation>Einstenio</translation>
+        <translation type="unfinished">Einstenio</translation>
     </message>
     <message>
         <source>Fermium</source>
-        <translation>Fermio</translation>
+        <translation type="unfinished">Fermio</translation>
     </message>
     <message>
         <source>Mendelevium</source>
-        <translation>Mendelevio</translation>
+        <translation type="unfinished">Mendelevio</translation>
     </message>
     <message>
         <source>Nobelium</source>
-        <translation>Nobelio</translation>
+        <translation type="unfinished">Nobelio</translation>
     </message>
     <message>
         <source>Lawrencium</source>
-        <translation>Laurencio</translation>
+        <translation type="unfinished">Laurencio</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
-        <translation>Rutherfordio</translation>
+        <translation type="unfinished">Rutherfordio</translation>
     </message>
     <message>
         <source>Dubnium</source>
-        <translation>Dubnio</translation>
+        <translation type="unfinished">Dubnio</translation>
     </message>
     <message>
         <source>Seaborgium</source>
-        <translation>Seaborgio</translation>
+        <translation type="unfinished">Seaborgio</translation>
     </message>
     <message>
         <source>Bohrium</source>
-        <translation>Bohrio</translation>
+        <translation type="unfinished">Bohrio</translation>
     </message>
     <message>
         <source>Hassium</source>
-        <translation>Hassio</translation>
+        <translation type="unfinished">Hassio</translation>
     </message>
     <message>
         <source>Meitnerium</source>
-        <translation>Meitnerio</translation>
+        <translation type="unfinished">Meitnerio</translation>
+    </message>
+</context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation>Sistema Periódico</translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation>ERROR: 
+</translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation>Datos Químicos</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/systemtime.ts b/i18n/es/systemtime.ts
index 339dc8d..969192e 100644
--- a/i18n/es/systemtime.ts
+++ b/i18n/es/systemtime.ts
@@ -1,145 +1,133 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Ntp</name>
     <message>
         <source>time.fu-berlin.de</source>
         <translation>time.fu-berlin.de</translation>
     </message>
     <message>
         <source>Run NTP?</source>
         <translation>¿Ejecutar NTP?</translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation>Solicitó 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.</source>
-        <translation> minutos han transcurrido desde el última visita.</translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation>¿Ejecutar NTP?</translation>
-    </message>
-    <message>
         <source>Running:</source>
         <translation>Ejecutando:</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation>Error al ejecutar ntpdate</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation> segundos</translation>
     </message>
     <message>
         <source>last [h]</source>
         <translation>último [h]</translation>
     </message>
     <message>
         <source>offset [s]</source>
         <translation>corrección [s]</translation>
     </message>
     <message>
         <source>shift [s/h]</source>
         <translation>ajuste [s/h]</translation>
     </message>
     <message>
         <source> s/h</source>
         <translation> s/h</translation>
     </message>
     <message>
         <source>Get time from network</source>
         <translation>Obtener hora de la Red</translation>
     </message>
     <message>
         <source>Set predicted time: </source>
         <translation>Fijar predicción de hora: </translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation>No pude conectar con el servidor </translation>
     </message>
     <message>
         <source>Predict</source>
         <translation>Predecir</translation>
     </message>
     <message>
         <source>NTP</source>
         <translation>NTP</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Principal</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>ntp error</source>
         <translation>error ntp</translation>
     </message>
     <message>
         <source>Error while getting time form network!</source>
         <translation>¡Error al obtener la hora de la Red!</translation>
     </message>
     <message>
         <source>Error while getting time form
  server</source>
         <translation>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="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NtpBase</name>
     <message>
         <source>Network Time</source>
         <translation>Hora de la Red</translation>
     </message>
     <message>
         <source>Get time from network</source>
         <translation>Obtener hora de la Red</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Hora inicio:</translation>
     </message>
     <message>
         <source>nan</source>
         <translation>nan</translation>
     </message>
     <message>
         <source>Time Shift:</source>
         <translation>Ajuste de hora:</translation>
     </message>
     <message>
         <source>New Time:</source>
         <translation>Nueva hora:</translation>
     </message>
     <message>
         <source>Esimated Shift:</source>
         <translation>Ajuste estimado:</translation>
     </message>
     <message>
         <source>Predicted Time:</source>
         <translation>Predicción de hora:</translation>
     </message>
     <message>
         <source>Mean shift:</source>
         <translation>Ajuste promedio:</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>Fijar predicción de hora</translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation>Predicción de hora</translation>
     </message>
     <message>
diff --git a/i18n/es/todolist.ts b/i18n/es/todolist.ts
index 56277d7..75de883 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -108,222 +108,409 @@ e inténtelo de nuevo.
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
-        <source>Overview</source>
-        <translation>Vistazo</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Avanzado</translation>
-    </message>
-    <message>
         <source>Alarms</source>
         <translation>Alarmas</translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation>Recordatorios</translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation>Ref.cruzadas</translation>
     </message>
     <message>
-        <source>Recurrance</source>
-        <translation>Recurrencia</translation>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrence</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarea</translation>
     </message>
     <message>
         <source>Enter Task</source>
         <translation>Introducir Tarea</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Fecha lí­mite</translation>
     </message>
     <message>
         <source>Table View</source>
         <translation>Vista de tablas</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dia(s)</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished">Prioridad</translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorAdvanced</name>
+    <name>TaskEditorAlarms</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter brief description of the task here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buy </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Organize </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select priority of task here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select category to organize this task with.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurring task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information about this task here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorStatus</name>
+    <message>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>State:</source>
-        <translation>Estado:</translation>
+        <source>Click here to set the current status of this task.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
-        <translation>Iniciado</translation>
+        <translation type="unfinished">Iniciado</translation>
     </message>
     <message>
         <source>Postponed</source>
-        <translation>Pospuesto</translation>
+        <translation type="unfinished">Pospuesto</translation>
     </message>
     <message>
         <source>Finished</source>
-        <translation>Finalizado</translation>
+        <translation type="unfinished">Finalizado</translation>
     </message>
     <message>
         <source>Not started</source>
-        <translation>No iniciado</translation>
+        <translation type="unfinished">No iniciado</translation>
     </message>
     <message>
-        <source>Maintainer</source>
-        <translation>Mantenedor</translation>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>test</source>
-        <translation>test</translation>
+        <source>Select progress made on this task here.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation>...</translation>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintain Mode:</source>
-        <translation>Modo mantenimiento:</translation>
+        <source>20 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>40 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>60 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>80 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>100 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the date this task was started.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the date this task needs to be completed by.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to mark this task as completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the date this task was completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maintainer Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the maintainer&apos;s role.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished">Nada</translation>
     </message>
     <message>
         <source>Responsible</source>
-        <translation>Responsable</translation>
+        <translation type="unfinished">Responsable</translation>
     </message>
     <message>
         <source>Done By</source>
-        <translation>Hecho por</translation>
+        <translation type="unfinished">Hecho por</translation>
     </message>
     <message>
         <source>Coordinating</source>
-        <translation>Coordinador</translation>
+        <translation type="unfinished">Coordinador</translation>
     </message>
     <message>
-        <source>Nothing</source>
-        <translation>Nada</translation>
+        <source>Maintainer:</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
     <message>
-        <source>Description</source>
-        <translation>Descripción</translation>
+        <source>This is the name of the current task maintainer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished">test</translation>
+    </message>
+    <message>
+        <source>Click here to select the task maintainer.</source>
+        <translation type="unfinished"></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>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation>Configurar Platillas</translation>
     </message>
 </context>
 <context>
     <name>Todo</name>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>