24 files changed, 9459 insertions, 1853 deletions

diff --git a/i18n/cz/packagemanager.ts b/i18n/cz/packagemanager.ts
index 3ac6397..05d9dba 100644
--- a/i18n/cz/packagemanager.ts
+++ b/i18n/cz/packagemanager.ts
@@ -1,468 +1,498 @@
 <!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>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Packages</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Packages</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>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Download packages</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>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>No</source>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</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>
+</context>
 </TS>
diff --git a/i18n/da/packagemanager.ts b/i18n/da/packagemanager.ts
index 3ac6397..7fec62d 100644
--- a/i18n/da/packagemanager.ts
+++ b/i18n/da/packagemanager.ts
@@ -1,468 +1,970 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Kategorifilter</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">Vælg én eller flere grupper</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">Læser konfiguration...</translation>
+    </message>
+</context>
+<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;OK</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Afbryd</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Destination</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ledig plads</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Output</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Start</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Indstillinger</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ukendt</translation>
     </message>
     <message>
         <source>%1 Kb</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 Kb</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afbryd</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Luk</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gem output</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tekst</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation type="obsolete">Luk</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>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">Fjern</translation>
+    </message>
+    <message>
+        <source>Install
+</source>
+        <translation type="obsolete">Installer</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">Opgrader</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">(Geninstaller)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">(Opgrader)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Destination</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">Ledig plads</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">Output</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Start</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Indstillinger</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Alle</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Tekst</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">Afbryd</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">
+**** Brugeren klikkede AFBRYD ***</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">**** Process afbrudt ****</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">Gem output</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">Ukendt</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="obsolete">%1 Kb</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Indstillinger</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">--force-depends</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">--force-reinstall</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">--force-removal</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">--force-overwrite</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation type="obsolete">Informationsniveau</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation type="obsolete">Kun fejl</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="obsolete">Almindelige meddelelser</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="obsolete">Oplysende meddelelser</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="obsolete">Meddelelser til fejlfinding</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="obsolete">Håndterer pakken %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="obsolete">Fjerner symbolske links...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="obsolete">Laver symlinks til%1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="obsolete">Laver symlinks til %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="obsolete">Færdig</translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="obsolete">Opretter mappe</translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="obsolete">Link fra %1 til %1 oprettet</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="obsolete">%1 fjernet</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="obsolete">Kunne ikke fjerne %1</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="obsolete">Fjernet</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">AQPkg - Pakkestyring</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Indtast teksten du vil søge efter her.</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation type="obsolete">Klik her for at gemme Quick Jump værktøjslinien.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Opdatér lister</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at opdatere pakke lister fra serverne.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Opgradér</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at opgradere alle installerede pakker, hvis en nyere version er tilgængelig.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Hent</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at hente den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Anvend ændringer</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at installere, fjerne eller opgradere den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Handlinger</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis pakker der ikke er installeret</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vise de tilgængelige pakker der ikke er installeret.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis installerede pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vise de pakker der er installeret på denne enhed.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis opdaterede pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vise de pakker der er installeret på denne enhed, hvor en nyere version er tilgængelig.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Filter by category</source>
+        <translation type="obsolete">Filtrér efter kategori</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation type="obsolete">Klik her for at vise pakker tilhørende en bestemt kategori.</translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Set filter category</source>
+        <translation type="obsolete">Vælg filter kategori</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to change package category to used filter.</source>
+        <translation type="obsolete">Klik her for at ændre den kategori der skal bruges til filteret.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Find</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at søge efter tekst i pakke navnene.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Find næste</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at finde det næste pakke navn indeholdende den tekst du søger efter.</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation type="obsolete">Quick Jump tastplade</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation type="obsolete">Klik her for at vise/skjule tastpladen for hurtig søgning i pakke listen.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Konfigurér</translation>
+    </message>
+    <message>
+        <source>Click here to configure this application.</source>
+        <translation>Klik her for at konfigurere dette program.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at skjule søge værktøjslinien.</translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Servers:</source>
+        <translation type="obsolete">Servere:</translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Click here to select a package feed.</source>
+        <translation type="obsolete">Klik her for at vælge et pakke feed.</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>Pakker</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+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>
+        <translation type="obsolete">Dette er en liste over alle pakker fra det server feed der er valgt foroven.
+
+En blå prik ved siden af pakke navnet indikerer at pakken allerede er installeret.
+
+En blå prik med en stjerne indikerer at en nyere version af pakken er tilgængelig fra det valgte server feed.
+
+Klik inde i boksen til venstre for at vælge en pakke.</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Fjern</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation type="obsolete">Klik her for at afinstallere den/de valgte pakke(r).</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Bygger server liste:
+<byte value="x9"/>%1</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Bygger pakke liste for:
+<byte value="x9"/>%1</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation type="obsolete">Genopfrisker server pakke lister</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation type="obsolete">ADVARSEL: Opgradering mens
+Opie/Qtopia kører
+er IKKE anbefalet!
+
+Er du sikker?
+</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">Advarsel</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation type="obsolete">Opgraderer installerede pakker</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation type="obsolete">Er du sikker på du vil slette
+%1?</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="obsolete">Er du sikker?</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nej</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation type="obsolete">Hent hvortil</translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation type="obsolete">Indtast stien der skal hentes til</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation type="obsolete">Installér fjernpakke</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation type="obsolete">Indtast pakkens lokation</translation>
+    </message>
+    <message>
+        <source>Nothing to do</source>
+        <translation>Intet at lave</translation>
+    </message>
+    <message>
+        <source>No packages selected</source>
+        <translation>Ingen pakker er valgt</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation type="obsolete">Vil du fjerne eller geninstallere
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">Fjern eller geninstallér</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">Geninstallér</translation>
+    </message>
+    <message>
+        <source>R</source>
+        <translation type="obsolete">R</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation type="obsolete">Vil du fjerne eller opgradere
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation type="obsolete">Fjern eller opgradér</translation>
+    </message>
+    <message>
+        <source>U</source>
+        <translation type="obsolete">U</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="obsolete">Opdaterer Launcher...</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Remove or reinstall</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>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Konfiguration</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Servere</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Destinationer</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxyer</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Indstillinger</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ny</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Slet</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Navn:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aktiv server</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opdater</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aktiveret</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Brugernavn:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kodeord:</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">--force-depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">--force-reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">--force-removal</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">--force-overwrite</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Informationsniveau</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kun fejl</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Almindelige meddelelser</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Oplysende meddelelser</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Meddelelser til fejlfinding</translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;b&gt;Beskrivelse&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Installeret i&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Størrelse&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Sektion&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Filnavn&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Version installeret&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Version tilgængelig&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="obsolete">Pakkeinformation</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="obsolete">Pakkeinformation er ikke tilgængelig</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Luk</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="obsolete">Installerede pakker</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="obsolete">Lokale pakker</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="obsolete">Pakke - %1 version - %2</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Fjern</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">Konfiguration</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">Servere</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">Destinationer</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">Proxyer</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Ny</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Slet</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="obsolete">Server</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">Navn:</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">Adresse:</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">Aktiv server</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="obsolete">Opdater</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Destination</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="obsolete">Placering:</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">HTTP Proxy</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Aktiveret</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">FTP Proxy</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="obsolete">Brugernavn:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">Kodeord:</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/packagemanager.ts b/i18n/de/packagemanager.ts
index 3ac6397..b22f93c 100644
--- a/i18n/de/packagemanager.ts
+++ b/i18n/de/packagemanager.ts
@@ -1,468 +1,1035 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Kategorienfilter</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">Wählen Sie eine oder mehrere Gruppen</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">Lese Konfiguration ...</translation>
+    </message>
+</context>
 <context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;OK</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ziel</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Verf. Speicher</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ausgabe</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Starten</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Optionen</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Unbekannt</translation>
     </message>
     <message>
         <source>%1 Kb</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 kB</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Schließen</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ausgabe speichern</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Text</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation type="obsolete">Schließen</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>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">Entfernen
+</translation>
+    </message>
+    <message>
+        <source>Install
+</source>
+        <translation type="obsolete">Installieren
+</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">Aktualisieren
+</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">(Neuinstallation)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">(Aktualisierung)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Ziel</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">Verf. Speicher</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">Ausgabe</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Starten</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Optionen</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Alle</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Text</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">Abbruch</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">
+**** Benutzerabbruch ****</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">**** Vorgang abgebrochen ****</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">Ausgabe speichern</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">Unbekannt</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="obsolete">%1 kB</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Optionen</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">--force.depends</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">--force-reinstall</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">--force-removal</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">--force-overwrite</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation type="obsolete">Informationslevel</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation type="obsolete">Nur Fehler</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="obsolete">Normale Meldungen</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="obsolete">Informative Meldungen</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="obsolete">Ausgaben zur Fehlersuche</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="obsolete"> Bearbeite Paket %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="obsolete">Löschen symbolischer Links...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="obsolete">Erstellung symbolischer Links für %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="obsolete">Erstellung symbolischer Links für %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="obsolete">Erledigt</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="obsolete">Entfernen des Statuseintrags...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="obsolete">Statusdatei -</translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="obsolete">Paket-</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="obsolete">Statusdatei konnte nicht geöffnet werden- </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="obsolete">Temp. Statusdatei konnte nicht geöffnet werden- </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="obsolete">ipkg konnte nicoht gestartet werden</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="obsolete">Öffnen fehlgeschlagen: </translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="obsolete">Erstellung Verzeichnis </translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="obsolete">Verlinkung von %1 mit %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="obsolete">Verlinkung von %1 mit %2 fehlgeschlage</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="obsolete">%1 gelöscht</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="obsolete">Löschen %1 fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="obsolete">Gelöscht </translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="obsolete">Löschen fehlgeschlagen </translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">AQPkg- der Paketmanager</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tippen Sie den Suchtext hier ein.</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation type="obsolete">Klicken Sie hier um die alphabetische Schnellleiste auszublenden.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Listen aktualisieren</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier für eine aktualisierte Fassung der Serverliste.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualisieren</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier, um alle installierten Pakete zu aktualisieren, siofern eine neuere Version vorhanden ist.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Download</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier um das ausgewählte Paket downzuloaden.</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Übernehmen</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier, um das ausgewählte Paket zu löschen oder zu aktualisieren.</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktion</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht installierte Pakete anz.</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier um Pakete anzuzeigen, die nicht installiert wurden.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Installierte Pakete anzeigen</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier um installierte Pakete anzuzeigen.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualisierte Pakete anz.</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicke Sie hier um nur installierte Pakete anzuzeigen, für die eine neuere Version verfügbar ist.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Filter by category</source>
+        <translation type="obsolete">Filtern n. Kategorie</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation type="obsolete">Klicken Sie hier um Pakete aufzulisten, die einer bestmmten Kategorie zugehören.</translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Set filter category</source>
+        <translation type="obsolete">Filterkategorie setzen</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to change package category to used filter.</source>
+        <translation type="obsolete">Klicken Sie hier um die Paketkategorie in den verwendeten Filter zu übernehmen.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Suchen</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier um Text in Paketnamen zu suchen.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Nächstes finden</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier um das nächste Paket mit Ihrem Suchtext zu finden.</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation type="obsolete">Alphabetische Schnellleiste</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation type="obsolete">Klicken Sie hier um die alphabetische Schnellliste ein- und auszublenden.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzg.</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Konfiguration</translation>
+    </message>
+    <message>
+        <source>Click here to configure this application.</source>
+        <translation>Klicken Sie hier um die Anwendung zu konfigurieren.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier um die Finden-Leiste auszublenden.</translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Servers:</source>
+        <translation type="obsolete">Server: </translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Click here to select a package feed.</source>
+        <translation type="obsolete">Klicken Sie hier, um einen Feedserver auszuwählen.</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>Pakete</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+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>
+        <translation type="obsolete">Dies ist eine Liste aller Pakete des oben gewählten Feed-Servers.
+Eine blaue Kugel neben dem Paketnamen zeigt an dass das Paket zur Zeit installiert ist.
+Ein blauer Punkt mit einem gelben Stern zeit dass eine neuere Version des Pakets auf dem Server verfügbar ist.
+Um ein Paket auszuwählen klicken Sie in das Rechtecke auf der linken Seite.</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation type="obsolete">Klicken Sie hier um asgewählte Pakete zu entfernen</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Serverlistenerstellung: 
+<byte value="x9"/>%1
+</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Paketlistenerstellung für:
+<byte value="x9"/>%1</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation type="obsolete">Aktualisierung der Paketliste</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation type="obsolete">WARNUNG !!!
+Ein Upgrade während
+OPIE/Qtopia läuft ist
+nicht zu empfehlen.
+
+Sind Sie sicher ?</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">Warnung</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation type="obsolete">Installierte Pakete upgraden</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation type="obsolete">Sind Sie sicher %1 
+löschen zu wollen ?</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="obsolete">Sind Sie sicher ?</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nein</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation type="obsolete">Wohin downloaden </translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation type="obsolete">Geben Sie den Downloadpfad ein</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation type="obsolete">Entferntes Paket installieren</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation type="obsolete">Geben Sie die Paketquelle ein</translation>
+    </message>
+    <message>
+        <source>Nothing to do</source>
+        <translation>Nichts zu tun</translation>
+    </message>
+    <message>
+        <source>No packages selected</source>
+        <translation>Keine Pakete ausgewählt</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation type="obsolete">Möchten Sie %1
+löschen oder neu installieren ?</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">Löschen oder Neuinstallation</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">Neuinstallation</translation>
+    </message>
+    <message>
+        <source>R</source>
+        <translation type="obsolete">R</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation type="obsolete">Möchten Sie %1
+löschen oder aktualisieren ?</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation type="obsolete">Löschen oder Aktualisieren</translation>
+    </message>
+    <message>
+        <source>U</source>
+        <translation type="obsolete">U</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="obsolete">Aktualisiere Launcher...</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Remove or reinstall</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>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Konfiguration</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Server</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ziele</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxys</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Optionen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Neu</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Löschen</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Name: </translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aktive Server</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aktualisierung</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aktiviert</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Benutzername:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Passwort:</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">--force.depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">--force-reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">--force-removal</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">--force-overwrite</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Informationslevel</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nur Fehler</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Normale Meldungen</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Informative Meldungen</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ausgaben zur Fehlersuche</translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;b&gt;Bechreibung&lt;/B&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Installiert&lt;/B&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Größe&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Sektion&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Dateiname&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Installiete Version&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Verfügbare Version&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="obsolete">Paketinformation</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="obsolete">Paketinformation nicht verfügbar</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Schließen</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="obsolete">Installierte pakete</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="obsolete">Lokale Pakete</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="obsolete">Nicht verfügbar</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="obsolete">Paket- %1
+Version- %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="obsolete">
+installierte Version- %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="obsolete">Versionsnummer ist leer.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="obsolete">Epochennumer ist keine Zahl.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="obsolete">Kein Wert nach Doppelpunkt in der Versionsnummer.</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Löschen</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">Konfiguration</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">Server</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">Ziele</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">Proxys</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Neu</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Löschen</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="obsolete">Server</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">Name: </translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">Adresse:</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">Aktive Server</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="obsolete">Aktualisierung</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Ziel</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="obsolete">Ort:</translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation type="obsolete">Mit Root verlinken</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">HTTP Proxy</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Aktiviert</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">FTP Proxy</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="obsolete">Benutzername:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">Passwort:</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/dk/packagemanager.ts b/i18n/dk/packagemanager.ts
index 3ac6397..05d9dba 100644
--- a/i18n/dk/packagemanager.ts
+++ b/i18n/dk/packagemanager.ts
@@ -1,468 +1,498 @@
 <!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>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Packages</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Packages</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>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Download packages</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>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>No</source>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</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>
+</context>
 </TS>
diff --git a/i18n/en/packagemanager.ts b/i18n/en/packagemanager.ts
index 3ac6397..f6ddc91 100644
--- a/i18n/en/packagemanager.ts
+++ b/i18n/en/packagemanager.ts
@@ -1,468 +1,498 @@
 <!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>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Packages</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to apply current filter.</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Configure</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>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Update package information</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>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</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>
+</context>
 </TS>
diff --git a/i18n/es/packagemanager.ts b/i18n/es/packagemanager.ts
index 3ac6397..9e9268d 100644
--- a/i18n/es/packagemanager.ts
+++ b/i18n/es/packagemanager.ts
@@ -1,468 +1,1033 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Filtro de Categorías</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">Seleccione uno o más grupos</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">Leyendo configuración...</translation>
+    </message>
+</context>
+<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Todo</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Destino</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Espacio disponible</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Salida</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Empezar</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opciones</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Desconocido</translation>
     </message>
     <message>
         <source>%1 Kb</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 Kb</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Abortar</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cerrar</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Guardar salida</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Todo</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Texto</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation type="obsolete">Cerrar</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>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">Borrar
+</translation>
+    </message>
+    <message>
+        <source>Install
+</source>
+        <translation type="obsolete">Instalar</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">Renovar</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">(Reinstalar)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">(Renovar)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Destino</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">Espacio disponible</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">Salida</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Empezar</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Opciones</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Todo</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Texto</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">Abortar</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">
+**** Usuario pulsó ABORTAR ****</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">**** Proceso abortado ****</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">Guardar salida</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">Desconocido</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="obsolete">%1 Kb</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Opciones</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">Forzar dependencias</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">Forzar reinstalar</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">Forzar borrar</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">Forzar sobreescribir</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation type="obsolete">Nivel de información</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation type="obsolete">Sólo errores</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="obsolete">Mensajes normales</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="obsolete">Mensajes informativos</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="obsolete">Salida de soluciones</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="obsolete">Tratando con el paquete %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="obsolete">Eliminando enlaces simbólicos...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="obsolete">Creando enlaces simbólicos para %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="obsolete">Creando enlaces simbólicos para %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="obsolete">Finalizado</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="obsolete">Eliminando entrada de estado...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="obsolete">fichero de estado - </translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="obsolete">paquete - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="obsolete">No pude abrir fichero de estado - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="obsolete">No pude crear fichero temporal de estado - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="obsolete">No pude iniciar proceso ipkg</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="obsolete">No pude abrir :</translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="obsolete">Creando directorio </translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="obsolete">Enlazando %1 a %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="obsolete">Fallo al enlazar %1 a %2</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="obsolete">Eliminado %1</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="obsolete">Fallo al borrar %1</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="obsolete">Eliminado </translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="obsolete">Fallo al borrar </translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">AQPkg - Gestor de Paquetes</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escriba aquí el texto a buscar.</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation type="obsolete">Pulse aquí para esconder la barra Salto Rápido.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualizar listas</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulse aquí para actualizar las lista de paquetes de los servidores.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Renovar</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulse aquí para actualizar todos los paquetes instalados si se dispone de una nueva versión.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Descargar</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulse aquí para descargar los paquetes seleccionados actualmente.</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Aplicar cambios</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulse aquí para instalar, borrar o renovar los paquetes instalados actualmente.</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Acciones</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar paquetes no instalados</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulse aquí para mostrar los paquetes disponibles que no han sido instalados.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar paquetes instalados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar paquetes actualizados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo que tienen una versión más nueva disponible.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Filter by category</source>
+        <translation type="obsolete">Filtrar por categoría</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation type="obsolete">Pulse aquí para listar paquetes que pertenecen a una categoría.</translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Set filter category</source>
+        <translation type="obsolete">Fijar categoría del filtro</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to change package category to used filter.</source>
+        <translation type="obsolete">Pulse aquí para cambiar la categoría de paquetes que serán filtrados.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Buscar</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulse aquí para buscar texto en el nombre de los paquetes.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulse aquí para buscar el siguiente nombre de paquete que contenga el texto que está buscando.</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation type="obsolete">Teclas de Salto Rápido</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation type="obsolete">Pulse aquí para mostrar/esconder el teclado que permite moverse rápidamente a través de la lista de paquetes.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Configurar</translation>
+    </message>
+    <message>
+        <source>Click here to configure this application.</source>
+        <translation>Pulse aquí para configurar esta aplicación.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulse aquí para esconder la barra de búsqueda.</translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Servers:</source>
+        <translation type="obsolete">Servidores:</translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Click here to select a package feed.</source>
+        <translation type="obsolete">Pulse aquí para seleccionar una fuente de paquetes.</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>Paquetes</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+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>
+        <translation type="obsolete">Ésta es una lista de todos los paquetes del servidor selecionado arriba.
+
+Un punto azul junto al nombre del paquete indica que está instalado actualmente.
+
+Un punto azul con una estrella indica que hay una versión más moderna disponible.
+
+Pulse en el recuadro de la izquierda para seleccionar un paquete.</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Borrar</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation type="obsolete">Pulse aquí para desinstalar los paquetes seleccionados.</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Construyendo lista del servidor:
+<byte value="x9"/>%1</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Construyendo lista de paquetes para:
+<byte value="x9"/>%1</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation type="obsolete">Refrescando listas de paquetes del servidor</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation type="obsolete">ATENCIÓN: ¡No se recomienda
+actualizar mientras
+Opie/Qtopia está corriendo!
+
+¿Está seguro?</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">Aviso</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation type="obsolete">Renovando paquetes instalados</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation type="obsolete">¿Está seguro que desea borrar
+%1?</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="obsolete">¿Está seguro?</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sí</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation type="obsolete">Descargar a dónde</translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation type="obsolete">Introduzca carpeta donde descargar</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation type="obsolete">Instalar paquete remoto</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation type="obsolete">Introduzca localización del paquete</translation>
+    </message>
+    <message>
+        <source>Nothing to do</source>
+        <translation>No hay nada que hacer</translation>
+    </message>
+    <message>
+        <source>No packages selected</source>
+        <translation>No hay paquetes seleccionados</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation type="obsolete">¿Desea borrar o reinstalar
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">Borrar o reinstalar</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">Reinstalar</translation>
+    </message>
+    <message>
+        <source>R</source>
+        <translation type="obsolete">R</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation type="obsolete">¿Desea borrar o actualizar
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation type="obsolete">Borrar o actualizar</translation>
+    </message>
+    <message>
+        <source>U</source>
+        <translation type="obsolete">U</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="obsolete">Actualizando lanzador...</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Remove or reinstall</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>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Configuración</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Servidores</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Destinos</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxies</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opciones</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nuevo</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Borrar</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Servidor</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nombre:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dirección:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Servidor activo</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Actualizar</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Habilitada</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nombre usuario:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Clave:</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forzar dependencias</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forzar reinstalar</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forzar borrar</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forzar sobreescribir</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nivel de información</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sólo errores</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mensajes normales</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mensajes informativos</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Salida de soluciones</translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;b&gt;Descripción&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Instalado en&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Tamaño&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Selección&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Nombre de fichero&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Versión instalada&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Versión disponible&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="obsolete">Información del paquete</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="obsolete">No dispongo de información del paquete</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Cerrar</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="obsolete">Paquetes instalados</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="obsolete">Paquetes locales</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="obsolete">N/D</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="obsolete">Paquete - %1
+             versión - %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="obsolete">
+             versión inst - %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="obsolete">Cadena de versión vacía.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="obsolete">Época en versión no numérica.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="obsolete">Nada después del punto en el número de verisión.</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Borrar</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">Configuración</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">Servidores</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">Destinos</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">Proxies</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Nuevo</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Borrar</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="obsolete">Servidor</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">Nombre:</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">Dirección:</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">Servidor activo</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="obsolete">Actualizar</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Destino</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="obsolete">Posición:</translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation type="obsolete">Enlazar a root</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">Proxy HTTP</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Habilitada</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">Proxy FTP</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="obsolete">Nombre usuario:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">Clave:</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/kpacman.ts b/i18n/fr/kpacman.ts
index 21c1d00..cdfd70c 100644
--- a/i18n/fr/kpacman.ts
+++ b/i18n/fr/kpacman.ts
@@ -140,121 +140,121 @@ ou est dans un format inconnu.</translation>
         <source>PAUSED</source>
         <translation>EN PAUSE</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>PERSONNAGE</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>SURNOM</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SHADOW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-BASHFUL</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>PORTAGE QTOPIA: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>TOUCHE DE DIRECTION DEMARRER</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>MEILLEUR SCORE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>FELICITATIONS</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>VOUS AVEZ REUSSIT</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>UN SCORE DANS LE TOP 10.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNK SCORE NOM DATE</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>EN PAUSE</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>L&apos;image ne peut-être construite.
 
 Le fichier &apos;@PIXMAPNAME@&apos; n&apos;existe pas,
 ou est dans un format inconnu.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Erreur d&apos;initialisation</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/packagemanager.ts b/i18n/fr/packagemanager.ts
index 3ac6397..6048bf2 100644
--- a/i18n/fr/packagemanager.ts
+++ b/i18n/fr/packagemanager.ts
@@ -1,468 +1,1234 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>CategoryFilterDlg</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Filtre par catégorie</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;OK</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Annuler</translation>
+    </message>
+    <message>
+        <source>Select groups to show</source>
+        <translation type="obsolete">Sélectionner groupes à afficher</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Filtre par catégorie</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">Sélectionnez un ou plusieurs groupes</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">Lecture de la configuration...</translation>
+    </message>
+</context>
 <context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Tous</translation>
     </message>
     <message>
         <source>Installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Installé</translation>
     </message>
     <message>
         <source>Not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Non installé</translation>
     </message>
     <message>
         <source>Updated</source>
-        <translation type="unfinished"></translation>
+        <translation>Mise à jour</translation>
     </message>
     <message>
         <source>Filter packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtrer les paquets</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Names containing:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom contenant : </translation>
     </message>
     <message>
         <source>With the status:</source>
-        <translation type="unfinished"></translation>
+        <translation>Status : </translation>
     </message>
     <message>
         <source>Available from the following server:</source>
-        <translation type="unfinished"></translation>
+        <translation>Disponible sur le serveur : </translation>
     </message>
     <message>
         <source>Installed on device at:</source>
-        <translation type="unfinished"></translation>
+        <translation>Installé dans : </translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InputDialog</name>
     <message>
-        <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;OK</translation>
     </message>
     <message>
-        <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Annuler</translation>
     </message>
+</context>
+<context>
+    <name>InstallDlg</name>
     <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
+        <source>Install</source>
+        <translation type="obsolete">Installer</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Démarrer</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Options</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation>Sortie</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation>Destination</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation>Espace dispo</translation>
     </message>
     <message>
         <source>Packages to </source>
-        <translation type="unfinished"></translation>
+        <translation>Paquets vers</translation>
     </message>
     <message>
         <source>install</source>
-        <translation type="unfinished"></translation>
+        <translation>installer</translation>
     </message>
     <message>
         <source>remove</source>
-        <translation type="unfinished"></translation>
+        <translation>supprimer</translation>
     </message>
     <message>
         <source>upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>mise à jour</translation>
     </message>
     <message>
         <source>download</source>
-        <translation type="unfinished"></translation>
+        <translation>télécharger</translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Cliquez sur le bouton démarrer pour commencer.
+</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Inconnu</translation>
     </message>
     <message>
         <source>%1 Kb</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Kb</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>Abandonner</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Fermer</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer la sortie</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Tous</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Texte</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation type="obsolete">Fermer</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>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">Supprimer
+</translation>
+    </message>
+    <message>
+        <source>Install
+</source>
+        <translation type="obsolete">Installer</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">Mise à jour
+</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">(Réinstaller)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">(Mise à jour)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Destination</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">Espace dispo</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">Sortie</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Démarrer</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Options</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Tous</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Texte</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">Abandonner</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">
+**  L&apos;utilisateur à annuler l&apos;opération **</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">** Processus annulé **</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="obsolete">%1 Kb</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">Inconnu</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">Enregistrer la sortie</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlg</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Options</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">Forcer les Dépendances</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">Forcer la Réinstallation</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">Forcer la Suppression</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">Forcer la Ré-écriture</translation>
+    </message>
+    <message>
+        <source>Verbose WGet</source>
+        <translation type="obsolete">WGet Verbeux</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="obsolete">OK</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Options</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">Forcer les dépendances</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">Forcer la réinstallation</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">Forcer la suppression</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">Forcer la ré-écriture</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation type="obsolete">Niveau d&apos;information</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation type="obsolete">Erreurs seulement</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="obsolete">Messages normaux</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="obsolete">Messages d&apos;information</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="obsolete">Problème rencontré</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="obsolete">Traitement du paquet %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="obsolete">Suppression des liens symboliques...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="obsolete">Création de liens symboliques pour %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="obsolete">Création de liens symboliques pour %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="obsolete">Terminé</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="obsolete">Suppression du statut...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="obsolete">fichier statut - </translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="obsolete">paquet -</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="obsolete">Impossible d&apos;ouvrir le fichier de statut -</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="obsolete">Impossible de créer le fichier temporaire de statut -</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="obsolete">Impossible de démarrer le processus ipkg</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="obsolete">Ouverture impossible de : </translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="obsolete">Création du répertoire</translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="obsolete">Lien %1 sur %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="obsolete">Erreur de création du lien de %1 vers %2</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="obsolete">Supprimé : %1</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="obsolete">Suppression impossible de : %1</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="obsolete">Supprimé</translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="obsolete">Suppression impossible</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">AQPkg - Gestionnaire de Paquets</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tapez le texte à rechercher ici.</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation type="obsolete">Cliquez ici pour cacher la Barre d&apos;Accès Rapide.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Mise à jour les listes</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliquez ici pour mettre les listes de paquets des serveurs à jour.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Mise à jour</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliquez ici pour mettre à jour tous les paquets installés si une nouvelle version est disponible.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Télécharger</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliquer ici pour télécharger le(s) paquet(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Appliquer les modifications</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliquez ici pour installer, enlever ou mettre à jour le(s) paquet(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Actions</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher les paquets non installés</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliquez ici pour afficher les paquets non installés disponibles.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher les paquets installés</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliquez ici pour afficher les paquets installés sur cet appareil.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher les paquets mis à jour</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliquez ici pour afficher les paquets installés sur cet appareil et dont une version plus récente est disponible.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Filter by category</source>
+        <translation type="obsolete">Filtrer par catégorie</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation type="obsolete">Cliquez ici pour afficher les paquets appartenant à une catégorie.</translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Set filter category</source>
+        <translation type="obsolete">Définir le filtre par catégorie</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to change package category to used filter.</source>
+        <translation type="obsolete">Cliquez ici pour changer la catégorie de paquets à utiliser comme filtre.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechercher</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliquez ici pour rechercher un texte dans les noms de paquets.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Trouver suivant</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliquez ici pour trouver le paquets suivant contenant le texte recherché.</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation type="obsolete">Clavier Accès Rapide</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation type="obsolete">Cliquez ici pour afficher/cacher le clavier permettant le déplacement rapide dans la liste des paquets.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vue</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Configurer</translation>
+    </message>
+    <message>
+        <source>Click here to configure this application.</source>
+        <translation>Cliquez ici pour configurer l&apos;application.</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="obsolete">Aide</translation>
+    </message>
+    <message>
+        <source>Click here for help.</source>
+        <translation type="obsolete">Cliquez ici pour afficher l&apos;aide.</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="obsolete">A Propos</translation>
+    </message>
+    <message>
+        <source>Click here for software version information.</source>
+        <translation type="obsolete">Cliquez ici pour les informations sur la version du logiciel.</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Options</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliquez ici pour fermer la barre de recherche.</translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Servers:</source>
+        <translation type="obsolete">Serveurs : </translation>
     </message>
     <message>
-        <source>Update package information</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to select a package feed.</source>
+        <translation type="obsolete">Cliquez ici pour sélectionner un serveur de paquets.</translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
-        <translation type="unfinished"></translation>
+        <source>Packages</source>
+        <translation>Paquets</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+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>
+        <translation type="obsolete">Voici la liste de tous les paquets disponibles sur le serveur sélectionné.
+
+Un point bleu signifie que le paquet est déjà installé sur cet appareil.
+
+Un point bleu avec une étoile signifie que le paquet est déjà installé, mais que la version du serveur est plus récente.
+
+Cochez la case en début de ligne pour sélectionner un paquet.</translation>
+    </message>
+    <message>
+        <source>About AQPkg</source>
+        <translation type="obsolete">A propos de AQPkg</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Enlever</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation type="obsolete">Cliquez ici pour désinstaller le(s) paquet(s) sélectionné(s).</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Construit la liste du serveur :
+%1
+</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Construit la liste des paquets pour :
+%1</translation>
+    </message>
+    <message>
+        <source>Installed To - %1</source>
+        <translation type="obsolete">Installé sur - %1</translation>
+    </message>
+    <message>
+        <source>Description - %1</source>
+        <translation type="obsolete">Description - %1</translation>
+    </message>
+    <message>
+        <source>Size - %1</source>
+        <translation type="obsolete">Taille - %1</translation>
+    </message>
+    <message>
+        <source>Section - %1</source>
+        <translation type="obsolete">Section - %1</translation>
+    </message>
+    <message>
+        <source>Filename - %1</source>
+        <translation type="obsolete">Nom - %1</translation>
+    </message>
+    <message>
+        <source>V. Installed - %1</source>
+        <translation type="obsolete">V. Installée - %1</translation>
+    </message>
+    <message>
+        <source>V. Available - %1</source>
+        <translation type="obsolete">V. Disponible - %1</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation type="obsolete">Rafraîchit la liste des paquets des serveurs</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation type="obsolete">ATTENTION : La mise à jour
+lorsque Opie/Qtopia fonctionne
+n&apos;est PAS recommandée !
+
+Etes-vous sûr ?</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">Avertissement</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation type="obsolete">Mise à jour des paquets installés</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation type="obsolete">Etes-vous sûr de vouloir effacer
+%1 ?</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="obsolete">Etes-vous sûr ?</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Non</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Oui</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation type="obsolete">Télécharger dans</translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation type="obsolete">Entrez la destination du téléchargement</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation type="obsolete">Installer paquet distant</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation type="obsolete">Entrez la chemin du paquet</translation>
     </message>
     <message>
         <source>Nothing to do</source>
-        <translation type="unfinished"></translation>
+        <translation>Rien à faire</translation>
     </message>
     <message>
         <source>No packages selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun paquet sélectionné</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation type="obsolete">Voulez-vous enlever ou réinstaller
+%1 ?</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">Enlever ou réinstaller</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">Réinstaller</translation>
+    </message>
+    <message>
+        <source>R</source>
+        <translation type="obsolete">R</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation type="obsolete">Voulez-vous enlever ou mettre à jour
+%1 ?</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation type="obsolete">Enlever ou mettre à jour</translation>
+    </message>
+    <message>
+        <source>U</source>
+        <translation type="obsolete">M</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="obsolete">Mise à jour du bureau...</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>
+        <translation>Ceci est la liste de tous les paquets disponibles sur le serveur sélectionné.
+
+Un point bleu signifie que le paquet est déjà installé sur cet appareil.
+
+Un point bleu avec une étoile signifie que le paquet est déjà installé, mais que la version du serveur est plus récente.
+
+Cochez la case en début de ligne pour sélectionner un paquet.</translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation>Filtre</translation>
+    </message>
+    <message>
+        <source>Click here to apply current filter.</source>
+        <translation>Cliquez ici pour appliquer le filtre courant.</translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation>Critère de filtrage</translation>
+    </message>
+    <message>
+        <source>Click here to change the package filter criteria.</source>
+        <translation>Cliquez ici pour modifier les critères de filtrage des fichiers.</translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation>Gestionnaire de Fichier</translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation>Mise à jour des informations des paquets</translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation>Mise à jour des paquets intallés</translation>
     </message>
     <message>
         <source>Enter path to download package to:</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrer le chemin d&apos;enregistrement des fichiers téléchargés : </translation>
     </message>
     <message>
         <source>Download packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Télécharger paquets</translation>
     </message>
     <message>
         <source>Remove or upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer ou mettre à jour</translation>
     </message>
     <message>
         <source>Remove or reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer ou réinstaller</translation>
     </message>
     <message>
         <source>Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Réinstaller</translation>
     </message>
     <message>
         <source>Config updated</source>
-        <translation type="unfinished"></translation>
+        <translation>Config mis à jour</translation>
     </message>
     <message>
         <source>The configuration has been updated.  Do you want to update server and package information now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>La configuration a été mis à jour. Voulez-vous mettre à jour les serveurs et les informations sur les paquets maintenant ?</translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
-        <translation type="unfinished"></translation>
+        <translation>OIpkg</translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur lors de l&apos;initialisation de libipkg</translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur lors du détachement de libipkg</translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuration</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Serveurs</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinations</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxies</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Options</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nouveau</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Serveur</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom : </translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse : </translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Serveur actif</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouter - Mettre à jour</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Activé</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom utilisateur : </translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Mot de passe : </translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation>Forcer dépendances</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Forcer réinstallation</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Forcer suppression</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation>Forcer réinstallation</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Niveau d&apos;information</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreurs seulement</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Messages normaux</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Messages d&apos;information</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation>Problème rencontré</translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
-        <translation type="unfinished"></translation>
+        <translation>Lecture des paquets disponibles : 
+</translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
-        <translation type="unfinished"></translation>
+        <translation>Lecture des paquets installés : 
+</translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Information</translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de récupérer les informations du paquet.</translation>
     </message>
     <message>
         <source>Retrieve file list</source>
-        <translation type="unfinished"></translation>
+        <translation>Récupération de la liste des fichiers</translation>
     </message>
     <message>
         <source>File list</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste de fichier</translation>
+    </message>
+</context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;b&gt;Description&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Installé Sur&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Taille&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Nom fichier&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Version installée&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Version disponible&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="obsolete">Information paquet</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="obsolete">Informations sur le paquet non disponibles</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Fermer</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="obsolete">Paquets installés</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="obsolete">Paquets locaux</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="obsolete">N/A</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="obsolete">Paquets - %1
+             version - %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="obsolete">
+            version inst. - %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="obsolete">N° de version indisponible.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="obsolete">Nombre incorrect.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="obsolete">N° de version terminé par &apos;:&apos; .</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Supprimer</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsBase</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">Configuration</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">Serveurs</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">Serveur actif</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">Nom : </translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="obsolete">URL : </translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="obsolete">Changer</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Supprimer</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Nouveau</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">Destinations</translation>
+    </message>
+    <message>
+        <source>Link To Root</source>
+        <translation type="obsolete">Créer un lien vers root</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">Proxies</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">Proxy HTTP</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="obsolete">Mot de Passe</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Activé</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">Proxy FTP</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="obsolete">Utilisateur</translation>
+    </message>
+    <message>
+        <source>&amp;Apply</source>
+        <translation type="obsolete">&amp;Appliquer</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="obsolete">Général</translation>
+    </message>
+    <message>
+        <source>(Will take effect on restart)</source>
+        <translation type="obsolete">(Prendra effet après redémarrage)</translation>
+    </message>
+    <message>
+        <source>Show Jump To Letters</source>
+        <translation type="obsolete">Afficher la Navigation par Lettres</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">Configuration</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">Serveurs</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">Destinations</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">Proxies</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Nouveau</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Supprimer</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="obsolete">Serveur</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">Nom : </translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">Adresse : </translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">Serveur actif</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="obsolete">Ajouter - Mettre à jour</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Destination</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="obsolete">Emplacement : </translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation type="obsolete">Lien vers la racine</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">Proxy HTTP</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Activé</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">Proxy FTP</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="obsolete">Nom utilisateur : </translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">Mot de passe : </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/packagemanager.ts b/i18n/hu/packagemanager.ts
index 3ac6397..f6ddc91 100644
--- a/i18n/hu/packagemanager.ts
+++ b/i18n/hu/packagemanager.ts
@@ -1,468 +1,498 @@
 <!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>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Packages</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to apply current filter.</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Configure</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>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Update package information</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>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</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>
+</context>
 </TS>
diff --git a/i18n/it/packagemanager.ts b/i18n/it/packagemanager.ts
index 3ac6397..fb3a01f 100644
--- a/i18n/it/packagemanager.ts
+++ b/i18n/it/packagemanager.ts
@@ -1,468 +1,1037 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Filtro Categoria</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">Seleziona uno o più gruppi</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">Lettura configurazione...</translation>
+    </message>
+</context>
 <context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tutti</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;OK</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Cancella</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Destinazione</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Spazio Disp.</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Output</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Inizia</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opzioni</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sconosciuto</translation>
     </message>
     <message>
         <source>%1 Kb</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 Kb</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Interrompi</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Chiudi</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Salva output</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tutti</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Testo</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation type="obsolete">Chiudi</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>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">Elimina
+</translation>
+    </message>
+    <message>
+        <source>Install
+</source>
+        <translation type="obsolete">Installa
+</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">Upgrade
+</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">(Rinstalla)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">(Upgrade)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Destinazione</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">Spazio Disp.</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">Output</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Inizia</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Opzioni</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Tutti</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Testo</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">Interrompi</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">
+**** L&apos;utente ha premuto INTERROMPI ***</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">**** Processo Interrotto ****</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">Salva output</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">Sconosciuto</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="obsolete">%1 Kb</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Opzioni</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">Forza Dipendenze</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">Forza Rinstallazione</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">Forza Eliminazione</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">Forza Sovrascrittura</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation type="obsolete">Livello Informazioni</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation type="obsolete">Solo errori</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="obsolete">Messaggi normali</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="obsolete">Messaggi informativi</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="obsolete">Output troubleshooting</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="obsolete">Trattamento pacchetto %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="obsolete">Rimozione link simbolici...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="obsolete">Creazione link simbolici per %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="obsolete">Creazione link simbolici per %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="obsolete">Terminato</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="obsolete">Rimozione valore stato...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="obsolete">file di stato - </translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="obsolete">pacchetto - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="obsolete">Impossibile aprire file di stato - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="obsolete">Impossibile creare file di stato temporaneo - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="obsolete">Impossibile avviare processo ipkg</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="obsolete">Impossibile aprire :</translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="obsolete">Creazione directory </translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="obsolete">Creato link da %1 a %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="obsolete">Creazione link da %1 a %2 fallita</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="obsolete">Eliminato %1</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="obsolete">Impossibile eliminare %1</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="obsolete">Eliminato </translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="obsolete">Impossibile eliminare </translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">AQPkg - Gestore Pacchetti</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserisci qui il testo da cercare.</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation type="obsolete">Premi qui per nascondere la toolbar &quot;Quick Jump&quot;.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiorna liste</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per aggiornare le liste dei pacchetti dai server.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Upgrade</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per fare l&apos;upgrade di tutti i pacchetti installati se è disponibile una versione più aggiornata.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Download</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per fare il download dei pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Applica modifiche</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per installare, eliminare o fare l&apos;upgrade dei pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Azioni</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra pacchetti non installati</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per visualizzare i pacchetti disponibili non ancora installati.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra pacchetti installati</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per visualizzare i pacchetti installati su questo dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra pacchetti aggiornati</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per visualizzare i pacchetti installati su questo dispositivo che hanno disponibile una versione più aggiornata.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Filter by category</source>
+        <translation type="obsolete">Filtra per categoria</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation type="obsolete">Premi qui per visualizzare i pacchetti appartenenti ad una categoria.</translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Set filter category</source>
+        <translation type="obsolete">Imposta filtro per categoria</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to change package category to used filter.</source>
+        <translation type="obsolete">Premi qui per cambiare la categoria utilizzata per il filtro dei pacchetti.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Trova</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per cercare del testo nei nomi dei pacchetti.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Trova successivo</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per trovare il successivo nome del pacchetto che contiene il testo che stai cercando.</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation type="obsolete">Tastiera Quick Jump</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation type="obsolete">Premi qui per mostrare/nascondere la tastiera per muoversi velocemente nella lista dei pacchetti.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Configura</translation>
+    </message>
+    <message>
+        <source>Click here to configure this application.</source>
+        <translation>Premi qui per configurare questa applicazione.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per nascondere la toolbar di ricerca.</translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Servers:</source>
+        <translation type="obsolete">Server:</translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Click here to select a package feed.</source>
+        <translation type="obsolete">Premi qui per selezionare un server per i pacchetti.</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>Pacchetti</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+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>
+        <translation type="obsolete">Questa è la lista di tutti i pacchetti del server selezionato sopra.
+
+Un punto blu dopo il nome del pacchetto indica che il pacchetto è installato.
+
+Un punto blu con una stella indica che è disponibile sul server una nuova versione del pacchetto .
+
+Premi dentro il box sulla sinistra per selezionare un pacchetto.</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Elimina</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation type="obsolete">Premi qui per disinstallare i pacchetti selezionati.</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Creazione lista server:
+<byte value="x9"/>%1</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Creazione lista pacchetti per:
+<byte value="x9"/>%1</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation type="obsolete">Aggiornamento liste pacchetti dal server</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation type="obsolete">ATTENZIONE: Fare l&apos;upgrade
+mentre Opie/Qtopia è in esecuzione
+è SCONSIGLIATO!
+
+Sei sicuro?
+</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">Attenzione</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation type="obsolete">Aggiornamento pacchetti installati</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation type="obsolete">Sei sicuro di voler eliminare
+%1?</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="obsolete">Sei sicuro?</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sì</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation type="obsolete">Download su dove</translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation type="obsolete">Inserisci path per download su</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation type="obsolete">Installa Pacchetto Remoto</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation type="obsolete">Inserisci posizione pacchetto</translation>
+    </message>
+    <message>
+        <source>Nothing to do</source>
+        <translation>Niente da fare</translation>
+    </message>
+    <message>
+        <source>No packages selected</source>
+        <translation>Nessun pacchetto selezionato</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation type="obsolete">Vuoi eliminare o rinstallare
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">Elimina o Rinstalla</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">Rinstalla</translation>
+    </message>
+    <message>
+        <source>R</source>
+        <translation type="obsolete">R</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation type="obsolete">Vuoi eliminare o fare l&apos;upgrade di
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation type="obsolete">Elimina o Upgrade</translation>
+    </message>
+    <message>
+        <source>U</source>
+        <translation type="obsolete">U</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="obsolete">Aggiornamento...</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Remove or reinstall</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>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Configurazione</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Server</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Destinazioni</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxy</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opzioni</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nuovo</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Elimina</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nome:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Indirizzo:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Server Attivo</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aggiorna</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Abilitato</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Username:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Password:</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forza Dipendenze</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forza Rinstallazione</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forza Eliminazione</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forza Sovrascrittura</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Livello Informazioni</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Solo errori</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Messaggi normali</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Messaggi informativi</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Output troubleshooting</translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;b&gt;Descrizione&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Installato Su&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Dimensione&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Sezione&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Versione Installata&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Versione Disponibile&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="obsolete">Informazioni Pacchetto</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="obsolete">Informazioni pacchetto non disponibili</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Chiudi</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="obsolete">Pacchetti installati</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="obsolete">Pacchetti locali</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="obsolete">N/D</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="obsolete">Pacchetto - %1
+              versione - %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="obsolete">
+              versione inst - %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="obsolete">La stringa della versione è vuota.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="obsolete">Il valore nella versione non è un numero.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="obsolete">Nessun carattere dopo i due punti nel numero di versione.</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Elimina</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">Configurazione</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">Server</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">Destinazioni</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">Proxy</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Nuovo</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Elimina</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="obsolete">Server</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">Nome:</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">Indirizzo:</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">Server Attivo</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="obsolete">Aggiorna</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Destinazione</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="obsolete">Ubicazione:</translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation type="obsolete">Link a /</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">Proxy HTTP</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Abilitato</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">Proxy FTP</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="obsolete">Username:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">Password:</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/packagemanager.ts b/i18n/ja/packagemanager.ts
index 3ac6397..05d9dba 100644
--- a/i18n/ja/packagemanager.ts
+++ b/i18n/ja/packagemanager.ts
@@ -1,468 +1,498 @@
 <!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>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Packages</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Packages</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>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Download packages</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>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>No</source>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</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>
+</context>
 </TS>
diff --git a/i18n/ko/packagemanager.ts b/i18n/ko/packagemanager.ts
index 3ac6397..05d9dba 100644
--- a/i18n/ko/packagemanager.ts
+++ b/i18n/ko/packagemanager.ts
@@ -1,468 +1,498 @@
 <!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>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Packages</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Packages</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>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Download packages</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>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>No</source>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</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>
+</context>
 </TS>
diff --git a/i18n/lv/packagemanager.ts b/i18n/lv/packagemanager.ts
index 3ac6397..84f9734 100644
--- a/i18n/lv/packagemanager.ts
+++ b/i18n/lv/packagemanager.ts
@@ -1,468 +1,612 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Kategoriju Filtrs</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">Izvēlēties vienu vai vairāk grupas</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">Lasa konfigurāciju...</translation>
+    </message>
+</context>
+<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Visas</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;OK</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Atlikt</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mērķis</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pieejamā Vieta</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Izvads</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Starts</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opcijas</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nezināms</translation>
     </message>
     <message>
         <source>%1 Kb</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 Kb</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pārtrauce</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aizvērt</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Saglabāt izvadu</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Visas</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Teksts</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">Izņemt
+</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>
-        <translation type="unfinished"></translation>
+        <source>Install
+</source>
+        <translation type="obsolete">Instalēt
+</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">Uzlabot</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">(Pārinstalēt)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">(Uzlabot)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Mērķis</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">Pieejamā Vieta</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">Izvads</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Starts</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Opcijas</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Visas</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Teksts</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">Pārtrauce</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">**** Lietotājs klikšķināja PĀRTRAUKT ****</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">**** Process Pārtraukts ****</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Aizvērt</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="obsolete">%1 Kb</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">Nezināms</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">Saglabāt izvadu</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Opcijas</translation>
     </message>
+</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Packages</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>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Download packages</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>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>No</source>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opcijas</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Aizvērt</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>QuestionDlg</name>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Mērķis</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/packagemanager.ts b/i18n/mk/packagemanager.ts
index 3ac6397..04accf9 100644
--- a/i18n/mk/packagemanager.ts
+++ b/i18n/mk/packagemanager.ts
@@ -1,468 +1,913 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Филтер по категории</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">Ибери една или повеќе групи</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">Вчитување на конфигурацијата...</translation>
+    </message>
+</context>
+<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Аите</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;Прифати</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Откажи</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Цел</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Слободен простор</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Излез</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Старт</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Опции</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Непознато</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Откажи</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Затвори</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сними излез</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Аите</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Текст</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">Избриши</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>
-        <translation type="unfinished"></translation>
+        <source>Install
+</source>
+        <translation type="obsolete">Инсталирај</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">Надгради</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">(Повторно инсталирај)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">(Надгради)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Цел</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">Слободен простор</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">Излез</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Старт</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Опции</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Аите</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Текст</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">Откажи</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">
+**** Откажано од Корисник ***</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">**** Прекинат Процес ****</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Затвори</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">Непознато</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">Сними излез</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Опции</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">Форсирај Зависности</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">Форсирај повторна инсталација</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">Форсирај отстранување</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">Офрисрај Препишување</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation type="obsolete">Ниво на информации</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation type="obsolete">Само грешки</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="obsolete">Нормални пораки</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="obsolete">Информативни пораки</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="obsolete">Детален излез</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">AQPkg - менаџер на пакети</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Искуцај го текстот за пребарување.</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation type="obsolete">Клики овде за да се сокрие палетата за брзи скокови.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Освежи листа</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Кликни овде за да се освежи листата од серверите.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Надгради</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Кликни овде за да се надградат сите инсталирани пакети доколку постои понова верзија.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Превземи</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Кликни овде за да се превземат избраните пакети.</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Примени промени</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Кликни овде за да се инталираат, отстранат или надградат избраните пакети.</translation>
     </message>
     <message>
         <source>Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Кликни овде за да ја конфигурираш апликацијава.</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Акции</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Прикажи ги неинсталираните пакети</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Кликни овде за да се прикажат пакетите кои не се инсталирани.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Прикажи инсталирани пакети</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Кликни овде за да се прикажат инсталираните пакети.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Прикажи ги надградените пакети</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Кликни овде за да се прикажат инсталираните пакети за кои има понова верзија.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Filter by category</source>
+        <translation type="obsolete">Филтрирај по категорија</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation type="obsolete">Кликни овде за да се прикажат пакетите кои припаѓаат на одредена категорија.</translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Set filter category</source>
+        <translation type="obsolete">Постави категорија за филтрирање</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to change package category to used filter.</source>
+        <translation type="obsolete">Кликни овде за се промени категоријата за користениот филтер.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Пронајди</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Кликни овде за пребарување на текст во имињата на пакетите.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Најди текст</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Кликни овде за да го најдете следниот пакет кој го содржи текстот кој го барате.</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation type="obsolete">Палета за брзо скокање</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation type="obsolete">Kликни овде за да се прикаже/сокрие панелот за брзо скокање во листата со пакети.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Преглед</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Кликни овде за да се сокрие палетата за пребарување.</translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Servers:</source>
+        <translation type="obsolete">Сервери:</translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Click here to select a package feed.</source>
+        <translation type="obsolete">Кликни овде за да се избере извор на пакети.</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>Пакети</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+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>
+        <translation type="obsolete">Ова е листа на сите пакети од избраниот извор
+
+Плавата точка до името на пакетот покажува дека пакетот е инсталиран.
+
+Плавата точка до името на пакетот покажива дека постои понова верзија на тој пакет во изворот на пакети.
+
+Кликни во квадратчето лево од пакетот за да изберете истиот.</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Одстрани</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation type="obsolete">Кликни тука за да се отрстранта избраните пакети.</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Листана сервери:
+%1</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Листа на пакети за:
+%1</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation type="obsolete">Освежување на листи на пакети</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation type="obsolete">ПРЕДУПРЕДУВАЊЕ: Надградба додека
+Oie/Qtopia е вклучена
+НЕ Е ПРЕПОРАЧЛИВО
+
+Дали си сигурен?</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">Предупредување</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation type="obsolete">Надградба на инсталираните пакети</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation type="obsolete">Дали сакаш да се избрише %1?</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="obsolete">Сигурно?</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Не</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation type="obsolete">Превземи во</translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation type="obsolete">Внеси пат каде да се снимат превземените датотеки</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation type="obsolete">Инсталирај пакет</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation type="obsolete">Внеси локација на пакет</translation>
+    </message>
+    <message>
+        <source>Nothing to do</source>
+        <translation>Нема ништо за работа</translation>
+    </message>
+    <message>
+        <source>No packages selected</source>
+        <translation>Нема избрани пакети</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>ОК</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation type="obsolete">Дали сакаш да се отстрани или преинсталира 
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">Отстрани или повторно инсталирај</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">Повторно Инсталирај</translation>
+    </message>
+    <message>
+        <source>R</source>
+        <translation type="obsolete">Р</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation type="obsolete">Дали сакаш да се отстрани или надгради
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation type="obsolete">Одстрани или Надгради</translation>
+    </message>
+    <message>
+        <source>U</source>
+        <translation type="obsolete">У</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="obsolete">Надградба на стартувач...</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Remove or reinstall</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>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Конфигурација</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сервери</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Цел</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Прокси сервери</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Опции</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ново</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Избриши</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сервер</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Име:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Адреса:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Активен Сервер</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Надгради</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">HTTP прокси</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вклучено</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FTP прокси</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Корисничко име:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Лозинка:</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Форсирај Зависности</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Форсирај повторна инсталација</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Форсирај отстранување</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Офрисрај Препишување</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ниво на информации</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Само грешки</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нормални пораки</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Информативни пораки</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Детален излез</translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;b&gt;Цел&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Инсталирано во&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Големина&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Оддел&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Име на датотека&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Инсталирана Верзија&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt; Достапна Верзија&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="obsolete">Информации за пакет</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="obsolete">Информациите за пакетот не се достапни</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Затвори</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Одстрани</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">Конфигурација</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">Сервери</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">Цел</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">Прокси сервери</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Ново</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Избриши</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="obsolete">Сервер</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">Име:</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">Адреса:</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">Активен Сервер</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="obsolete">Надгради</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Цел</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="obsolete">Локација:</translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation type="obsolete">Поврзи со root</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">HTTP прокси</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Вклучено</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">FTP прокси</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="obsolete">Корисничко име:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">Лозинка:</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/packagemanager.ts b/i18n/nl/packagemanager.ts
index 3ac6397..36ad4ec 100644
--- a/i18n/nl/packagemanager.ts
+++ b/i18n/nl/packagemanager.ts
@@ -1,468 +1,1035 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Kategoriefilter</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">Selecteer een of meer groepen</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">Lees Configuratie....</translation>
+    </message>
+</context>
+<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;OK</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Annuleer</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Doel</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Beschikbare ruimte</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Uitvoer</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Start</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opties</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Onbekend</translation>
     </message>
     <message>
         <source>%1 Kb</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 kB</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afbreken</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sluit</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sla utivoer op</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tekst</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">Verwijder
+</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>
-        <translation type="unfinished"></translation>
+        <source>Install
+</source>
+        <translation type="obsolete">Installeer</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">Vernieuw
+</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">(Herinstallatie)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">(Vernieuw)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Doel</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">Beschikbare ruimte</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">Uitvoer</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Start</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Opties</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Alle</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Tekst</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">Afbreken</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">
+**** Gebruiker drukte op AFBREKEN ****</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">**** Bewerking Afgebroken ****</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Sluit</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">Onbekend</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">Sla utivoer op</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="obsolete">%1 kB</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Opties</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">Forceer Afhankelijkheden</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">Forceer Herinstallatie</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">Forceer Verwijderen</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">Forceer Overschrijven</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation type="obsolete">Informatieniveau</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation type="obsolete">Alleen Fouten</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="obsolete">Normale berichten</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="obsolete">Informatieve berichten</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="obsolete">Foutopsporingsuitvoer</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="obsolete">Verwerken van pakket %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="obsolete">Verwijderen van symbolysche links...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="obsolete">Maak symbolische links aan voor %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="obsolete">Maak symbolische links aan voor %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="obsolete">Klaar</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="obsolete">Verwijder status info...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="obsolete">statusbestand - </translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="obsolete">pakket - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="obsolete">Kan statusbestand niet openen - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="obsolete">Kan tijdelijk statusbestand niet maken - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="obsolete">Kan ipkg proces niet starten</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="obsolete">Kan niet openen:</translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="obsolete">Maak map aan</translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="obsolete">Link gemaakt van %1 naar %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="obsolete">Link van %1 naar %2 mislukt</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="obsolete">Verwijderd %1</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="obsolete">%1 verwijderen mislukt</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="obsolete">Verwijderd</translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="obsolete">Verwijderen mislukt</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">AQPkg - Pakketmanager</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ hier de te zoeken tekst.</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation type="obsolete">Klik hier on de Quick Jump werkbalk te verbergen.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Vernieuw lijsten</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik hier om de pakketlijsten van de server te vernieuwen.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Upgrade</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik hier om alle geinstaleerde pakketten te vernieuwen als er een nieuwere versie is.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Download</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik hier on de momenteel geselecteerde pakketten op te halen.</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Voer uit</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik hier om de momenteel geselecteerde pakketten te installeren, verwijderen of vernieuwen.</translation>
     </message>
     <message>
         <source>Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Stel in</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik hier om dit programma in te stellen.</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Akties</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Laat niet geinstalleerde paketten zien</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik hier om beschikbare pakketten te laten zien die niet geinstallerd zijn.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Laat geinstalleerde paketten zien</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik hier om de momenteel geinstalleerde paketten te zien.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Laat vernieuwde paketten zien</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik hier om geinstalleerde pakketten te laten zien waar een nieuwere versie van beschikbaar is.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Filter by category</source>
+        <translation type="obsolete">Filter op kategorie</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation type="obsolete">Klik hier om paketten te laten zien die tot een kategorie behoren.</translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Set filter category</source>
+        <translation type="obsolete">Stel kategoriefilter in</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to change package category to used filter.</source>
+        <translation type="obsolete">Klik hier om pakket-filtercategorie te wijzigen.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Vind</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik hier om te zoeken op tekst in pakketnamen.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Vind volgende</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik hier om het volgende pakket te zoeken die aan de zoektekst voldoet.</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation type="obsolete">Quick Jump toetsenblok</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation type="obsolete">Klik hier om het toetsenblok te laten zien/verbergen om snelle toegang tot de pakketlijst mogelijk te maken. </translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Aanzicht</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik hier om de zoekbalk te verbergen.</translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Servers:</source>
+        <translation type="obsolete">Servers:</translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Click here to select a package feed.</source>
+        <translation type="obsolete">Klik hietr om een pakketbron te kiezen.</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>Pakketten</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+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>
+        <translation type="obsolete">Dit is een lijst met alle paketten van de bovenstaande server.
+
+Een blauw bolletje naast de naam geeft aan dat het pakket momenteel is geinstalleerd.
+
+Een blauw bolletje met een ster geeft aan dat er een nieuwere versie van dit pakket beschikbaar is.
+
+Vink het vakje aan de linkerkant aan om een pakket te selecteren.</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation type="obsolete">Klik hier om de momenteel geselecteerde paketten te verwijderen.</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Bouw serverlijst op:
+%1</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Bouw serverlijst op voor:
+%1</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation type="obsolete">Ververs serverpakketlijsten</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation type="obsolete">WAARSCHUWING: Upgraden
+terwijl Opie/Qtopia draait
+is NIET aanbevolen!
+
+Weet u het zeker?
+</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">Waarschuwing</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation type="obsolete">Vernieuwen geinstalleerde paketten</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation type="obsolete">Bent u zeker van het verwijderen van
+pakket %1?</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="obsolete">Weet u het zeker?</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nee</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation type="obsolete">Waarheen downloaden</translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation type="obsolete">Vul pad om naartoe te downloaden in</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation type="obsolete">Installeer pakket van server</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation type="obsolete">Voer pakketlocatie in</translation>
+    </message>
+    <message>
+        <source>Nothing to do</source>
+        <translation>Niets te doen</translation>
+    </message>
+    <message>
+        <source>No packages selected</source>
+        <translation>Geen pakketten geselecteerd</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation type="obsolete">Wilt u verwijdering of herinstallatie van
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">Verwijdering of Herinstallatie</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">Herinstalleer</translation>
+    </message>
+    <message>
+        <source>R</source>
+        <translation type="obsolete">R</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation type="obsolete">Wilt u verwijdering of vernieuwing van
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation type="obsolete">Verwijdering of Vernieuwing</translation>
+    </message>
+    <message>
+        <source>U</source>
+        <translation type="obsolete">U</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="obsolete">Vernieuwen Launcher...</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Remove or reinstall</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>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Instellingen</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Servers</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Doelen</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxies</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opties</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nieuw</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Verwijder</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Naam:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Adres:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aktieve Server</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vernieuw</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ingeschakeld</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gebruikersnaam:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wachtwoord:</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forceer Afhankelijkheden</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forceer Herinstallatie</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forceer Verwijderen</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forceer Overschrijven</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Informatieniveau</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alleen Fouten</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Normale berichten</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Informatieve berichten</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Foutopsporingsuitvoer</translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;b&gt;Omschrijving&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Geinstalleerd naar&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Grootte&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Sectie&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Bestandsnaam&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Geinstalleerde versie&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Beschikbare versie&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="obsolete">Pakketinformatie</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="obsolete">Pakketinformatie is niet beschikbaar</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Sluit</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="obsolete">Geinstalleerde pakketten</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="obsolete">Lokale pakketten</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="obsolete">n/b</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="obsolete">Pakket - %1
+            versie - %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="obsolete">
+            inst versie - %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="obsolete">Versiestring is leeg.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="obsolete">Tekst in versie is geen nummer.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="obsolete">Geen versienummer na de punt.</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Verwijder</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">Instellingen</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">Servers</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">Doelen</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">Proxies</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Nieuw</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Verwijder</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="obsolete">Server</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">Naam:</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">Adres:</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">Aktieve Server</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="obsolete">Vernieuw</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Doel</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="obsolete">Locatie:</translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation type="obsolete">Link naar Root</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">HTTP Proxy</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Ingeschakeld</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">FTP Proxy</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="obsolete">Gebruikersnaam:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">Wachtwoord:</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/packagemanager.ts b/i18n/no/packagemanager.ts
index 3ac6397..2fbaa41 100644
--- a/i18n/no/packagemanager.ts
+++ b/i18n/no/packagemanager.ts
@@ -1,468 +1,913 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Kategori filter</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">Velg en eller flere grupper</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">Leser konfigurasjon...</translation>
+    </message>
+</context>
+<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;OK</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Avbryt</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Destinasjon</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tilgjengelig plass</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utdata</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Start</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Valg</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ukjent</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Avbryt</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lukk</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lagre utdata</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tekst</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation type="obsolete">Lukk</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>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">Fjern
+</translation>
+    </message>
+    <message>
+        <source>Install
+</source>
+        <translation type="obsolete">Installer
+</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">Oppgrader
+</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">(Installer på nytt)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">(Oppgrader)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Destinasjon</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">Tilgjengelig plass</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">Utdata</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Start</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Valg</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Alle</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Tekst</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">Avbryt</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">
+**** Bruker har klikket AVBRYT ****</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">**** Prosessen er blitt avbrutt ****</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">Lagre utdata</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">Ukjent</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Valg</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">Tving avhengigheter</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">Tving reinstallering</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">Tving sletting</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">Tving overskrivning</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation type="obsolete">Informasjonsnivå</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation type="obsolete">Kun feil</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="obsolete">Normale meldinger</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="obsolete">Informative meldinger</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="obsolete">Feilsøking utdata</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">AQPkg - Pakke behandler</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv teksten for å lete her.</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation type="obsolete">Klikk her for å skjule snarvei verktøylinjen.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppdater lister</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å oppdatere pakkelister fra servere.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppgrader</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å oppgradere alle installerte pakker dersom en nyere versjon er tilgjengelig.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Last ned</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å laste ned de valgte pakkene. </translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppdater endringer</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for installere, fjerne eller oppgradere valgte pakker.</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Handlinger</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis ikke-installerte pakker</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å vise pakker som er tilgjengelige, men som ikke er installert.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis installerte pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å vise pakker som er installert på denne enheten.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis oppdaterte pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å vise pakker som er installert på enheten som har en nyere versjon tilgjengelig.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Filter by category</source>
+        <translation type="obsolete">Filtrer etter kategori</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation type="obsolete">Klikk her for vise liste over pakker som tilhører en kategori.</translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Set filter category</source>
+        <translation type="obsolete">Sett filtrer kategori</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to change package category to used filter.</source>
+        <translation type="obsolete">Klikk her for å endre pakke kategori til brukt filter.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Finn</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å søke etter tekst i navnene til pakkene.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Finn neste</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å finne den neste pakken som inneholder teksten som du søker etter.</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation type="obsolete">Snarvei tastatur</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation type="obsolete">Klikk her for å vise/skjule tastatur for å tillate hurtig bevegelse gjennom pakkelisten.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Konfigurer</translation>
+    </message>
+    <message>
+        <source>Click here to configure this application.</source>
+        <translation>Klikk her for å konfigurere denne applikasjonen.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å skjule Søk verktøylinjen.</translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Servers:</source>
+        <translation type="obsolete">Servere:</translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Click here to select a package feed.</source>
+        <translation type="obsolete">Klikk her for å velge en pakke tilførselskanal.</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>Pakker</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+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>
+        <translation type="obsolete">Dette er en liste over alle pakker tilgjengelige fra de ovenfor valgte servere.  
+
+Et blått punkt ved siden av navnet på pakken indikerer at pakken er installert.
+
+Et blått punkt med en stjerne viser at en nyere versjon av pakken er tilgjengelig for nedlasting.</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Slett</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation type="obsolete">Klikk her for å slette valgte pakker.</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Bygger server liste
+</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Bygger pakkeliste for:
+</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation type="obsolete">Oppdaterer pakkelister fra server</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation type="obsolete">ADVARSEL: Oppgradering mens
+Opie/qtopia kjører
+er IKKE anbefalt!</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">Advarsel</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation type="obsolete">Oppgraderer installerte pakker</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation type="obsolete">Er du sikker på at du ønsker å slette
+%1?</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="obsolete">Er du sikker?</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nei</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation type="obsolete">Laste ned til?</translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation type="obsolete">Skriv sti til nedlast til</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation type="obsolete">Installer ekstern pakke</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation type="obsolete">Skriv sti for pakke</translation>
+    </message>
+    <message>
+        <source>Nothing to do</source>
+        <translation>Intet å gjøre</translation>
+    </message>
+    <message>
+        <source>No packages selected</source>
+        <translation>Ingen pakker valgt</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation type="obsolete">Ønsker du å slette eller reinstallere
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">Slette eller reinstallere</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">Reinstallere</translation>
+    </message>
+    <message>
+        <source>R</source>
+        <translation type="obsolete">R</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation type="obsolete">Ønsker du å slette eller oppgradere
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation type="obsolete">Slette eller oppgradere</translation>
+    </message>
+    <message>
+        <source>U</source>
+        <translation type="obsolete">U</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="obsolete">Oppdaterer Launcher...</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Remove or reinstall</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>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Innstillinger</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Servere</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Destinasjoner</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxier</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Valg</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ny</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Slett</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Navn:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aktiv server</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Oppdater</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tilgjengelig</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Brukernavn:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Passord:</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tving avhengigheter</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tving reinstallering</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tving sletting</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tving overskrivning</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Informasjonsnivå</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kun feil</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Normale meldinger</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Informative meldinger</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Feilsøking utdata</translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;b&gt;Beskrivelse&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Innstallert til&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Størrelse&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Seksjon&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Filnavn&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Versjon installert&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Versjon tilgjengelig&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="obsolete">Pakke informasjon</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="obsolete">Pakke informasjon er ikke tilgjengelig</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Lukk</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Slett</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">Innstillinger</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">Servere</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">Destinasjoner</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">Proxier</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Ny</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Slett</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="obsolete">Server</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">Navn:</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">Adresse:</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">Aktiv server</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="obsolete">Oppdater</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Destinasjon</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="obsolete">Sted:</translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation type="obsolete">Lenke til root</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">HTTP Proxy</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Tilgjengelig</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">FTP Proxy</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="obsolete">Brukernavn:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">Passord:</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/packagemanager.ts b/i18n/pl/packagemanager.ts
index 3ac6397..7b96474 100644
--- a/i18n/pl/packagemanager.ts
+++ b/i18n/pl/packagemanager.ts
@@ -1,468 +1,1025 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Filtr kategorii</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">Wybierz jedna lub wiecej grup</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">Czytam konfiguracje...</translation>
+    </message>
+</context>
+<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wszystkie</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;OK</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Anuluj</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cel</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dostepna przestrzen</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wyjscie</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Start</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opcje</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nieznany</translation>
     </message>
     <message>
         <source>%1 Kb</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 Kb</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Przerwij</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zamknij</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zapisz wyjscie</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wszystkie</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tekst</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation type="obsolete">Zamknij</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>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">Usun
+</translation>
+    </message>
+    <message>
+        <source>Install
+</source>
+        <translation type="obsolete">Instaluj</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">Aktualizuj
+</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">(Przeinstaluj)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">(Aktualizuj)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Cel</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">Dostepna przestrzen</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">Wyjscie</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Start</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Opcje</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Wszystkie</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Tekst</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">Przerwij</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">
+**** Uzytkownik wcisnal PRZERWIJ ***</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">**** Proces przerwany ****</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">Zapisz wyjscie</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">Nieznany</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="obsolete">%1 Kb</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Opcje</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">Wymus zaleznosci</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">Wymus reinstalacje</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">Wymus usuniecie</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">Wymus nadpisanie</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation type="obsolete">Poziom informacji</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation type="obsolete">Tylko bledy</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="obsolete">Normalne wiadomosci</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="obsolete">Wiadomosci informujace</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="obsolete">Komunikaty problemow</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="obsolete">Przetwarzanie pakietu %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="obsolete">Usuwanie linkow symbolicznych...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="obsolete">Tworzenie linkow symbolicznych dla %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="obsolete">Tworzenie linkow symbolicznych dla %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="obsolete">Skonczone</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="obsolete">Usuwanie wpisu statusu...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="obsolete">plik statusu -</translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="obsolete">pakiet - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="obsolete">Nie mozna otworzyc pliku statusu - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="obsolete">Nie mozna utworzyc tymczasowego pliku statusu - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="obsolete">Nie mozna rozpoczac procesu ipkg</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="obsolete">Nie mozna otworzyc: </translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="obsolete">Tworzenie katalogu</translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="obsolete">%1 zlinkowany do %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="obsolete">Nie udalo sie zlinkowanie %1 do %2</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="obsolete">Usuniete %1</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="obsolete">Nie udalo sie usuniecie %1</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="obsolete">Usuniete</translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="obsolete">Nie udalo sie usunac</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">AQPkg - Manager Pakietow</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu tekst do wyszukania.</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation type="obsolete">Kliknij tu by ukryc listwe Quick Jump.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualizuj liste</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby aktualizowac liste pakietow z serwera.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualizuj</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby aktualizowac wszystkie zainstalowane pakiety, jasli dostepne sa nowsze wersje.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Sciagaj</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby sciagnac aktualnie wybrane pakiety.</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Zastosuj zmiany</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby instalowac, usunac lub aktualizowac aktualnie wybrane pakiety.</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Akcje</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz pakiety nie zainstalowane</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wyswietlic dostepne pakiety, ktore nie zostaly zainstalowane.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz zainstalowane pakiety</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wyswietlic zainstalowane na tym urzadzeniu pakiety.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz zaktualizowane pakiety</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wyswietlic zainstalowane na tym urzadzeniu pakiety, dla ktorych dostepne sa nowsze wersje.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Filter by category</source>
+        <translation type="obsolete">Filtruj po kategorii</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation type="obsolete">Kliknij tu aby wyswietlic pakiety nalezace do jednej kategorii.</translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Set filter category</source>
+        <translation type="obsolete">Ustaw kategorie filtrowania</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to change package category to used filter.</source>
+        <translation type="obsolete">Kliknij tu aby zmienic kategorie pakietow w uzywanym filtrze.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Szukaj</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wyszukac tekst w nazwach pakietow.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Znajdz nastepny</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby znalezc nastepna nazwe pakietu zawierajaca szukany tekst.</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation type="obsolete">Klawiatura Quick Jump</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation type="obsolete">Kliknij tu aby pokazac/ukryc klawiature pozwalajaca na szybkie przegladanie listy pakietow.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Widok</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Konfiguruj</translation>
+    </message>
+    <message>
+        <source>Click here to configure this application.</source>
+        <translation>Kliknij tu aby skonfigurowac ta aplikacje.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby ukryc pasek wyszukiwania.</translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Servers:</source>
+        <translation type="obsolete">Serwery:</translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Click here to select a package feed.</source>
+        <translation type="obsolete">Kliknij tu aby wybrac zrodlo pakietow (feed).</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>Pakiety</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+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>
+        <translation type="obsolete">To jest lista wszystkich pakietow dostepnych z wybanego powyzej zrodla (feed).
+
+Niebieska kropka obok nazwy pakietu oznacza, ze jest on aktualnie zainstalowany.
+
+Niebieska kropka z gwiazdka oznacza, ze na serwerze jest dostepna nowsza wersja pakietu.
+
+Kliknij w okienko po lewej aby wybrac pakiet.</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Usun</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation type="obsolete">Kliknij tu aby odinstalowac aktualnie wybrane pakiety.</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Buduje liste serwerow:
+<byte value="x9"/>%1</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Buduje liste pakietow dla:
+<byte value="x9"/>%1</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation type="obsolete">Odswiezam liste pakietow serwera</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation type="obsolete">OSTRZEZENIE: Aktualizacja w czasie
+gdy dziala Opie/Qtopia
+jest NIEZALECANE!
+
+Czy jestes pewien?</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">Ostrzezenie</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation type="obsolete">Aktualizuje zainstalowane pakiety</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation type="obsolete">Czy jestes pewien, ze chcesz usunac
+%1?</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="obsolete">Czy jestes pewien?</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nie</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Tak</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation type="obsolete">Gdzie sciagac</translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation type="obsolete">Wpisz sciezke do ktorej sciagac</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation type="obsolete">Instaluj Zdalny Pakiet</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation type="obsolete">Wpisz lokalizacje pakietu</translation>
+    </message>
+    <message>
+        <source>Nothing to do</source>
+        <translation>Nic do roboty</translation>
+    </message>
+    <message>
+        <source>No packages selected</source>
+        <translation>Brak wybranych pakietow</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation type="obsolete">Czy chcesz usunac lub przeinstalowac
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">Usun lub Przeinstaluj</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">Przeinstaluj</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation type="obsolete">Czy chcesz usunac lub aktualizowac
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation type="obsolete">Usun lub Aktualizuj</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="obsolete">Aktualizuje Launcher...</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Remove or reinstall</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>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Konfiguracja</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Serwery</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cele</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxy</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opcje</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nowy</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Usun</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Serwer</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nazwa:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Adres:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Serwer aktywny</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aktualizuj</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wlaczone</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nazwa uzytkownika:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Haslo:</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wymus zaleznosci</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wymus reinstalacje</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wymus usuniecie</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wymus nadpisanie</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Poziom informacji</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tylko bledy</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Normalne wiadomosci</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wiadomosci informujace</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Komunikaty problemow</translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;b&gt;Opis&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Zainstalowany&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Rozmiar&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Wybor&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Nazwa pliku&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Zainstalowana wersja&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Dostepna wersja&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="obsolete">Informacje o pakiecie</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="obsolete">Informacje o pakiecie niedostepne</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Zamknij</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="obsolete">Zainstalowane pakiety</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="obsolete">Lokalne pakiety</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="obsolete">niedostepne</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="obsolete">Pakiet - %1
+             wersja - %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="obsolete">zainst. wersja - %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="obsolete">Numer wersji jest pusty.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="obsolete">Czas w wersji nie jest liczba.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="obsolete">Nie ma nic po dwukropku w numerze wersji.</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Usun</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">Konfiguracja</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">Serwery</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">Cele</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">Proxy</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Nowy</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Usun</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="obsolete">Serwer</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">Nazwa:</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">Adres:</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">Serwer aktywny</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="obsolete">Aktualizuj</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Cel</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="obsolete">Lokalizacja:</translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation type="obsolete">Linkuj do root&apos;a</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">HTTP Proxy</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Wlaczone</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">FTP Proxy</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="obsolete">Nazwa uzytkownika:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">Haslo:</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/packagemanager.ts b/i18n/pt/packagemanager.ts
index 3ac6397..ca83859 100644
--- a/i18n/pt/packagemanager.ts
+++ b/i18n/pt/packagemanager.ts
@@ -1,468 +1,1022 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Filtro por Categoria</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">Selecione um ou mais grupos</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">A ler a configuração...</translation>
+    </message>
+</context>
+<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tudo</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Destino</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Espaço Disponível</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Resultado</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Iniciar</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opções</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Desconhecido</translation>
     </message>
     <message>
         <source>%1 Kb</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 Kb</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Abortar</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fechar</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gravar Resultado</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tudo</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Texto</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation type="obsolete">Fechar</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>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">Apagar
+</translation>
+    </message>
+    <message>
+        <source>Install
+</source>
+        <translation type="obsolete">Instalar
+</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">Actualizar
+</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">(Re-Instalar)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">(Actualizar)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Destino</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">Espaço Disponível</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">Resultado</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Iniciar</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Opções</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Tudo</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Texto</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">Abortar</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">
+**** Abortado pelo utilizador ****</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">**** Processo Abortado ****</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">Gravar Resultado</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">Desconhecido</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="obsolete">%1 Kb</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Opções</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">Ignorar Dependências</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">Forçar Reinstalação</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">Forçar Remoção</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">Forçar Sobreposição</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation type="obsolete">Nível de Informação</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation type="obsolete">Apenas Erros</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="obsolete">Mensagens Normais</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="obsolete">Mensagens de informação</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="obsolete">Analisar resultado</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="obsolete">A processar o pacote %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="obsolete">A remover links simbólicos...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="obsolete">A criar os links simbólicos para %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="obsolete">A criar os links simbólicos para %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="obsolete">Concluído</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="obsolete">A remover o ficheiro de estado...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="obsolete">ficheiro de estado -</translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="obsolete">pacote - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="obsolete">Não foi possível abrir o ficheiro de status - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="obsolete">Não foi possível criar o ficheiro de estado temporário - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="obsolete">Não foi possível executar o ipkg</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="obsolete">Não foi possível abrir: </translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="obsolete">A criar a directoria</translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="obsolete">Ligado %1 a %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="obsolete">Falhou a ligação de %1 a %2</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="obsolete">%1 apagado</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="obsolete">Falhou a remoção de %1</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="obsolete">Apagado</translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="obsolete">Falhou a remoção</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">AQPkg - Gestor de Software</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o texto para procurar aqui.</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation type="obsolete">Clique aqui para esconder a barra de ferramentas de salto rápido.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualizar Listas</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para actualizar a lista de pacotes dos servidores.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualizar</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para actualizar todos os pacotes que tenham disponível uma versão mais recente.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Obter</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para obter os pacotes seleccionados.</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Aplicar Alterações</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para instalar, remover ou actualizar os pacotes seleccionados.</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Acções</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar pacotes por instalar</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mostrar os pacotes disponíveis que não estão instalados.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar pacotes instalados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para motrar os pacotes instalados neste dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar pacotes por actualizar</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para motrar os pacotes instalados neste dispositivo e que tenham disponível uma versão mais recente.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Filter by category</source>
+        <translation type="obsolete">Filtrar por categoria</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation type="obsolete">Clique aqui para mostrar os pacotes que pertençam a uma determinada categoria.</translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Set filter category</source>
+        <translation type="obsolete">Filtrar por categoria</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to change package category to used filter.</source>
+        <translation type="obsolete">Clique aqui para mudar a filtragem de pacotes por categoria.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para procurar pacotes por texto no nome.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar Próxima</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para procurar o próximo pacote que contenha o texto que procura no nome.</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation type="obsolete">Teclado de Salto Rápido</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation type="obsolete">Clique aqui para mostrar ou esconder o teclado que permite um movimento rápido na lista de pacotes.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Configurar</translation>
+    </message>
+    <message>
+        <source>Click here to configure this application.</source>
+        <translation>Clique aqui para configurar esta aplicação.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para esconder a barra de pesquisa.</translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Servers:</source>
+        <translation type="obsolete">Servidores:</translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Click here to select a package feed.</source>
+        <translation type="obsolete">Clique aqui para seleccionar uma fonte de pacotes.</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>Pacotes</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+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>
+        <translation type="obsolete">Esta é a lista de todos os pacotes disponíveis no servidor seleccionado.
+
+Um ponto azul perto do nome do pacote indica que está instalado.
+
+Um ponto azul com uma estrela indica que existe uma nova versão disponível neste servidor.
+
+Clique na caixa à esquerda para seleccionar um pacote.</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Apagar</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation type="obsolete">Clique aqui para desinstalar os pacotes seleccionado.</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">A criar a lista de servidores:
+    %1</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">A criar a lista de servidores para:
+    %1</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation type="obsolete">A actualizar a lista de pacotes disponíveis</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation type="obsolete">ATENÇÃO: Não é recomendada
+a actualização do Opie/Qtopia 
+enquanto o está a usar!
+
+Tem a certeza?</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">Atenção</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation type="obsolete">A actualizar os pacotes instalados</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation type="obsolete">Tem a certeza que quer apagar %1?</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="obsolete">Tem a certeza?</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Não</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sim</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation type="obsolete">Obter para onde</translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation type="obsolete">Introduza a directoria para onde gravar</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation type="obsolete">Instalar Pacotes Remotos</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation type="obsolete">Introduza a localização do pacote</translation>
+    </message>
+    <message>
+        <source>Nothing to do</source>
+        <translation>Nada a fazer</translation>
+    </message>
+    <message>
+        <source>No packages selected</source>
+        <translation>Nenhum pacote selecionado</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation type="obsolete">Quer remover ou reinstalar %1?</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">Remover ou Reinstalar</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">Reinstalar</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation type="obsolete">Quer remover ou actualizar %1?</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation type="obsolete">Remover ou Actualizar</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="obsolete">A actualizar a lista de aplicações...</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Remove or reinstall</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>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Configuração</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Servidores</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Destinos</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxies</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opções</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Novo</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Remover</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Servidor</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nome:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Endereço:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Servidor Activo</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Actualizar</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Activo</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Conta:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Palavra Chave:</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ignorar Dependências</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forçar Reinstalação</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forçar Remoção</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forçar Sobreposição</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nível de Informação</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Apenas Erros</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mensagens Normais</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mensagens de informação</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Analisar resultado</translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;b&gt;Descrição&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Instalado Em&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Tamanho&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Secção&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Nome do Ficheiro&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Versão Instalada&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Versão Disponível&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="obsolete">Informação do Pacote</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="obsolete">A informação do pacote não está disponível</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Fechar</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="obsolete">Pacotes instalados</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="obsolete">Pacotes locais</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="obsolete">N/A</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="obsolete">Pacote - %1 versão %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="obsolete">versão instalada - %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="obsolete">Sem versão.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="obsolete">O valor da época na versão não é um número.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="obsolete">Nada depois do ponto no número da versão.</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Remover</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">Configuração</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">Servidores</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">Destinos</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">Proxies</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Novo</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Remover</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="obsolete">Servidor</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">Nome:</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">Endereço:</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">Servidor Activo</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="obsolete">Actualizar</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Destino</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="obsolete">Localização:</translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation type="obsolete">Ligar à raiz </translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">Proxy HTTP</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Activo</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">Proxy FTP</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="obsolete">Conta:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">Palavra Chave:</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/packagemanager.ts b/i18n/pt_BR/packagemanager.ts
index 3ac6397..f6ddc91 100644
--- a/i18n/pt_BR/packagemanager.ts
+++ b/i18n/pt_BR/packagemanager.ts
@@ -1,468 +1,498 @@
 <!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>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Packages</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to apply current filter.</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Configure</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>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Update package information</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>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</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>
+</context>
 </TS>
diff --git a/i18n/ru/packagemanager.ts b/i18n/ru/packagemanager.ts
index 3ac6397..8b41297 100644
--- a/i18n/ru/packagemanager.ts
+++ b/i18n/ru/packagemanager.ts
@@ -1,468 +1,1028 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Фильтр категорий</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">Выберите одну или более групп</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">Читаю конфигурацию...</translation>
+    </message>
+</context>
+<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Все</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;Да</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Отмена</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Место доступно</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вывод</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Начать</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Опции</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Неизвестный</translation>
     </message>
     <message>
         <source>%1 Kb</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 кбайт</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отменить</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Закрыть</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сохранить вывод</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Все</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Текст</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation type="obsolete">Закрыть</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>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">Убрать
+</translation>
+    </message>
+    <message>
+        <source>Install
+</source>
+        <translation type="obsolete">Установить
+</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">Обновить
+</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">(Переустановить)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">(Обновить)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Место назначения</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">Место доступно</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">Вывод</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Начать</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Опции</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Все</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Текст</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">Отменить</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">
+**** Пользователь нажал Отменить ***</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">**** Процесс отменен **** </translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">Сохранить вывод</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">Неизвестный</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="obsolete">%1 кбайт</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Опции</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">Игнор. зависимости</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">Вынужд. переустановка</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">Вынужд. удаление</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">Вынужд. перезапись</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation type="obsolete">Уровень информации</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation type="obsolete">Только ошибки</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="obsolete">Обычные сообщения</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="obsolete">Полезные сообщения</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="obsolete">Выявление неисправностей</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="obsolete">Обрабатываю пакет %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="obsolete">Убираю ссылки...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="obsolete">Создаю ссылки для %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="obsolete">Создаю ссылки для %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="obsolete">Закончил</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="obsolete">Убираю заметку о статусе...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="obsolete">файл статуса - </translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="obsolete">пакет - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="obsolete">Не могу открыть файл статуса - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="obsolete">Не могу создать временный файл статуса - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="obsolete">Не могу запустить процесс ipkg</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="obsolete">Не могу открыть :</translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="obsolete">Создаю каталог</translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="obsolete">Привязал %1 к %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="obsolete">Не смог привязать %1 к %2</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="obsolete">Убрал %1</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="obsolete">Не смог убрать %1</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="obsolete">Убран</translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="obsolete">Не смог убрать</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">AQPkg - Менеджер пакетов</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Введите текст для поиска здесь.</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation type="obsolete">Нажмите чтобы скрыть Quick Jump панель.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Обновить списки</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Нажмите чтобы обновить списки пакетов с серверов.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Обновить</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Нажмите чтобы обновить все установленные пакеты если есть более свежая версия.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Скачать</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Нажмите чтобы скачать выделенные пакеты.</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Применить изменения</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Нажмите чтобы установить, убрать или обновить выделенные пакеты.</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Действия</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать неустановленные пакеты</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Нажмите чтобы показать доступные, но не установленные пакеты.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать установленные пакеты</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Нажмите чтобы показать пакеты установленные на этом устройстве.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать обновленные пакеты</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Нажмите чтобы показать пакеты установленные на этом устройстве для которых имеется более свежая версия.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Filter by category</source>
+        <translation type="obsolete">Фильтровать по разделу</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation type="obsolete">Нажмите чтобы показать список пакетов в одной категории.</translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Set filter category</source>
+        <translation type="obsolete">Уст. категорию для фильтра</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to change package category to used filter.</source>
+        <translation type="obsolete">Нажмите чтобы сменить категорию пакетов на используемый фильтр.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Найти</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Нажмите чтобы найти текст в названиях пакетов.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Найти дальше</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Нажмите чтобы найти следующий пакет содержащий нужный вам текст в названии.</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation type="obsolete">Quick Jump клавиатура</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation type="obsolete">Нажмите чтобы показать/скрыть клавиатуру разрешающую быстрое перемещение по списку.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Вид</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Настроить</translation>
+    </message>
+    <message>
+        <source>Click here to configure this application.</source>
+        <translation>Нажмите чтобы настроить это приложение.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Нажмите чтобы скрыть панель поиска.</translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Servers:</source>
+        <translation type="obsolete">Сервера:</translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Click here to select a package feed.</source>
+        <translation type="obsolete">Нажмите чтобы выбрать источник пакетов.</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>Пакеты</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+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>
+        <translation type="obsolete">Это список всех пакетов из выделенного выше источника.
+
+Синяя точка рядом с названием показывает что пакет установлен.
+
+Синяя точка со звездой показывает что более свежая версия доступна из источника.
+
+Нажмите внутри квадрата слева чтобы выделить пакет.</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation type="obsolete">Нажмите чтобы удалить выбранные пакеты.</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Выстраиваю список серверов:
+<byte value="x9"/>%1</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Выстраиваю список серверов для:
+<byte value="x9"/>%1</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation type="obsolete">Обновляю список пакетов с сервера</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation type="obsolete">ВНИМАНИЕ: Обновлять пакеты
+когда запущен Opie/Qtopia
+не рекомендуется!
+
+Вы уверены?
+</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">Предупреждение</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation type="obsolete">Обновляю установленные пакеты</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation type="obsolete">Вы уверены что хотите удалить
+%1?</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="obsolete">Вы уверены?</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Нет</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation type="obsolete">Скачать куда</translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation type="obsolete">Введите путь куда надо скачать</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation type="obsolete">Установить внешний пакет</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation type="obsolete">Введите место где находится пакет</translation>
+    </message>
+    <message>
+        <source>Nothing to do</source>
+        <translation>Нечего делать</translation>
+    </message>
+    <message>
+        <source>No packages selected</source>
+        <translation>Не выделено ни одного пакета</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation type="obsolete">Вы хотите удалить или же переустановить
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">Удалить или переустановить</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">Переустановить</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation type="obsolete">Вы хотите удалить или же обновить
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation type="obsolete">Удалить или обновить</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="obsolete">Обновляю Launcher...</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Remove or reinstall</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>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Конфигурация</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сервера</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Места назначения</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Прокси</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Опции</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Новый</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удалить</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сервер</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Имя:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Адрес:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Активный сервер</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обновить</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">HTTP прокси</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Разрешен</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FTP прокси</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Имя польз.:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Пароль:</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Игнор. зависимости</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вынужд. переустановка</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вынужд. удаление</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вынужд. перезапись</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Уровень информации</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Только ошибки</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обычные сообщения</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Полезные сообщения</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выявление неисправностей</translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;b&gt;Описание&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Установлен в&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Размер&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Секция&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Имя файла&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Установленная версия&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Доступная версия&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="obsolete">Информация о пакете</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="obsolete">Информация о пакете недоступна</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Закрыть</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="obsolete">Установленные пакеты</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="obsolete">Местные пакеты</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="obsolete">N/A</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="obsolete">Пакет - %1
+             версия - %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="obsolete">
+             устан. версия - %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="obsolete">Строка версии пуста.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="obsolete">Префикс версии не является числом.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="obsolete">В номере версии после двоеточия ничего нет.</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Убрать</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">Конфигурация</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">Сервера</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">Места назначения</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">Прокси</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Новый</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Удалить</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="obsolete">Сервер</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">Имя:</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">Адрес:</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">Активный сервер</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="obsolete">Обновить</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Назначение</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="obsolete">Место:</translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation type="obsolete">Привязать к корню</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">HTTP прокси</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Разрешен</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">FTP прокси</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="obsolete">Имя польз.:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">Пароль:</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/packagemanager.ts b/i18n/sl/packagemanager.ts
index 3ac6397..46ae98a 100644
--- a/i18n/sl/packagemanager.ts
+++ b/i18n/sl/packagemanager.ts
@@ -1,468 +1,918 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">Filter kategorij</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">Izberite eno ali več skupin</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">Berem nastavitve...</translation>
+    </message>
+</context>
+<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vse</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;Vredu</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Prekliči</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cilj</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Prostor na voljo</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Izhod</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Začni</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Možnosti</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Neznano</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Prekini</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zapri</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Shrani izhod</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vse</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Besedilo</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation type="obsolete">Zapri</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>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">Odstrani
+</translation>
+    </message>
+    <message>
+        <source>Install
+</source>
+        <translation type="obsolete">Naloži
+</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">Nadgradi
+</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">(Ponovno naloži)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">(Nadgradi)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Cilj</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">Prostor na voljo</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">Izhod</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Začni</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Možnosti</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Vse</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Besedilo</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">Prekini</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">
+**** Uporabnik je kliknil PREKINI ****</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">**** Proces prekinjen ****</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">Shrani izhod</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">Neznano</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Možnosti</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">Prisili odvisne</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">Prisili ponovno nalaganje</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">Prisili odstranjevanje</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">Prisili prepis</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation type="obsolete">Stopnja informiranosti</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation type="obsolete">Samo napake</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="obsolete">Normalna sporočila</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="obsolete">Informativna sporočila</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="obsolete">Problematičen izhod</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">AQPkg - Paketni upravljalnik</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tu vpišite besedilo za iskanje.</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation type="obsolete">Kliknite tu, da skrijete Hitroskočno orodno vrstico.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Posodobi sezname</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknite tu, da posodobite paketne sezname iz strežnikov.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Nadgradi</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknite tu, da nadgradite vse naložene pakete, če je novejša različica na voljo.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Prenesi k sebi</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknite tu, da prenesete k sebi trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Uveljavi spremembe</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknite tu, da naložite, odstranite ali posodbite trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Dejanja</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Prikaži pakete, ki niso naloženi</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknite tu, da prikažem nenaložene pakete, ki so na voljo.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Prikaži naložene pakete</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknite tu, da prikažem pakete, ki so trenutno naloženi na tej napravi.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Prikaži posodobljene pakete</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknite tu, da prikažem pakete, ki so trenutno naloženi na tej napravi in imajo na voljo novejšo različico.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Filter by category</source>
+        <translation type="obsolete">Filter po kategoriji</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation type="obsolete">Kliknite tu, da prikažem pakete, ki pripadajo eni kategoriji.</translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Set filter category</source>
+        <translation type="obsolete">Nastavi filter kategorije</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to change package category to used filter.</source>
+        <translation type="obsolete">Kliknite tu, da zamenjate kategorijo paketa za uporabljen filter.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Najdi</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknite tu, da najdete besedilo v paketnih imenih.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Najdi naslednjo</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknite tu, da najdete naslednje ime paketa, ki vsebuje iskano besedilo.</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation type="obsolete">Hitroskočne smerne tipke</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation type="obsolete">Kliknite tu, da prikažem/skrijem smerne tipke, da se lažje premikate po paketnem seznamu.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Pogled</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Spremeni nastavitve</translation>
+    </message>
+    <message>
+        <source>Click here to configure this application.</source>
+        <translation>Kliknite tu, da spremenite nastavitve temu programu.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknite tu, da skijem iskalno orodno vrstico.</translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Servers:</source>
+        <translation type="obsolete">Strežniki:</translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Click here to select a package feed.</source>
+        <translation type="obsolete">Kliknite tu, da izberete paketni vir.</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>Paketi</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+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>
+        <translation type="obsolete">To je seznam vseh paketev iz strežniškega vira izbranega zgoraj.
+
+Modra pika pri imenu paketa pove, da je paket trenutno nameščen.
+
+Modra pika z zvezdico pove, da je novejša različica paketa na voljo iz strežniškega vira.
+
+Kliknite v škatlico levo od pakete, da le tega izberete.</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Odstrani</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation type="obsolete">Kliknite tu, da odstranite trenutno izbran(e) paket(e).</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Gradim seznam strežnikov:
+%1</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">Gradim seznam paketov za:
+%1</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation type="obsolete">Osvežujem strežniški seznam paketov</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation type="obsolete">OPOZORILO: Posodabljanje med 
+tem, ko Opie teče
+NI priporočljivo!
+
+Ste prepričani?
+</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">Opozorilo</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation type="obsolete">Posodabljam naložene pakete</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation type="obsolete">Ali ste prepričani da želite izbrisati
+%1?</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="obsolete">Ste prepričani?</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Ne</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Da</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation type="obsolete">Cilj prenosa</translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation type="obsolete">Vpišite pot za prenos za</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation type="obsolete">Naloži odaljeni paket</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation type="obsolete">Vpišite lokacijo paketa</translation>
+    </message>
+    <message>
+        <source>Nothing to do</source>
+        <translation>Nič ni za naredit</translation>
+    </message>
+    <message>
+        <source>No packages selected</source>
+        <translation>Nič paketov izbranih</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>Vredu</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation type="obsolete">Želite odstraniti ali ponovno naložiti
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">Odstrani ali ponovno naloži</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">Ponovno naloži</translation>
+    </message>
+    <message>
+        <source>R</source>
+        <translation type="obsolete">P</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation type="obsolete">Želite odstraniti ali nadgraditi
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation type="obsolete">Odstrani ali nadgradi</translation>
+    </message>
+    <message>
+        <source>U</source>
+        <translation type="obsolete">N</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="obsolete">Posodabljam Zaganjalnik...</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Remove or reinstall</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>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Spremeni nastavitve</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strežniki</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cilj</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Posredniki</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Možnosti</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nov</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Izbriši</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Strežnik</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ime:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Naslov:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aktivni strežnik</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Posodobi</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">HTTP posrednik</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vključen</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FTP posrednik</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Uporabniško ime:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Geslo:</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Prisili odvisne</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Prisili ponovno nalaganje</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Prisili odstranjevanje</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Prisili prepis</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Stopnja informiranosti</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Samo napake</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Normalna sporočila</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Informativna sporočila</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Problematičen izhod</translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;b&gt;Opis&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Naloženo na&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Velikost&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Odsek&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Ime datoteke&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Naložena različica&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Različica, ki je na voljo&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="obsolete">Informacije o paketu</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="obsolete">Informacije o paketu niso na voljo</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">Zapri</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Odstrani</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">Spremeni nastavitve</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">Strežniki</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">Cilj</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">Posredniki</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Nov</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Izbriši</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="obsolete">Strežnik</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">Ime:</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">Naslov:</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">Aktivni strežnik</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="obsolete">Posodobi</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">Cilj</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="obsolete">Lokacija:</translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation type="obsolete">Povezava do korena</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">HTTP posrednik</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Vključen</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">FTP posrednik</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="obsolete">Uporabniško ime:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">Geslo:</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/packagemanager.ts b/i18n/xx/packagemanager.ts
index 3ac6397..43c8bf9 100644
--- a/i18n/xx/packagemanager.ts
+++ b/i18n/xx/packagemanager.ts
@@ -1,468 +1,1013 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>%1 Kb</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation type="obsolete">FOO</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>
-        <translation type="unfinished"></translation>
+        <source>Remove
+</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Install
+</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Filter by category</source>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Set filter category</source>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
-        <translation type="unfinished"></translation>
+        <source>Click here to change package category to used filter.</source>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Click here to configure this application.</source>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Servers:</source>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Click here to select a package feed.</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+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>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Nothing to do</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>No packages selected</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>R</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>U</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="obsolete">FOO</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Remove or reinstall</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>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/packagemanager.ts b/i18n/zh_CN/packagemanager.ts
index 3ac6397..05d9dba 100644
--- a/i18n/zh_CN/packagemanager.ts
+++ b/i18n/zh_CN/packagemanager.ts
@@ -1,468 +1,498 @@
 <!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>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Packages</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Packages</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>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Download packages</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>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>No</source>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</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>
+</context>
 </TS>
diff --git a/i18n/zh_TW/packagemanager.ts b/i18n/zh_TW/packagemanager.ts
index 3ac6397..4d2c663 100644
--- a/i18n/zh_TW/packagemanager.ts
+++ b/i18n/zh_TW/packagemanager.ts
@@ -1,468 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>CategoryFilterImpl</name>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation type="obsolete">正在讀取設定...</translation>
+    </message>
+</context>
+<context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="obsolete">&amp;O確定</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;C取消</translation>
+    </message>
+</context>
+<context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">目的檔</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">可使用空間</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">輸出</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">開始</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">選項</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">關閉</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation type="obsolete">關閉</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>
-        <translation type="unfinished"></translation>
+        <source>Destination</source>
+        <translation type="obsolete">目的檔</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation type="obsolete">可使用空間</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation type="obsolete">輸出</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">開始</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">選項</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">選項</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">Force Depends</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">Force Reinstall</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">Force Remove</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">Force Overwrite</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation type="obsolete">AQPkg - 套件管理者</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>在這裡輸入搜尋文字.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>更新  List</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Upgrade</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>下載</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>執行變更</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>動作</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Find</source>
+        <translation>尋找</translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
-        <translation type="unfinished"></translation>
+        <source>Find next</source>
+        <translation>尋找下一個</translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>View</source>
+        <translation>瀏覽</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>設定</translation>
+    </message>
+    <message>
+        <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to search for text in package names.</source>
+        <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find next</source>
+        <source>Servers:</source>
+        <translation type="obsolete">伺服器:</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>套件</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>刪除</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="obsolete">警告</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>不</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>是</translation>
+    </message>
+    <message>
+        <source>Nothing to do</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>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
+        <source>OK</source>
+        <translation>確定</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation type="obsolete">刪除或重新安裝</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation type="obsolete">重新安裝</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to hide the find toolbar.</source>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Click here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Click here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing to do</source>
+        <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No packages selected</source>
+        <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove or reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>OIpkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initialing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error freeing libipkg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">設定</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">選項</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">新的</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">啟動</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Force Depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Force Reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Force Remove</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Force Overwrite</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>Close</source>
+        <translation type="obsolete">關閉</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">刪除</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="obsolete">設定</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">新的</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="obsolete">目的檔</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">啟動</translation>
+    </message>
+</context>
 </TS>