1 files changed, 18 insertions, 87 deletions

diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 3df569b..43eaaae 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -129,3 +129,3 @@ void Ipkg :: runIpkg()
     if ( package != "" )
-        emit outputText( QString( "Dealing with package " ) + package );
+        emit outputText( tr( "Dealing with package %1" ).arg( package) );
 
@@ -140,3 +140,3 @@ void Ipkg :: runIpkg()
         {
-            emit outputText( QString( "Removing symbolic links...\n" ) );
+            emit outputText( tr( "Removing symbolic links...\n" ) );
             linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
@@ -164,3 +164,3 @@ void Ipkg :: createSymLinks()
             emit outputText( " " );
-            emit outputText( QString( "Creating symbolic links for " )+ package );
+            emit outputText( tr( "Creating symbolic links for %1." ).arg( package) );
 
@@ -175,3 +175,3 @@ void Ipkg :: createSymLinks()
                 emit outputText( " " );
-                emit outputText( QString( "Creating symbolic links for " )+ (*pkg) );
+                emit outputText( tr( "Creating symbolic links for %1" ).arg( *pkg ) );
                 linkPackage( Utils::getPackageNameFromIpkFilename( *pkg ), destination, destDir );
@@ -183,3 +183,3 @@ void Ipkg :: createSymLinks()
 
-    emit outputText( "Finished" );
+    emit outputText( tr("Finished") );
     emit outputText( "" );
@@ -197,7 +197,7 @@ void Ipkg :: removeStatusEntry()
     emit outputText( "" );
-    emit outputText( "Removing status entry..." );
-    QString tempstr = "status file - ";
+    emit outputText( tr("Removing status entry...") );
+    QString tempstr = tr("status file - ");
     tempstr.append( statusFile );
     emit outputText( tempstr );
-    tempstr = "package - ";
+    tempstr = tr("package - ");
     tempstr.append( package );
@@ -209,3 +209,3 @@ void Ipkg :: removeStatusEntry()
     {
-        tempstr = "Couldn't open status file - ";
+        tempstr = tr("Couldn't open status file - ");
         tempstr.append( statusFile );
@@ -217,3 +217,3 @@ void Ipkg :: removeStatusEntry()
     {
-        tempstr = "Couldn't create tempory status file - ";
+        tempstr = tr("Couldn't create tempory status file - ");
         tempstr.append( outStatusFile );
@@ -317,3 +317,3 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
     {
-        emit outputText( QString( "Couldn't start ipkg process" ) );
+        emit outputText( tr("Couldn't start ipkg process" ) );
     }
@@ -388,68 +388,2 @@ void Ipkg :: abort()
 
-/*
-int Ipkg :: executeIpkgCommand( QString &cmd, const QString option )
-{
-    FILE *fp = NULL;
-    char line[130];
-    QString lineStr, lineStrOld;
-    int ret = false;
-
-    fp = popen( (const char *) cmd, "r");
-    if ( fp == NULL )
-    {
-        QString text;
-        text.sprintf( "Couldn't execute %s! See stdout for error code", (const char *)cmd );
-        emit outputText( text );
-    }
-    else
-    {
-        while ( fgets( line, sizeof line, fp) != NULL )
-        {
-            lineStr = line;
-            lineStr=lineStr.left( lineStr.length()-1 );
-
-            if ( lineStr != lineStrOld )
-            {
-                //See if we're finished
-                if ( option == "install" || option == "reinstall" )
-                {
-                    // Need to keep track of any dependant packages that get installed
-                    // so that we can create links to them as necessary
-                    if ( lineStr.startsWith( "Installing " ) )
-                    {
-                        int start = lineStr.find( " " ) + 1;
-                        int end = lineStr.find( " ", start );
-                        QString *package = new QString( lineStr.mid( start, end-start ) );
-                        dependantPackages->append( package );
-                    }
-                }
-
-                if ( option == "update" )
-                {
-                    if (lineStr.contains("Updated list"))
-                        ret = true;
-                }
-                else if ( option == "download" )
-                {
-                    if (lineStr.contains("Downloaded"))
-                        ret = true;
-                }
-                else
-                {
-                    if (lineStr.contains("Done"))
-                        ret = true;
-                }
-
-                emit outputText( lineStr );
-            }
-            lineStrOld = lineStr;
-            qApp->processEvents();
-        }
-        pclose(fp);
-    }
-
-    return ret;
-}
-*/
-
 void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, const QString &destDir )
@@ -485,3 +419,3 @@ QStringList* Ipkg :: getList( const QString &packageFilename, const QString &des
         {
-            QString tempstr = "Could not open :";
+            QString tempstr = tr("Could not open :");
             tempstr.append( packageFileDir );
@@ -550,3 +484,3 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
             {
-                QString tempstr = "Creating directory ";
+                QString tempstr = tr("Creating directory ");
                 tempstr.append( linkFile );
@@ -563,6 +497,5 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
             int rc = symlink( sourceFile, linkFile );
-            text = (rc == 0 ? "Linked " : "Failed to link ");
-            text.append( sourceFile );
-            text.append( " to " );
-            text.append( linkFile );
+            text = ( rc == 0 ? tr( "Linked %1 to %2" ) : tr( "Failed to link %1 to %2" ) ).
+                    arg( sourceFile ).
+                    arg( linkFile );
             emit outputText( text );
@@ -580,4 +513,3 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
 
-                text = (rc ? "Removed " : "Failed to remove ");
-                text.append( linkFile );
+                text = ( rc ? tr( "Removed %1" ) : tr( "Failed to remove %1" ) ).arg( linkFile );
                 emit outputText( text );
@@ -590,4 +522,3 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
                 {
-                    text = (rc ? "Removed " : "Failed to remove ");
-                    text.append( linkFile );
+                    text = ( rc ? tr( "Removed " ) : tr( "Failed to remove " ) ).arg( linkFile );
                     emit outputText( text );