1 files changed, 252 insertions, 96 deletions

diff --git a/i18n/zh_CN/packagemanager.ts b/i18n/zh_CN/packagemanager.ts
index 05d9dba..3b60785 100644
--- a/i18n/zh_CN/packagemanager.ts
+++ b/i18n/zh_CN/packagemanager.ts
@@ -1,14 +1,8 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterImpl</name>
-</context>
-<context>
-    <name>DataManager</name>
-</context>
-<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -44,15 +38,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InputDialog</name>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
@@ -125,225 +156,228 @@
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallDlgImpl</name>
-</context>
-<context>
-    <name>InstallOptionsDlgImpl</name>
-</context>
-<context>
-    <name>Ipkg</name>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to update package lists from servers.</source>
+        <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade</source>
+        <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to upgrade all installed packages if a newer version is available.</source>
+        <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download</source>
+        <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to download the currently selected package(s).</source>
+        <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply changes</source>
+        <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to install, remove or upgrade currently selected package(s).</source>
+        <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure</source>
+        <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to configure this application.</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actions</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show packages not installed</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages available which have not been installed.</source>
+        <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show installed packages</source>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show updated packages</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to find the next package name containing the text you are searching for.</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Packages</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Remove or reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
@@ -372,85 +406,207 @@ Click inside the box at the left to select a package.</source>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Address:</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username:</source>
+        <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Depends</source>
+        <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Reinstall</source>
+        <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Remove</source>
+        <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force Overwrite</source>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information Level</source>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Errors only</source>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal messages</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Informative messages</source>
+        <source>Tap here to edit the entry selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Troubleshooting output</source>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
@@ -479,20 +635,20 @@ Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PackageWindow</name>
-</context>
-<context>
-    <name>QObject</name>
-</context>
-<context>
-    <name>QuestionDlg</name>
-</context>
-<context>
-    <name>SettingsImpl</name>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>