Merge from BRANCH_1_0.

1 files changed, 128 insertions, 8 deletions

diff --git a/i18n/en/aqpkg.ts b/i18n/en/aqpkg.ts
index 348cc10..6db6ebe 100644
--- a/i18n/en/aqpkg.ts
+++ b/i18n/en/aqpkg.ts
@@ -106,6 +106,10 @@
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
@@ -151,6 +155,86 @@
     </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>
@@ -400,10 +484,6 @@ Are you sure?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
@@ -413,10 +493,6 @@ Are you sure?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -465,6 +541,50 @@ Are you sure?
     </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"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>