5 files changed, 244 insertions, 163 deletions
diff --git a/i18n/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index 507554e..497b27c 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -1332,12 +1332,16 @@ is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">公司電話號碼</translation>
diff --git a/i18n/zh_TW/libqpe.ts b/i18n/zh_TW/libqpe.ts
index 482b3ec..54a53e0 100644
--- a/i18n/zh_TW/libqpe.ts
+++ b/i18n/zh_TW/libqpe.ts
@@ -192,13 +192,18 @@ editing categories.</source>
     <message>
         <source>String Not Found.</source>
         <translation>找不到字串.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>到達結尾, 從開頭處找起</translation>
+        <translation type="obsolete">到達結尾, 從開頭處找起</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
@@ -335,12 +340,16 @@ editing categories.</source>
         <translation>將這個文件傳輸到另一個裝置.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>使用自訂旋轉</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>擁有者資訊</translation>
@@ -441,17 +450,17 @@ before entering data</source>
 Free some memory and try again.</source>
         <translation>無法排程警示.
 請釋放一些記憶體並再試一次.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>D</translation>
+        <translation type="obsolete">D</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>Y</translation>
     </message>
     <message>
@@ -779,29 +788,29 @@ Free some memory and try again.</source>
     <message>
         <source>New Document</source>
         <translation>新增文件</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished">按這裡關閉這個視窗, 放棄所做的變更.</translation>
+        <translation type="obsolete">按這裡關閉這個視窗, 放棄所做的變更.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation type="unfinished">按這裡關閉視窗.</translation>
+        <translation type="obsolete">按這裡關閉視窗.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished">按這裡關閉視窗並接受所有的變更.</translation>
+        <translation type="obsolete">按這裡關閉視窗並接受所有的變更.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation type="unfinished">按這裡讓這個視窗可以移動.</translation>
+        <translation type="obsolete">按這裡讓這個視窗可以移動.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished">按這裡讓這個視窗使用所有可用的螢幕區域.</translation>
+        <translation type="obsolete">按這裡讓這個視窗使用所有可用的螢幕區域.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished">&lt;QT&gt;泛用說明無法用於這個應用程式, 不過還有內容感應式說明.&lt;p&gt;要使用內容感應式說明:&lt;p&gt;&lt;ol&gt;&lt;li&gt;按住並停留在說明按鈕上.&lt;li&gt;當標題列顯示 &lt;b&gt;這是什麼...&lt;/b&gt; 時, 按一下任何控制元.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
@@ -862,21 +871,74 @@ Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">錯誤</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">D</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">M</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 文件</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">按這裡關閉這個視窗, 放棄所做的變更.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">按這裡關閉視窗.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">按這裡關閉視窗並接受所有的變更.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">按這裡讓這個視窗使用所有可用的螢幕區域.</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF 卡</translation>
     </message>
     <message>
@@ -954,7 +1016,15 @@ Please free up space and try again</source>
     </message>
     <message>
         <source>All files</source>
         <translation>所有檔案</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index ca9e179..e70e916 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -82,17 +82,17 @@
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="obsolete">請按下十字架中心以校正觸控筆</translation>
+        <translation type="unfinished">請按下十字架中心以校正觸控筆</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="obsolete">歡迎進入Opie</translation>
+        <translation type="unfinished">歡迎進入Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
@@ -256,12 +256,23 @@ Please charge the back-up battery.</source>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Mediadlg</name>
+    <message>
+        <source>A new storage media detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What should I do with it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">中間插入</translation>
     </message>
     <message>
@@ -479,12 +490,16 @@ These termination options are provided primarily for use while developing and te
         <translation type="unfinished">淮許</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">同步中</translation>
diff --git a/i18n/zh_TW/security.ts b/i18n/zh_TW/security.ts
index 1401aac..dc36a67 100644
--- a/i18n/zh_TW/security.ts
+++ b/i18n/zh_TW/security.ts
@@ -76,20 +76,12 @@ Access denied</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>安全性設定</translation>
@@ -229,35 +221,27 @@ Beware that all manually entered net ranges will be lost!</source>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>QTopia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Both</source>
+        <source>Alter the Sync Protocol to tweak for the different devices.
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/zsafe.ts b/i18n/zh_TW/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/zh_TW/zsafe.ts
+++ b/i18n/zh_TW/zsafe.ts
@@ -1,264 +1,216 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
@@ -410,12 +362,16 @@ edit or select the directories name</source>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
@@ -587,177 +543,177 @@ ZSafe wird sich jetzt beenden.</translation>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
@@ -767,21 +723,21 @@ sichern</translation>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
@@ -807,8 +763,60 @@ ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>