Merge from BRANCH_1_0.

1 files changed, 279 insertions, 119 deletions

diff --git a/i18n/zh_TW/aqpkg.ts b/i18n/zh_TW/aqpkg.ts
index 83eec9e..692fd63 100644
--- a/i18n/zh_TW/aqpkg.ts
+++ b/i18n/zh_TW/aqpkg.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation>&amp;O確定</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;C取消</translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
-        <translation>選擇顯示群組</translation>
+        <source>Select one or more groups</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
@@ -34,74 +26,215 @@
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;C取消</translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
-        <translation>安裝</translation>
+        <source>Close</source>
+        <translation>關閉</translation>
     </message>
     <message>
-        <source>Start</source>
-        <translation>開始</translation>
+        <source>Remove
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation>選項</translation>
+        <source>Install
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
-        <translation>輸出</translation>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation>目的檔</translation>
+        <translation type="unfinished">目的檔</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation>可使用空間</translation>
+        <translation type="unfinished">可使用空間</translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
-        <translation>關閉</translation>
+        <source>Output</source>
+        <translation type="unfinished">輸出</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">開始</translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation>選項</translation>
+        <translation type="unfinished">選項</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation>Force Depends</translation>
+        <translation type="unfinished">Force Depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation>Force Reinstall</translation>
+        <translation type="unfinished">Force Reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation>Force Remove</translation>
+        <translation type="unfinished">Force Remove</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation>Force Overwrite</translation>
+        <translation type="unfinished">Force Overwrite</translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
-        <translation>Verbose WGet</translation>
+        <source>Information Level</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
-        <translation>確定</translation>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
@@ -225,32 +358,12 @@
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation>幫助</translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation>關於</translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>選項</translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>伺服器:</translation>
@@ -271,16 +384,12 @@ A blue dot next to the package name indicates that the package is currently inst
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished">關於 AQPkg</translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
@@ -293,40 +402,12 @@ Click inside the box at the left to select a package.</source>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
@@ -400,107 +481,186 @@ Are you sure?
     </message>
     <message>
         <source>ReInstall</source>
         <translation>重新安裝</translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>U</source>
+        <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>PackageWindow</name>
     <message>
-        <source>Configuration</source>
-        <translation>設定</translation>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Servers</source>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>Package information is unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Close</source>
+        <translation type="unfinished">關閉</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
-        <translation>刪除</translation>
+        <translation type="unfinished">刪除</translation>
     </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
     <message>
-        <source>New</source>
-        <translation>新的</translation>
+        <source>Configuration</source>
+        <translation type="unfinished">設定</translation>
     </message>
     <message>
-        <source>Destinations</source>
+        <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>New</source>
+        <translation type="unfinished">新的</translation>
+    </message>
+    <message>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>密碼</translation>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>啟動</translation>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished">目的檔</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
-        <translation type="unfinished">&amp;A執行</translation>
+        <source>Enabled</source>
+        <translation type="unfinished">啟動</translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>