1 files changed, 45 insertions, 45 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index cae0d8f..ee37157 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -147,12 +147,12 @@ void NetworkPackageManager :: initGui()
 {
-    QLabel *l = new QLabel( "Servers", this );
+    QLabel *l = new QLabel( tr( "Servers" ), this );
    serversList = new QComboBox( this );
    packagesList = new QListView( this );
-    update = new QPushButton( "Refresh Lists", this );
+    update = new QPushButton( tr( "Refresh Lists" ), this );
-    download = new QPushButton( "Download", this );
+    download = new QPushButton( tr( "Download" ), this );
-    upgrade = new QPushButton( "Upgrade", this );
+    upgrade = new QPushButton( tr( "Upgrade" ), this );
-    apply = new QPushButton( "Apply", this );
+    apply = new QPushButton( tr( "Apply" ), this );
-    QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1, "VBox" );
+    QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1 );
-    QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1, "HBox1" );
+    QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 );
    hbox1->addWidget( l );
@@ -160,4 +160,4 @@ void NetworkPackageManager :: initGui()
-    QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1, "HBox1" );
+    QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1 );
-    QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1, "HBox1" );
+    QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1 );
@@ -181,5 +181,5 @@ void NetworkPackageManager :: initGui()
    vbox->addWidget( packagesList );
-    packagesList->addColumn( "Packages" );
+    packagesList->addColumn( tr( "Packages" ) );
-    QHBoxLayout *hbox2 = new QHBoxLayout( vbox, -1, "HBox2" );
+    QHBoxLayout *hbox2 = new QHBoxLayout( vbox, -1 );
    hbox2->addWidget( update );
@@ -310,3 +310,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
            if ( destName != "" )
-                new QCheckListItem( item, QString( "Installed To - " ) + destName );
+                new QCheckListItem( item, QString( tr( "Installed To - " ) ) + destName );
        }
@@ -315,8 +315,8 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
        {
-            new QCheckListItem( item, QString( "Description - " ) + it->getDescription() );
+            new QCheckListItem( item, QString( tr( "Description - " ) ) + it->getDescription() );
-            new QCheckListItem( item, QString( "Size - " ) + it->getPackageSize() );
+            new QCheckListItem( item, QString( tr( "Size - " ) ) + it->getPackageSize() );
-            new QCheckListItem( item, QString( "Section - " ) + it->getSection() );
+            new QCheckListItem( item, QString( tr( "Section - " ) ) + it->getSection() );
        }
        else
-            new QCheckListItem( item, QString( "Filename - " ) + it->getFilename() );
+            new QCheckListItem( item, QString( tr( "Filename - " ) ) + it->getFilename() );
        
@@ -324,3 +324,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
                {
-                new QCheckListItem( item, QString( "V. Installed - " ) + it->getVersion() );
+                new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getVersion() );
                }
@@ -328,3 +328,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
                {
-                new QCheckListItem( item, QString( "V. Available - " ) + it->getVersion() );
+                new QCheckListItem( item, QString( tr( "V. Available - " ) ) + it->getVersion() );
                if ( it->getLocalPackage() )
@@ -332,3 +332,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
                                if ( it->isInstalled() )
-                            new QCheckListItem( item, QString( "V. Installed - " ) + it->getInstalledVersion() );
+                            new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getInstalledVersion() );
                        }
@@ -343,3 +343,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
        upgrade->setEnabled( false );
-        download->setText( "Download" );
+        download->setText( tr( "Download" ) );
        download->setEnabled( true );
@@ -350,3 +350,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
        download->setEnabled( true );
-        download->setText( "Remove" );
+        download->setText( tr( "Remove" ) );
    }
@@ -356,3 +356,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
        download->setEnabled( true );
-        download->setText( "Download" );
+        download->setText( tr( "Download" ) );
    }
@@ -381,3 +381,3 @@ void NetworkPackageManager :: updateServer()
-    InstallDlgImpl dlg( &ipkg, "Refreshing server package lists", this, "Upgrade", true );
+    InstallDlgImpl dlg( &ipkg, tr( "Refreshing server package lists" ), this, tr( "Upgrade" ), true );
    dlg.showDlg();
@@ -394,4 +394,4 @@ void NetworkPackageManager :: upgradePackages()
    // First warn user that this isn't recommended
-    QString text = "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n";
+    QString text = tr( "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n" );
-    QMessageBox warn("Warning", text, QMessageBox::Warning,
+    QMessageBox warn( tr( "Warning" ), text, QMessageBox::Warning,
                        QMessageBox::Yes,
@@ -410,3 +410,3 @@ void NetworkPackageManager :: upgradePackages()
        
-        InstallDlgImpl dlg( &ipkg, "Upgrading installed packages", this, "Upgrade", true );
+        InstallDlgImpl dlg( &ipkg, tr( "Upgrading installed packages" ), this, tr( "Upgrade" ), true );
        dlg.showDlg();
@@ -423,3 +423,3 @@ void NetworkPackageManager :: downloadPackage()
    bool doUpdate = true;
-    if ( download->text() == "Download" )
+    if ( download->text() == tr( "Download" ) )
    {
@@ -447,3 +447,3 @@ void NetworkPackageManager :: downloadPackage()
    }
-    else if ( download->text() == "Remove" )
+    else if ( download->text() == tr( "Remove" ) )
    {
@@ -468,5 +468,5 @@ void NetworkPackageManager :: downloadPackage()
                QString msgtext;
-                msgtext.sprintf( "Are you sure you wish to delete\n%s?", (const char *)p->getPackageName() );
+                msgtext = tr( "Are you sure you wish to delete\n%1?" ).arg( (const char *)p->getPackageName() );
-                if ( QMessageBox::information( this, "Are you sure?",
+                if ( QMessageBox::information( this, tr( "Are you sure?" ),
-                                    msgtext, "No", "Yes" ) == 1 )
+                                    msgtext, tr( "No" ), tr( "Yes" ) ) == 1 )
                {
@@ -548,3 +548,3 @@ void NetworkPackageManager :: downloadRemotePackage()
    bool ok;
-    QString package = InputDialog::getText( "Install Remote Package", tr( "Enter package location" ), "http://", &ok, this );
+    QString package = InputDialog::getText( tr( "Install Remote Package" ), tr( "Enter package location" ), "http://", &ok, this );
    if ( !ok || package.isEmpty() )
@@ -605,4 +605,4 @@ void NetworkPackageManager :: applyChanges()
        // Nothing to do
-        QMessageBox::information( this, "Nothing to do",
+        QMessageBox::information( this, tr( "Nothing to do" ),
-                             "No packages selected", "OK" );
+                             tr( "No packages selected" ), tr( "OK" ) );
        
@@ -705,6 +705,6 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
                // Version available is the same - option to remove or reinstall
-                caption = "Do you wish to remove or reinstall\n%s?";
+                caption = tr( "Do you wish to remove or reinstall\n%1?" );
-                text = "Remove or ReInstall";
+                text = tr( "Remove or ReInstall" );
-                secondButton = "ReInstall";
+                secondButton = tr( "ReInstall" );
-                secondOption = "R";
+                secondOption = tr( "R" );
            }
@@ -713,6 +713,6 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
                // Version available is newer - option to remove or upgrade
-                caption = "Do you wish to remove or upgrade\n%s?";
+                caption = tr( "Do you wish to remove or upgrade\n%1?" );
-                text = "Remove or Upgrade";
+                text = tr( "Remove or Upgrade" );
-                secondButton = "Upgrade";
+                secondButton = tr( "Upgrade" );
-                secondOption = "U";
+                secondOption = tr( "U" );
            }
@@ -724,5 +724,5 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
                QString msgtext;
-                msgtext.sprintf( caption, (const char *)name );
+                msgtext = caption.arg( ( const char * )name );
                switch( QMessageBox::information( this, text,
-                                    msgtext, "Remove", secondButton ) )
+                                    msgtext, tr( "Remove" ), secondButton ) )
                {
@@ -799,3 +799,3 @@ void NetworkPackageManager :: searchForPackage( bool findNext )
    if ( !findNext || lastSearchText.isEmpty() )
-        lastSearchText = InputDialog::getText( "Search for package", "Enter package to search for", lastSearchText, &ok, this ).lower();
+        lastSearchText = InputDialog::getText( tr( "Search for package" ), tr( "Enter package to search for" ), lastSearchText, &ok, this ).lower();
    else

diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index cae0d8f..ee37157 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -147,12 +147,12 @@ void NetworkPackageManager :: initGui()
147	{	147	{
148	QLabel *l = new QLabel( "Servers", this );	148	QLabel *l = new QLabel( tr( "Servers" ), this );
149	serversList = new QComboBox( this );	149	serversList = new QComboBox( this );
150	packagesList = new QListView( this );	150	packagesList = new QListView( this );
151	update = new QPushButton( "Refresh Lists", this );	151	update = new QPushButton( tr( "Refresh Lists" ), this );
152	download = new QPushButton( "Download", this );	152	download = new QPushButton( tr( "Download" ), this );
153	upgrade = new QPushButton( "Upgrade", this );	153	upgrade = new QPushButton( tr( "Upgrade" ), this );
154	apply = new QPushButton( "Apply", this );	154	apply = new QPushButton( tr( "Apply" ), this );
155		155
156	QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1, "VBox" );	156	QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1 );
157	QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1, "HBox1" );	157	QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 );
158	hbox1->addWidget( l );	158	hbox1->addWidget( l );
@@ -160,4 +160,4 @@ void NetworkPackageManager :: initGui()
160		160
161	QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1, "HBox1" );	161	QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1 );
162	QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1, "HBox1" );	162	QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1 );
163		163
@@ -181,5 +181,5 @@ void NetworkPackageManager :: initGui()
181	vbox->addWidget( packagesList );	181	vbox->addWidget( packagesList );
182	packagesList->addColumn( "Packages" );	182	packagesList->addColumn( tr( "Packages" ) );
183		183
184	QHBoxLayout *hbox2 = new QHBoxLayout( vbox, -1, "HBox2" );	184	QHBoxLayout *hbox2 = new QHBoxLayout( vbox, -1 );
185	hbox2->addWidget( update );	185	hbox2->addWidget( update );
@@ -310,3 +310,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
310	if ( destName != "" )	310	if ( destName != "" )
311	new QCheckListItem( item, QString( "Installed To - " ) + destName );	311	new QCheckListItem( item, QString( tr( "Installed To - " ) ) + destName );
312	}	312	}
@@ -315,8 +315,8 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
315	{	315	{
316	new QCheckListItem( item, QString( "Description - " ) + it->getDescription() );	316	new QCheckListItem( item, QString( tr( "Description - " ) ) + it->getDescription() );
317	new QCheckListItem( item, QString( "Size - " ) + it->getPackageSize() );	317	new QCheckListItem( item, QString( tr( "Size - " ) ) + it->getPackageSize() );
318	new QCheckListItem( item, QString( "Section - " ) + it->getSection() );	318	new QCheckListItem( item, QString( tr( "Section - " ) ) + it->getSection() );
319	}	319	}
320	else	320	else
321	new QCheckListItem( item, QString( "Filename - " ) + it->getFilename() );	321	new QCheckListItem( item, QString( tr( "Filename - " ) ) + it->getFilename() );
322		322
@@ -324,3 +324,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
324	{	324	{
325	new QCheckListItem( item, QString( "V. Installed - " ) + it->getVersion() );	325	new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getVersion() );
326	}	326	}
@@ -328,3 +328,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
328	{	328	{
329	new QCheckListItem( item, QString( "V. Available - " ) + it->getVersion() );	329	new QCheckListItem( item, QString( tr( "V. Available - " ) ) + it->getVersion() );
330	if ( it->getLocalPackage() )	330	if ( it->getLocalPackage() )
@@ -332,3 +332,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
332	if ( it->isInstalled() )	332	if ( it->isInstalled() )
333	new QCheckListItem( item, QString( "V. Installed - " ) + it->getInstalledVersion() );	333	new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getInstalledVersion() );
334	}	334	}
@@ -343,3 +343,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
343	upgrade->setEnabled( false );	343	upgrade->setEnabled( false );
344	download->setText( "Download" );	344	download->setText( tr( "Download" ) );
345	download->setEnabled( true );	345	download->setEnabled( true );
@@ -350,3 +350,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
350	download->setEnabled( true );	350	download->setEnabled( true );
351	download->setText( "Remove" );	351	download->setText( tr( "Remove" ) );
352	}	352	}
@@ -356,3 +356,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
356	download->setEnabled( true );	356	download->setEnabled( true );
357	download->setText( "Download" );	357	download->setText( tr( "Download" ) );
358	}	358	}
@@ -381,3 +381,3 @@ void NetworkPackageManager :: updateServer()
381		381
382	InstallDlgImpl dlg( &ipkg, "Refreshing server package lists", this, "Upgrade", true );	382	InstallDlgImpl dlg( &ipkg, tr( "Refreshing server package lists" ), this, tr( "Upgrade" ), true );
383	dlg.showDlg();	383	dlg.showDlg();
@@ -394,4 +394,4 @@ void NetworkPackageManager :: upgradePackages()
394	// First warn user that this isn't recommended	394	// First warn user that this isn't recommended
395	QString text = "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n";	395	QString text = tr( "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n" );
396	QMessageBox warn("Warning", text, QMessageBox::Warning,	396	QMessageBox warn( tr( "Warning" ), text, QMessageBox::Warning,
397	QMessageBox::Yes,	397	QMessageBox::Yes,
@@ -410,3 +410,3 @@ void NetworkPackageManager :: upgradePackages()
410		410
411	InstallDlgImpl dlg( &ipkg, "Upgrading installed packages", this, "Upgrade", true );	411	InstallDlgImpl dlg( &ipkg, tr( "Upgrading installed packages" ), this, tr( "Upgrade" ), true );
412	dlg.showDlg();	412	dlg.showDlg();
@@ -423,3 +423,3 @@ void NetworkPackageManager :: downloadPackage()
423	bool doUpdate = true;	423	bool doUpdate = true;
424	if ( download->text() == "Download" )	424	if ( download->text() == tr( "Download" ) )
425	{	425	{
@@ -447,3 +447,3 @@ void NetworkPackageManager :: downloadPackage()
447	}	447	}
448	else if ( download->text() == "Remove" )	448	else if ( download->text() == tr( "Remove" ) )
449	{	449	{
@@ -468,5 +468,5 @@ void NetworkPackageManager :: downloadPackage()
468	QString msgtext;	468	QString msgtext;
469	msgtext.sprintf( "Are you sure you wish to delete\n%s?", (const char *)p->getPackageName() );	469	msgtext = tr( "Are you sure you wish to delete\n%1?" ).arg( (const char *)p->getPackageName() );
470	if ( QMessageBox::information( this, "Are you sure?",	470	if ( QMessageBox::information( this, tr( "Are you sure?" ),
471	msgtext, "No", "Yes" ) == 1 )	471	msgtext, tr( "No" ), tr( "Yes" ) ) == 1 )
472	{	472	{
@@ -548,3 +548,3 @@ void NetworkPackageManager :: downloadRemotePackage()
548	bool ok;	548	bool ok;
549	QString package = InputDialog::getText( "Install Remote Package", tr( "Enter package location" ), "http://", &ok, this );	549	QString package = InputDialog::getText( tr( "Install Remote Package" ), tr( "Enter package location" ), "http://", &ok, this );
550	if ( !ok \|\| package.isEmpty() )	550	if ( !ok \|\| package.isEmpty() )
@@ -605,4 +605,4 @@ void NetworkPackageManager :: applyChanges()
605	// Nothing to do	605	// Nothing to do
606	QMessageBox::information( this, "Nothing to do",	606	QMessageBox::information( this, tr( "Nothing to do" ),
607	"No packages selected", "OK" );	607	tr( "No packages selected" ), tr( "OK" ) );
608		608
@@ -705,6 +705,6 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
705	// Version available is the same - option to remove or reinstall	705	// Version available is the same - option to remove or reinstall
706	caption = "Do you wish to remove or reinstall\n%s?";	706	caption = tr( "Do you wish to remove or reinstall\n%1?" );
707	text = "Remove or ReInstall";	707	text = tr( "Remove or ReInstall" );
708	secondButton = "ReInstall";	708	secondButton = tr( "ReInstall" );
709	secondOption = "R";	709	secondOption = tr( "R" );
710	}	710	}
@@ -713,6 +713,6 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
713	// Version available is newer - option to remove or upgrade	713	// Version available is newer - option to remove or upgrade
714	caption = "Do you wish to remove or upgrade\n%s?";	714	caption = tr( "Do you wish to remove or upgrade\n%1?" );
715	text = "Remove or Upgrade";	715	text = tr( "Remove or Upgrade" );
716	secondButton = "Upgrade";	716	secondButton = tr( "Upgrade" );
717	secondOption = "U";	717	secondOption = tr( "U" );
718	}	718	}
@@ -724,5 +724,5 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
724	QString msgtext;	724	QString msgtext;
725	msgtext.sprintf( caption, (const char *)name );	725	msgtext = caption.arg( ( const char * )name );
726	switch( QMessageBox::information( this, text,	726	switch( QMessageBox::information( this, text,
727	msgtext, "Remove", secondButton ) )	727	msgtext, tr( "Remove" ), secondButton ) )
728	{	728	{
@@ -799,3 +799,3 @@ void NetworkPackageManager :: searchForPackage( bool findNext )
799	if ( !findNext \|\| lastSearchText.isEmpty() )	799	if ( !findNext \|\| lastSearchText.isEmpty() )
800	lastSearchText = InputDialog::getText( "Search for package", "Enter package to search for", lastSearchText, &ok, this ).lower();	800	lastSearchText = InputDialog::getText( tr( "Search for package" ), tr( "Enter package to search for" ), lastSearchText, &ok, this ).lower();
801	else	801	else