update after several typofixes

54 files changed, 1897 insertions, 1915 deletions

diff --git a/i18n/da/appearance.ts b/i18n/da/appearance.ts
index 6b7db2b..0a0cc3c 100644
--- a/i18n/da/appearance.ts
+++ b/i18n/da/appearance.ts
@@ -49,36 +49,32 @@
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -199,32 +195,36 @@ This area allows you to select an application and which settings you wish to dis
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
diff --git a/i18n/da/buttonsettings.ts b/i18n/da/buttonsettings.ts
new file mode 100644
index 0000000..272c6ea
--- a/dev/null
+++ b/i18n/da/buttonsettings.ts
@@ -0,0 +1,116 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ButtonSettings</name>
+    <message>
+        <source>Button Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hold:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam VCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send eMail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle O-Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlg</name>
+    <message>
+        <source>%1 %2</source>
+        <comment>(hold|press) buttoname</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Held</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pressed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlgBase</name>
+    <message>
+        <source>RemapDlgBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/language.ts b/i18n/da/language.ts
index 15f1815..e5a3585 100644
--- a/i18n/da/language.ts
+++ b/i18n/da/language.ts
@@ -1,24 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Engelsk</translation>
     </message>
     <message>
         <source>default</source>
         <translation>standard</translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
-        <source>Language</source>
-        <translation>Sprog</translation>
-    </message>
-    <message>
         <source>Select language</source>
         <translation>Vælg sprog</translation>
     </message>
+    <message>
+        <source>Language Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/mediummount.ts b/i18n/da/mediummount.ts
index c2040eb..6b0b99b 100644
--- a/i18n/da/mediummount.ts
+++ b/i18n/da/mediummount.ts
@@ -39,36 +39,32 @@
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
         <translation>Hvis et medie bliver indsat i denne enhed vil Opie prøve at søge efter dokumenter på mediet. Dette kan tage en del tid på større medier. Du kan vælge om Opie skal skanne efter dokumenter globalt eller på et &quot;pr. medie&quot;-basis. Du kan også ændre tidligere indstillinger for hvert medie.</translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
-        <translation type="obsolete">Opsætning af dette medie. Ændringerne træder i kræft når programmet bliver lukket. For at opdatere Dokument-fanen skal du fjerne og isætte mediet igen.</translation>
-    </message>
-    <message>
         <source>Which media files</source>
         <translation>Hvilke medie filer</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Lyd</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Billede</translation>
     </message>
     <message>
diff --git a/i18n/da/todolist.ts b/i18n/da/todolist.ts
index f13608d..015a524 100644
--- a/i18n/da/todolist.ts
+++ b/i18n/da/todolist.ts
@@ -105,32 +105,58 @@ Quit Anyway?</source>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -151,55 +177,55 @@ Quit Anyway?</source>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Prior.</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>
         <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>TaskEditorAdvanced</name>
     <message>
         <source>State:</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>
@@ -238,229 +264,108 @@ Quit Anyway?</source>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvancedImpl</name>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorAlarms</name>
+    <name>TemplateDialog</name>
     <message>
-        <source>empty</source>
+        <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Add</source>
+        <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Edit</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress</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>Due Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summary</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>Completed Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>TemplateDialogImpl</name>
     <message>
-        <source>Category</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable Recurrance</source>
+        <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorOverViewImpl</name>
+    <name>TemplateEditor</name>
     <message>
-        <source>Todo List</source>
+        <source>Configure Templates</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>
+    <name>Todo</name>
     <message>
-        <source>Edit</source>
+        <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
     <message>
-        <source>Name</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Template %1</source>
+        <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>
-</context>
-<context>
-    <name>TemplateEditor</name>
     <message>
-        <source>Configure Templates</source>
+        <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>
-</context>
-<context>
-    <name>Todo</name>
     <message>
-        <source>More</source>
+        <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>
+        <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>
+        <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/de/appearance.ts b/i18n/de/appearance.ts
index 8b14b6c..aa6f7d0 100644
--- a/i18n/de/appearance.ts
+++ b/i18n/de/appearance.ts
@@ -49,36 +49,32 @@
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation type="unfinished">Erscheinungsbild</translation>
-    </message>
-    <message>
         <source>Style</source>
         <translation type="unfinished">Stil</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Schrift</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished">Farben</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -199,32 +195,36 @@ This area allows you to select an application and which settings you wish to dis
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Schema editieren</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
diff --git a/i18n/de/buttonsettings.ts b/i18n/de/buttonsettings.ts
new file mode 100644
index 0000000..272c6ea
--- a/dev/null
+++ b/i18n/de/buttonsettings.ts
@@ -0,0 +1,116 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ButtonSettings</name>
+    <message>
+        <source>Button Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hold:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam VCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send eMail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle O-Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlg</name>
+    <message>
+        <source>%1 %2</source>
+        <comment>(hold|press) buttoname</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Held</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pressed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlgBase</name>
+    <message>
+        <source>RemapDlgBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/language.ts b/i18n/de/language.ts
index 55922e1..71c6b94 100644
--- a/i18n/de/language.ts
+++ b/i18n/de/language.ts
@@ -1,24 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
-        <source>Language</source>
-        <translation>Sprache</translation>
-    </message>
-    <message>
         <source>Select language</source>
         <translation>Sprache auswählen</translation>
     </message>
+    <message>
+        <source>Language Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/mediummount.ts b/i18n/de/mediummount.ts
index dba8eda..896ec3d 100644
--- a/i18n/de/mediummount.ts
+++ b/i18n/de/mediummount.ts
@@ -1,23 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -27,32 +31,36 @@
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -67,21 +75,21 @@
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/todolist.ts b/i18n/de/todolist.ts
index bbc38c5..9b154d7 100644
--- a/i18n/de/todolist.ts
+++ b/i18n/de/todolist.ts
@@ -109,32 +109,58 @@ Trozdem beenden?</translation>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation>Überblick</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Fortgeschritten</translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation>Alarme</translation>
     </message>
     <message>
@@ -155,55 +181,55 @@ Trozdem beenden?</translation>
     <message>
         <source>Enter Task</source>
         <translation>Aufgabe erstellen</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Aufgabe editieren</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
-        <source>Prior.</source>
-        <translation>Prior.</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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Priority</source>
+        <translation type="unfinished">Priorität</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>State:</source>
         <translation>Status:</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Begonnen</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Verschoben</translation>
     </message>
     <message>
@@ -242,193 +268,32 @@ Trozdem beenden?</translation>
         <source>Coordinating</source>
         <translation>Koordinatin</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Nichts</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvancedImpl</name>
     <message>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorAlarms</name>
-    <message>
-        <source>empty</source>
-        <translation>leer</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Hinzufügen</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editieren</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Entfernen</translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation>Priorität</translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation>1 - Sehr Hoch</translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation>2 - Hoch</translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation>3 - Normal</translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation>4 - Niedrig</translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation>5 - Sehr niedrig</translation>
-    </message>
-    <message>
-        <source>Progress</source>
-        <translation>Fortschritt</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>Due Date:</source>
-        <translation>fällig am:</translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation>1 Januar 2002</translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation>Startdatum:</translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation>1 Januar 2001</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation>Zusammenfassung</translation>
-    </message>
-    <message>
-        <source>Complete</source>
-        <translation>Komplett</translation>
-    </message>
-    <message>
-        <source>work on</source>
-        <translation>etwas bearbeiten</translation>
-    </message>
-    <message>
-        <source>buy</source>
-        <translation>kaufen</translation>
-    </message>
-    <message>
-        <source>organize</source>
-        <translation>organisieren</translation>
-    </message>
-    <message>
-        <source>get</source>
-        <translation>besorgen</translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation>Update</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Erstellen</translation>
-    </message>
-    <message>
-        <source>Plan</source>
-        <translation>Plan</translation>
-    </message>
-    <message>
-        <source>Call</source>
-        <translation>Anruf</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>Post</translation>
-    </message>
-    <message>
-        <source>Completed Date</source>
-        <translation>Beendigungsdatum</translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation>Beended</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation>Kategorie</translation>
-    </message>
-    <message>
-        <source>Enable Recurrance</source>
-        <translation>Wiederholen aktivieren</translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverViewImpl</name>
-    <message>
-        <source>Todo List</source>
-        <translation>Aufgaben</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>
@@ -453,18 +318,58 @@ Trozdem beenden?</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/en/appearance.ts b/i18n/en/appearance.ts
index 6b7db2b..0a0cc3c 100644
--- a/i18n/en/appearance.ts
+++ b/i18n/en/appearance.ts
@@ -49,36 +49,32 @@
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -199,32 +195,36 @@ This area allows you to select an application and which settings you wish to dis
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
diff --git a/i18n/en/buttonsettings.ts b/i18n/en/buttonsettings.ts
new file mode 100644
index 0000000..272c6ea
--- a/dev/null
+++ b/i18n/en/buttonsettings.ts
@@ -0,0 +1,116 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ButtonSettings</name>
+    <message>
+        <source>Button Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hold:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam VCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send eMail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle O-Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlg</name>
+    <message>
+        <source>%1 %2</source>
+        <comment>(hold|press) buttoname</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Held</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pressed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlgBase</name>
+    <message>
+        <source>RemapDlgBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/language.ts b/i18n/en/language.ts
index 24fd93b..77c6cff 100644
--- a/i18n/en/language.ts
+++ b/i18n/en/language.ts
@@ -1,24 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
-        <source>Language</source>
+        <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select language</source>
+        <source>Language Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/mediummount.ts b/i18n/en/mediummount.ts
index dba8eda..896ec3d 100644
--- a/i18n/en/mediummount.ts
+++ b/i18n/en/mediummount.ts
@@ -1,23 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -27,32 +31,36 @@
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -67,21 +75,21 @@
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/todolist.ts b/i18n/en/todolist.ts
index 03b98f6..c5c28da 100644
--- a/i18n/en/todolist.ts
+++ b/i18n/en/todolist.ts
@@ -105,32 +105,58 @@ Quit Anyway?</source>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -151,55 +177,55 @@ Quit Anyway?</source>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Prior.</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>
         <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>TaskEditorAdvanced</name>
     <message>
         <source>State:</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>
@@ -238,229 +264,108 @@ Quit Anyway?</source>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvancedImpl</name>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorAlarms</name>
+    <name>TemplateDialog</name>
     <message>
-        <source>empty</source>
+        <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Add</source>
+        <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Edit</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress</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>Due Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summary</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>Completed Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>TemplateDialogImpl</name>
     <message>
-        <source>Category</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable Recurrance</source>
+        <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorOverViewImpl</name>
+    <name>TemplateEditor</name>
     <message>
-        <source>Todo List</source>
+        <source>Configure Templates</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>
+    <name>Todo</name>
     <message>
-        <source>Edit</source>
+        <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
     <message>
-        <source>Name</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Template %1</source>
+        <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>
-</context>
-<context>
-    <name>TemplateEditor</name>
     <message>
-        <source>Configure Templates</source>
+        <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>
-</context>
-<context>
-    <name>Todo</name>
     <message>
-        <source>More</source>
+        <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>
+        <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>
+        <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/appearance.ts b/i18n/es/appearance.ts
index 77152ed..66d782e 100644
--- a/i18n/es/appearance.ts
+++ b/i18n/es/appearance.ts
@@ -49,36 +49,32 @@
         <source>Drop down list</source>
         <translation>Lista donde soltar</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Lista donde soltar con iconos</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Arriba</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Abajo</translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation>Apariencia</translation>
-    </message>
-    <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Ventanas</translation>
     </message>
     <message>
@@ -214,32 +210,36 @@ Esta área le permite seleccionar un aplicación y qué funciones desea deshabil
 2. Etiquetas con iconos - etiquetas con iconos, el texto aparece solo en la actual
 3. Lista desplegable - una lista vertical de etiquetas
 4. Lista desplegable con iconos - una lista vertical de etiquetas con iconos</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Pulse aquí para que las etiquetas aparezcan en la parte superior de la ventana.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Pulse aquí para que las etiquetas aparezcan en la parte inferior de la ventana.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Esta en una ventana de previsualización. Vea la nueva apariencia mientras cambia las opciones.</translation>
     </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editar esquema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Seleccione aquí un color para: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
diff --git a/i18n/es/buttonsettings.ts b/i18n/es/buttonsettings.ts
new file mode 100644
index 0000000..272c6ea
--- a/dev/null
+++ b/i18n/es/buttonsettings.ts
@@ -0,0 +1,116 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ButtonSettings</name>
+    <message>
+        <source>Button Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hold:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam VCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send eMail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle O-Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlg</name>
+    <message>
+        <source>%1 %2</source>
+        <comment>(hold|press) buttoname</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Held</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pressed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlgBase</name>
+    <message>
+        <source>RemapDlgBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/language.ts b/i18n/es/language.ts
index 1027e8a..6d7ca28 100644
--- a/i18n/es/language.ts
+++ b/i18n/es/language.ts
@@ -1,24 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Inglés</translation>
     </message>
     <message>
         <source>default</source>
         <translation>predefinido</translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
-        <source>Language</source>
-        <translation>Idioma</translation>
-    </message>
-    <message>
         <source>Select language</source>
         <translation>Seleccione idioma</translation>
     </message>
+    <message>
+        <source>Language Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/mediummount.ts b/i18n/es/mediummount.ts
index 9957138..12d9dd1 100644
--- a/i18n/es/mediummount.ts
+++ b/i18n/es/mediummount.ts
@@ -1,23 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>Enable medium checking</source>
         <translation>Habilitar comprobación medio</translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation>Usar configuración global</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Qué ficheros de medio</translation>
     </message>
     <message>
@@ -27,32 +31,36 @@
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation>Qué ficheros de medio</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
@@ -67,21 +75,21 @@
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Limitar búsqueda a:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Comprobar siempre este medio</translation>
     </message>
     <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
-        <translation>Configure este medio. Los cambios tendrán efecto cuando la aplicación se cierre. Para actualizar la pestaña de Documentos, necesita extraer e insertar este medio.</translation>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/todolist.ts b/i18n/es/todolist.ts
index ac848ac..56277d7 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -110,32 +110,58 @@ e inténtelo de nuevo.
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation>Vistazo</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation>Alarmas</translation>
     </message>
     <message>
@@ -156,55 +182,55 @@ e inténtelo de nuevo.
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarea</translation>
     </message>
     <message>
         <source>Enter Task</source>
         <translation>Introducir Tarea</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
-        <source>Prior.</source>
-        <translation>Prior.</translation>
-    </message>
-    <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Fecha lí­mite</translation>
     </message>
     <message>
         <source>Table View</source>
         <translation>Vista de tablas</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dia(s)</translation>
     </message>
+    <message>
+        <source>Priority</source>
+        <translation type="unfinished">Prioridad</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>State:</source>
         <translation>Estado:</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Iniciado</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Pospuesto</translation>
     </message>
     <message>
@@ -243,193 +269,32 @@ e inténtelo de nuevo.
         <source>Coordinating</source>
         <translation>Coordinador</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Nada</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvancedImpl</name>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorAlarms</name>
-    <message>
-        <source>empty</source>
-        <translation>vacío</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Añadir</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Borrar</translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation>Form1</translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioridad</translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation>1 - Muy alta</translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation>2 - Alta</translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation>3 - Normal</translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation>4 - Baja</translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation>5 - Muy baja</translation>
-    </message>
-    <message>
-        <source>Progress</source>
-        <translation>Progreso</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>Due Date:</source>
-        <translation>Fecha límite:</translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation>1 enero 2002</translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation>Fecha inicio:</translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation>1 enero 2002</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation>Sumario</translation>
-    </message>
-    <message>
-        <source>Complete</source>
-        <translation>Completar</translation>
-    </message>
-    <message>
-        <source>work on</source>
-        <translation>trabajar en</translation>
-    </message>
-    <message>
-        <source>buy</source>
-        <translation>comprar</translation>
-    </message>
-    <message>
-        <source>organize</source>
-        <translation>organizar</translation>
-    </message>
-    <message>
-        <source>get</source>
-        <translation>conseguir</translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation>Actualizar</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Crear</translation>
-    </message>
-    <message>
-        <source>Plan</source>
-        <translation>Planear</translation>
-    </message>
-    <message>
-        <source>Call</source>
-        <translation>Llamar</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>Correo a</translation>
-    </message>
-    <message>
-        <source>Completed Date</source>
-        <translation>Fecha completado</translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation>Completado</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation>Categoría</translation>
-    </message>
-    <message>
-        <source>Enable Recurrance</source>
-        <translation>Habilitar recurrencia</translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverViewImpl</name>
-    <message>
-        <source>Todo List</source>
-        <translation>Lista Tareas</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>
@@ -454,18 +319,58 @@ e inténtelo de nuevo.
     </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/appearance.ts b/i18n/fr/appearance.ts
index 3832866..3f0d6cc 100644
--- a/i18n/fr/appearance.ts
+++ b/i18n/fr/appearance.ts
@@ -50,36 +50,32 @@
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation type="unfinished">Apparence</translation>
-    </message>
-    <message>
         <source>Style</source>
         <translation type="unfinished">Style</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Police</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished">Couleurs</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -200,32 +196,36 @@ This area allows you to select an application and which settings you wish to dis
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editer le thème</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
diff --git a/i18n/fr/buttonsettings.ts b/i18n/fr/buttonsettings.ts
new file mode 100644
index 0000000..272c6ea
--- a/dev/null
+++ b/i18n/fr/buttonsettings.ts
@@ -0,0 +1,116 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ButtonSettings</name>
+    <message>
+        <source>Button Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hold:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam VCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send eMail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle O-Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlg</name>
+    <message>
+        <source>%1 %2</source>
+        <comment>(hold|press) buttoname</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Held</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pressed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlgBase</name>
+    <message>
+        <source>RemapDlgBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/language.ts b/i18n/fr/language.ts
index bf64bb9..1748844 100644
--- a/i18n/fr/language.ts
+++ b/i18n/fr/language.ts
@@ -1,25 +1,25 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
-        <source>Language</source>
-        <translation>Langue</translation>
-    </message>
-    <message>
         <source>Select language</source>
         <translation>Sélectionner une langue</translation>
     </message>
+    <message>
+        <source>Language Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/mediummount.ts b/i18n/fr/mediummount.ts
index dba8eda..896ec3d 100644
--- a/i18n/fr/mediummount.ts
+++ b/i18n/fr/mediummount.ts
@@ -1,23 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -27,32 +31,36 @@
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -67,21 +75,21 @@
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index 03b98f6..c5c28da 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -105,32 +105,58 @@ Quit Anyway?</source>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -151,55 +177,55 @@ Quit Anyway?</source>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Prior.</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>
         <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>TaskEditorAdvanced</name>
     <message>
         <source>State:</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>
@@ -238,229 +264,108 @@ Quit Anyway?</source>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvancedImpl</name>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorAlarms</name>
+    <name>TemplateDialog</name>
     <message>
-        <source>empty</source>
+        <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Add</source>
+        <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Edit</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress</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>Due Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summary</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>Completed Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>TemplateDialogImpl</name>
     <message>
-        <source>Category</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable Recurrance</source>
+        <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorOverViewImpl</name>
+    <name>TemplateEditor</name>
     <message>
-        <source>Todo List</source>
+        <source>Configure Templates</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>
+    <name>Todo</name>
     <message>
-        <source>Edit</source>
+        <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
     <message>
-        <source>Name</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Template %1</source>
+        <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>
-</context>
-<context>
-    <name>TemplateEditor</name>
     <message>
-        <source>Configure Templates</source>
+        <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>
-</context>
-<context>
-    <name>Todo</name>
     <message>
-        <source>More</source>
+        <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>
+        <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>
+        <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/pl/appearance.ts b/i18n/pl/appearance.ts
index 44fca93..00d6cc9 100644
--- a/i18n/pl/appearance.ts
+++ b/i18n/pl/appearance.ts
@@ -49,36 +49,32 @@
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation type="unfinished">Wyglad</translation>
-    </message>
-    <message>
         <source>Style</source>
         <translation type="unfinished">Styl</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished">Kolory</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -199,32 +195,36 @@ This area allows you to select an application and which settings you wish to dis
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Edytuj schemat</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
diff --git a/i18n/pl/language.ts b/i18n/pl/language.ts
index a74552f..3ddd2bc 100644
--- a/i18n/pl/language.ts
+++ b/i18n/pl/language.ts
@@ -1,24 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
-        <source>Language</source>
-        <translation>Jezyk</translation>
-    </message>
-    <message>
         <source>Select language</source>
         <translation>Wybierz jezyk</translation>
     </message>
+    <message>
+        <source>Language Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/mediummount.ts b/i18n/pl/mediummount.ts
index dba8eda..896ec3d 100644
--- a/i18n/pl/mediummount.ts
+++ b/i18n/pl/mediummount.ts
@@ -1,23 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -27,32 +31,36 @@
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -67,21 +75,21 @@
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/todolist.ts b/i18n/pl/todolist.ts
index 251f8a3..89cc40f 100644
--- a/i18n/pl/todolist.ts
+++ b/i18n/pl/todolist.ts
@@ -105,32 +105,58 @@ Quit Anyway?</source>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -151,55 +177,55 @@ Quit Anyway?</source>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Edycja procesu</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Prior.</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>
         <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>TaskEditorAdvanced</name>
     <message>
         <source>State:</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>
@@ -238,193 +264,32 @@ Quit Anyway?</source>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvancedImpl</name>
     <message>
         <source>Description</source>
         <translation type="unfinished">Opis</translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorAlarms</name>
-    <message>
-        <source>empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation type="unfinished">1 - Bardzo wysoki</translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation type="unfinished">2 - Wysoki</translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation type="unfinished">3 - Normalny</translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation type="unfinished">4 - Niski</translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation type="unfinished">5 - Bardzo niski</translation>
-    </message>
-    <message>
-        <source>Progress</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>Due Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summary</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>Completed Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Recurrance</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverViewImpl</name>
-    <message>
-        <source>Todo List</source>
-        <translation type="unfinished">Lista ZrobTo</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>
@@ -449,18 +314,58 @@ Quit Anyway?</source>
     </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/appearance.ts b/i18n/pt/appearance.ts
index 6df15fa..309e018 100644
--- a/i18n/pt/appearance.ts
+++ b/i18n/pt/appearance.ts
@@ -49,36 +49,32 @@
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation type="unfinished">Aparência</translation>
-    </message>
-    <message>
         <source>Style</source>
         <translation type="unfinished">Estilo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Fonte</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished">Cores</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -199,32 +195,36 @@ This area allows you to select an application and which settings you wish to dis
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editar esquema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
diff --git a/i18n/pt/buttonsettings.ts b/i18n/pt/buttonsettings.ts
new file mode 100644
index 0000000..272c6ea
--- a/dev/null
+++ b/i18n/pt/buttonsettings.ts
@@ -0,0 +1,116 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ButtonSettings</name>
+    <message>
+        <source>Button Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hold:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam VCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send eMail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle O-Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlg</name>
+    <message>
+        <source>%1 %2</source>
+        <comment>(hold|press) buttoname</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Held</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pressed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlgBase</name>
+    <message>
+        <source>RemapDlgBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/language.ts b/i18n/pt/language.ts
index d923a9e..560b39b 100644
--- a/i18n/pt/language.ts
+++ b/i18n/pt/language.ts
@@ -1,24 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
-        <source>Language</source>
-        <translation>Linguagem</translation>
-    </message>
-    <message>
         <source>Select language</source>
         <translation>Escolha a linguagem</translation>
     </message>
+    <message>
+        <source>Language Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/mediummount.ts b/i18n/pt/mediummount.ts
index dba8eda..896ec3d 100644
--- a/i18n/pt/mediummount.ts
+++ b/i18n/pt/mediummount.ts
@@ -1,23 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -27,32 +31,36 @@
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -67,21 +75,21 @@
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/todolist.ts b/i18n/pt/todolist.ts
index b4fd245..b45ce14 100644
--- a/i18n/pt/todolist.ts
+++ b/i18n/pt/todolist.ts
@@ -105,32 +105,58 @@ Quit Anyway?</source>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -151,55 +177,55 @@ Quit Anyway?</source>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Editar Tarefa</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">C.</translation>
     </message>
     <message>
-        <source>Prior.</source>
-        <translation type="unfinished">Pri.</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>
         <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>TaskEditorAdvanced</name>
     <message>
         <source>State:</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>
@@ -238,193 +264,32 @@ Quit Anyway?</source>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvancedImpl</name>
     <message>
         <source>Description</source>
         <translation type="unfinished">Descrição</translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorAlarms</name>
-    <message>
-        <source>empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation type="unfinished">1 - Muito Alta</translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation type="unfinished">2 - Alta</translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation type="unfinished">3 - Normal</translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation type="unfinished">4 - Baixa</translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation type="unfinished">5 - Muito Baixa</translation>
-    </message>
-    <message>
-        <source>Progress</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>Due Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summary</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>Completed Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished">Categoria</translation>
-    </message>
-    <message>
-        <source>Enable Recurrance</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverViewImpl</name>
-    <message>
-        <source>Todo List</source>
-        <translation type="unfinished">Lista Tarefas</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>
@@ -449,18 +314,58 @@ Quit Anyway?</source>
     </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/appearance.ts b/i18n/pt_BR/appearance.ts
index 13f0809..31d7702 100644
--- a/i18n/pt_BR/appearance.ts
+++ b/i18n/pt_BR/appearance.ts
@@ -50,36 +50,32 @@
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation type="unfinished">Aparncia</translation>
-    </message>
-    <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -200,32 +196,36 @@ This area allows you to select an application and which settings you wish to dis
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
diff --git a/i18n/pt_BR/buttonsettings.ts b/i18n/pt_BR/buttonsettings.ts
new file mode 100644
index 0000000..272c6ea
--- a/dev/null
+++ b/i18n/pt_BR/buttonsettings.ts
@@ -0,0 +1,116 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ButtonSettings</name>
+    <message>
+        <source>Button Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hold:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam VCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send eMail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle O-Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlg</name>
+    <message>
+        <source>%1 %2</source>
+        <comment>(hold|press) buttoname</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Held</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pressed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlgBase</name>
+    <message>
+        <source>RemapDlgBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/language.ts b/i18n/pt_BR/language.ts
index 9611abe..a82d130 100644
--- a/i18n/pt_BR/language.ts
+++ b/i18n/pt_BR/language.ts
@@ -5,21 +5,21 @@
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Select language</source>
         <translation type="unfinished">Seleção de Linguagem</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation type="unfinished">Linguagem</translation>
+        <source>Language Settings</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/mediummount.ts b/i18n/pt_BR/mediummount.ts
index dba8eda..896ec3d 100644
--- a/i18n/pt_BR/mediummount.ts
+++ b/i18n/pt_BR/mediummount.ts
@@ -1,23 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -27,32 +31,36 @@
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -67,21 +75,21 @@
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/todolist.ts b/i18n/pt_BR/todolist.ts
index f018c3e..f7a2d7e 100644
--- a/i18n/pt_BR/todolist.ts
+++ b/i18n/pt_BR/todolist.ts
@@ -111,32 +111,58 @@ Sair assim mesmo ?</translation>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -157,55 +183,55 @@ Sair assim mesmo ?</translation>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Editar Tarefa</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">C.</translation>
     </message>
     <message>
-        <source>Prior.</source>
-        <translation type="unfinished">Prior.</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>
         <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>TaskEditorAdvanced</name>
     <message>
         <source>State:</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>
@@ -244,193 +270,32 @@ Sair assim mesmo ?</translation>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvancedImpl</name>
     <message>
         <source>Description</source>
         <translation type="unfinished">Descrição</translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorAlarms</name>
-    <message>
-        <source>empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation type="unfinished">1 - Muito Alta</translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation type="unfinished">2 - Alta</translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation type="unfinished">3 - Normal</translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation type="unfinished">4 - Baixa</translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation type="unfinished">5 - Muito Baixa</translation>
-    </message>
-    <message>
-        <source>Progress</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>Due Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summary</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>Completed Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Recurrance</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverViewImpl</name>
-    <message>
-        <source>Todo List</source>
-        <translation type="unfinished">Lista de Tarefas</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>
@@ -455,18 +320,58 @@ Sair assim mesmo ?</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/appearance.ts b/i18n/sl/appearance.ts
index 75e5224..da23806 100644
--- a/i18n/sl/appearance.ts
+++ b/i18n/sl/appearance.ts
@@ -49,36 +49,32 @@
         <source>Drop down list</source>
         <translation type="unfinished">Roletni seznam</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished">Roletni seznam - ikone</translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished">Zgoraj</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished">Spodaj</translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation type="unfinished">Videz</translation>
-    </message>
-    <message>
         <source>Style</source>
         <translation type="unfinished">Stil</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Pisava</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished">Barve</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -199,32 +195,36 @@ This area allows you to select an application and which settings you wish to dis
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Uredi shemo</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
diff --git a/i18n/sl/language.ts b/i18n/sl/language.ts
index 8b08c3e..9c6d5a0 100644
--- a/i18n/sl/language.ts
+++ b/i18n/sl/language.ts
@@ -1,24 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
-        <source>Language</source>
-        <translation>Jezik</translation>
-    </message>
-    <message>
         <source>Select language</source>
         <translation>Izberi jezik</translation>
     </message>
+    <message>
+        <source>Language Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/mediummount.ts b/i18n/sl/mediummount.ts
index 4a888fb..3187df3 100644
--- a/i18n/sl/mediummount.ts
+++ b/i18n/sl/mediummount.ts
@@ -1,23 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation>Globalno</translation>
     </message>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>Enable medium checking</source>
         <translation>Vklopi preverjanje medija</translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation>Uporabi globalne nastavitve</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Katere medijske datoteke</translation>
     </message>
     <message>
@@ -27,32 +31,36 @@
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Slika</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Besedilo</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation>Katere medijske datoteke</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
@@ -67,21 +75,21 @@
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Omeji iskanje na:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Vedno preveri ta medij</translation>
     </message>
     <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/todolist.ts b/i18n/sl/todolist.ts
index c63b3a7..fbc0b00 100644
--- a/i18n/sl/todolist.ts
+++ b/i18n/sl/todolist.ts
@@ -110,32 +110,58 @@ Izhod?</translation>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -156,55 +182,55 @@ Izhod?</translation>
     <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>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">K.</translation>
     </message>
     <message>
-        <source>Prior.</source>
-        <translation type="unfinished">Pred.</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>TaskEditorAdvanced</name>
     <message>
         <source>State:</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>
@@ -243,193 +269,32 @@ Izhod?</translation>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvancedImpl</name>
     <message>
         <source>Description</source>
         <translation type="unfinished">Opis</translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorAlarms</name>
-    <message>
-        <source>empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation type="unfinished">1 - Zelo visoka</translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation type="unfinished">2 - Visoka</translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation type="unfinished">3 - Normalna</translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation type="unfinished">4 - Nizka</translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation type="unfinished">5 - Zelo nizka</translation>
-    </message>
-    <message>
-        <source>Progress</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>Due Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summary</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>Completed Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished">Kategorija</translation>
-    </message>
-    <message>
-        <source>Enable Recurrance</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverViewImpl</name>
-    <message>
-        <source>Todo List</source>
-        <translation type="unfinished">Seznam opravkov</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>
@@ -454,18 +319,58 @@ Izhod?</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/appearance.ts b/i18n/xx/appearance.ts
index 6b7db2b..0a0cc3c 100644
--- a/i18n/xx/appearance.ts
+++ b/i18n/xx/appearance.ts
@@ -49,36 +49,32 @@
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -199,32 +195,36 @@ This area allows you to select an application and which settings you wish to dis
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
diff --git a/i18n/xx/language.ts b/i18n/xx/language.ts
index 24fd93b..77c6cff 100644
--- a/i18n/xx/language.ts
+++ b/i18n/xx/language.ts
@@ -1,24 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
-        <source>Language</source>
+        <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select language</source>
+        <source>Language Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/mediummount.ts b/i18n/xx/mediummount.ts
index 763d016..896ec3d 100644
--- a/i18n/xx/mediummount.ts
+++ b/i18n/xx/mediummount.ts
@@ -1,23 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -27,39 +31,39 @@
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MediumMountWidget</name>
     <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -70,18 +74,22 @@
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/todolist.ts b/i18n/xx/todolist.ts
index f13608d..015a524 100644
--- a/i18n/xx/todolist.ts
+++ b/i18n/xx/todolist.ts
@@ -105,32 +105,58 @@ Quit Anyway?</source>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -151,55 +177,55 @@ Quit Anyway?</source>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Prior.</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>
         <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>TaskEditorAdvanced</name>
     <message>
         <source>State:</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>
@@ -238,229 +264,108 @@ Quit Anyway?</source>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvancedImpl</name>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorAlarms</name>
+    <name>TemplateDialog</name>
     <message>
-        <source>empty</source>
+        <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Add</source>
+        <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Edit</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress</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>Due Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summary</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>Completed Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>TemplateDialogImpl</name>
     <message>
-        <source>Category</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable Recurrance</source>
+        <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorOverViewImpl</name>
+    <name>TemplateEditor</name>
     <message>
-        <source>Todo List</source>
+        <source>Configure Templates</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>
+    <name>Todo</name>
     <message>
-        <source>Edit</source>
+        <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
     <message>
-        <source>Name</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Template %1</source>
+        <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>
-</context>
-<context>
-    <name>TemplateEditor</name>
     <message>
-        <source>Configure Templates</source>
+        <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>
-</context>
-<context>
-    <name>Todo</name>
     <message>
-        <source>More</source>
+        <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>
+        <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>
+        <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/appearance.ts b/i18n/zh_TW/appearance.ts
index 6b7db2b..0a0cc3c 100644
--- a/i18n/zh_TW/appearance.ts
+++ b/i18n/zh_TW/appearance.ts
@@ -49,36 +49,32 @@
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -199,32 +195,36 @@ This area allows you to select an application and which settings you wish to dis
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
diff --git a/i18n/zh_TW/buttonsettings.ts b/i18n/zh_TW/buttonsettings.ts
new file mode 100644
index 0000000..272c6ea
--- a/dev/null
+++ b/i18n/zh_TW/buttonsettings.ts
@@ -0,0 +1,116 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ButtonSettings</name>
+    <message>
+        <source>Button Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hold:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam VCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send eMail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle O-Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlg</name>
+    <message>
+        <source>%1 %2</source>
+        <comment>(hold|press) buttoname</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Held</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pressed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlgBase</name>
+    <message>
+        <source>RemapDlgBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/language.ts b/i18n/zh_TW/language.ts
index a074308..2412cf4 100644
--- a/i18n/zh_TW/language.ts
+++ b/i18n/zh_TW/language.ts
@@ -1,24 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>英文</translation>
     </message>
     <message>
         <source>default</source>
         <translation>預設值</translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
-        <source>Language</source>
-        <translation>語言</translation>
-    </message>
-    <message>
         <source>Select language</source>
         <translation>選擇語言</translation>
     </message>
+    <message>
+        <source>Language Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/mediummount.ts b/i18n/zh_TW/mediummount.ts
index dba8eda..896ec3d 100644
--- a/i18n/zh_TW/mediummount.ts
+++ b/i18n/zh_TW/mediummount.ts
@@ -1,23 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -27,32 +31,36 @@
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -67,21 +75,21 @@
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index 5ee0e1e..012c7c8 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -43,55 +43,55 @@ accurately to calibrate your screen.</source>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>低電量警告! 
 請把電源關掉直到插上插座</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>低電量</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation >低電量警告.
+        <translation>低電量警告.
 請換上備份電池</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>business card </translation>
     </message>
     <message>
         <source>Information</source>
         <translation>訊息</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
-        <translation >電池狀態</translation>
+        <translation>電池狀態</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>啟動器</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation> - 啟動器</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>無應用程式</translation>
     </message>
@@ -110,65 +110,65 @@ Please charge the back-up battery.</source>
         <source>All types of file</source>
         <translation>所有類型檔案</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>文件瀏覽</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>中間插入</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation >A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
+        <translation>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Which media files</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation >音效</translation>
+        <translation>音效</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>圖形</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>文字</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>影像</translation>
     </message>
     <message>
         <source>All</source>
         <translation>所有</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>連結程式</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation >Limit search to dir: (not used yet)</translation>
+        <translation>Limit search to dir: (not used yet)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>加入</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>你的決定將存在儲存媒体當中</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>不再詢問這一個儲存媒体</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
diff --git a/i18n/zh_TW/tictac.ts b/i18n/zh_TW/tictac.ts
index 8d4cc55..296cb79 100644
--- a/i18n/zh_TW/tictac.ts
+++ b/i18n/zh_TW/tictac.ts
@@ -6,33 +6,33 @@
         <translation>電腦先下</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>玩家先下</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>開始!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>離開</translation>
     </message>
     <message>
         <source>Click Play to start</source>
-        <translation>按"開始!"開始遊戲</translation>
+        <translation>按&quot;開始!&quot;開始遊戲</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>輪到你了</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>你贏了!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>電腦贏了!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>不分勝負</translation>
diff --git a/i18n/zh_TW/todolist.ts b/i18n/zh_TW/todolist.ts
index ac79230..51f7445 100644
--- a/i18n/zh_TW/todolist.ts
+++ b/i18n/zh_TW/todolist.ts
@@ -25,56 +25,44 @@
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Completed tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Deadline</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>Show only over due</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</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.
@@ -97,32 +85,78 @@ Quit Anyway?</source>
     <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>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show completed tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show only over-due tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show task deadlines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show quick task bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QuickEdit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -143,55 +177,55 @@ Quit Anyway?</source>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Prior.</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>
         <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>TaskEditorAdvanced</name>
     <message>
         <source>State:</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>
@@ -230,214 +264,108 @@ Quit Anyway?</source>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvancedImpl</name>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorAlarms</name>
+    <name>TemplateDialog</name>
     <message>
-        <source>empty</source>
+        <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Add</source>
+        <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Edit</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress</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>Due Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summary</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>Completed Date</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>TemplateDialogImpl</name>
     <message>
-        <source>Completed</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category</source>
+        <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
     <message>
-        <source>Enable Recurrance</source>
+        <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorOverViewImpl</name>
+    <name>Todo</name>
     <message>
-        <source>Todo List</source>
+        <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>
-</context>
-<context>
-    <name>TemplateDialog</name>
     <message>
-        <source>Template Editor</source>
+        <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>Add</source>
+        <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit</source>
+        <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>Remove</source>
+        <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
     <message>
-        <source>Name</source>
+        <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>New Template %1</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TemplateEditor</name>
     <message>
-        <source>Configure Templates</source>
+        <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>