1 files changed, 26 insertions, 72 deletions

diff --git a/i18n/en/todolist.ts b/i18n/en/todolist.ts
index 5887338..4c1790b 100644
--- a/i18n/en/todolist.ts
+++ b/i18n/en/todolist.ts
@@ -1,264 +1,218 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
     <message>
-        <source>Alarms</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NewTaskDlg</name>
     <message>
-        <source>Status</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recurrence</source>
+        <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Task Editor</source>
+        <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>OTaskEditor</name>
     <message>
-        <source>Enter Task</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>silent</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>loud</source>
+        <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Todolist</source>
+        <source>Task Editor</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QWidget</name>
+    <name>Opie</name>
     <message>
-        <source>New from template</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Click here to create a new task.</source>
+        <source>Enter 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 type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
+        <source>silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all...</source>
+        <source>loud</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</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>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>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Out of space</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 type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></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"></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>
-    <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</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>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>