updated translations for todolist

13 files changed, 1389 insertions, 1313 deletions

diff --git a/i18n/da/todolist.ts b/i18n/da/todolist.ts
index e9c98ea..356bad6 100644
--- a/i18n/da/todolist.ts
+++ b/i18n/da/todolist.ts
@@ -1,589 +1,586 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
-    <message>
-        <source>New Task</source>
-        <translation>Ny opgave</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation>Rediger opgave</translation>
-    </message>
+    <name>OTaskEditor</name>
     <message>
-        <source>View Task</source>
-        <translation>Vis opgave</translation>
+        <source>Alarms</source>
+        <translation>Alarmer</translation>
     </message>
     <message>
-        <source>Delete...</source>
-        <translation>Slet...</translation>
+        <source>Reminders</source>
+        <translation>Påmindelser</translation>
     </message>
     <message>
-        <source>Delete all...</source>
-        <translation>Slet alle...</translation>
+        <source>X-Ref</source>
+        <translation>X-Ref</translation>
     </message>
     <message>
-        <source>Delete completed</source>
-        <translation>Slet afsluttede</translation>
+        <source>Information</source>
+        <translation>Information</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation>Duplikere</translation>
+        <source>Status</source>
+        <translation>Status</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation>Send</translation>
+        <source>Recurrence</source>
+        <translation>Gentagelse</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Find</source>
-        <translation>Find</translation>
+        <source>Enter Task</source>
+        <translation>Indtast opgave</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation>Data</translation>
+        <source>Edit Task</source>
+        <translation>Rediger opgave</translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
-        <source>Category</source>
-        <translation>Kategori</translation>
+        <source>New from template</source>
+        <translation type="unfinished">Ny fra skabelon</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation>Valgmuligheder</translation>
+        <source>New Task</source>
+        <translation type="unfinished">Ny opgave</translation>
     </message>
     <message>
-        <source>New from template</source>
-        <translation>Ny fra skabelon</translation>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished">Klik her for at oprette en ny opgave.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation>Alle kategorier</translation>
+        <source>Edit Task</source>
+        <translation type="unfinished">Rediger opgave</translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation>Ikke mere plads</translation>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished">Klik her for at redigere den valgte opgave.</translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
-        <translation>Opgaveliste kunne ikke
-gemme dine ændringer.
-Frigør noget lagerplads
-og prøv igen.
-
-Afslut alligevel?</translation>
+        <source>View Task</source>
+        <translation type="unfinished">Vis opgave</translation>
     </message>
     <message>
-        <source>Todo</source>
-        <translation>Opgaveliste</translation>
+        <source>Delete...</source>
+        <translation type="unfinished">Slet...</translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation>Kan ikke redigere data da en synkronisering er igang</translation>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished">Klik her for at fjerne den valgte opgave.</translation>
     </message>
     <message>
-        <source>all tasks?</source>
-        <translation>Alle opgaver?</translation>
+        <source>Delete all...</source>
+        <translation type="unfinished">Slet alle...</translation>
     </message>
     <message>
-        <source>all completed tasks?</source>
-        <translation>Alle afsluttede opgaver?</translation>
+        <source>Delete completed</source>
+        <translation type="unfinished">Slet afsluttede</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation>Ikke-arkiverede</translation>
+        <source>Beam</source>
+        <translation type="unfinished">Send</translation>
     </message>
     <message>
-        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation>&lt;P&gt;%1 nye opgaver er modtaget.&lt;p&gt;Vil du tilføje dem til din opgaveliste?</translation>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished">Klik her for at sende den valgte opgave til en anden enhed.</translation>
     </message>
     <message>
-        <source>New Tasks</source>
-        <translation>Nye opgaver</translation>
+        <source>Find</source>
+        <translation type="unfinished">Find</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
-        <translation>Vis afsluttede opgaver</translation>
+        <translation type="unfinished">Vis afsluttede opgaver</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
-        <translation>Vis kun forfaldne opgaver</translation>
+        <translation type="unfinished">Vis kun forfaldne opgaver</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
-        <translation>Vis opgave deadlines</translation>
+        <translation type="unfinished">Vis opgave deadlines</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
-        <translation>Vis genvejspanel</translation>
-    </message>
-    <message>
-        <source>QuickEdit</source>
-        <translation></translation>
+        <translation type="unfinished">Vis genvejspanel</translation>
     </message>
     <message>
-        <source>Click here to create a new task.</source>
-        <translation>Klik her for at oprette en ny opgave.</translation>
+        <source>Data</source>
+        <translation type="unfinished">Data</translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
-        <translation>Klik her for at redigere den valgte opgave.</translation>
+        <source>Category</source>
+        <translation type="unfinished">Kategori</translation>
     </message>
     <message>
-        <source>Click here to remove the current task.</source>
-        <translation>Klik her for at fjerne den valgte opgave.</translation>
+        <source>Options</source>
+        <translation type="unfinished">Valgmuligheder</translation>
     </message>
     <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation>Klik her for at sende den valgte opgave til en anden enhed.</translation>
+        <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>Dette er en liste over alle nuværende opgaver.
+        <translation type="unfinished">Dette er en liste over alle nuværende opgaver.
 
 Listen viser følgende information:
 1. Afsluttet - Et grønt hak indikerer at opgaven er afsluttet. Klik her for at afslutte en opgave.
 2. Prioritet - En grafisk repræsentation af opgavens prioritet. Dobbelt-klik her for at ændre.
 3. Beskrivelse - Beskrivelse af opgaven. Klik her for at vælge opgaven.
 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>Alarms</source>
-        <translation>Alarmer</translation>
+        <source>All Categories</source>
+        <translation type="unfinished">Alle kategorier</translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation>Påmindelser</translation>
+        <source>Out of space</source>
+        <translation type="unfinished">Ikke mere plads</translation>
     </message>
     <message>
-        <source>X-Ref</source>
-        <translation>X-Ref</translation>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished">Opgaveliste kunne ikke
+gemme dine ændringer.
+Frigør noget lagerplads
+og prøv igen.
+
+Afslut alligevel?</translation>
     </message>
     <message>
-        <source>Information</source>
-        <translation>Information</translation>
+        <source>Todo</source>
+        <translation type="unfinished">Opgaveliste</translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation>Status</translation>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished">Kan ikke redigere data da en synkronisering er igang</translation>
     </message>
     <message>
-        <source>Recurrence</source>
-        <translation>Gentagelse</translation>
+        <source>all tasks?</source>
+        <translation type="unfinished">Alle opgaver?</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Enter Task</source>
-        <translation>Indtast opgave</translation>
+        <source>all completed tasks?</source>
+        <translation type="unfinished">Alle afsluttede opgaver?</translation>
     </message>
     <message>
-        <source>Edit Task</source>
-        <translation>Rediger opgave</translation>
+        <source>Unfiled</source>
+        <translation type="unfinished">Ikke-arkiverede</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished">&lt;P&gt;%1 nye opgaver er modtaget.&lt;p&gt;Vil du tilføje dem til din opgaveliste?</translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation type="unfinished">Nye opgaver</translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished">Duplikere</translation>
     </message>
-</context>
-<context>
-    <name>TableView</name>
     <message>
         <source>C.</source>
-        <translation>C.</translation>
+        <translation type="unfinished">C.</translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation type="unfinished">Prioritet</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Beskrivelse</translation>
+        <translation type="unfinished">Beskrivelse</translation>
     </message>
     <message>
         <source>Deadline</source>
-        <translation>Deadline</translation>
+        <translation type="unfinished">Deadline</translation>
     </message>
     <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished">Konfigurer skabeloner</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished">Prioritet:</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
         <source>Table View</source>
         <translation>Tabel visning</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dag(e)</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioritet</translation>
-    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Beskrivelse:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Indtast en kort beskrivelse af opgaven her.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Afsluttet</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Arbejde</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Køb</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organisere</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Hent</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Opdater</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Opret</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Planlægge</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Ring</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Maile</translation>
     </message>
     <message>
-        <source>Priority:</source>
-        <translation>Prioritet:</translation>
-    </message>
-    <message>
         <source>Select priority of task here.</source>
         <translation>Vælg opgavens prioritet her.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Meget høj</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Høj</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Lav</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Meget lav</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Vælg opgavens kategori.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Gentagende opgave</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>Klik her hvis opgaven forekommer på et regelmæssigt basis. Hvis valgt, kan hyppigheden vælges på Gentagelse-fanen.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Noter:</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Indtast yderligere information angående opgaven her.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Opgaveliste</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Status:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Klik her for at vælge opgavens nuværende status.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Påbegyndt</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Udsat</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Afsluttet</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Ikke påbegyndt</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Forløb:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Angiv opgavens forløb her.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Start dato:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Klik her for at vælge datoen denne opgave var påbegyndt.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Forventet dato:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Klik her for at vælge datoen denne opgave skal afsluttes på.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Afsluttet:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Klik her for at markere denne opgave som afsluttet.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Klik her for at vælge datoen denne opgave var afsluttet.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Vedligeholder rolle:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Klik her for at vælge vedligeholderens rolle.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Intet</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Ansvarlig</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Afsluttet af</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Tilrettelæggelse</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Vedligeholder:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Dette er navnet på den nuværende opgave vedligeholder.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Klik her for at vælge opgave vedligeholderen.</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation>Skabelon redigering</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Ny skabelon %1</translation>
     </message>
 </context>
 <context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation>Konfigurer skabeloner</translation>
-    </message>
-</context>
-<context>
     <name>Todo</name>
     <message>
         <source>More</source>
         <translation>Mere</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klik her for at bestemme prioriteten på den nye opgave.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</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>Indtast beskrivelsen af den nye opgave her.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</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>Klik her for at indtaste yderligere information til den nye opgave.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</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>Klik her for at tilføje en ny opgave.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</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>Klik her for at nulstille informationen i den nye opgave.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/todolist.ts b/i18n/de/todolist.ts
index 3b59a24..ea2c4cb 100644
--- a/i18n/de/todolist.ts
+++ b/i18n/de/todolist.ts
@@ -1,583 +1,581 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>OTaskEditor</name>
+    <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>Information</source>
+        <translation>Information</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <source>Recurrence</source>
+        <translation>Wiederholung</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation>Aufgabe erstellen</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation>Aufgabe editieren</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>New from template</source>
+        <translation>Neu von Vorlage</translation>
+    </message>
     <message>
         <source>New Task</source>
         <translation>Neue Aufgabe</translation>
     </message>
     <message>
+        <source>Click here to create a new task.</source>
+        <translation>Hier klicken, um eine neue Aufgabe zu erzeugen.</translation>
+    </message>
+    <message>
         <source>Edit Task</source>
         <translation>Aufgabe editieren</translation>
     </message>
     <message>
+        <source>Click here to modify the current task.</source>
+        <translation>Hier klicken, um die aktuelle Aufgabe zu ändern.</translation>
+    </message>
+    <message>
         <source>View Task</source>
         <translation>Aufgabe sehen</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation>Löschen...</translation>
     </message>
     <message>
+        <source>Click here to remove the current task.</source>
+        <translation>Hier klicken, um die aktuelle Aufgabe zu löschen.</translation>
+    </message>
+    <message>
         <source>Delete all...</source>
         <translation>Alles Löschen...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation>Löschen komplett</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation>Verdoppeln</translation>
-    </message>
-    <message>
         <source>Beam</source>
         <translation>Senden</translation>
     </message>
     <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation>Hier klicken, um die aktuelle Aufgabe an ein anderes Gerät zu senden.</translation>
+    </message>
+    <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
+        <source>Show completed tasks</source>
+        <translation>Anueigen der erledigten Aufgabe</translation>
+    </message>
+    <message>
+        <source>Show only over-due tasks</source>
+        <translation>Anzeige erledigter Aufgaben</translation>
+    </message>
+    <message>
+        <source>Show task deadlines</source>
+        <translation>Fälligkeitsdatum anzeigen</translation>
+    </message>
+    <message>
+        <source>Show quick task bar</source>
+        <translation>Schnelleingabe anzeigen</translation>
+    </message>
+    <message>
         <source>Data</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
-        <source>New from template</source>
-        <translation>Neu von Vorlage</translation>
+        <source>QuickEdit</source>
+        <translation>Schnelleingabe</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>Dies ist eine Liste aller Aufgaben.
+
+Die Liste zeigt folgende Informationen:
+1. Erledigt- Ein grüner Haken zeigt die Erledigung der Aufgabe. Klicken Sie hier, um die Aufgabe zu erledigen.
+2. Priorität- Eine graphische Repräsentation der Aufgabenpriorität. Hier Doppelklicken, um sie zu ändern.
+3. Beschreibung- Die Aufgabenbeschreibung. Hier Klicken, um die Aufgabe auszuwählen.
+4. Fälligkeit- Zeigt wann die Aufgabe fällig ist. Diese Anzeige kann wahlweise ein- und ausgeschaltet werden, indem man im Menü Optionen-&gt;&quot;Fälligkeitsdatum anzeigen&quot; wählt.</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation>Alle Kategorien</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Kein Speichplatz mehr</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
-        <translation>&apos;Aufgabe&apos; war nicht in der 
-Lage, Ihre Änderungen zu 
+        <translation>Es war nicht möglich, 
+Ihre Änderungen zu 
 speichern. Bitte schaffen 
 Sie freien Speicherplatz. 
 Trozdem beenden?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Aufgaben</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>Kann die Daten nicht editieren, synchronisiere gerade</translation>
+        <translation>Die Daten können nicht editiert werden.
+Es wird gerade synchronisiert</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>alle Aufgaben?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
-        <translation>alles erledigten Aufgaben?</translation>
+        <translation>alle erledigten Aufgaben?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>nicht eingeteilt</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation>&lt;P&gt;%1 neue Aufgaben sind angekommen.&lt;p&gt;Wollen Sie diese zu ihren Aufgaben hinzufügen?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Neue Aufgaben</translation>
     </message>
     <message>
-        <source>Show completed tasks</source>
-        <translation>Anueigen der erledigten Aufgabe</translation>
-    </message>
-    <message>
-        <source>Show only over-due tasks</source>
-        <translation>Nur überfällige Aufgaben anzeigen</translation>
-    </message>
-    <message>
-        <source>Show task deadlines</source>
-        <translation>Fälligkeitsdatum anzeigen</translation>
-    </message>
-    <message>
-        <source>Show quick task bar</source>
-        <translation>Schnelleiongabe anzeigen</translation>
-    </message>
-    <message>
-        <source>QuickEdit</source>
-        <translation>Schnelleingabe</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation>Hier klicken, um eine neue Aufgabe zu erzeugen</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation>Hier klicken um die aktuelle Aufgabe zu ändern</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation>Hier klicken, um die aktuelle Aufgabe zu löschen</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation>Hier klicken um die aktuelle Aufgabe an ein anderes Gerät zu senden.</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>Dies ist eine Liste aller Aufgaben.
-
-Die Liste zeigt folgende Informationen:
-1. Erledigt- Ein grüner Haken zeigt die Erledigung der Aufgabe. Clicken Sie hier um die Aufgabe zu erledigen.
-2. Priorität- Eine graphische Repräsentation der Aufgabenpriorität. Hier Doppelklicken um sie zu ändern.
-3. Beschreibung- Die Aufgabenbeschreibung. Hier Klicken um die Aufgabe auszuwählen.
-4. Fälligkeit- Zeigt wann die Aufgabe fällig ist. Diese Anzeige kann wahlweise ein- und ausgeschaltet werden, indem man im Menü Optionen-&gt;&quot;Fälligkeitsanzeige&quot; wählt.</translation>
-    </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
-    <message>
-        <source>Alarms</source>
-        <translation>Alarme</translation>
-    </message>
-    <message>
-        <source>Reminders</source>
-        <translation>Erinnerungen</translation>
+        <source>Duplicate</source>
+        <translation>Duplizieren</translation>
     </message>
     <message>
-        <source>X-Ref</source>
-        <translation>X-Ref</translation>
+        <source>C.</source>
+        <translation>E.</translation>
     </message>
     <message>
-        <source>Information</source>
-        <translation>Information</translation>
+        <source>Priority</source>
+        <translation>Priorität</translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation>Status</translation>
+        <source>Description</source>
+        <translation>Beschreibung</translation>
     </message>
     <message>
-        <source>Recurrence</source>
-        <translation>Wiederholung</translation>
+        <source>Deadline</source>
+        <translation>fällig bis</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Enter Task</source>
-        <translation>Aufgabe erstellen</translation>
+        <source>Configure Templates</source>
+        <translation>Vorlagen konfigurieren</translation>
     </message>
     <message>
-        <source>Edit Task</source>
-        <translation>Aufgabe editieren</translation>
+        <source>Priority:</source>
+        <translation>Priorität:</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
-        <source>C.</source>
-        <translation>C.</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation>Beschreibung</translation>
-    </message>
-    <message>
-        <source>Deadline</source>
-        <translation>fällig bis</translation>
-    </message>
-    <message>
         <source>Table View</source>
         <translation>Tabellenansicht</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 Tag(e)</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Priorität</translation>
-    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
-        <translation>Beschreibung</translation>
+        <translation>Beschreibung:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
-        <translation>Geben Sie hier eine detaillierte Bschreibung der Aufgabe ein.</translation>
+        <translation>Geben Sie hier eine detaillierte Beschreibung der Aufgabe ein.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Erledige</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Arbeite an </translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Kaufe</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organiziere</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Hole</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Aktualisiere</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Erstelle</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Plane</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Anruf</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Maile</translation>
     </message>
     <message>
-        <source>Priority:</source>
-        <translation>Priorität:</translation>
-    </message>
-    <message>
         <source>Select priority of task here.</source>
         <translation>Wählen Sie hier die Priorität der Aufgabe.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Sehr hoch</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Niedrig</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Sehr niedrig</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Wählen Sie die Kategorie der Aufgabe</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Wiederkehrende Aufgabe</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>Klicken Sie hier, wenn die Aufgaben auf einer wiederkehrenden Basis anstehen. Bei Auswahl kann die Häufigkeit des Wiederkehrens über den &lt;b&gt;Wiederholung&lt;/b&gt;-Reiter gesetzt werden.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Geben Sie hier zusätzliche Informationen zu der Aufgabe an.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Aufgabenliste</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Status:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Klicken Sie hier, um den aktuellen Status des Tasks zu setzen.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Begonnen</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Verschoben</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Beendet</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Nicht begonnen</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Fortschritt</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Wählen Sie hier den aktuellen Fortschritt der Aufgabe aus.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Startdatum</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Klicken Sie hier, um das Startdatum der aktuellen Aufgabe zu setzen.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Fälligkeitsdatum:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Klicken Sie hier, um das aktuelle Fälligkeitsdatum der Aufgabe zu setzen.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Erledigt:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Klicken Sie hier, um diese Aufgabe als erledigt zu markieren</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Klicken Sie hier. um das Datum der Erledigung zu setzen.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Ausführungsmodus</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
-        <translation>Klicken Sie hier um die Rolle des Ausführenden zu definieren.</translation>
+        <translation>Klicken Sie hier, um die Rolle des Ausführenden zu definieren.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Nichts</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Verantwortlich</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Erledigt von</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Koordiert durch</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Ausführender:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Dies ist der Name des Ausführenden</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Klicken Sie  hier, um den Ausführenden der Aufgabe festzulegen.</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation>Vorlageneditor</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editieren</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Neue Vorlage %1</translation>
     </message>
 </context>
 <context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation>Vorlagen konfigurieren</translation>
-    </message>
-</context>
-<context>
     <name>Todo</name>
     <message>
         <source>More</source>
         <translation>Weiteres...</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klicken Sie hier, um die Priorität der neuen Aufgabe zu setzen.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</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>Geben Sie hier die Beschreibung der neuen Aufgabe an.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</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>Geben Sie hier zusätzliche Informationen für Ihre Aufgabe an.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</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>Klicken Sie hier, um eine neue Aufgabe hinzuzufügen.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</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>Klicken Sie hier, um die Aufgabeninformationen zurück zu setzen.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/todolist.ts b/i18n/en/todolist.ts
index 9a2f327..e4fcec0 100644
--- a/i18n/en/todolist.ts
+++ b/i18n/en/todolist.ts
@@ -1,558 +1,555 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
-    <message>
-        <source>New Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>OTaskEditor</name>
     <message>
-        <source>View Task</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
+        <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all...</source>
+        <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete completed</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Find</source>
+        <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
+        <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
-        <source>Category</source>
+        <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New from template</source>
+        <source>Click here to create a new task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
+        <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
+        <source>Click here to modify the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
+        <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo</source>
+        <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
+        <source>Click here to remove the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>all tasks?</source>
+        <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>all completed tasks?</source>
+        <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <source>Click here to send the current task to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Tasks</source>
+        <source>Find</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>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>QuickEdit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
+        <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to remove the current task.</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to send the current task to another device.</source>
+        <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>
+        <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>X-Ref</source>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status</source>
+        <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrence</source>
+        <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Enter Task</source>
+        <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Table View</source>
+        <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 day(s)</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority</source>
+        <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <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>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>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Todo</name>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation 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>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>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>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>
diff --git a/i18n/es/todolist.ts b/i18n/es/todolist.ts
index 75de883..6ebad0e 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -1,563 +1,560 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
-    <message>
-        <source>New Task</source>
-        <translation>Nueva tarea</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation>Editar tarea</translation>
-    </message>
+    <name>OTaskEditor</name>
     <message>
-        <source>View Task</source>
-        <translation>Ver tarea</translation>
+        <source>Alarms</source>
+        <translation>Alarmas</translation>
     </message>
     <message>
-        <source>Delete...</source>
-        <translation>Eliminar...</translation>
+        <source>Reminders</source>
+        <translation>Recordatorios</translation>
     </message>
     <message>
-        <source>Delete all...</source>
-        <translation>Borrar todo...</translation>
+        <source>X-Ref</source>
+        <translation>Ref.cruzadas</translation>
     </message>
     <message>
-        <source>Delete completed</source>
-        <translation>Borrado completado</translation>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation>Duplicar</translation>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation>Emitir</translation>
+        <source>Recurrence</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Find</source>
-        <translation>Buscar</translation>
+        <source>Edit Task</source>
+        <translation>Editar Tarea</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation>Datos</translation>
+        <source>Enter Task</source>
+        <translation>Introducir Tarea</translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
-        <source>Category</source>
-        <translation>Categorí­a</translation>
+        <source>New from template</source>
+        <translation type="unfinished">Nuevo desde plantilla</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation>Opciones</translation>
+        <source>New Task</source>
+        <translation type="unfinished">Nueva tarea</translation>
     </message>
     <message>
-        <source>New from template</source>
-        <translation>Nuevo desde plantilla</translation>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation>Todas</translation>
+        <source>Edit Task</source>
+        <translation type="unfinished">Editar Tarea</translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation>Sin espacio</translation>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
-        <translation>Tareas fue incapaz de
-salvar sus cambios.
-Libere algo de espacio
-e inténtelo de nuevo.
-
-¿Salir de todas formas?</translation>
+        <source>View Task</source>
+        <translation type="unfinished">Ver tarea</translation>
     </message>
     <message>
-        <source>Todo</source>
-        <translation>Tareas</translation>
+        <source>Delete...</source>
+        <translation type="unfinished">Eliminar...</translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation>No puedo editar datos, estoy sincronizando</translation>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>all tasks?</source>
-        <translation>¿todas las tareas?</translation>
+        <source>Delete all...</source>
+        <translation type="unfinished">Borrar todo...</translation>
     </message>
     <message>
-        <source>all completed tasks?</source>
-        <translation>¿todas las tareas completadas?</translation>
+        <source>Delete completed</source>
+        <translation type="unfinished">Borrado completado</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation>En blanco</translation>
+        <source>Beam</source>
+        <translation type="unfinished">Emitir</translation>
     </message>
     <message>
-        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation>&lt;P&gt;Han llegado %1 nuevas tareas.&lt;p&gt;¿Desea añadirlas a su lista de tareas?</translation>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Tasks</source>
-        <translation>Nuevas tareas</translation>
+        <source>Find</source>
+        <translation type="unfinished">Buscar</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>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>QuickEdit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="unfinished"></translation>
+        <source>Data</source>
+        <translation type="unfinished">Datos</translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
+        <source>Category</source>
+        <translation type="unfinished">Categorí­a</translation>
     </message>
     <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="unfinished"></translation>
+        <source>Options</source>
+        <translation type="unfinished">Opciones</translation>
     </message>
     <message>
-        <source>Click here to send the current task to another device.</source>
+        <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>Alarmas</translation>
+        <source>All Categories</source>
+        <translation type="unfinished">Todas</translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation>Recordatorios</translation>
+        <source>Out of space</source>
+        <translation type="unfinished">Sin espacio</translation>
     </message>
     <message>
-        <source>X-Ref</source>
-        <translation>Ref.cruzadas</translation>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished">Tareas fue incapaz de
+salvar sus cambios.
+Libere algo de espacio
+e inténtelo de nuevo.
+
+¿Salir de todas formas?</translation>
     </message>
     <message>
-        <source>Information</source>
-        <translation type="unfinished"></translation>
+        <source>Todo</source>
+        <translation type="unfinished">Tareas</translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished">No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
-        <source>Recurrence</source>
-        <translation type="unfinished"></translation>
+        <source>all tasks?</source>
+        <translation type="unfinished">¿todas las tareas?</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Edit Task</source>
-        <translation>Editar Tarea</translation>
+        <source>all completed tasks?</source>
+        <translation type="unfinished">¿todas las tareas completadas?</translation>
     </message>
     <message>
-        <source>Enter Task</source>
-        <translation>Introducir Tarea</translation>
+        <source>Unfiled</source>
+        <translation type="unfinished">En blanco</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished">&lt;P&gt;Han llegado %1 nuevas tareas.&lt;p&gt;¿Desea añadirlas a su lista de tareas?</translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation type="unfinished">Nuevas tareas</translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished">Duplicar</translation>
     </message>
-</context>
-<context>
-    <name>TableView</name>
     <message>
         <source>C.</source>
-        <translation>C.</translation>
+        <translation type="unfinished">C.</translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation type="unfinished">Prioridad</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descripción</translation>
+        <translation type="unfinished">Descripción</translation>
     </message>
     <message>
         <source>Deadline</source>
-        <translation>Fecha lí­mite</translation>
+        <translation type="unfinished">Fecha lí­mite</translation>
+    </message>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished">Configurar Platillas</translation>
     </message>
     <message>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
         <source>Table View</source>
         <translation>Vista de tablas</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dia(s)</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished">Prioridad</translation>
-    </message>
 </context>
 <context>
     <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>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished">Iniciado</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished">Pospuesto</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished">Finalizado</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished">No iniciado</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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 type="unfinished">Responsable</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished">Hecho por</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished">Coordinador</translation>
     </message>
     <message>
         <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>
         <translation>Editor de plantillas</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nueva plantilla %1</translation>
     </message>
 </context>
 <context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation>Configurar Platillas</translation>
-    </message>
-</context>
-<context>
     <name>Todo</name>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation 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>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>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>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>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index 8638f6c..5f17b15 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -1,588 +1,585 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
-    <message>
-        <source>New Task</source>
-        <translation>Nouvelle Tâche</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation>Editer une Tâche</translation>
-    </message>
+    <name>OTaskEditor</name>
     <message>
-        <source>View Task</source>
-        <translation>Voir la Tâche</translation>
+        <source>Alarms</source>
+        <translation>Alarmes</translation>
     </message>
     <message>
-        <source>Delete...</source>
-        <translation>Effacer...</translation>
+        <source>Reminders</source>
+        <translation>Rappels</translation>
     </message>
     <message>
-        <source>Delete all...</source>
-        <translation>Effacer Tout...</translation>
+        <source>X-Ref</source>
+        <translation>X-Ref</translation>
     </message>
     <message>
-        <source>Delete completed</source>
-        <translation>Effacement Terminé</translation>
+        <source>Information</source>
+        <translation>Information</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation>Dupliquer</translation>
+        <source>Status</source>
+        <translation>Etat</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation>Transmettre</translation>
+        <source>Recurrence</source>
+        <translation>Récurrence</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Find</source>
-        <translation>Rechercher</translation>
+        <source>Enter Task</source>
+        <translation>Entrer la Tâche</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation>Date</translation>
+        <source>Edit Task</source>
+        <translation>Editer la Tâche</translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
-        <source>Category</source>
-        <translation>Catégorie</translation>
+        <source>New from template</source>
+        <translation type="unfinished">Nouvelle à Partir d&apos;un Modèle</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation>Options</translation>
+        <source>New Task</source>
+        <translation type="unfinished">Nouvelle Tâche</translation>
     </message>
     <message>
-        <source>New from template</source>
-        <translation>Nouvelle à Partir d&apos;un Modèle</translation>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished">Cliquer ici pour créer une nouvelle tâche.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation>Toutes les Catégories</translation>
+        <source>Edit Task</source>
+        <translation type="unfinished">Editer la Tâche</translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation>Plus de Mémoire Disponible</translation>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished">Cliquer ici pour modifier la tâche courante.</translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
-        <translation>Tâche n&apos;a pas pu
-enregistrer vos changements.
-Libérez de l&apos;espace
-et réessayez.
-
-Quitter?</translation>
+        <source>View Task</source>
+        <translation type="unfinished">Voir la Tâche</translation>
     </message>
     <message>
-        <source>Todo</source>
-        <translation>Tâche</translation>
+        <source>Delete...</source>
+        <translation type="unfinished">Effacer...</translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation>Impossible d&apos;éditer les données, Synchronization en cours</translation>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished">Cliquer  ici pour effacer la tâche courante.</translation>
     </message>
     <message>
-        <source>all tasks?</source>
-        <translation>Toutes les Tâches?</translation>
+        <source>Delete all...</source>
+        <translation type="unfinished">Effacer Tout...</translation>
     </message>
     <message>
-        <source>all completed tasks?</source>
-        <translation>Toutes les tâches effectuées?</translation>
+        <source>Delete completed</source>
+        <translation type="unfinished">Effacement Terminé</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation>Non classé</translation>
+        <source>Beam</source>
+        <translation type="unfinished">Transmettre</translation>
     </message>
     <message>
-        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation>&lt;P&gt;%1 Il y  une nouvelle tâches.&lt;p&gt; Voulez-vous l&apos;ajouter à votre liste?</translation>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished">Cliquer ici pour transmettre la tâche courante à un autre périphérique.</translation>
     </message>
     <message>
-        <source>New Tasks</source>
-        <translation>Nouvelles Tâches</translation>
+        <source>Find</source>
+        <translation type="unfinished">Rechercher</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
-        <translation>Montrer les tâches terminées</translation>
+        <translation type="unfinished">Montrer les tâches terminées</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
-        <translation>Montrer seulement les tâches échues</translation>
+        <translation type="unfinished">Montrer seulement les tâches échues</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
-        <translation>Montrer les échéances</translation>
+        <translation type="unfinished">Montrer les échéances</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
-        <translation>Montrer la barre d&apos;outils</translation>
-    </message>
-    <message>
-        <source>QuickEdit</source>
-        <translation>Edition Rapide</translation>
+        <translation type="unfinished">Montrer la barre d&apos;outils</translation>
     </message>
     <message>
-        <source>Click here to create a new task.</source>
-        <translation>Cliquer ici pour créer une nouvelle tâche.</translation>
+        <source>Data</source>
+        <translation type="unfinished">Date</translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
-        <translation>Cliquer ici pour modifier la tâche courante.</translation>
+        <source>Category</source>
+        <translation type="unfinished">Catégorie</translation>
     </message>
     <message>
-        <source>Click here to remove the current task.</source>
-        <translation>Cliquer  ici pour effacer la tâche courante.</translation>
+        <source>Options</source>
+        <translation type="unfinished">Options</translation>
     </message>
     <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation>Cliquer ici pour transmettre la tâche courante à un autre périphérique.</translation>
+        <source>QuickEdit</source>
+        <translation type="unfinished">Edition Rapide</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>Voici la liste de toutes les tâches en cours.
+        <translation type="unfinished">Voici la liste de toutes les tâches en cours.
 
 La liste affiche les informations suivantes:
 1. Terminé - Un marque verte indique une tâche terminée. Cliquer ici pour terminer un tâche.
 2. Priorité - Une représentation graphique de la priorité de la tâche. Double-cliquer ici pour la modifier.
 3. Description - Date d&apos;échéance de la tâche. This colonne peut être affichée ou cachée en séléctionnant Options-&gt;&apos;Montrer les dates d&apos;échéance&apos; à partir du menu ci-dessus.</translation>
     </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
     <message>
-        <source>Alarms</source>
-        <translation>Alarmes</translation>
+        <source>All Categories</source>
+        <translation type="unfinished">Toutes les Catégories</translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation>Rappels</translation>
+        <source>Out of space</source>
+        <translation type="unfinished">Plus de Mémoire Disponible</translation>
     </message>
     <message>
-        <source>X-Ref</source>
-        <translation>X-Ref</translation>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished">Tâche n&apos;a pas pu
+enregistrer vos changements.
+Libérez de l&apos;espace
+et réessayez.
+
+Quitter?</translation>
     </message>
     <message>
-        <source>Information</source>
-        <translation>Information</translation>
+        <source>Todo</source>
+        <translation type="unfinished">Tâche</translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation>Etat</translation>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished">Impossible d&apos;éditer les données, Synchronization en cours</translation>
     </message>
     <message>
-        <source>Recurrence</source>
-        <translation>Récurrence</translation>
+        <source>all tasks?</source>
+        <translation type="unfinished">Toutes les Tâches?</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Enter Task</source>
-        <translation>Entrer la Tâche</translation>
+        <source>all completed tasks?</source>
+        <translation type="unfinished">Toutes les tâches effectuées?</translation>
     </message>
     <message>
-        <source>Edit Task</source>
-        <translation>Editer la Tâche</translation>
+        <source>Unfiled</source>
+        <translation type="unfinished">Non classé</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished">&lt;P&gt;%1 Il y  une nouvelle tâches.&lt;p&gt; Voulez-vous l&apos;ajouter à votre liste?</translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation type="unfinished">Nouvelles Tâches</translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished">Dupliquer</translation>
     </message>
-</context>
-<context>
-    <name>TableView</name>
     <message>
         <source>C.</source>
-        <translation>C.</translation>
+        <translation type="unfinished">C.</translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation type="unfinished">Priorité</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Description</translation>
+        <translation type="unfinished">Description</translation>
     </message>
     <message>
         <source>Deadline</source>
-        <translation>Echéance</translation>
+        <translation type="unfinished">Echéance</translation>
     </message>
     <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished">Configurer les Modèles</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished">Priorité:</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
         <source>Table View</source>
         <translation>Vue en Tableau</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Sans</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 jour(s)</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Priorité</translation>
-    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Nouvelle</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Description:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Entrer une brève description de la tâches ici.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Terminé</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>En Cours</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Acheter</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organiser</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Obtenir</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Mettre à Jour</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Créer</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Planifier</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Appeler</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Courrier</translation>
     </message>
     <message>
-        <source>Priority:</source>
-        <translation>Priorité:</translation>
-    </message>
-    <message>
         <source>Select priority of task here.</source>
         <translation>Selectionner la priorité de la tâche ici.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Très Haute</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Haute</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Basse</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Très Basse</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Selectionner la catégorie de la tâche.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Tâche Récurrente</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>Cliquer ici si cette tâches doit-être répétée. La fréquence est choisie dans le tableau de Répétition.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notes:</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Entrer des informations supplémentaires sur la tâche ici.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Liste des Tâches</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Etat:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Cliquer ici pour définir l&apos;état courant de la tâche.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Démarrée</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Reportée</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Terminée</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Arrétée</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Avancement:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Selectionner l&apos;avancement de la tâche ici.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Date de début:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Cliquer ici pour définir la date de début de la tâche.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Date d&apos;écheance:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Cliquer ici pour définir la date à laquelle la tâche doit-être terminée.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Terminée:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Cliquer ici pour définir la tâche comme &quot;Terminée&quot;.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Cliquer ici pour définir la date à laquelle la tâche a été terminée.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Mode Maintenance:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Click here to set the maintainer&apos;s role.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Sans</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Fait par</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Coordinateur</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Mainteneur:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>C&apos;est le nom du mainteneur actuel de la tâche.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Cliquer ici pour selectionner le mainteneur de la tâche.</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation>Editeur de Modèle</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Effacer</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nouveau Modèle %1</translation>
     </message>
 </context>
 <context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation>Configurer les Modèles</translation>
-    </message>
-</context>
-<context>
     <name>Todo</name>
     <message>
         <source>More</source>
         <translation>Plus</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Valider</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Cliquer ici pour définir la prioriré de la nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</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>Entrer la description de la nouvelle tâche ici.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</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>Cliquer ici pour entrer des informations supplémentaires pour la nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</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>Cliquer ici pour ajouter une nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</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>Cliquer ici pour réinitialiser les informations de la nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/todolist.ts b/i18n/hu/todolist.ts
index 9155469..2f44490 100644
--- a/i18n/hu/todolist.ts
+++ b/i18n/hu/todolist.ts
@@ -1,589 +1,586 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
-    <message>
-        <source>New Task</source>
-        <translation>Új feladat</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation>Feladat szerkesztése</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation>Feladat megnézése</translation>
-    </message>
+    <name>OTaskEditor</name>
     <message>
-        <source>Delete...</source>
-        <translation>Töröl...</translation>
+        <source>Alarms</source>
+        <translation>Ébresztők</translation>
     </message>
     <message>
-        <source>Delete all...</source>
-        <translation>Mindent töröl...</translation>
+        <source>Reminders</source>
+        <translation>Emlékeztetők</translation>
     </message>
     <message>
-        <source>Delete completed</source>
-        <translation>Elvégzettek törlése</translation>
+        <source>X-Ref</source>
+        <translation>X-Ref</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation>Dupláz</translation>
+        <source>Information</source>
+        <translation>Információ</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation>Átsugárzás</translation>
+        <source>Status</source>
+        <translation>Állapot</translation>
     </message>
     <message>
-        <source>Find</source>
-        <translation>Keresés</translation>
+        <source>Recurrence</source>
+        <translation>Ismétlődés</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Data</source>
-        <translation>Adat</translation>
+        <source>Enter Task</source>
+        <translation>Feladat bevitele</translation>
     </message>
     <message>
-        <source>Category</source>
-        <translation>Kategória</translation>
+        <source>Edit Task</source>
+        <translation>Feladat szerkesztése</translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
-        <source>Options</source>
-        <translation>Beállítások</translation>
+        <source>New from template</source>
+        <translation type="unfinished">Új sablonból</translation>
     </message>
     <message>
-        <source>New from template</source>
-        <translation>Új sablonból</translation>
+        <source>New Task</source>
+        <translation type="unfinished">Új feladat</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation>Minden kategória</translation>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished">Bökjön ide új feladat létrehozásához.</translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation>Nincs hely</translation>
+        <source>Edit Task</source>
+        <translation type="unfinished">Feladat szerkesztése</translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
-        <translation>A Teendők nem tudta elmenteni
-a változásokat.
-Szabaditson fel némi helyet
-és próbálja újra.
-
-Mégis kilép?</translation>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished">Bökjön ide az aktuális feladat módosításához.</translation>
     </message>
     <message>
-        <source>Todo</source>
-        <translation>Teendők</translation>
+        <source>View Task</source>
+        <translation type="unfinished">Feladat megnézése</translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation>Az adat nem szerkeszthető, szinkronizáció folyamatban</translation>
+        <source>Delete...</source>
+        <translation type="unfinished">Töröl...</translation>
     </message>
     <message>
-        <source>all tasks?</source>
-        <translation>minden feladat?</translation>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished">Bökjön ide az aktuális feladat eltávolításához.</translation>
     </message>
     <message>
-        <source>all completed tasks?</source>
-        <translation>minden elvégzett feladat?</translation>
+        <source>Delete all...</source>
+        <translation type="unfinished">Mindent töröl...</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation>Iktatatlan</translation>
+        <source>Delete completed</source>
+        <translation type="unfinished">Elvégzettek törlése</translation>
     </message>
     <message>
-        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation>&lt;P&gt;%1 új feladat érkezett.&lt;p&gt;Szeretné hozzáadni a Teendőkhöz?</translation>
+        <source>Beam</source>
+        <translation type="unfinished">Átsugárzás</translation>
     </message>
     <message>
-        <source>New Tasks</source>
-        <translation>Új feladatok</translation>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished">Bökjön ide az aktuális felada másik eszköznek küldéséhez.</translation>
     </message>
     <message>
-        <source>Click here to create a new task.</source>
-        <translation>Bökjön ide új feladat létrehozásához.</translation>
+        <source>Find</source>
+        <translation type="unfinished">Keresés</translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
-        <translation>Bökjön ide az aktuális feladat módosításához.</translation>
+        <source>Show completed tasks</source>
+        <translation type="unfinished">Mutasd az elvégzett feladatokat</translation>
     </message>
     <message>
-        <source>Click here to remove the current task.</source>
-        <translation>Bökjön ide az aktuális feladat eltávolításához.</translation>
+        <source>Show only over-due tasks</source>
+        <translation type="unfinished">Csak a lejárt feladatokat mutasd</translation>
     </message>
     <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation>Bökjön ide az aktuális felada másik eszköznek küldéséhez.</translation>
+        <source>Show task deadlines</source>
+        <translation type="unfinished">Mutasd a feladatok határidejét</translation>
     </message>
     <message>
-        <source>Show completed tasks</source>
-        <translation>Mutasd az elvégzett feladatokat</translation>
+        <source>Show quick task bar</source>
+        <translation type="unfinished">Mutasd a gyors feladatcsíkot</translation>
     </message>
     <message>
-        <source>Show only over-due tasks</source>
-        <translation>Csak a lejárt feladatokat mutasd</translation>
+        <source>Data</source>
+        <translation type="unfinished">Adat</translation>
     </message>
     <message>
-        <source>Show task deadlines</source>
-        <translation>Mutasd a feladatok határidejét</translation>
+        <source>Category</source>
+        <translation type="unfinished">Kategória</translation>
     </message>
     <message>
-        <source>Show quick task bar</source>
-        <translation>Mutasd a gyors feladatcsíkot</translation>
+        <source>Options</source>
+        <translation type="unfinished">Beállítások</translation>
     </message>
     <message>
         <source>QuickEdit</source>
-        <translation>GyorsSzerkesztés</translation>
+        <translation type="unfinished">GyorsSzerkesztés</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>Ez az összes aktuális feladat listája.
+        <translation type="unfinished">Ez az összes aktuális feladat listája.
 
 A lista az alábbi információkat tartalmazza:
 1. Teljesített -  Egy zöld pipa jelzi a feladat teljesítését. Bökjön ide, ha teljesítette a feladatot.
 2. Fontosság - grafikus megjelenítése a feladat fontosságának. Duplán bökjön ide a módosításhoz.
 3. Leírás - a feladat leírása. Bökjön ide a feladat kiválasztásához.
 4. Határidő - megmutatja mikorra kell készlegyen a feladattal. Ez az oszlop mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a feladatok határidejét&apos; kiválasztásával a fenti menüből.</translation>
     </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
     <message>
-        <source>Alarms</source>
-        <translation>Ébresztők</translation>
+        <source>All Categories</source>
+        <translation type="unfinished">Minden kategória</translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation>Emlékeztetők</translation>
+        <source>Out of space</source>
+        <translation type="unfinished">Nincs hely</translation>
     </message>
     <message>
-        <source>X-Ref</source>
-        <translation>X-Ref</translation>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished">A Teendők nem tudta elmenteni
+a változásokat.
+Szabaditson fel némi helyet
+és próbálja újra.
+
+Mégis kilép?</translation>
     </message>
     <message>
-        <source>Information</source>
-        <translation>Információ</translation>
+        <source>Todo</source>
+        <translation type="unfinished">Teendők</translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation>Állapot</translation>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished">Az adat nem szerkeszthető, szinkronizáció folyamatban</translation>
     </message>
     <message>
-        <source>Recurrence</source>
-        <translation>Ismétlődés</translation>
+        <source>all tasks?</source>
+        <translation type="unfinished">minden feladat?</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Enter Task</source>
-        <translation>Feladat bevitele</translation>
+        <source>all completed tasks?</source>
+        <translation type="unfinished">minden elvégzett feladat?</translation>
     </message>
     <message>
-        <source>Edit Task</source>
-        <translation>Feladat szerkesztése</translation>
+        <source>Unfiled</source>
+        <translation type="unfinished">Iktatatlan</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished">&lt;P&gt;%1 új feladat érkezett.&lt;p&gt;Szeretné hozzáadni a Teendőkhöz?</translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation type="unfinished">Új feladatok</translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished">Dupláz</translation>
     </message>
-</context>
-<context>
-    <name>TableView</name>
     <message>
         <source>C.</source>
-        <translation>T.</translation>
+        <translation type="unfinished">T.</translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation type="unfinished">Fontosság</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Leírás</translation>
+        <translation type="unfinished">Leírás</translation>
     </message>
     <message>
         <source>Deadline</source>
-        <translation>Határidő</translation>
+        <translation type="unfinished">Határidő</translation>
     </message>
     <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished">Sablonok beállítása</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished">Fontosság:</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
         <source>Table View</source>
         <translation>Tábla nézet</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nincs</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 nap</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>Fontosság</translation>
-    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Új</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Szerkeszt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Leírás:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Írja be a feladat rövid leírását ide.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Teljesítsd a</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Dolgozz a</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Vegyél</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Szervezd a</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Szerezz be</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Frissítsd a</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Készíts</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Tervezz</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Hívd fel</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Írj levelet</translation>
     </message>
     <message>
-        <source>Priority:</source>
-        <translation>Fontosság:</translation>
-    </message>
-    <message>
         <source>Select priority of task here.</source>
         <translation>Válassza ki a feladat fontosságát itt.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Nagyon fontos</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Fontos</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normál</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Alacsony</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Nagyon alacsony</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategória:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Válassza ki a kategóriát, melyhez a feladat tartozik.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Ismétlődő feladat</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>Bökjön ide, ha a feladat rendszeresen esedékes. Ha kiválasztja, a rendszerességet beállíthatja a Rendszeresség fülön.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Jegyzetek:</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Írjon be bármi kiegészítő információt a feladatról ide.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Teendők listája</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Állapot:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Bökjön ide, hogy beállítsa a jelenlegi feladat állapotát.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Elkezdve</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Elhalasztva</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Befejezve</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Nincs elkezdve</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Haladás:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Válassza ki a feladat előrehaladtát itt.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Kezdőnap:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Bökjön ide, hogy beállítsa mely napon kezdődött ez a feladat.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Határidő:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Bökjön ide, hogy beállítsa mikorra kellene a feladatnak elkészülnie.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Teljesítve:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Bökjön ide, hogy a feladatot teljesítettnek jelölje.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Bökjön ide, hogy beállíthassa mikor teljesítette a feladatot.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Karbantartó mód:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Bökjön ide, hogy beállítsa a karbantartó szerepét.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Semmi</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Felelős</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Elvégezte</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Koordinálja</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Karbantartó:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Ez a jelenlegi feladat karbantartójának neve.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>próba</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Bökjön ide, hogy beállítsa a feladat karbantartóját.</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation>Sablon szerkesztő</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hozzáad</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Szerkeszt</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eltávolít</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation>Név</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>új sablon %1</translation>
     </message>
 </context>
 <context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation>Sablonok beállítása</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>Bökjön ide az új feladat fontosságának beállításához.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</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>Írja be az új feladat leírását ide.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Több</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>Bökjön ide, hogy beírjon kiegészítő információkat az új feladathoz.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Bevisz</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>Bökjön ide új feladat hozzáadásához.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Mégsem</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>Bökjön ide az új feladat információk alaphelyzetbe hozásához.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/todolist.ts b/i18n/pl/todolist.ts
index 92a5449..59b9282 100644
--- a/i18n/pl/todolist.ts
+++ b/i18n/pl/todolist.ts
@@ -1,558 +1,555 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
-    <message>
-        <source>New Task</source>
-        <translation type="unfinished">Nowy proces</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="unfinished">Edycja procesu</translation>
-    </message>
+    <name>OTaskEditor</name>
     <message>
-        <source>View Task</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
+        <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all...</source>
+        <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete completed</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Find</source>
-        <translation type="unfinished">Znajdz</translation>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
+        <source>Edit Task</source>
+        <translation type="unfinished">Edycja procesu</translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
-        <source>Category</source>
+        <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
+        <source>New Task</source>
+        <translation type="unfinished">Nowy proces</translation>
     </message>
     <message>
-        <source>New from template</source>
+        <source>Click here to create a new task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="unfinished">Wszystkie kategorie</translation>
+        <source>Edit Task</source>
+        <translation type="unfinished">Edycja procesu</translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation type="unfinished">Brak pamieci</translation>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
+        <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo</source>
-        <translation type="unfinished">ZrobTo</translation>
+        <source>Delete...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
+        <source>Click here to remove the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>all tasks?</source>
+        <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>all completed tasks?</source>
+        <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="unfinished">Nieprzypisany</translation>
+        <source>Beam</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <source>Click here to send the current task to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Tasks</source>
-        <translation type="unfinished"></translation>
+        <source>Find</source>
+        <translation type="unfinished">Znajdz</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>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>QuickEdit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
+        <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to remove the current task.</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to send the current task to another device.</source>
+        <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 type="unfinished"></translation>
+        <source>All Categories</source>
+        <translation type="unfinished">Wszystkie kategorie</translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>Out of space</source>
+        <translation type="unfinished">Brak pamieci</translation>
+    </message>
+    <message>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>X-Ref</source>
+        <source>Todo</source>
+        <translation type="unfinished">ZrobTo</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status</source>
+        <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrence</source>
+        <source>Unfiled</source>
+        <translation type="unfinished">Nieprzypisany</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Enter Task</source>
+        <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
-        <translation type="unfinished">Edycja procesu</translation>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Description</source>
         <translation type="unfinished">Opis</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Table View</source>
+        <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TableView</name>
     <message>
-        <source>%1 day(s)</source>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority</source>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <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>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>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Todo</name>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation 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>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>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>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>
diff --git a/i18n/pt/todolist.ts b/i18n/pt/todolist.ts
index 31ac230..8c1510a 100644
--- a/i18n/pt/todolist.ts
+++ b/i18n/pt/todolist.ts
@@ -1,558 +1,555 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>OTaskEditor</name>
     <message>
-        <source>New Task</source>
-        <translation type="unfinished">Nova Tarefa</translation>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
-        <translation type="unfinished">Editar Tarefa</translation>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View Task</source>
-        <translation type="unfinished">Ver Tarefa</translation>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
-        <translation type="unfinished">Apagar...</translation>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all...</source>
-        <translation type="unfinished">Apagar Todas...</translation>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete completed</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Duplicate</source>
-        <translation type="unfinished">Duplicar</translation>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="unfinished">Irradiar</translation>
+        <source>Edit Task</source>
+        <translation type="unfinished">Editar Tarefa</translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
-        <source>Find</source>
-        <translation type="unfinished">Procurar</translation>
+        <source>New from template</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="unfinished">Dados</translation>
+        <source>New Task</source>
+        <translation type="unfinished">Nova Tarefa</translation>
     </message>
     <message>
-        <source>Category</source>
-        <translation type="unfinished">Categoria</translation>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="unfinished">Opções</translation>
+        <source>Edit Task</source>
+        <translation type="unfinished">Editar Tarefa</translation>
     </message>
     <message>
-        <source>New from template</source>
+        <source>Click here to modify the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="unfinished">Todas as Categoria</translation>
+        <source>View Task</source>
+        <translation type="unfinished">Ver Tarefa</translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation type="unfinished">Sem espaço</translation>
+        <source>Delete...</source>
+        <translation type="unfinished">Apagar...</translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
+        <source>Click here to remove the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo</source>
-        <translation type="unfinished">Tarefa</translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished">Não pode editar enquanto sincroniza</translation>
-    </message>
-    <message>
-        <source>all tasks?</source>
-        <translation type="unfinished"></translation>
+        <source>Delete all...</source>
+        <translation type="unfinished">Apagar Todas...</translation>
     </message>
     <message>
-        <source>all completed tasks?</source>
+        <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="unfinished">Vazio</translation>
+        <source>Beam</source>
+        <translation type="unfinished">Irradiar</translation>
     </message>
     <message>
-        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <source>Click here to send the current task to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Tasks</source>
-        <translation type="unfinished"></translation>
+        <source>Find</source>
+        <translation type="unfinished">Procurar</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>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>QuickEdit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="unfinished"></translation>
+        <source>Data</source>
+        <translation type="unfinished">Dados</translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
+        <source>Category</source>
+        <translation type="unfinished">Categoria</translation>
     </message>
     <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="unfinished"></translation>
+        <source>Options</source>
+        <translation type="unfinished">Opções</translation>
     </message>
     <message>
-        <source>Click here to send the current task to another device.</source>
+        <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 type="unfinished"></translation>
+        <source>All Categories</source>
+        <translation type="unfinished">Todas as Categoria</translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation type="unfinished"></translation>
+        <source>Out of space</source>
+        <translation type="unfinished">Sem espaço</translation>
     </message>
     <message>
-        <source>X-Ref</source>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Todo</source>
+        <translation type="unfinished">Tarefa</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished">Não pode editar enquanto sincroniza</translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status</source>
+        <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrence</source>
+        <source>Unfiled</source>
+        <translation type="unfinished">Vazio</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Enter Task</source>
+        <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
-        <translation type="unfinished">Editar Tarefa</translation>
+        <source>Duplicate</source>
+        <translation type="unfinished">Duplicar</translation>
     </message>
-</context>
-<context>
-    <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">C.</translation>
     </message>
     <message>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Description</source>
         <translation type="unfinished">Descrição</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished">Limite</translation>
     </message>
     <message>
-        <source>Table View</source>
+        <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TableView</name>
     <message>
-        <source>%1 day(s)</source>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority</source>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <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>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>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Todo</name>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation 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>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>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>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>
diff --git a/i18n/pt_BR/todolist.ts b/i18n/pt_BR/todolist.ts
index 7be8c2e..0774b46 100644
--- a/i18n/pt_BR/todolist.ts
+++ b/i18n/pt_BR/todolist.ts
@@ -1,564 +1,561 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>MainWindow</name>
-    <message>
-        <source>New Task</source>
-        <translation type="unfinished">Nova Tarefa</translation>
-    </message>
+    <name>OTaskEditor</name>
     <message>
-        <source>Edit Task</source>
-        <translation type="unfinished">Editar Tarefa</translation>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View Task</source>
+        <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
+        <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all...</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete completed</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Beam</source>
-        <translation type="unfinished">Enviar</translation>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
-        <translation type="unfinished">Localizar</translation>
+        <source>Edit Task</source>
+        <translation type="unfinished">Editar Tarefa</translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
-        <source>Data</source>
+        <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
+        <source>New Task</source>
+        <translation type="unfinished">Nova Tarefa</translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Click here to create a new task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New from template</source>
-        <translation type="unfinished"></translation>
+        <source>Edit Task</source>
+        <translation type="unfinished">Editar Tarefa</translation>
     </message>
     <message>
-        <source>All Categories</source>
+        <source>Click here to modify the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation type="unfinished">Sem Espaço</translation>
-    </message>
-    <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
-        <translation type="unfinished">Tarefas não pode
-salvar suas mudanças.
-Libere algum espaço
-e tente novamente.
-
-Sair assim mesmo ?</translation>
+        <source>View Task</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo</source>
-        <translation type="unfinished">Tarefas</translation>
+        <source>Delete...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished">Impossível editar dados durante sincronização</translation>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>all tasks?</source>
+        <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>all completed tasks?</source>
+        <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
+        <source>Beam</source>
+        <translation type="unfinished">Enviar</translation>
     </message>
     <message>
-        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <source>Click here to send the current task to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Tasks</source>
-        <translation type="unfinished"></translation>
+        <source>Find</source>
+        <translation type="unfinished">Localizar</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>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>QuickEdit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
+        <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to remove the current task.</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to send the current task to another device.</source>
+        <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>
+        <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation type="unfinished"></translation>
+        <source>Out of space</source>
+        <translation type="unfinished">Sem Espaço</translation>
     </message>
     <message>
-        <source>X-Ref</source>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished">Tarefas não pode
+salvar suas mudanças.
+Libere algum espaço
+e tente novamente.
+
+Sair assim mesmo ?</translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished">Tarefas</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished">Impossível editar dados durante sincronização</translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrence</source>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Enter Task</source>
+        <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
-        <translation type="unfinished">Editar Tarefa</translation>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">C.</translation>
     </message>
     <message>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Description</source>
         <translation type="unfinished">Descrição</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Table View</source>
+        <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TableView</name>
     <message>
-        <source>%1 day(s)</source>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority</source>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <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>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>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Todo</name>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation 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>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>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>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>
diff --git a/i18n/sl/todolist.ts b/i18n/sl/todolist.ts
index aa75aca..82f0ee8 100644
--- a/i18n/sl/todolist.ts
+++ b/i18n/sl/todolist.ts
@@ -1,563 +1,560 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished">Uredi opravilo</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>New from template</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Novo opravilo</translation>
     </message>
     <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Edit Task</source>
         <translation type="unfinished">Uredi opravilo</translation>
     </message>
     <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>View Task</source>
         <translation type="unfinished">Poglej opravila</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished">Izbriši...</translation>
     </message>
     <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Delete all...</source>
         <translation type="unfinished">Izbriši vse...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="unfinished">Podvoji</translation>
-    </message>
-    <message>
         <source>Beam</source>
         <translation type="unfinished">Prežarči</translation>
     </message>
     <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Find</source>
         <translation type="unfinished">Najdi</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>Show quick task bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Data</source>
         <translation type="unfinished">Podatki</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorija</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">Izbire</translation>
     </message>
     <message>
-        <source>New from template</source>
+        <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>
     <message>
         <source>All Categories</source>
         <translation type="unfinished">Vse kategorije</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished">Ne uspem
 shraniti vaših sprememb.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">Opravki</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished">Ne morem urediti podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Neizpolnjeno</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</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>Show quick task bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QuickEdit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all current tasks.
-
-The list displays the following information:
-1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
-2. Priority - a graphical representation of task priority.  Double-click here to modify.
-3. Description - description of task.  Click here to select the task.
-4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
-    <message>
-        <source>Alarms</source>
-        <translation type="unfinished"></translation>
+        <source>Duplicate</source>
+        <translation type="unfinished">Podvoji</translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation type="unfinished"></translation>
+        <source>C.</source>
+        <translation type="unfinished">K.</translation>
     </message>
     <message>
-        <source>X-Ref</source>
+        <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
-        <translation type="unfinished"></translation>
+        <source>Description</source>
+        <translation type="unfinished">Opis</translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
+        <source>Deadline</source>
+        <translation type="unfinished">Rok</translation>
     </message>
     <message>
-        <source>Recurrence</source>
+        <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Enter Task</source>
+        <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="unfinished">Uredi opravilo</translation>
-    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
-        <source>C.</source>
-        <translation type="unfinished">K.</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished">Opis</translation>
-    </message>
-    <message>
-        <source>Deadline</source>
-        <translation type="unfinished">Rok</translation>
-    </message>
-    <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <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>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>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Todo</name>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation 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>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>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>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>
diff --git a/i18n/xx/todolist.ts b/i18n/xx/todolist.ts
index 9a2f327..e4fcec0 100644
--- a/i18n/xx/todolist.ts
+++ b/i18n/xx/todolist.ts
@@ -1,558 +1,555 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
-    <message>
-        <source>New Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>OTaskEditor</name>
     <message>
-        <source>View Task</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
+        <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all...</source>
+        <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete completed</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Find</source>
+        <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
+        <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
-        <source>Category</source>
+        <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New from template</source>
+        <source>Click here to create a new task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
+        <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
+        <source>Click here to modify the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
+        <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo</source>
+        <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
+        <source>Click here to remove the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>all tasks?</source>
+        <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>all completed tasks?</source>
+        <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <source>Click here to send the current task to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Tasks</source>
+        <source>Find</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>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>QuickEdit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
+        <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to modify the current task.</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to remove the current task.</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to send the current task to another device.</source>
+        <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>
+        <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>X-Ref</source>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status</source>
+        <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrence</source>
+        <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Enter Task</source>
+        <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Table View</source>
+        <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 day(s)</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority</source>
+        <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <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>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>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Todo</name>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation 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>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>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>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>
diff --git a/i18n/zh_TW/libopie.ts b/i18n/zh_TW/libopie.ts
index 7cf93a1..5651af8 100644
--- a/i18n/zh_TW/libopie.ts
+++ b/i18n/zh_TW/libopie.ts
@@ -1,112 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Repeating Event</translation>
     </message>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>星期</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>月份</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>年份</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>每:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>重復的</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>End On:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>No End Date</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>在某天重復</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>星期一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>星期二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>星期三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>星期四</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>星期五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>星期六</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>星期日</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>每</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>TimePicker</source>
-        <translation>TimePicker</translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation>Time:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Pick Time:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/todolist.ts b/i18n/zh_TW/todolist.ts
index 22ebf2a..59317c4 100644
--- a/i18n/zh_TW/todolist.ts
+++ b/i18n/zh_TW/todolist.ts
@@ -1,443 +1,555 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>OTaskEditor</name>
     <message>
-        <source>New Task</source>
-        <translation>新增待辦事項</translation>
+        <source>Alarms</source>
+        <translation>鬧鈴</translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation>提醒事項</translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation>X-Ref</translation>
+    </message>
+    <message>
+        <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>
+        <translation>輸入新的待辦事項</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>編輯待辦事項</translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>New from template</source>
+        <translation type="unfinished">利用樣板建立新事項</translation>
+    </message>
+    <message>
+        <source>New Task</source>
+        <translation type="unfinished">新增待辦事項</translation>
+    </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished">編輯待辦事項</translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>View Task</source>
-        <translation>檢視待辦事項</translation>
+        <translation type="unfinished">檢視待辦事項</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>刪除...</translation>
+        <translation type="unfinished">刪除...</translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>刪除全部....</translation>
+        <translation type="unfinished">刪除全部....</translation>
     </message>
     <message>
         <source>Delete completed</source>
-        <translation>刪除已完成事項</translation>
+        <translation type="unfinished">刪除已完成事項</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation>複製事項</translation>
+        <source>Beam</source>
+        <translation type="unfinished">傳送資料</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation>傳送資料</translation>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>搜尋</translation>
+        <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>Completed tasks</source>
-        <translation>顯示已完成事項</translation>
+        <source>Show task deadlines</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Deadline</source>
-        <translation>顯示到期日</translation>
+        <source>Show quick task bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
-        <translation>資料管理</translation>
+        <translation type="unfinished">資料管理</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>分類目錄</translation>
+        <translation type="unfinished">分類目錄</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>設定選項</translation>
+        <translation type="unfinished">設定選項</translation>
     </message>
     <message>
-        <source>Show only over due</source>
-        <translation>只顯示已過期之待辦事項</translation>
+        <source>QuickEdit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New from template</source>
-        <translation>利用樣板建立新事項</translation>
+        <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>
     <message>
         <source>All Categories</source>
-        <translation>全部目錄</translation>
+        <translation type="unfinished">全部目錄</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>空間不足</translation>
+        <translation type="unfinished">空間不足</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
-        <translation>您的變更無法被存入，請清理出更多可用空間。是否放棄變更並退出？</translation>
+        <translation type="unfinished">您的變更無法被存入，請清理出更多可用空間。是否放棄變更並退出？</translation>
     </message>
     <message>
         <source>Todo</source>
-        <translation>待辦事項</translation>
+        <translation type="unfinished">待辦事項</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>正在同步資料中，無法進行編輯</translation>
+        <translation type="unfinished">正在同步資料中，無法進行編輯</translation>
     </message>
     <message>
         <source>all tasks?</source>
-        <translation>所有的待辦事項？</translation>
+        <translation type="unfinished">所有的待辦事項？</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
-        <translation>所有的已完成事項？</translation>
+        <translation type="unfinished">所有的已完成事項？</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>未分類的</translation>
+        <translation type="unfinished">未分類的</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation>&lt;P&gt;%1 已完成接收新的待辦事項。&lt;p&gt;請問您是否要將其新增至您的待辦事項清單中？</translation>
+        <translation type="unfinished">&lt;P&gt;%1 已完成接收新的待辦事項。&lt;p&gt;請問您是否要將其新增至您的待辦事項清單中？</translation>
     </message>
     <message>
         <source>New Tasks</source>
-        <translation>新增待辦事項</translation>
+        <translation type="unfinished">新增待辦事項</translation>
     </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
     <message>
-        <source>Overview</source>
-        <translation>內容</translation>
+        <source>Duplicate</source>
+        <translation type="unfinished">複製事項</translation>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>進階設定</translation>
+        <source>C.</source>
+        <translation type="unfinished">完成</translation>
     </message>
     <message>
-        <source>Alarms</source>
-        <translation>鬧鈴</translation>
+        <source>Priority</source>
+        <translation type="unfinished">優先順序</translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation>提醒事項</translation>
+        <source>Description</source>
+        <translation type="unfinished">說明</translation>
     </message>
     <message>
-        <source>X-Ref</source>
-        <translation>X-Ref</translation>
+        <source>Deadline</source>
+        <translation type="unfinished">到期日</translation>
     </message>
     <message>
-        <source>Recurrance</source>
-        <translation>週期性</translation>
+        <source>Configure Templates</source>
+        <translation type="unfinished">樣板管理</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>TableView</name>
     <message>
-        <source>Enter Task</source>
-        <translation>輸入新的待辦事項</translation>
+        <source>Table View</source>
+        <translation>Table View</translation>
     </message>
     <message>
-        <source>Edit Task</source>
-        <translation>編輯待辦事項</translation>
+        <source>None</source>
+        <translation>無</translation>
+    </message>
+    <message>
+        <source>%1 day(s)</source>
+        <translation>%1 天</translation>
     </message>
 </context>
 <context>
-    <name>TableView</name>
+    <name>TaskEditorAlarms</name>
     <message>
-        <source>C.</source>
-        <translation>完成</translation>
+        <source>New</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Prior.</source>
-        <translation>優先順序</translation>
+        <source>Edit</source>
+        <translation type="unfinished">編輯</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation>說明</translation>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
     <message>
-        <source>Deadline</source>
-        <translation>到期日</translation>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Table View</source>
-        <translation>Table View</translation>
+        <source>Enter brief description of the task here.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>無</translation>
+        <source>Complete </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 day(s)</source>
-        <translation>%1 天</translation>
+        <source>Work on </source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvanced</name>
     <message>
-        <source>State:</source>
-        <translation>狀態：</translation>
+        <source>Buy </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Started</source>
-        <translation>已開始</translation>
+        <source>Organize </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Postponed</source>
-        <translation>已延期</translation>
+        <source>Get </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Finished</source>
-        <translation>已完成</translation>
+        <source>Update </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not started</source>
-        <translation>尚未開始</translation>
+        <source>Create </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintainer</source>
-        <translation>負責人</translation>
+        <source>Plan </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>test</source>
-        <translation>測試</translation>
+        <source>Call </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation>...</translation>
+        <source>Mail </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintain Mode:</source>
-        <translation>責任歸屬：</translation>
+        <source>Select priority of task here.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Responsible</source>
-        <translation>由其負責</translation>
+        <source>Very High</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Done By</source>
-        <translation>由其完成</translation>
+        <source>High</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Coordinating</source>
-        <translation>由其協調</translation>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing</source>
-        <translation>無</translation>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
     <message>
-        <source>Description</source>
-        <translation>細節說明</translation>
+        <source>Very Low</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAlarms</name>
     <message>
-        <source>empty</source>
-        <translation>無</translation>
+        <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>&amp;Add</source>
-        <translation>&amp;新增</translation>
+        <source>Recurring task</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;編輯</translation>
+        <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>&amp;Remove</source>
-        <translation>&amp;移除</translation>
+        <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>
         <translation>樣板編輯器</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation>命名</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>新樣板 %1</translation>
     </message>
 </context>
 <context>
-    <name>TemplateEditor</name>
+    <name>Todo</name>
     <message>
-        <source>Configure Templates</source>
-        <translation>樣板管理</translation>
+        <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>