Merge from BRANCH_1_0.

1 files changed, 130 insertions, 2 deletions

diff --git a/i18n/sl/aqpkg.ts b/i18n/sl/aqpkg.ts
index b06f4e4..d6fcac5 100644
--- a/i18n/sl/aqpkg.ts
+++ b/i18n/sl/aqpkg.ts
@@ -65,141 +65,225 @@
         <translation>Cilj</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Prostor na voljo</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Izhod</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Začni</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Besedilo</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Prekini</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Uporabnik je kliknil PREKINI ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Proces prekinjen ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Shrani izhod</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznano</translation>
     </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Prisili odvisne</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Prisili ponovno nalaganje</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Prisili odstranjevanje</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Prisili prepis</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Stopnja informiranosti</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Samo napake</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normalna sporočila</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informativna sporočila</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Problematičen izhod</translation>
     </message>
 </context>
 <context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Paketni upravljalnik</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Tu vpišite besedilo za iskanje.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Kliknite tu, da skrijete Hitroskočno orodno vrstico.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Posodobi sezname</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Kliknite tu, da posodobite paketne sezname iz strežnikov.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Nadgradi</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Kliknite tu, da nadgradite vse naložene pakete, če je novejša različica na voljo.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Prenesi k sebi</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Kliknite tu, da prenesete k sebi trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Uveljavi spremembe</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Kliknite tu, da naložite, odstranite ali posodbite trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Dejanja</translation>
@@ -375,161 +459,205 @@ Ste prepričani?
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Cilj prenosa</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Vpišite pot za prenos za</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Naloži odaljeni paket</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>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>Želite odstraniti ali ponovno naložiti
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Odstrani ali ponovno naloži</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Ponovno naloži</translation>
     </message>
     <message>
         <source>R</source>
-        <translation>P</translation>
+        <translation type="obsolete">P</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Želite odstraniti ali nadgraditi
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Odstrani ali nadgradi</translation>
     </message>
     <message>
         <source>U</source>
-        <translation>N</translation>
+        <translation type="obsolete">N</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation>Posodabljam Zaganjalnik...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Opis&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation>&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>&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>&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>&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>&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>&lt;p&gt;&lt;b&gt;Različica, ki je na voljo&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Informacije o paketu</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Informacije o paketu niso na voljo</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Zapri</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">Odstrani</translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Spremeni nastavitve</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Strežniki</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Cilj</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Posredniki</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Strežnik</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Naslov:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Aktivni strežnik</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Posodobi</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Cilj</translation>