update

97 files changed, 3490 insertions, 1289 deletions

diff --git a/i18n/da/advancedfm.ts b/i18n/da/advancedfm.ts
index e4d1d45..df42a9e 100644
--- a/i18n/da/advancedfm.ts
+++ b/i18n/da/advancedfm.ts
@@ -225,12 +225,20 @@ exists. Ok to overwrite?</source>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></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>Output</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/da/libhomeapplet.ts b/i18n/da/libhomeapplet.ts
index 4f91fb0..5539e4a 100644
--- a/i18n/da/libhomeapplet.ts
+++ b/i18n/da/libhomeapplet.ts
@@ -3,11 +3,11 @@
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
         <translation>Hjem genvej</translation>
     </message>
     <message>
-        <source>Home</source>
-        <translation>Hjem</translation>
+        <source>Desktop</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libopie.ts b/i18n/da/libopie.ts
index aa5feb8..da530df 100644
--- a/i18n/da/libopie.ts
+++ b/i18n/da/libopie.ts
@@ -90,16 +90,12 @@
         <translation></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>TimePicker</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation>Tid:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
diff --git a/i18n/da/libscreenshotapplet.ts b/i18n/da/libscreenshotapplet.ts
index 057c267..15bd7b3 100644
--- a/i18n/da/libscreenshotapplet.ts
+++ b/i18n/da/libscreenshotapplet.ts
@@ -1,17 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Snapshot</source>
+        <source>Name of screenshot </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>scap</source>
+        <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
+        <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/da/oxygen.ts b/i18n/da/oxygen.ts
index e105969..8f8d88a 100644
--- a/i18n/da/oxygen.ts
+++ b/i18n/da/oxygen.ts
@@ -100,467 +100,463 @@
         <translation></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Udregninger</translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation>Periodiske System</translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation>FEJL: 
-</translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation>Kemiske Data</translation>
-    </message>
     <message>
         <source>Hydrogen</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beryllium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boron</source>
-        <translation>Bor</translation>
+        <translation type="unfinished">Bor</translation>
     </message>
     <message>
         <source>Carbon</source>
-        <translation>Kulstof</translation>
+        <translation type="unfinished">Kulstof</translation>
     </message>
     <message>
         <source>Nitrogen</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fluorine</source>
-        <translation>Fluor</translation>
+        <translation type="unfinished">Fluor</translation>
     </message>
     <message>
         <source>Neon</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sodium</source>
-        <translation>Natrium</translation>
+        <translation type="unfinished">Natrium</translation>
     </message>
     <message>
         <source>Magnesium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aluminum</source>
-        <translation>Aluminium</translation>
+        <translation type="unfinished">Aluminium</translation>
     </message>
     <message>
         <source>Silicon</source>
-        <translation>Silicium</translation>
+        <translation type="unfinished">Silicium</translation>
     </message>
     <message>
         <source>Phosphorus</source>
-        <translation>Phosphor</translation>
+        <translation type="unfinished">Phosphor</translation>
     </message>
     <message>
         <source>Sulfur</source>
-        <translation>Svovl</translation>
+        <translation type="unfinished">Svovl</translation>
     </message>
     <message>
         <source>Chlorine</source>
-        <translation>Chlor</translation>
+        <translation type="unfinished">Chlor</translation>
     </message>
     <message>
         <source>Argon</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Potassium</source>
-        <translation>Kalium</translation>
+        <translation type="unfinished">Kalium</translation>
     </message>
     <message>
         <source>Calcium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scandium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Titanium</source>
-        <translation>Titan</translation>
+        <translation type="unfinished">Titan</translation>
     </message>
     <message>
         <source>Vanadium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chromium</source>
-        <translation>Chrom</translation>
+        <translation type="unfinished">Chrom</translation>
     </message>
     <message>
         <source>Manganese</source>
-        <translation>Mangan</translation>
+        <translation type="unfinished">Mangan</translation>
     </message>
     <message>
         <source>Iron</source>
-        <translation>Jern</translation>
+        <translation type="unfinished">Jern</translation>
     </message>
     <message>
         <source>Cobalt</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickel</source>
-        <translation>Nikkel</translation>
+        <translation type="unfinished">Nikkel</translation>
     </message>
     <message>
         <source>Copper</source>
-        <translation>Kobber</translation>
+        <translation type="unfinished">Kobber</translation>
     </message>
     <message>
         <source>Zinc</source>
-        <translation>Zink</translation>
+        <translation type="unfinished">Zink</translation>
     </message>
     <message>
         <source>Gallium</source>
-        <translation>Galium</translation>
+        <translation type="unfinished">Galium</translation>
     </message>
     <message>
         <source>Germanium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arsenic</source>
-        <translation>Arsen</translation>
+        <translation type="unfinished">Arsen</translation>
     </message>
     <message>
         <source>Selenium</source>
-        <translation>Selen</translation>
+        <translation type="unfinished">Selen</translation>
     </message>
     <message>
         <source>Bromine</source>
-        <translation>Brom</translation>
+        <translation type="unfinished">Brom</translation>
     </message>
     <message>
         <source>Krypton</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rubidium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Strontium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yttrium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zirconium</source>
-        <translation>Zirkonium</translation>
+        <translation type="unfinished">Zirkonium</translation>
     </message>
     <message>
         <source>Niobium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molybdenum</source>
-        <translation>Molybdæn</translation>
+        <translation type="unfinished">Molybdæn</translation>
     </message>
     <message>
         <source>Technetium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruthenium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhodium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palladium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silver</source>
-        <translation>Sølv</translation>
+        <translation type="unfinished">Sølv</translation>
     </message>
     <message>
         <source>Cadmium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tin</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antimony</source>
-        <translation>Antimon</translation>
+        <translation type="unfinished">Antimon</translation>
     </message>
     <message>
         <source>Tellurium</source>
-        <translation>Tellur</translation>
+        <translation type="unfinished">Tellur</translation>
     </message>
     <message>
         <source>Iodine</source>
-        <translation>Jod</translation>
+        <translation type="unfinished">Jod</translation>
     </message>
     <message>
         <source>Xenon</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cesium</source>
-        <translation>Cæsium</translation>
+        <translation type="unfinished">Cæsium</translation>
     </message>
     <message>
         <source>Barium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lanthanum</source>
-        <translation>Lanthan</translation>
+        <translation type="unfinished">Lanthan</translation>
     </message>
     <message>
         <source>Cerium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Praseodymium</source>
-        <translation>Praseodym</translation>
+        <translation type="unfinished">Praseodym</translation>
     </message>
     <message>
         <source>Neodymium</source>
-        <translation>Neodym</translation>
+        <translation type="unfinished">Neodym</translation>
     </message>
     <message>
         <source>Promethium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samarium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Europium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gadolinium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terbium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dysprosium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holmium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erbium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thulium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ytterbium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lutetium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hafnium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tantalum</source>
-        <translation>Tantal</translation>
+        <translation type="unfinished">Tantal</translation>
     </message>
     <message>
         <source>Tungsten</source>
-        <translation>Wolfram</translation>
+        <translation type="unfinished">Wolfram</translation>
     </message>
     <message>
         <source>Rhenium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Osmium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iridium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Platinum</source>
-        <translation>Platin</translation>
+        <translation type="unfinished">Platin</translation>
     </message>
     <message>
         <source>Gold</source>
-        <translation>Guld</translation>
+        <translation type="unfinished">Guld</translation>
     </message>
     <message>
         <source>Mercury</source>
-        <translation>Kviksølv</translation>
+        <translation type="unfinished">Kviksølv</translation>
     </message>
     <message>
         <source>Thallium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lead</source>
-        <translation>Bly</translation>
+        <translation type="unfinished">Bly</translation>
     </message>
     <message>
         <source>Bismuth</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Polonium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Astatine</source>
-        <translation>Astatin</translation>
+        <translation type="unfinished">Astatin</translation>
     </message>
     <message>
         <source>Radon</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Francium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actinium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thorium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protactinium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uranium</source>
-        <translation>Uran</translation>
+        <translation type="unfinished">Uran</translation>
     </message>
     <message>
         <source>Neptunium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plutonium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Americium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Berkelium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Californium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Einsteinium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fermium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mendelevium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nobelium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lawrencium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rutherfordium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dubnium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seaborgium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bohrium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hassium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meitnerium</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation>Periodiske System</translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation>FEJL: 
+</translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation>Kemiske Data</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/systemtime.ts b/i18n/da/systemtime.ts
index 99e3732..b5e5247 100644
--- a/i18n/da/systemtime.ts
+++ b/i18n/da/systemtime.ts
@@ -23,28 +23,12 @@
     </message>
     <message>
         <source>Run NTP?</source>
         <translation>Kør NTP?</translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation>Du bad om en pause på</translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation> minutter, men kun </translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation> minutter er gået siden sidste opslag.</translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation>Kør NTP igen?</translation>
-    </message>
-    <message>
         <source>Running:</source>
         <translation>Kører:</translation>
     </message>
     <message>
         <source>ntp error</source>
         <translation>NTP Fejl</translation>
@@ -93,12 +77,16 @@ tiden fra serveren </translation>
         <translation>Brug forudsagt tid: </translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation>Kunne ikke forbinde til serveren </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>Netværks Tid</translation>
diff --git a/i18n/da/todolist.ts b/i18n/da/todolist.ts
index b2633a4..1c88191 100644
--- a/i18n/da/todolist.ts
+++ b/i18n/da/todolist.ts
@@ -156,34 +156,34 @@ Listen viser følgende information:
 4. Deadline - Viser hvornår opgaven skal være afsluttet. Denne kolonne kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis opgave deadlines&apos; fra menuen ovenover.</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
-        <source>Overview</source>
-        <translation>Oversigt</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Advanceret</translation>
-    </message>
-    <message>
         <source>Alarms</source>
         <translation>Alarmer</translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation>Påmindelser</translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation>X-Ref</translation>
     </message>
     <message>
-        <source>Recurrance</source>
-        <translation>Gentagelse</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>Enter Task</source>
@@ -223,71 +223,258 @@ Listen viser følgende information:
     <message>
         <source>Priority</source>
         <translation>Prioritet</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">Rediger</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>State:</source>
-        <translation>Status:</translation>
+        <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>Click here to set the current status of this task.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
-        <translation>Påbegyndt</translation>
+        <translation type="unfinished">Påbegyndt</translation>
     </message>
     <message>
         <source>Postponed</source>
-        <translation>Udsat</translation>
+        <translation type="unfinished">Udsat</translation>
     </message>
     <message>
         <source>Finished</source>
-        <translation>Afsluttet</translation>
+        <translation type="unfinished">Afsluttet</translation>
     </message>
     <message>
         <source>Not started</source>
-        <translation>Ikke påbegyndt</translation>
+        <translation type="unfinished">Ikke påbegyndt</translation>
     </message>
     <message>
-        <source>Maintainer</source>
-        <translation>Vedligeholder</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>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>...</source>
-        <translation>...</translation>
+        <source>100 %</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintain Mode:</source>
-        <translation>Vedligeholdelses mode:</translation>
+        <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>Intet</translation>
+        <translation type="unfinished">Intet</translation>
     </message>
     <message>
         <source>Responsible</source>
-        <translation>Ansvarlig</translation>
+        <translation type="unfinished">Ansvarlig</translation>
     </message>
     <message>
         <source>Done By</source>
-        <translation>Afsluttet af</translation>
+        <translation type="unfinished">Afsluttet af</translation>
     </message>
     <message>
         <source>Coordinating</source>
-        <translation>Tilrettelæggelse</translation>
+        <translation type="unfinished">Tilrettelæggelse</translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
     <message>
-        <source>Description</source>
-        <translation>Beskrivelse</translation>
+        <source>Maintainer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
diff --git a/i18n/de/advancedfm.ts b/i18n/de/advancedfm.ts
index 176800c..bd7b703 100644
--- a/i18n/de/advancedfm.ts
+++ b/i18n/de/advancedfm.ts
@@ -232,12 +232,20 @@ exists. Ok to overwrite?</source>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></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>Ausgabe in Datei speichern (nur Name)</translation>
diff --git a/i18n/de/libhomeapplet.ts b/i18n/de/libhomeapplet.ts
index 35433b8..818c609 100644
--- a/i18n/de/libhomeapplet.ts
+++ b/i18n/de/libhomeapplet.ts
@@ -3,11 +3,11 @@
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home</source>
+        <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libopie.ts b/i18n/de/libopie.ts
index c851529..e94d2a7 100644
--- a/i18n/de/libopie.ts
+++ b/i18n/de/libopie.ts
@@ -90,16 +90,12 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>TimePicker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation>Zeit:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
diff --git a/i18n/de/libscreenshotapplet.ts b/i18n/de/libscreenshotapplet.ts
index 101cf72..af5b359 100644
--- a/i18n/de/libscreenshotapplet.ts
+++ b/i18n/de/libscreenshotapplet.ts
@@ -1,17 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Snapshot</source>
-        <translation>Aufnehmen</translation>
+        <source>Name of screenshot </source>
+        <translation>Name des Bildschirmfotos</translation>
     </message>
     <message>
-        <source>scap</source>
-        <translation>scap</translation>
+        <source>Delay</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
-        <translation>Name des Bildschirmfotos</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/de/oxygen.ts b/i18n/de/oxygen.ts
index 9802a60..b00cfb8 100644
--- a/i18n/de/oxygen.ts
+++ b/i18n/de/oxygen.ts
@@ -100,213 +100,187 @@
         <translation>Daten</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Berechnungen</translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation>Periodensystem</translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation>Fehler:</translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation>Chemische Daten</translation>
-    </message>
     <message>
         <source>Hydrogen</source>
-        <translation>Wasserstoff</translation>
+        <translation type="unfinished">Wasserstoff</translation>
     </message>
     <message>
         <source>Helium</source>
-        <translation>Helium</translation>
+        <translation type="unfinished">Helium</translation>
     </message>
     <message>
         <source>Lithium</source>
-        <translation>Lithium</translation>
+        <translation type="unfinished">Lithium</translation>
     </message>
     <message>
         <source>Beryllium</source>
-        <translation>Beryllium</translation>
+        <translation type="unfinished">Beryllium</translation>
     </message>
     <message>
         <source>Boron</source>
-        <translation>Bor</translation>
+        <translation type="unfinished">Bor</translation>
     </message>
     <message>
         <source>Carbon</source>
-        <translation>Kohlenstoff</translation>
+        <translation type="unfinished">Kohlenstoff</translation>
     </message>
     <message>
         <source>Nitrogen</source>
-        <translation>Stickstoff</translation>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation>Sauerstoff</translation>
+        <translation type="unfinished">Stickstoff</translation>
     </message>
     <message>
         <source>Fluorine</source>
-        <translation>Flour</translation>
+        <translation type="unfinished">Flour</translation>
     </message>
     <message>
         <source>Neon</source>
-        <translation>Neon</translation>
+        <translation type="unfinished">Neon</translation>
     </message>
     <message>
         <source>Sodium</source>
-        <translation>Natrium</translation>
+        <translation type="unfinished">Natrium</translation>
     </message>
     <message>
         <source>Magnesium</source>
-        <translation>Magnesium</translation>
+        <translation type="unfinished">Magnesium</translation>
     </message>
     <message>
         <source>Aluminum</source>
-        <translation>Aluminum</translation>
+        <translation type="unfinished">Aluminum</translation>
     </message>
     <message>
         <source>Silicon</source>
-        <translation>Silikon</translation>
+        <translation type="unfinished">Silikon</translation>
     </message>
     <message>
         <source>Phosphorus</source>
-        <translation>Phospor</translation>
+        <translation type="unfinished">Phospor</translation>
     </message>
     <message>
         <source>Sulfur</source>
-        <translation>Schwefel</translation>
+        <translation type="unfinished">Schwefel</translation>
     </message>
     <message>
         <source>Chlorine</source>
-        <translation>Chlor</translation>
+        <translation type="unfinished">Chlor</translation>
     </message>
     <message>
         <source>Argon</source>
-        <translation>Argon</translation>
+        <translation type="unfinished">Argon</translation>
     </message>
     <message>
         <source>Potassium</source>
-        <translation>Kalium</translation>
+        <translation type="unfinished">Kalium</translation>
     </message>
     <message>
         <source>Calcium</source>
-        <translation>Kalzium</translation>
+        <translation type="unfinished">Kalzium</translation>
     </message>
     <message>
         <source>Scandium</source>
-        <translation>Scandium</translation>
+        <translation type="unfinished">Scandium</translation>
     </message>
     <message>
         <source>Titanium</source>
-        <translation>Titan</translation>
+        <translation type="unfinished">Titan</translation>
     </message>
     <message>
         <source>Vanadium</source>
-        <translation>Vanadium</translation>
+        <translation type="unfinished">Vanadium</translation>
     </message>
     <message>
         <source>Chromium</source>
-        <translation>Chrom</translation>
+        <translation type="unfinished">Chrom</translation>
     </message>
     <message>
         <source>Manganese</source>
-        <translation>Mangesium</translation>
+        <translation type="unfinished">Mangesium</translation>
     </message>
     <message>
         <source>Iron</source>
-        <translation>Eisen</translation>
+        <translation type="unfinished">Eisen</translation>
     </message>
     <message>
         <source>Cobalt</source>
-        <translation>Kobalt</translation>
+        <translation type="unfinished">Kobalt</translation>
     </message>
     <message>
         <source>Nickel</source>
-        <translation>Nickel</translation>
+        <translation type="unfinished">Nickel</translation>
     </message>
     <message>
         <source>Copper</source>
-        <translation>Kupfer</translation>
+        <translation type="unfinished">Kupfer</translation>
     </message>
     <message>
         <source>Zinc</source>
-        <translation>Zink</translation>
+        <translation type="unfinished">Zink</translation>
     </message>
     <message>
         <source>Gallium</source>
-        <translation>Gallium</translation>
+        <translation type="unfinished">Gallium</translation>
     </message>
     <message>
         <source>Germanium</source>
-        <translation>Germanium</translation>
+        <translation type="unfinished">Germanium</translation>
     </message>
     <message>
         <source>Arsenic</source>
-        <translation>Arsen</translation>
+        <translation type="unfinished">Arsen</translation>
     </message>
     <message>
         <source>Selenium</source>
-        <translation>Selen</translation>
+        <translation type="unfinished">Selen</translation>
     </message>
     <message>
         <source>Bromine</source>
-        <translation>Brom</translation>
+        <translation type="unfinished">Brom</translation>
     </message>
     <message>
         <source>Krypton</source>
-        <translation>Krypton</translation>
+        <translation type="unfinished">Krypton</translation>
     </message>
     <message>
         <source>Rubidium</source>
-        <translation>Rubidium</translation>
+        <translation type="unfinished">Rubidium</translation>
     </message>
     <message>
         <source>Strontium</source>
-        <translation>Strontium</translation>
+        <translation type="unfinished">Strontium</translation>
     </message>
     <message>
         <source>Yttrium</source>
-        <translation>Yttrium</translation>
+        <translation type="unfinished">Yttrium</translation>
     </message>
     <message>
         <source>Zirconium</source>
-        <translation>Zirconium</translation>
+        <translation type="unfinished">Zirconium</translation>
     </message>
     <message>
         <source>Niobium</source>
-        <translation>Niob</translation>
+        <translation type="unfinished">Niob</translation>
     </message>
     <message>
         <source>Molybdenum</source>
-        <translation>Molybden</translation>
+        <translation type="unfinished">Molybden</translation>
     </message>
     <message>
         <source>Technetium</source>
-        <translation>Technetium</translation>
+        <translation type="unfinished">Technetium</translation>
     </message>
     <message>
         <source>Ruthenium</source>
-        <translation>Ruthenium</translation>
+        <translation type="unfinished">Ruthenium</translation>
     </message>
     <message>
         <source>Rhodium</source>
-        <translation>Rhodium</translation>
+        <translation type="unfinished">Rhodium</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -516,50 +490,72 @@
     <message>
         <source>Californium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Einsteinium</source>
-        <translation>Einsteinium</translation>
+        <translation type="unfinished">Einsteinium</translation>
     </message>
     <message>
         <source>Fermium</source>
-        <translation>Fermium</translation>
+        <translation type="unfinished">Fermium</translation>
     </message>
     <message>
         <source>Mendelevium</source>
-        <translation>Mendelevium</translation>
+        <translation type="unfinished">Mendelevium</translation>
     </message>
     <message>
         <source>Nobelium</source>
-        <translation>Nobelium</translation>
+        <translation type="unfinished">Nobelium</translation>
     </message>
     <message>
         <source>Lawrencium</source>
-        <translation>Lawrencium</translation>
+        <translation type="unfinished">Lawrencium</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
-        <translation>Rutherfordium</translation>
+        <translation type="unfinished">Rutherfordium</translation>
     </message>
     <message>
         <source>Dubnium</source>
-        <translation>Dubnium</translation>
+        <translation type="unfinished">Dubnium</translation>
     </message>
     <message>
         <source>Seaborgium</source>
-        <translation>Seaborgium</translation>
+        <translation type="unfinished">Seaborgium</translation>
     </message>
     <message>
         <source>Bohrium</source>
-        <translation>Bohrium</translation>
+        <translation type="unfinished">Bohrium</translation>
     </message>
     <message>
         <source>Hassium</source>
-        <translation>Hassium</translation>
+        <translation type="unfinished">Hassium</translation>
     </message>
     <message>
         <source>Meitnerium</source>
-        <translation>Meitnerium</translation>
+        <translation type="unfinished">Meitnerium</translation>
+    </message>
+</context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation>Periodensystem</translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation>Fehler:</translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation>Chemische Daten</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/systemtime.ts b/i18n/de/systemtime.ts
index fc8d707..76c6974 100644
--- a/i18n/de/systemtime.ts
+++ b/i18n/de/systemtime.ts
@@ -7,28 +7,12 @@
     </message>
     <message>
         <source>Run NTP?</source>
         <translation>Starte NTP?</translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation>Sie haben um eine Verzögerung von</translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation>minuten gebeten, es sind nur</translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation>minuten vergangen seit dem letzten Lookup.</translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation>NTP neu starten?</translation>
-    </message>
-    <message>
         <source>Running:</source>
         <translation>führe aus:</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation>Fehler beim Ausführen</translation>
@@ -92,12 +76,16 @@
     <message>
         <source>Error while getting time form
  server</source>
         <translation>Fehler beim Nachsehen der
 Zeit auf dem Server</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>Netzwerk Zeit</translation>
diff --git a/i18n/de/todolist.ts b/i18n/de/todolist.ts
index 9b154d7..627357d 100644
--- a/i18n/de/todolist.ts
+++ b/i18n/de/todolist.ts
@@ -149,34 +149,34 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
-        <source>Overview</source>
-        <translation>Überblick</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Fortgeschritten</translation>
-    </message>
-    <message>
         <source>Alarms</source>
         <translation>Alarme</translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation>Erinnerungen</translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation>X-Ref</translation>
     </message>
     <message>
-        <source>Recurrance</source>
-        <translation>Wiederholung</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>Enter Task</source>
@@ -216,71 +216,258 @@ The list displays the following information:
     <message>
         <source>Priority</source>
         <translation type="unfinished">Priorität</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">Editieren</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>Status:</translation>
+        <source>Click here to set the current status of this task.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
-        <translation>Begonnen</translation>
+        <translation type="unfinished">Begonnen</translation>
     </message>
     <message>
         <source>Postponed</source>
-        <translation>Verschoben</translation>
+        <translation type="unfinished">Verschoben</translation>
     </message>
     <message>
         <source>Finished</source>
-        <translation>Beended</translation>
+        <translation type="unfinished">Beended</translation>
     </message>
     <message>
         <source>Not started</source>
-        <translation>Nicht begonnen</translation>
+        <translation type="unfinished">Nicht begonnen</translation>
     </message>
     <message>
-        <source>Maintainer</source>
-        <translation>Verwalter</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>Verwaltermodus:</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">Nichts</translation>
     </message>
     <message>
         <source>Responsible</source>
-        <translation>Verantwortlich</translation>
+        <translation type="unfinished">Verantwortlich</translation>
     </message>
     <message>
         <source>Done By</source>
-        <translation>Erledigt von</translation>
+        <translation type="unfinished">Erledigt von</translation>
     </message>
     <message>
         <source>Coordinating</source>
-        <translation>Koordinatin</translation>
+        <translation type="unfinished">Koordinatin</translation>
     </message>
     <message>
-        <source>Nothing</source>
-        <translation>Nichts</translation>
+        <source>Maintainer:</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
     <message>
-        <source>Description</source>
-        <translation>Beschreibung</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>
diff --git a/i18n/en/advancedfm.ts b/i18n/en/advancedfm.ts
index 070ddfe..0b1212e 100644
--- a/i18n/en/advancedfm.ts
+++ b/i18n/en/advancedfm.ts
@@ -225,12 +225,20 @@ exists. Ok to overwrite?</source>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
diff --git a/i18n/en/libhomeapplet.ts b/i18n/en/libhomeapplet.ts
index 35433b8..818c609 100644
--- a/i18n/en/libhomeapplet.ts
+++ b/i18n/en/libhomeapplet.ts
@@ -3,11 +3,11 @@
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home</source>
+        <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libopie.ts b/i18n/en/libopie.ts
index cbaa47b..b78f90c 100644
--- a/i18n/en/libopie.ts
+++ b/i18n/en/libopie.ts
@@ -90,16 +90,12 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>TimePicker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/libscreenshotapplet.ts b/i18n/en/libscreenshotapplet.ts
index 057c267..15bd7b3 100644
--- a/i18n/en/libscreenshotapplet.ts
+++ b/i18n/en/libscreenshotapplet.ts
@@ -1,17 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Snapshot</source>
+        <source>Name of screenshot </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>scap</source>
+        <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
+        <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/en/oxygen.ts b/i18n/en/oxygen.ts
index 1faa4e1..eaf68a3 100644
--- a/i18n/en/oxygen.ts
+++ b/i18n/en/oxygen.ts
@@ -100,34 +100,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
@@ -151,16 +129,12 @@
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
@@ -559,7 +533,29 @@
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/systemtime.ts b/i18n/en/systemtime.ts
index dabf608..5958bed 100644
--- a/i18n/en/systemtime.ts
+++ b/i18n/en/systemtime.ts
@@ -7,28 +7,12 @@
     </message>
     <message>
         <source>Run NTP?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Running:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
@@ -91,12 +75,16 @@
     </message>
     <message>
         <source>Error while getting time form
  server</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
diff --git a/i18n/en/todolist.ts b/i18n/en/todolist.ts
index c5c28da..9a2f327 100644
--- a/i18n/en/todolist.ts
+++ b/i18n/en/todolist.ts
@@ -145,33 +145,33 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
-        <source>Overview</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarms</source>
+        <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>X-Ref</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrance</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
@@ -212,15 +212,141 @@ The list displays the following information:
     <message>
         <source>Priority</source>
         <translation type="unfinished"></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"></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>State:</source>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
@@ -234,25 +360,81 @@ The list displays the following information:
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintainer</source>
+        <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>test</source>
+        <source>Select progress made on this task here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>...</source>
+        <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintain Mode:</source>
+        <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"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
@@ -262,20 +444,25 @@ The list displays the following information:
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing</source>
+        <source>Maintainer:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
     <message>
-        <source>Description</source>
+        <source>This is the name of the current task maintainer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
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
@@ -237,12 +237,20 @@ existe. ¿Lo sobrescribo?</translation>
     <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>
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
@@ -3,11 +3,11 @@
     <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
@@ -90,16 +90,12 @@
         <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>
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
@@ -100,467 +100,463 @@
         <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
@@ -7,28 +7,12 @@
     </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>
@@ -92,12 +76,16 @@
     <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>
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
@@ -150,34 +150,34 @@ The list displays the following information:
         <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>
@@ -217,71 +217,258 @@ The list displays the following information:
     <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>
diff --git a/i18n/fr/advancedfm.ts b/i18n/fr/advancedfm.ts
index b19ed67..6091dce 100644
--- a/i18n/fr/advancedfm.ts
+++ b/i18n/fr/advancedfm.ts
@@ -226,12 +226,20 @@ exists. Ok to overwrite?</source>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></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>Sauvegarder la sortie dans un fichier</translation>
diff --git a/i18n/fr/libhomeapplet.ts b/i18n/fr/libhomeapplet.ts
index 35433b8..818c609 100644
--- a/i18n/fr/libhomeapplet.ts
+++ b/i18n/fr/libhomeapplet.ts
@@ -3,11 +3,11 @@
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home</source>
+        <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libopie.ts b/i18n/fr/libopie.ts
index a46f352..44e0774 100644
--- a/i18n/fr/libopie.ts
+++ b/i18n/fr/libopie.ts
@@ -91,16 +91,12 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>TimePicker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/fr/libscreenshotapplet.ts b/i18n/fr/libscreenshotapplet.ts
index 057c267..15bd7b3 100644
--- a/i18n/fr/libscreenshotapplet.ts
+++ b/i18n/fr/libscreenshotapplet.ts
@@ -1,17 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Snapshot</source>
+        <source>Name of screenshot </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>scap</source>
+        <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
+        <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/fr/oxygen.ts b/i18n/fr/oxygen.ts
index 1faa4e1..eaf68a3 100644
--- a/i18n/fr/oxygen.ts
+++ b/i18n/fr/oxygen.ts
@@ -100,34 +100,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
@@ -151,16 +129,12 @@
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
@@ -559,7 +533,29 @@
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/systemtime.ts b/i18n/fr/systemtime.ts
index dabf608..5958bed 100644
--- a/i18n/fr/systemtime.ts
+++ b/i18n/fr/systemtime.ts
@@ -7,28 +7,12 @@
     </message>
     <message>
         <source>Run NTP?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Running:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
@@ -91,12 +75,16 @@
     </message>
     <message>
         <source>Error while getting time form
  server</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index c5c28da..9a2f327 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -145,33 +145,33 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
-        <source>Overview</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarms</source>
+        <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>X-Ref</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrance</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
@@ -212,15 +212,141 @@ The list displays the following information:
     <message>
         <source>Priority</source>
         <translation type="unfinished"></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"></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>State:</source>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
@@ -234,25 +360,81 @@ The list displays the following information:
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintainer</source>
+        <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>test</source>
+        <source>Select progress made on this task here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>...</source>
+        <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintain Mode:</source>
+        <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"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
@@ -262,20 +444,25 @@ The list displays the following information:
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing</source>
+        <source>Maintainer:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
     <message>
-        <source>Description</source>
+        <source>This is the name of the current task maintainer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
diff --git a/i18n/it/oxygen.ts b/i18n/it/oxygen.ts
index b47b9fc..398fb6c 100644
--- a/i18n/it/oxygen.ts
+++ b/i18n/it/oxygen.ts
@@ -101,35 +101,12 @@
         <translation>Dati</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Calcoli</translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation>Tavola Periodica</translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation>ERRORE: 
-</translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation>Dati Chimici</translation>
-    </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
@@ -153,16 +130,12 @@
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Oxygen</source>
-        <translation type="unfinished">Oxygen</translation>
-    </message>
-    <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
@@ -561,7 +534,30 @@
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation>Tavola Periodica</translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation>ERRORE: 
+</translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation>Dati Chimici</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/advancedfm.ts b/i18n/pl/advancedfm.ts
index 070ddfe..0b1212e 100644
--- a/i18n/pl/advancedfm.ts
+++ b/i18n/pl/advancedfm.ts
@@ -225,12 +225,20 @@ exists. Ok to overwrite?</source>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
diff --git a/i18n/pl/libhomeapplet.ts b/i18n/pl/libhomeapplet.ts
index 35433b8..818c609 100644
--- a/i18n/pl/libhomeapplet.ts
+++ b/i18n/pl/libhomeapplet.ts
@@ -3,11 +3,11 @@
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home</source>
+        <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libopie.ts b/i18n/pl/libopie.ts
index cbaa47b..b78f90c 100644
--- a/i18n/pl/libopie.ts
+++ b/i18n/pl/libopie.ts
@@ -90,16 +90,12 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>TimePicker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pl/libscreenshotapplet.ts b/i18n/pl/libscreenshotapplet.ts
index 057c267..15bd7b3 100644
--- a/i18n/pl/libscreenshotapplet.ts
+++ b/i18n/pl/libscreenshotapplet.ts
@@ -1,17 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Snapshot</source>
+        <source>Name of screenshot </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>scap</source>
+        <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
+        <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/pl/oxygen.ts b/i18n/pl/oxygen.ts
index 1faa4e1..eaf68a3 100644
--- a/i18n/pl/oxygen.ts
+++ b/i18n/pl/oxygen.ts
@@ -100,34 +100,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
@@ -151,16 +129,12 @@
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
@@ -559,7 +533,29 @@
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/systemtime.ts b/i18n/pl/systemtime.ts
index 8bf13b0..a6bfb67 100644
--- a/i18n/pl/systemtime.ts
+++ b/i18n/pl/systemtime.ts
@@ -7,28 +7,12 @@
     </message>
     <message>
         <source>Run NTP?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Running:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
@@ -91,12 +75,16 @@
     </message>
     <message>
         <source>Error while getting time form
  server</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
diff --git a/i18n/pl/todolist.ts b/i18n/pl/todolist.ts
index 89cc40f..92a5449 100644
--- a/i18n/pl/todolist.ts
+++ b/i18n/pl/todolist.ts
@@ -145,33 +145,33 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
-        <source>Overview</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarms</source>
+        <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>X-Ref</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrance</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
@@ -212,15 +212,141 @@ The list displays the following information:
     <message>
         <source>Priority</source>
         <translation type="unfinished"></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"></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>
+        <source>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
@@ -234,25 +360,81 @@ The list displays the following information:
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintainer</source>
+        <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>test</source>
+        <source>Select progress made on this task here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>...</source>
+        <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintain Mode:</source>
+        <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"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
@@ -262,21 +444,26 @@ The list displays the following information:
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing</source>
+        <source>Maintainer:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
     <message>
-        <source>Description</source>
-        <translation type="unfinished">Opis</translation>
+        <source>This is the name of the current task maintainer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished"></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>
diff --git a/i18n/pt/advancedfm.ts b/i18n/pt/advancedfm.ts
index d8a0698..95a1394 100644
--- a/i18n/pt/advancedfm.ts
+++ b/i18n/pt/advancedfm.ts
@@ -225,12 +225,20 @@ exists. Ok to overwrite?</source>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
diff --git a/i18n/pt/libhomeapplet.ts b/i18n/pt/libhomeapplet.ts
index 35433b8..818c609 100644
--- a/i18n/pt/libhomeapplet.ts
+++ b/i18n/pt/libhomeapplet.ts
@@ -3,11 +3,11 @@
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home</source>
+        <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libopie.ts b/i18n/pt/libopie.ts
index cbaa47b..b78f90c 100644
--- a/i18n/pt/libopie.ts
+++ b/i18n/pt/libopie.ts
@@ -90,16 +90,12 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>TimePicker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pt/libscreenshotapplet.ts b/i18n/pt/libscreenshotapplet.ts
index c307a74..15bd7b3 100644
--- a/i18n/pt/libscreenshotapplet.ts
+++ b/i18n/pt/libscreenshotapplet.ts
@@ -1,17 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Snapshot</source>
-        <translation>Grava Ecrâ</translation>
+        <source>Name of screenshot </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>scap</source>
+        <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
+        <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/pt/oxygen.ts b/i18n/pt/oxygen.ts
index 1faa4e1..eaf68a3 100644
--- a/i18n/pt/oxygen.ts
+++ b/i18n/pt/oxygen.ts
@@ -100,34 +100,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
@@ -151,16 +129,12 @@
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
@@ -559,7 +533,29 @@
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/systemtime.ts b/i18n/pt/systemtime.ts
index 4fffdda..c4ad1a3 100644
--- a/i18n/pt/systemtime.ts
+++ b/i18n/pt/systemtime.ts
@@ -7,28 +7,12 @@
     </message>
     <message>
         <source>Run NTP?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Running:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
@@ -91,12 +75,16 @@
     </message>
     <message>
         <source>Error while getting time form
  server</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
diff --git a/i18n/pt/todolist.ts b/i18n/pt/todolist.ts
index b45ce14..31ac230 100644
--- a/i18n/pt/todolist.ts
+++ b/i18n/pt/todolist.ts
@@ -145,33 +145,33 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
-        <source>Overview</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarms</source>
+        <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>X-Ref</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrance</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
@@ -212,15 +212,141 @@ The list displays the following information:
     <message>
         <source>Priority</source>
         <translation type="unfinished"></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"></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>
+        <source>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
@@ -234,25 +360,81 @@ The list displays the following information:
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintainer</source>
+        <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>test</source>
+        <source>Select progress made on this task here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>...</source>
+        <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintain Mode:</source>
+        <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"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
@@ -262,21 +444,26 @@ The list displays the following information:
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing</source>
+        <source>Maintainer:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
     <message>
-        <source>Description</source>
-        <translation type="unfinished">Descrição</translation>
+        <source>This is the name of the current task maintainer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished"></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>
diff --git a/i18n/pt_BR/advancedfm.ts b/i18n/pt_BR/advancedfm.ts
index 070ddfe..0b1212e 100644
--- a/i18n/pt_BR/advancedfm.ts
+++ b/i18n/pt_BR/advancedfm.ts
@@ -225,12 +225,20 @@ exists. Ok to overwrite?</source>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
diff --git a/i18n/pt_BR/libhomeapplet.ts b/i18n/pt_BR/libhomeapplet.ts
index 35433b8..818c609 100644
--- a/i18n/pt_BR/libhomeapplet.ts
+++ b/i18n/pt_BR/libhomeapplet.ts
@@ -3,11 +3,11 @@
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home</source>
+        <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libopie.ts b/i18n/pt_BR/libopie.ts
index cbaa47b..b78f90c 100644
--- a/i18n/pt_BR/libopie.ts
+++ b/i18n/pt_BR/libopie.ts
@@ -90,16 +90,12 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>TimePicker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pt_BR/libscreenshotapplet.ts b/i18n/pt_BR/libscreenshotapplet.ts
index 198867a..586e128 100644
--- a/i18n/pt_BR/libscreenshotapplet.ts
+++ b/i18n/pt_BR/libscreenshotapplet.ts
@@ -1,18 +1,50 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Snapshot</source>
+        <source>Name of screenshot </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>scap</source>
+        <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
+        <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/pt_BR/oxygen.ts b/i18n/pt_BR/oxygen.ts
index 1faa4e1..eaf68a3 100644
--- a/i18n/pt_BR/oxygen.ts
+++ b/i18n/pt_BR/oxygen.ts
@@ -100,34 +100,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
@@ -151,16 +129,12 @@
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
@@ -559,7 +533,29 @@
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/systemtime.ts b/i18n/pt_BR/systemtime.ts
index 9027d20..00096b4 100644
--- a/i18n/pt_BR/systemtime.ts
+++ b/i18n/pt_BR/systemtime.ts
@@ -8,28 +8,12 @@
     </message>
     <message>
         <source>Run NTP?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Running:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
@@ -92,12 +76,16 @@
     </message>
     <message>
         <source>Error while getting time form
  server</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
diff --git a/i18n/pt_BR/todolist.ts b/i18n/pt_BR/todolist.ts
index f7a2d7e..7be8c2e 100644
--- a/i18n/pt_BR/todolist.ts
+++ b/i18n/pt_BR/todolist.ts
@@ -151,33 +151,33 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
-        <source>Overview</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarms</source>
+        <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>X-Ref</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrance</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
@@ -218,15 +218,141 @@ The list displays the following information:
     <message>
         <source>Priority</source>
         <translation type="unfinished"></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"></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>
+        <source>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
@@ -240,25 +366,81 @@ The list displays the following information:
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintainer</source>
+        <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>test</source>
+        <source>Select progress made on this task here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>...</source>
+        <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintain Mode:</source>
+        <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"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
@@ -268,21 +450,26 @@ The list displays the following information:
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing</source>
+        <source>Maintainer:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
     <message>
-        <source>Description</source>
-        <translation type="unfinished">Descrição</translation>
+        <source>This is the name of the current task maintainer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished"></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>
diff --git a/i18n/sl/advancedfm.ts b/i18n/sl/advancedfm.ts
index 1abb8a9..d0c93f1 100644
--- a/i18n/sl/advancedfm.ts
+++ b/i18n/sl/advancedfm.ts
@@ -230,12 +230,20 @@ exists. Ok to overwrite?</source>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></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>Shrani izhod v datoteko (samo ime)</translation>
diff --git a/i18n/sl/libhomeapplet.ts b/i18n/sl/libhomeapplet.ts
index 63d41c4..2d8ee17 100644
--- a/i18n/sl/libhomeapplet.ts
+++ b/i18n/sl/libhomeapplet.ts
@@ -3,11 +3,11 @@
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
         <translation>Domača bljižnica</translation>
     </message>
     <message>
-        <source>Home</source>
-        <translation>Dom</translation>
+        <source>Desktop</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libopie.ts b/i18n/sl/libopie.ts
index c41f344..efdf58b 100644
--- a/i18n/sl/libopie.ts
+++ b/i18n/sl/libopie.ts
@@ -90,16 +90,12 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>TimePicker</source>
-        <translation>izbiralecČasa</translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation>Čas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
diff --git a/i18n/sl/libscreenshotapplet.ts b/i18n/sl/libscreenshotapplet.ts
index bfd563f..ef58222 100644
--- a/i18n/sl/libscreenshotapplet.ts
+++ b/i18n/sl/libscreenshotapplet.ts
@@ -1,17 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Snapshot</source>
-        <translation>Posnetek</translation>
+        <source>Name of screenshot </source>
+        <translation>Ime posnetka</translation>
     </message>
     <message>
-        <source>scap</source>
-        <translation>zgrabi</translation>
+        <source>Delay</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
-        <translation>Ime posnetka</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/sl/oxygen.ts b/i18n/sl/oxygen.ts
index 1faa4e1..eaf68a3 100644
--- a/i18n/sl/oxygen.ts
+++ b/i18n/sl/oxygen.ts
@@ -100,34 +100,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
@@ -151,16 +129,12 @@
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
@@ -559,7 +533,29 @@
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/systemtime.ts b/i18n/sl/systemtime.ts
index 2da5ae3..44bbef8 100644
--- a/i18n/sl/systemtime.ts
+++ b/i18n/sl/systemtime.ts
@@ -7,28 +7,12 @@
     </message>
     <message>
         <source>Run NTP?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Running:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
@@ -91,12 +75,16 @@
     </message>
     <message>
         <source>Error while getting time form
  server</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
diff --git a/i18n/sl/todolist.ts b/i18n/sl/todolist.ts
index fbc0b00..aa75aca 100644
--- a/i18n/sl/todolist.ts
+++ b/i18n/sl/todolist.ts
@@ -150,33 +150,33 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
-        <source>Overview</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarms</source>
+        <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>X-Ref</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrance</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
@@ -217,15 +217,141 @@ The list displays the following information:
     <message>
         <source>Priority</source>
         <translation type="unfinished"></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"></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>
+        <source>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
@@ -239,25 +365,81 @@ The list displays the following information:
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintainer</source>
+        <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>test</source>
+        <source>Select progress made on this task here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>...</source>
+        <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintain Mode:</source>
+        <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"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
@@ -267,21 +449,26 @@ The list displays the following information:
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing</source>
+        <source>Maintainer:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
     <message>
-        <source>Description</source>
-        <translation type="unfinished">Opis</translation>
+        <source>This is the name of the current task maintainer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished"></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>
diff --git a/i18n/xx/advancedfm.ts b/i18n/xx/advancedfm.ts
index e4d1d45..df42a9e 100644
--- a/i18n/xx/advancedfm.ts
+++ b/i18n/xx/advancedfm.ts
@@ -225,12 +225,20 @@ exists. Ok to overwrite?</source>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></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>Output</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/xx/libhomeapplet.ts b/i18n/xx/libhomeapplet.ts
index 35433b8..818c609 100644
--- a/i18n/xx/libhomeapplet.ts
+++ b/i18n/xx/libhomeapplet.ts
@@ -3,11 +3,11 @@
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home</source>
+        <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libopie.ts b/i18n/xx/libopie.ts
index cbaa47b..b78f90c 100644
--- a/i18n/xx/libopie.ts
+++ b/i18n/xx/libopie.ts
@@ -90,16 +90,12 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>TimePicker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/xx/libscreenshotapplet.ts b/i18n/xx/libscreenshotapplet.ts
index 057c267..15bd7b3 100644
--- a/i18n/xx/libscreenshotapplet.ts
+++ b/i18n/xx/libscreenshotapplet.ts
@@ -1,17 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Snapshot</source>
+        <source>Name of screenshot </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>scap</source>
+        <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
+        <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/xx/oxygen.ts b/i18n/xx/oxygen.ts
index 5207066..8ce6a6e 100644
--- a/i18n/xx/oxygen.ts
+++ b/i18n/xx/oxygen.ts
@@ -100,34 +100,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
@@ -151,16 +129,12 @@
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
@@ -559,7 +533,29 @@
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/systemtime.ts b/i18n/xx/systemtime.ts
index e6c425a..b7dcd0b 100644
--- a/i18n/xx/systemtime.ts
+++ b/i18n/xx/systemtime.ts
@@ -23,28 +23,12 @@
     </message>
     <message>
         <source>Run NTP?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Running:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ntp error</source>
         <translation type="unfinished"></translation>
@@ -91,12 +75,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation type="unfinished"></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 type="unfinished"></translation>
diff --git a/i18n/xx/todolist.ts b/i18n/xx/todolist.ts
index 015a524..9a2f327 100644
--- a/i18n/xx/todolist.ts
+++ b/i18n/xx/todolist.ts
@@ -145,33 +145,33 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
-        <source>Overview</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarms</source>
+        <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>X-Ref</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrance</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
@@ -212,15 +212,141 @@ The list displays the following information:
     <message>
         <source>Priority</source>
         <translation type="unfinished"></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"></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>State:</source>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
@@ -234,25 +360,77 @@ The list displays the following information:
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintainer</source>
+        <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>test</source>
+        <source>Select progress made on this task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
+        <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintain Mode:</source>
+        <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"></translation>
     </message>
@@ -265,17 +443,26 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
     <message>
-        <source>Description</source>
+        <source>Maintainer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is the name of the current task maintainer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index 070ddfe..0b1212e 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -225,12 +225,20 @@ exists. Ok to overwrite?</source>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
diff --git a/i18n/zh_TW/buzzword.ts b/i18n/zh_TW/buzzword.ts
index 4d1bc18..a71309b 100644
--- a/i18n/zh_TW/buzzword.ts
+++ b/i18n/zh_TW/buzzword.ts
@@ -1,21 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
-        <translation >buZzword</translation>
+        <translation>buZzword</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>&amp;新遊戲</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
-        <translation >&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</translation>
+        <translation>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/helpbrowser.ts b/i18n/zh_TW/helpbrowser.ts
index d3f398f..1ccb583 100644
--- a/i18n/zh_TW/helpbrowser.ts
+++ b/i18n/zh_TW/helpbrowser.ts
@@ -1,37 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
-        <translation >往回</translation>
+        <translation>往回</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation >往前</translation>
+        <translation>往前</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation >家目錄</translation>
+        <translation>家目錄</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
-        <translation >新增書簽</translation>
+        <translation>新增書簽</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
-        <translation >從書簽中移除</translation>
+        <translation>從書簽中移除</translation>
     </message>
     <message>
         <source>Bookmarks</source>
-        <translation >書簽</translation>
+        <translation>書簽</translation>
     </message>
     <message>
         <source>Help Browser</source>
-        <translation >幫助瀏覽器</translation>
+        <translation>幫助瀏覽器</translation>
     </message>
     <message>
         <source>HelpBrowser</source>
-        <translation >幫助瀏覽器</translation>
+        <translation>幫助瀏覽器</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/language.ts b/i18n/zh_TW/language.ts
index a074308..2412cf4 100644
--- a/i18n/zh_TW/language.ts
+++ b/i18n/zh_TW/language.ts
@@ -10,15 +10,15 @@
         <translation>預設值</translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
-        <source>Language</source>
-        <translation>語言</translation>
-    </message>
-    <message>
         <source>Select language</source>
         <translation>選擇語言</translation>
     </message>
+    <message>
+        <source>Language Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libcardmonapplet.ts b/i18n/zh_TW/libcardmonapplet.ts
index 0b5ef8d..28c4368 100644
--- a/i18n/zh_TW/libcardmonapplet.ts
+++ b/i18n/zh_TW/libcardmonapplet.ts
@@ -8,13 +8,13 @@
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>SD/MMC 移除失敗!</translation>
     </message>
     <message>
         <source>New card: </source>
-        <translation >新卡片:</translation>
+        <translation>新卡片:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>移除:</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/libhomeapplet.ts b/i18n/zh_TW/libhomeapplet.ts
index 1242dba..42a0349 100644
--- a/i18n/zh_TW/libhomeapplet.ts
+++ b/i18n/zh_TW/libhomeapplet.ts
@@ -1,13 +1,13 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
-        <translation >快速進入家目錄</translation>
+        <translation>快速進入家目錄</translation>
     </message>
     <message>
-        <source>Home</source>
-        <translation>進入家目錄</translation>
+        <source>Desktop</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/liblogoutapplet.ts b/i18n/zh_TW/liblogoutapplet.ts
index 01d33f3..92b6e00 100644
--- a/i18n/zh_TW/liblogoutapplet.ts
+++ b/i18n/zh_TW/liblogoutapplet.ts
@@ -1,18 +1,18 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LogoutApplet</name>
     <message>
         <source>Logout shortcut</source>
-        <translation >快速登出</translation>
+        <translation>快速登出</translation>
     </message>
     <message>
         <source>Logout</source>
-        <translation >登出</translation>
+        <translation>登出</translation>
     </message>
     <message>
         <source>Do you really want to
 end this session ?</source>
-        <translation >確定登出?</translation>
+        <translation>確定登出?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libopie.ts b/i18n/zh_TW/libopie.ts
index cbaa47b..b78f90c 100644
--- a/i18n/zh_TW/libopie.ts
+++ b/i18n/zh_TW/libopie.ts
@@ -90,16 +90,12 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>TimePicker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/libqdvorak.ts b/i18n/zh_TW/libqdvorak.ts
index 421dd31..83ab234 100644
--- a/i18n/zh_TW/libqdvorak.ts
+++ b/i18n/zh_TW/libqdvorak.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Dvorak</source>
-        <translation >Dvorak</translation>
+        <translation>Dvorak</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqkjumpx.ts b/i18n/zh_TW/libqkjumpx.ts
index c2d8db3..2f0bdbc 100644
--- a/i18n/zh_TW/libqkjumpx.ts
+++ b/i18n/zh_TW/libqkjumpx.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InputMethods</name>
     <message>
         <source>KJumpX</source>
-        <translation >KJumpX</translation>
+        <translation>KJumpX</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqpickboard.ts b/i18n/zh_TW/libqpickboard.ts
index 468515a..7eef6c6 100644
--- a/i18n/zh_TW/libqpickboard.ts
+++ b/i18n/zh_TW/libqpickboard.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
-        <translation >Pickboard</translation>
+        <translation>Pickboard</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqunikeyboard.ts b/i18n/zh_TW/libqunikeyboard.ts
index ecacc23..caf766c 100644
--- a/i18n/zh_TW/libqunikeyboard.ts
+++ b/i18n/zh_TW/libqunikeyboard.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
-        <translation >Unicode</translation>
+        <translation>Unicode</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libscreenshotapplet.ts b/i18n/zh_TW/libscreenshotapplet.ts
index 84f00d8..81a2422 100644
--- a/i18n/zh_TW/libscreenshotapplet.ts
+++ b/i18n/zh_TW/libscreenshotapplet.ts
@@ -1,17 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Snapshot</source>
-        <translation>Snapshot</translation>
+        <source>Name of screenshot </source>
+        <translation>檔案名稱</translation>
     </message>
     <message>
-        <source>scap</source>
-        <translation>scap</translation>
+        <source>Delay</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
-        <translation>檔案名稱</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/zh_TW/libvolumeapplet.ts b/i18n/zh_TW/libvolumeapplet.ts
index 4995ad2..e796c5e 100644
--- a/i18n/zh_TW/libvolumeapplet.ts
+++ b/i18n/zh_TW/libvolumeapplet.ts
@@ -8,14 +8,14 @@
     <message>
         <source>Alarm Sound</source>
         <translation>鬧鐘</translation>
     </message>
     <message>
         <source>Key Clicks</source>
-        <translation >鍵般</translation>
+        <translation>鍵般</translation>
     </message>
     <message>
         <source>Screen Taps</source>
-        <translation >觸控</translation>
+        <translation>觸控</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libwirelessapplet.ts b/i18n/zh_TW/libwirelessapplet.ts
index 993457c..c53fcef 100644
--- a/i18n/zh_TW/libwirelessapplet.ts
+++ b/i18n/zh_TW/libwirelessapplet.ts
@@ -1,29 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedConfigBase</name>
     <message>
         <source>Advanced Config</source>
-        <translation >進階設定</translation>
+        <translation>進階設定</translation>
     </message>
     <message>
         <source>Renew DHCP on changing</source>
-        <translation >在切換時更新DHCP</translation>
+        <translation>在切換時更新DHCP</translation>
     </message>
     <message>
         <source>Frequency</source>
-        <translation >頻率</translation>
+        <translation>頻率</translation>
     </message>
     <message>
         <source>MODE</source>
-        <translation >模式</translation>
+        <translation>模式</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation >ESSID</translation>
+        <translation>ESSID</translation>
     </message>
     <message>
         <source>AccessPoint</source>
-        <translation >AccessPoint</translation>
+        <translation>AccessPoint</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/minesweep.ts b/i18n/zh_TW/minesweep.ts
index e031976..8f00160 100644
--- a/i18n/zh_TW/minesweep.ts
+++ b/i18n/zh_TW/minesweep.ts
@@ -1,12 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
-        <translation >你贏了!</translation>
+        <translation>你贏了!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>你爆了!</translation>
     </message>
     <message>
@@ -16,13 +16,13 @@
     <message>
         <source>Beginner</source>
         <translation>初學</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation >進階</translation>
+        <translation>進階</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>專家</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/opieftp.ts b/i18n/zh_TW/opieftp.ts
index 70f7b42..06bf6b7 100644
--- a/i18n/zh_TW/opieftp.ts
+++ b/i18n/zh_TW/opieftp.ts
@@ -247,7 +247,7 @@ It must be empty</source>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>名稱已經存在</translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/i18n/zh_TW/oxygen.ts b/i18n/zh_TW/oxygen.ts
index 1faa4e1..eaf68a3 100644
--- a/i18n/zh_TW/oxygen.ts
+++ b/i18n/zh_TW/oxygen.ts
@@ -100,34 +100,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
@@ -151,16 +129,12 @@
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
@@ -559,7 +533,29 @@
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/parashoot.ts b/i18n/zh_TW/parashoot.ts
index 96dba92..3dc00b7 100644
--- a/i18n/zh_TW/parashoot.ts
+++ b/i18n/zh_TW/parashoot.ts
@@ -1,20 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ParaShoot</name>
     <message>
         <source>ParaShoot</source>
-        <translation >ParaShoot</translation>
+        <translation>ParaShoot</translation>
     </message>
     <message>
         <source>New Game</source>
-        <translation >新遊戲</translation>
+        <translation>新遊戲</translation>
     </message>
     <message>
         <source>     Level: %1       Score: %2   </source>
-        <translation >     等級: %1       分數: %2   </translation>
+        <translation>     等級: %1       分數: %2   </translation>
     </message>
     <message>
         <source>       GAME OVER!
        Your Score:  %1
  Parachuters Killed: %2
         Accuracy: %3% </source>
diff --git a/i18n/zh_TW/qasteroids.ts b/i18n/zh_TW/qasteroids.ts
index d100e92..4ca6731 100644
--- a/i18n/zh_TW/qasteroids.ts
+++ b/i18n/zh_TW/qasteroids.ts
@@ -4,38 +4,38 @@
     <message>
         <source>Asteroids</source>
         <translation>行星</translation>
     </message>
     <message>
         <source>Score</source>
-        <translation >來源</translation>
+        <translation>來源</translation>
     </message>
     <message>
         <source>Level</source>
-        <translation >等級</translation>
+        <translation>等級</translation>
     </message>
     <message>
         <source>Ships</source>
         <translation>太空梭</translation>
     </message>
     <message>
         <source>Fuel</source>
-        <translation >燃料</translation>
+        <translation>燃料</translation>
     </message>
     <message>
         <source>Press Calendar to start playing</source>
-        <translation >請按下Calender(行事曆) 以開始遊戲</translation>
+        <translation>請按下Calender(行事曆) 以開始遊戲</translation>
     </message>
     <message>
         <source>Ship Destroyed.
 Press Contacts/Home key.</source>
-        <translation >殘念~
+        <translation>殘念~
 請按下 Contacts/Home key</translation>
     </message>
     <message>
         <source>Game Over.
 Press Calendar for a new game.</source>
-        <translation >Game Over
+        <translation>Game Over
 請按下Calender(行事曆) 以開始新遊戲</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index 5ee0e1e..012c7c8 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -53,13 +53,13 @@ Keep power off until power restored!</source>
         <source>Battery is running very low.</source>
         <translation>低電量</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation >低電量警告.
+        <translation>低電量警告.
 請換上備份電池</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>business card </translation>
     </message>
@@ -75,13 +75,13 @@ Please charge the back-up battery.</source>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
-        <translation >電池狀態</translation>
+        <translation>電池狀態</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
@@ -120,21 +120,21 @@ Please charge the back-up battery.</source>
     <message>
         <source>Medium inserted</source>
         <translation>中間插入</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation >A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
+        <translation>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Which media files</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation >音效</translation>
+        <translation>音效</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>圖形</translation>
     </message>
     <message>
@@ -152,13 +152,13 @@ Please charge the back-up battery.</source>
     <message>
         <source>Link apps</source>
         <translation>連結程式</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation >Limit search to dir: (not used yet)</translation>
+        <translation>Limit search to dir: (not used yet)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>加入</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/snake.ts b/i18n/zh_TW/snake.ts
index ec9dff7..60f7daf 100644
--- a/i18n/zh_TW/snake.ts
+++ b/i18n/zh_TW/snake.ts
@@ -4,13 +4,13 @@
     <message>
         <source>Snake</source>
         <translation>貪食蛇</translation>
     </message>
     <message>
         <source>New Game</source>
-        <translation >新遊戲</translation>
+        <translation>新遊戲</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>貪食蛇!</translation>
     </message>
     <message>
@@ -33,10 +33,10 @@ crash into the walls, edges or its tail.</source>
  Your Score: %1</source>
         <translation>GAME OVER!
  你的得分: %1</translation>
     </message>
     <message>
         <source>Press Any Key to Begin a New Game.</source>
-        <translation >按任意鍵以開始新遊戲</translation>
+        <translation>按任意鍵以開始新遊戲</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/systemtime.ts b/i18n/zh_TW/systemtime.ts
index dabf608..5958bed 100644
--- a/i18n/zh_TW/systemtime.ts
+++ b/i18n/zh_TW/systemtime.ts
@@ -7,28 +7,12 @@
     </message>
     <message>
         <source>Run NTP?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Running:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
@@ -91,12 +75,16 @@
     </message>
     <message>
         <source>Error while getting time form
  server</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
diff --git a/i18n/zh_TW/tetrix.ts b/i18n/zh_TW/tetrix.ts
index 4793873..511bf25 100644
--- a/i18n/zh_TW/tetrix.ts
+++ b/i18n/zh_TW/tetrix.ts
@@ -1,29 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
-        <translation >魔術方塊</translation>
+        <translation>魔術方塊</translation>
     </message>
     <message>
         <source>Next</source>
-        <translation >下一個</translation>
+        <translation>下一個</translation>
     </message>
     <message>
         <source>Score</source>
-        <translation >分數</translation>
+        <translation>分數</translation>
     </message>
     <message>
         <source>Level</source>
-        <translation >等級</translation>
+        <translation>等級</translation>
     </message>
     <message>
         <source>Removed</source>
-        <translation >移除</translation>
+        <translation>移除</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation >開始</translation>
+        <translation>開始</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/tictac.ts b/i18n/zh_TW/tictac.ts
index 8d4cc55..296cb79 100644
--- a/i18n/zh_TW/tictac.ts
+++ b/i18n/zh_TW/tictac.ts
@@ -16,13 +16,13 @@
     <message>
         <source>Quit</source>
         <translation>離開</translation>
     </message>
     <message>
         <source>Click Play to start</source>
-        <translation>按"開始!"開始遊戲</translation>
+        <translation>按&quot;開始!&quot;開始遊戲</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>輪到你了</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/todolist.ts b/i18n/zh_TW/todolist.ts
index 140fbc4..cbb2fc2 100644
--- a/i18n/zh_TW/todolist.ts
+++ b/i18n/zh_TW/todolist.ts
@@ -35,36 +35,24 @@
     </message>
     <message>
         <source>Find</source>
         <translation>搜尋</translation>
     </message>
     <message>
-        <source>Completed tasks</source>
-        <translation>顯示已完成事項</translation>
-    </message>
-    <message>
-        <source>Show Deadline</source>
-        <translation>顯示到期日</translation>
-    </message>
-    <message>
         <source>Data</source>
         <translation>資料管理</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>分類目錄</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>設定選項</translation>
     </message>
     <message>
-        <source>Show only over due</source>
-        <translation>只顯示已過期之待辦事項</translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation>利用樣板建立新事項</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation>全部目錄</translation>
@@ -107,38 +95,84 @@ Quit Anyway?</source>
         <translation>&lt;P&gt;%1 已完成接收新的待辦事項。&lt;p&gt;請問您是否要將其新增至您的待辦事項清單中？</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>新增待辦事項</translation>
     </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
     <message>
-        <source>Overview</source>
-        <translation>內容</translation>
+        <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>Show completed tasks</source>
+        <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>Advanced</source>
-        <translation>進階設定</translation>
+        <source>Show quick task bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QuickEdit</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>Alarms</source>
         <translation>鬧鈴</translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation>提醒事項</translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrance</source>
-        <translation>週期性</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>Enter Task</source>
@@ -153,16 +187,12 @@ Quit Anyway?</source>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation>完成</translation>
     </message>
     <message>
-        <source>Prior.</source>
-        <translation>優先順序</translation>
-    </message>
-    <message>
         <source>Description</source>
         <translation>說明</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>到期日</translation>
@@ -176,234 +206,264 @@ Quit Anyway?</source>
         <translation>無</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 天</translation>
     </message>
+    <message>
+        <source>Priority</source>
+        <translation type="unfinished">優先順序</translation>
+    </message>
 </context>
 <context>
-    <name>TaskEditorAdvanced</name>
+    <name>TaskEditorAlarms</name>
     <message>
-        <source>State:</source>
-        <translation>狀態：</translation>
+        <source>New</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Started</source>
-        <translation>已開始</translation>
+        <source>Edit</source>
+        <translation type="unfinished">編輯</translation>
     </message>
     <message>
-        <source>Postponed</source>
-        <translation>已延期</translation>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
     <message>
-        <source>Finished</source>
-        <translation>已完成</translation>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not started</source>
-        <translation>尚未開始</translation>
+        <source>Enter brief description of the task here.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintainer</source>
-        <translation>負責人</translation>
+        <source>Complete </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>test</source>
-        <translation>測試</translation>
+        <source>Work on </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation>...</translation>
+        <source>Buy </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintain Mode:</source>
-        <translation>責任歸屬：</translation>
+        <source>Organize </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Responsible</source>
-        <translation>由其負責</translation>
+        <source>Get </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Done By</source>
-        <translation>由其完成</translation>
+        <source>Update </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Coordinating</source>
-        <translation>由其協調</translation>
+        <source>Create </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing</source>
-        <translation>無</translation>
+        <source>Plan </source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
     <message>
-        <source>Description</source>
-        <translation>細節說明</translation>
+        <source>Call </source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAlarms</name>
     <message>
-        <source>empty</source>
-        <translation>無</translation>
+        <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>&amp;Add</source>
-        <translation>&amp;新增</translation>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;編輯</translation>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;移除</translation>
+        <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>TaskEditorOverView</name>
+    <name>TaskEditorStatus</name>
     <message>
-        <source>Form1</source>
-        <translation>表格 1</translation>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>優先順序</translation>
+        <source>Click here to set the current status of this task.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 - Very High</source>
-        <translation>1 - 非常高</translation>
+        <source>Started</source>
+        <translation type="unfinished">已開始</translation>
     </message>
     <message>
-        <source>2 - High</source>
-        <translation>2 - 高</translation>
+        <source>Postponed</source>
+        <translation type="unfinished">已延期</translation>
     </message>
     <message>
-        <source>3 - Normal</source>
-        <translation>3 - 普通</translation>
+        <source>Finished</source>
+        <translation type="unfinished">已完成</translation>
     </message>
     <message>
-        <source>4 - Low</source>
-        <translation>4 - 低</translation>
+        <source>Not started</source>
+        <translation type="unfinished">尚未開始</translation>
     </message>
     <message>
-        <source>5 - Very Low</source>
-        <translation>5 - 非常低</translation>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress</source>
-        <translation>進度</translation>
+        <source>Select progress made on this task here.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
-        <translation>0 %</translation>
+        <translation type="unfinished">0 %</translation>
     </message>
     <message>
         <source>20 %</source>
-        <translation>20 %</translation>
+        <translation type="unfinished">20 %</translation>
     </message>
     <message>
         <source>40 %</source>
-        <translation>40 %</translation>
+        <translation type="unfinished">40 %</translation>
     </message>
     <message>
         <source>60 %</source>
-        <translation>60 %</translation>
+        <translation type="unfinished">60 %</translation>
     </message>
     <message>
         <source>80 %</source>
-        <translation>80 %</translation>
+        <translation type="unfinished">80 %</translation>
     </message>
     <message>
         <source>100 %</source>
-        <translation>100 %</translation>
-    </message>
-    <message>
-        <source>Due Date:</source>
-        <translation>預定到期日：</translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation>2002 年一月一日</translation>
+        <translation type="unfinished">100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
-        <translation>開始日期：</translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation>2001 年一月一日</translation>
+        <translation type="unfinished">開始日期：</translation>
     </message>
     <message>
-        <source>Summary</source>
-        <translation>概要</translation>
+        <source>Click here to set the date this task was started.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Complete</source>
-        <translation>完成</translation>
+        <source>Due Date:</source>
+        <translation type="unfinished">預定到期日：</translation>
     </message>
     <message>
-        <source>work on</source>
-        <translation>進行中</translation>
+        <source>Click here to set the date this task needs to be completed by.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>buy</source>
-        <translation>購買</translation>
+        <source>Completed:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>organize</source>
-        <translation>組織</translation>
+        <source>Click here to mark this task as completed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>get</source>
-        <translation>取得</translation>
+        <source>Click here to set the date this task was completed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update</source>
-        <translation>更新</translation>
+        <source>Maintainer Mode:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create</source>
-        <translation>設計</translation>
+        <source>Click here to set the maintainer&apos;s role.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Plan</source>
-        <translation>計劃</translation>
+        <source>Nothing</source>
+        <translation type="unfinished">無</translation>
     </message>
     <message>
-        <source>Call</source>
-        <translation>打電話</translation>
+        <source>Responsible</source>
+        <translation type="unfinished">由其負責</translation>
     </message>
     <message>
-        <source>Mail</source>
-        <translation>寫信</translation>
+        <source>Done By</source>
+        <translation type="unfinished">由其完成</translation>
     </message>
     <message>
-        <source>Completed Date</source>
-        <translation>完成日期：</translation>
+        <source>Coordinating</source>
+        <translation type="unfinished">由其協調</translation>
     </message>
     <message>
-        <source>Completed</source>
-        <translation>已完成</translation>
+        <source>Maintainer:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category</source>
-        <translation>分類目錄</translation>
+        <source>This is the name of the current task maintainer.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable Recurrance</source>
-        <translation>啟動週期性設定</translation>
+        <source>test</source>
+        <translation type="unfinished">測試</translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorOverViewImpl</name>
     <message>
-        <source>Todo List</source>
-        <translation>待辦事項清單</translation>
+        <source>Click here to select the task maintainer.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
@@ -437,7 +497,62 @@ Quit Anyway?</source>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation>樣板管理</translation>
     </message>
 </context>
+<context>
+    <name>Todo</name>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>