opie-lupdate

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
@@ -1290,96 +1290,100 @@ is provided free !</source>
     <message>
         <source>Armenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn Islands</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>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">公司傳真號碼</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">公司手機號碼</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">預設電郵地址</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">電子郵件</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">住家電話號碼</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">住家傳真號碼</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">私人手機號碼</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">公司</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">職業</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">助理</translation>
     </message>
     <message>
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
@@ -150,97 +150,102 @@ editing categories.</source>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>顯示這個類型的文件</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>文件檢視</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>顯示這個類別中的文件</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>按一下以便自清單中選擇文件</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, 或選 &lt;b&gt;新增文件&lt;/b&gt; 來建立一個新文件.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;按住並停留以獲知文件內容.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>尋找</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <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>
         <translation>尋找</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>尋找什麼:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>類別:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>開始搜尋於:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>區分大小寫</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>向後搜尋</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>文件檢視</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>檔案偵測失敗.</translation>
     </message>
     <message>
@@ -293,96 +298,100 @@ editing categories.</source>
     <message>
         <source>Location:</source>
         <translation>位置</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>快速載入 (消耗記憶體)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>紅外線</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>存放此文件的媒體.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>這個文件的名稱.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>預先載入此應用程式以便能馬上使用它.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>刪除這個文件.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>製作這個文件的副本.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</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>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
@@ -399,101 +408,101 @@ editing categories.</source>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>空間不足</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>在為這個程式建立
 組態資訊
 時發生問題.
 
 請釋放一些空間並
 再試一次.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>無法建立啟動檔案
 在開始輸入資料之前
 請先釋放一些空間</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 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>
         <source>day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>month</source>
         <translation>月</translation>
     </message>
     <message>
         <source>year</source>
         <translation>年</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>四</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>六</translation>
@@ -737,224 +746,285 @@ Free some memory and try again.</source>
         <translation>住家 郵遞區號</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>住家 國家</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>個人網頁</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>配偶</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>性別</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>生日</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>周年紀念日</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>暱稱</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>子女</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>備註</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>群組</translation>
     </message>
     <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>
         <source>What&apos;s this...</source>
         <translation type="unfinished">這是什麼...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</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>
         <source>Hard Disk</source>
         <translation>硬碟</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD 卡</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI 硬碟</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>內部儲存空間</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>內部記憶體</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC 卡</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>找不到 城市時間 可執行檔</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>為了選擇時區,
 請安裝城市時間.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>空間不足</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>無法排程警示.
 請釋放空間後再試一次</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 檔案</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>全部 %1 個檔案</translation>
     </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
@@ -40,101 +40,101 @@
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">應用程式問題</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
     </message>
 </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>
         <translation type="obsolete">文件</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">圖示瀏覽</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">列表瀏覽</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">低電量警告! 
 請把電源關掉直到插上插座</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">低電量</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">低電量警告.
 請換上備份電池</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">business card </translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">訊息</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 type="obsolete">&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>
@@ -214,96 +214,107 @@ Please charge the back-up battery.</source>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">圖示瀏覽</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">列表瀏覽</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 檔案</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">所有類型檔案</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">文件瀏覽</translation>
     </message>
     <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>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">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 type="obsolete">Which media files</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">音效</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">圖形</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">文字</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">影像</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">所有</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">連結程式</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Limit search to dir: (not used yet)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">加入</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">你的決定將存在儲存媒体當中</translation>
@@ -437,73 +448,77 @@ immediately.</source>
         <source>Restart Opie</source>
         <translation type="unfinished">重新啟動Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">關機</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished">&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">取消</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">關機..</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <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.</source>
         <translation type="obsolete">&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.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">沒有權限</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <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>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;連結&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;取消</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -34,104 +34,96 @@ Access denied</source>
     <message>
         <source>Enter new passcode</source>
         <translation>輸入新的通行碼</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>重新輸入新的通行碼</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</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>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>改變通行碼</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>清除通行碼</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>在電源開啟時要求輸入通行碼</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>同步化</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>允許來自網路的同步化:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">任何</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">無</translation>
     </message>
     <message>
@@ -187,77 +179,69 @@ For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </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,306 +1,258 @@
 <!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>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
@@ -368,96 +320,100 @@ edit or select the filter</source>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <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>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
@@ -545,270 +501,322 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <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>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></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>
+    <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>