Merge from BRANCH_1_0.

1 files changed, 265 insertions, 122 deletions

diff --git a/i18n/no/aqpkg.ts b/i18n/no/aqpkg.ts
index 348cc10..6af9d28 100644
--- a/i18n/no/aqpkg.ts
+++ b/i18n/no/aqpkg.ts
@@ -3,107 +3,115 @@
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategori filter</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Velg en eller flere grupper</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
-        <translation type="unfinished"></translation>
+        <translation>Leser konfigurasjon...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Avbryt</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Lukk</translation>
     </message>
     <message>
         <source>Remove
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Fjern
+</translation>
     </message>
     <message>
         <source>Install
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Installer
+</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Oppgrader
+</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Installer på nytt)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Oppgrader)</translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinasjon</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation>Tilgjengelig plass</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Utdata</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Start</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Valg</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>Avbryt</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
-        <translation type="unfinished"></translation>
+        <translation>
+**** Bruker har klikket AVBRYT ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
-        <translation type="unfinished"></translation>
+        <translation>**** Prosessen er blitt avbrutt ****</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation>Lagre utdata</translation>
     </message>
     <message>
         <source>Unknown</source>
+        <translation>Ukjent</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -111,42 +119,122 @@
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Valg</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation>Tving avhengigheter</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Tving reinstallering</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Tving sletting</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation>Tving overskrivning</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Informasjonsnivå</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation>Kun feil</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Normale meldinger</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Informative meldinger</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
+        <translation>Feilsøking utdata</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -154,143 +242,143 @@
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>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="unfinished"></translation>
+        <translation>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>
+        <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 by category</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtrer etter kategori</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for vise liste over pakker som tilhører en kategori.</translation>
     </message>
     <message>
         <source>Set filter category</source>
-        <translation type="unfinished"></translation>
+        <translation>Sett filtrer kategori</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>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="unfinished"></translation>
+        <translation>Snarvei tastatur</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
-        <translation type="unfinished"></translation>
+        <translation>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 type="unfinished"></translation>
+        <translation>Konfigurer</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <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>Servers:</source>
-        <translation type="unfinished"></translation>
+        <translation>Servere:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å velge en pakke tilførselskanal.</translation>
     </message>
     <message>
         <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakker</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
@@ -300,29 +388,35 @@ A blue dot next to the package name indicates that the package is currently inst
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
-        <translation type="unfinished"></translation>
+        <translation>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 type="unfinished"></translation>
+        <translation>Slett</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å slette valgte pakker.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Bygger server liste
+</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Bygger pakkeliste for:
+</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppdaterer pakkelister fra server</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
@@ -331,216 +425,265 @@ is NOT recommended!
 
 Are you sure?
 </source>
-        <translation type="unfinished"></translation>
+        <translation>ADVARSEL: Oppgradering mens
+Opie/qtopia kjører
+er IKKE anbefalt!</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Advarsel</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppgraderer installerte pakker</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Er du sikker på at du ønsker å slette
+%1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation>Er du sikker?</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nei</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <source>Download to where</source>
-        <translation type="unfinished"></translation>
+        <translation>Laste ned til?</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv sti til nedlast til</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Installer ekstern pakke</translation>
     </message>
     <message>
         <source>Enter package location</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv sti for pakke</translation>
     </message>
     <message>
         <source>Nothing to do</source>
-        <translation type="unfinished"></translation>
+        <translation>Intet å gjøre</translation>
     </message>
     <message>
         <source>No packages selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen pakker valgt</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="unfinished"></translation>
+        <translation>Ønsker du å slette eller reinstallere
+%1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Slette eller reinstallere</translation>
     </message>
     <message>
         <source>ReInstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Reinstallere</translation>
     </message>
     <message>
         <source>R</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ønsker du å slette eller oppgradere
+%1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Slette eller oppgradere</translation>
     </message>
     <message>
         <source>U</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">U</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppdaterer Launcher...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&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="unfinished"></translation>
+        <translation>&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="unfinished"></translation>
+        <translation>&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="unfinished"></translation>
+        <translation>&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="unfinished"></translation>
+        <translation>&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="unfinished"></translation>
+        <translation>&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="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Versjon tilgjengelig&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Package Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakke informasjon</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakke informasjon er ikke tilgjengelig</translation>
     </message>
     <message>
         <source>Close</source>
+        <translation>Lukk</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished">Slett</translation>
+    </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Innstillinger</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Servere</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinasjoner</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxier</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Ny</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Slett</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Navn:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktiv server</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppdater</translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinasjon</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sted:</translation>
     </message>
     <message>
         <source>Link to root</source>
-        <translation type="unfinished"></translation>
+        <translation>Lenke til root</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation>HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Tilgjengelig</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation>FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>Brukernavn:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Passord:</translation>
     </message>
 </context>
 </TS>