21 files changed, 322 insertions, 113 deletions

diff --git a/i18n/mk/bluepin.ts b/i18n/mk/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/mk/bluepin.ts
+++ b/i18n/mk/bluepin.ts
@@ -6,19 +6,59 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/bluetooth-manager.ts b/i18n/mk/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/mk/bluetooth-manager.ts
+++ b/i18n/mk/bluetooth-manager.ts
@@ -26,27 +26,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -69,10 +65,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
@@ -113,10 +105,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -128,23 +116,23 @@
         <source>Bluetooth Basic Config</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DeviceDialog</name>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -160,21 +148,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/calculator.ts b/i18n/mk/calculator.ts
index ce18055..3d894d6 100644
--- a/i18n/mk/calculator.ts
+++ b/i18n/mk/calculator.ts
@@ -161,10 +161,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
@@ -185,10 +181,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -328,5 +320,13 @@
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/checkbook.ts b/i18n/mk/checkbook.ts
index 570e6c1..66d8f35 100644
--- a/i18n/mk/checkbook.ts
+++ b/i18n/mk/checkbook.ts
@@ -318,6 +318,14 @@ protected</source>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
diff --git a/i18n/mk/datebook.ts b/i18n/mk/datebook.ts
index fb9225d..87efad5 100644
--- a/i18n/mk/datebook.ts
+++ b/i18n/mk/datebook.ts
@@ -532,7 +532,7 @@ Quit anyway?</source>
     </message>
     <message>
         <source> minutes</source>
-        <translation>минути</translation>
+        <translation type="obsolete">минути</translation>
     </message>
     <message>
         <source>Silent</source>
@@ -554,6 +554,18 @@ Quit anyway?</source>
         <source>Note...</source>
         <translation>Забелешка...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">денови</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/mk/embeddedkonsole.ts b/i18n/mk/embeddedkonsole.ts
index 814b354..8a1a267 100644
--- a/i18n/mk/embeddedkonsole.ts
+++ b/i18n/mk/embeddedkonsole.ts
@@ -227,6 +227,10 @@
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
diff --git a/i18n/mk/go.ts b/i18n/mk/go.ts
index 985ea5f..1a44c6c 100644
--- a/i18n/mk/go.ts
+++ b/i18n/mk/go.ts
@@ -21,6 +21,10 @@
         <source>Game</source>
         <translation>Игра</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
diff --git a/i18n/mk/gutenbrowser.ts b/i18n/mk/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/mk/gutenbrowser.ts
+++ b/i18n/mk/gutenbrowser.ts
@@ -285,11 +285,6 @@ http://www.trolltech.com
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -305,6 +300,10 @@ http://www.trolltech.com
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
diff --git a/i18n/mk/libaboutapplet.ts b/i18n/mk/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/mk/libaboutapplet.ts
+++ b/i18n/mk/libaboutapplet.ts
@@ -61,7 +61,8 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
diff --git a/i18n/mk/libbatteryapplet.ts b/i18n/mk/libbatteryapplet.ts
index 8c2c3e9..f70e180 100644
--- a/i18n/mk/libbatteryapplet.ts
+++ b/i18n/mk/libbatteryapplet.ts
@@ -74,12 +74,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/libliquid.ts b/i18n/mk/libliquid.ts
index cfc92de..59246fb 100644
--- a/i18n/mk/libliquid.ts
+++ b/i18n/mk/libliquid.ts
@@ -1,5 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Течен</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
diff --git a/i18n/mk/libmemoryapplet.ts b/i18n/mk/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/mk/libmemoryapplet.ts
+++ b/i18n/mk/libmemoryapplet.ts
@@ -156,5 +156,9 @@ Memory is categorized as follows:
         <source>2 Mb,4 Mb,6 Mb,8 Mb,16 Mb,32 Mb,64 Mb</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopiecore2.ts b/i18n/mk/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/mk/libopiecore2.ts
+++ b/i18n/mk/libopiecore2.ts
@@ -85,6 +85,10 @@
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
diff --git a/i18n/mk/libopieobex.ts b/i18n/mk/libopieobex.ts
index 2c4827f..83ba39f 100644
--- a/i18n/mk/libopieobex.ts
+++ b/i18n/mk/libopieobex.ts
@@ -22,35 +22,35 @@
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Праќање:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Праќање:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Готово</translation>
+        <translation type="obsolete">Готово</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>IrDa не е вклучена!</translation>
+        <translation type="obsolete">IrDa не е вклучена!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Барање IrDa уреди.</translation>
+        <translation type="obsolete">Барање IrDa уреди.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth не е достапен</translation>
+        <translation type="obsolete">Bluetooth не е достапен</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Барање bluetooth уреди.</translation>
+        <translation type="obsolete">Барање bluetooth уреди.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Закажување на испраќање.</translation>
+        <translation type="obsolete">Закажување на испраќање.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Кликно да пренесеш</translation>
+        <translation type="obsolete">Кликно да пренесеш</translation>
     </message>
     <message>
         <source>Sent</source>
@@ -66,11 +66,74 @@
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Повторно барај IrDa.</translation>
+        <translation type="obsolete">Повторно барај IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Почни праќање</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libscreenshotapplet.ts b/i18n/mk/libscreenshotapplet.ts
index 6c0e95b..b4b02f5 100644
--- a/i18n/mk/libscreenshotapplet.ts
+++ b/i18n/mk/libscreenshotapplet.ts
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>Name of screenshot </source>
-        <translation>Име на слика</translation>
+        <translation type="obsolete">Име на слика</translation>
     </message>
     <message>
         <source>Success</source>
diff --git a/i18n/mk/libtodaydatebookplugin.ts b/i18n/mk/libtodaydatebookplugin.ts
index ef30237..7fdf806 100644
--- a/i18n/mk/libtodaydatebookplugin.ts
+++ b/i18n/mk/libtodaydatebookplugin.ts
@@ -13,6 +13,10 @@
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
@@ -68,6 +72,10 @@
         <source>How many more days</source>
         <translation type="unfinished">Уште колку денови</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
diff --git a/i18n/mk/odict.ts b/i18n/mk/odict.ts
index cbcb6b4..366f874 100644
--- a/i18n/mk/odict.ts
+++ b/i18n/mk/odict.ts
@@ -54,11 +54,11 @@
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation>Методи на пребарување</translation>
+        <translation type="obsolete">Методи на пребарување</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>О&amp;сетливо на големи и мали букви</translation>
+        <translation type="obsolete">О&amp;сетливо на големи и мали букви</translation>
     </message>
     <message>
         <source>Settings</source>
@@ -72,6 +72,14 @@
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
diff --git a/i18n/mk/opieirc.ts b/i18n/mk/opieirc.ts
index b23aa7d..507ee2b 100644
--- a/i18n/mk/opieirc.ts
+++ b/i18n/mk/opieirc.ts
@@ -382,6 +382,10 @@ Real name: %4</source>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -482,8 +486,9 @@ Real name: %4</source>
     </message>
     <message>
         <source>The channel list needs to contain a
-comma separated list of channel
- names which start with either &apos;#&apos; or &apos;+&apos;</source>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/sysinfo.ts b/i18n/mk/sysinfo.ts
index 118f753..135a857 100644
--- a/i18n/mk/sysinfo.ts
+++ b/i18n/mk/sysinfo.ts
@@ -113,19 +113,19 @@
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Апликации на процесорот (%)</translation>
+        <translation type="obsolete">Апликации на процесорот (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Користење на системскиот процесор (%)</translation>
+        <translation type="obsolete">Користење на системскиот процесор (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Оваа страна поклажува колку од процесорот се користи.</translation>
+        <translation type="obsolete">Оваа страна поклажува колку од процесорот се користи.</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Тип:</translation>
+        <translation type="obsolete">Тип:</translation>
     </message>
 </context>
 <context>
@@ -229,6 +229,17 @@ Click and hold on a module to see additional information about the module, or to
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
@@ -292,7 +303,7 @@ to this process?</source>
     </message>
     <message>
         <source>CPU</source>
-        <translation>Процесор</translation>
+        <translation type="obsolete">Процесор</translation>
     </message>
     <message>
         <source>Process</source>
@@ -314,6 +325,10 @@ to this process?</source>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
diff --git a/i18n/mk/today.ts b/i18n/mk/today.ts
index e38f3b3..c0fdcd2 100644
--- a/i18n/mk/today.ts
+++ b/i18n/mk/today.ts
@@ -38,12 +38,16 @@
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>денес од Maximillian ReiB</translation>
+        <translation type="obsolete">денес од Maximillian ReiB</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Кликни овде за да се отвори прозорот за конфигурација</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
diff --git a/i18n/mk/zsafe.ts b/i18n/mk/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/mk/zsafe.ts
+++ b/i18n/mk/zsafe.ts
@@ -208,43 +208,43 @@ shows the list of dirs and files</source>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
@@ -252,35 +252,35 @@ shows the list of dirs and files</source>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
@@ -456,37 +456,21 @@ sichern</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
@@ -547,10 +531,6 @@ newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -562,5 +542,57 @@ newly created document.</source>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>