author | mickeyl <mickeyl> | 2003-05-03 21:33:49 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-05-03 21:33:49 (UTC) |
commit | 031031a22a8482c674b250c9f32a758f11139aeb (patch) (side-by-side diff) | |
tree | 79126fc719c74361eb1966d774cdf75c04c82a7c /noncore/net | |
parent | cbaa70d78b1dccce4dc54baba5fc35431467972f (diff) | |
download | opie-031031a22a8482c674b250c9f32a758f11139aeb.zip opie-031031a22a8482c674b250c9f32a758f11139aeb.tar.gz opie-031031a22a8482c674b250c9f32a758f11139aeb.tar.bz2 |
prepare for i18n
-rw-r--r-- | noncore/net/wellenreiter/gui/main.cpp | 10 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 43 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 18 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/statwindow.cpp | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 32 | ||||
-rw-r--r-- | noncore/net/wellenreiter/wellenreiter.pro | 18 |
6 files changed, 82 insertions, 43 deletions
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp index 03da135..96ebb3f 100644 --- a/noncore/net/wellenreiter/gui/main.cpp +++ b/noncore/net/wellenreiter/gui/main.cpp @@ -57,5 +57,5 @@ int main( int argc, char **argv ) { - qWarning( "Wellenreiter: trying to run as non-root!" ); - result = QMessageBox::warning( w, " - Wellenreiter II - (non-root)", "You have started Wellenreiter II\n" - "as non-root. You will have\nonly limited functionality.\nProceed anyway?", + qWarning( QObject::tr( "Wellenreiter: trying to run as non-root!" ) ); + result = QMessageBox::warning( w, " - Wellenreiter II - (non-root)", QObject::tr( "You have started Wellenreiter II\n" + "as non-root. You will have\nonly limited functionality.\nProceed anyway?" ), QMessageBox::Yes, QMessageBox::No ); @@ -85,4 +85,4 @@ int main( int argc, char **argv ) qWarning( "Wellenreiter: found dhcp process #%d", (*it).toInt() ); - result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", "You have a dhcp client running.\n" - "This can severly limit scanning!\nShould I kill it for you?", + result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", QObject::tr( "You have a dhcp client running.\n" + "This can severly limit scanning!\nShould I kill it for you?" ), QMessageBox::Yes, QMessageBox::No ); diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 6cd364c..c4a8fbc 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp @@ -104,8 +104,8 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n QPopupMenu* fileSave = new QPopupMenu( mb ); - fileSave->insertItem( "&Session...", this, SLOT( fileSaveSession() ) ); - fileSave->insertItem( "&Text Log...", this, SLOT( fileSaveLog() ) ); - fileSave->insertItem( "&Hex Log...", this, SLOT( fileSaveHex() ) ); + fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) ); + fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) ); + fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) ); QPopupMenu* fileLoad = new QPopupMenu( mb ); - fileLoad->insertItem( "&Session...", this, SLOT( fileLoadSession() ) ); + fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) ); //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) ); @@ -113,17 +113,17 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n QPopupMenu* file = new QPopupMenu( mb ); - file->insertItem( "&New", this, SLOT( fileNew() ) ); - id = file->insertItem( "&Load", fileLoad ); - file->insertItem( "&Save", fileSave ); + file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) ); + id = file->insertItem( tr( "&Load" ), fileLoad ); + file->insertItem( tr( "&Save" ), fileSave ); file->insertSeparator(); - file->insertItem( "&Exit", qApp, SLOT( quit() ) ); + file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) ); QPopupMenu* view = new QPopupMenu( mb ); - view->insertItem( "&Configure..." ); + view->insertItem( tr( "&Configure..." ) ); QPopupMenu* sniffer = new QPopupMenu( mb ); - sniffer->insertItem( "&Configure...", this, SLOT( showConfigure() ) ); + sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) ); sniffer->insertSeparator(); - startID = sniffer->insertItem( "&Start", mw, SLOT( startClicked() ) ); + startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) ); sniffer->setItemEnabled( startID, false ); - stopID = sniffer->insertItem( "Sto&p", mw, SLOT( stopClicked() ) ); + stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) ); sniffer->setItemEnabled( stopID, false ); @@ -131,9 +131,9 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n QPopupMenu* demo = new QPopupMenu( mb ); - demo->insertItem( "&Add something", this, SLOT( demoAddStations() ) ); + demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) ); - id = mb->insertItem( "&File", file ); - id = mb->insertItem( "&View", view ); + id = mb->insertItem( tr( "&File" ), file ); + id = mb->insertItem( tr( "&View" ), view ); mb->setItemEnabled( id, false ); - id = mb->insertItem( "&Sniffer", sniffer ); - id = mb->insertItem( "&Demo", demo ); + id = mb->insertItem( tr( "&Sniffer" ), sniffer ); + id = mb->insertItem( tr( "&Demo" ), demo ); mb->setItemEnabled( id, true ); @@ -157,3 +157,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n #ifndef QWS - statusBar()->message( "Ready." ); + statusBar()->message( tr( "Ready." ) ); #endif @@ -232,5 +232,5 @@ QString WellenreiterMainWindow::getFileName( bool save ) text << "text/*"; - map.insert(tr("Text"), text ); + map.insert( tr("Text"), text ); text << "*"; - map.insert(tr("All"), text ); + map.insert( tr("All"), text ); @@ -353,3 +353,4 @@ void WellenreiterMainWindow::closeEvent( QCloseEvent* e ) { - QMessageBox::warning( this, "Wellenreiter/Opie", "Sniffing in progress!\nPlease stop sniffing before closing." ); + QMessageBox::warning( this, "Wellenreiter/Opie", + tr( "Sniffing in progress!\nPlease stop sniffing before closing." ) ); e->ignore(); diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 1cf49e0..3a6aa15 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp @@ -55,5 +55,5 @@ MScanListView::MScanListView( QWidget* parent, const char* name ) setColumnAlignment( 0, AlignLeft || AlignVCenter ); - addColumn( tr( "B" ) ); + addColumn( tr( "#" ) ); setColumnAlignment( 1, AlignCenter ); - addColumn( tr( "AP" ) ); + addColumn( tr( "MAC" ) ); setColumnAlignment( 2, AlignCenter ); @@ -150,2 +150,3 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo s.sprintf( "(i) new network: '%s'", (const char*) essid ); + //TODO send s to logwindow network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0 ); @@ -155,3 +156,2 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo // insert new station as child from network - // no essid to reduce clutter, maybe later we have a nick or stationname to display!? @@ -172,2 +172,3 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo } + //TODO send s to logwindow @@ -200,2 +201,13 @@ void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, cons station->setManufacturer( _manufacturerdb->lookup( addr ) ); + + QString s; + if ( type == "station" ) + { + s.sprintf( "(i) new station in '%s' [??]", (const char*) network->text( col_essid ) ); + } + else + { + s.sprintf( "(i) new wireless station in '%s' [??]", (const char*) network->text( col_essid ) ); + } + //TODO send s to logwindow } diff --git a/noncore/net/wellenreiter/gui/statwindow.cpp b/noncore/net/wellenreiter/gui/statwindow.cpp index 2c8c774..a9ae661 100644 --- a/noncore/net/wellenreiter/gui/statwindow.cpp +++ b/noncore/net/wellenreiter/gui/statwindow.cpp @@ -22,4 +22,4 @@ MStatWindow::MStatWindow( QWidget * parent, const char * name, WFlags f ) table = new OListView( this ); - table->addColumn( "Protocol" ); - table->addColumn( "Count" ); + table->addColumn( tr( "Protocol" ) ); + table->addColumn( tr( "Count" ) ); table->setItemMargin( 2 ); diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index c061319..62bda91 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -170,7 +170,11 @@ void Wellenreiter::receivePacket(OPacket* p) - // do we have a prism header? - OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) ); - if ( ds && prism ) - graphwindow->traffic( ds->channel(), prism->signalStrength() ); - + // update graph window + if ( ds ) + { + OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) ); + if ( prism ) + graphwindow->traffic( ds->channel(), prism->signalStrength() ); + else + graphwindow->traffic( ds->channel(), 95 ); + } return; @@ -261,3 +265,4 @@ void Wellenreiter::stopClicked() // message the user - QMessageBox::information( this, "Wellenreiter II", "Your wireless card\nshould now be usable again." ); + QMessageBox::information( this, "Wellenreiter II", + tr( "Your wireless card\nshould now be usable again." ) ); @@ -282,3 +287,4 @@ void Wellenreiter::startClicked() { - QMessageBox::information( this, "Wellenreiter II", "Your device is not\nproperly configured. Please reconfigure!" ); + QMessageBox::information( this, "Wellenreiter II", + tr( "Your device is not\nproperly configured. Please reconfigure!" ) ); return; @@ -299,3 +305,3 @@ void Wellenreiter::startClicked() case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface ) ); break; - case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", "Bring your device into\nmonitor mode now." ); break; + case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break; case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break; @@ -311,3 +317,4 @@ void Wellenreiter::startClicked() { - QMessageBox::warning( this, "Wellenreiter II", "Can't set device into monitor mode." ); + QMessageBox::warning( this, "Wellenreiter II", + tr( "Can't set device into monitor mode." ) ); return; @@ -319,3 +326,3 @@ void Wellenreiter::startClicked() { - if ( configwindow->writeCaptureFile->isEnabled() ) + if ( configwindow->writeCaptureFile->isEnabled() ) //FIXME: bug!? { @@ -339,3 +346,4 @@ void Wellenreiter::startClicked() { - QMessageBox::warning( this, "Wellenreiter II", "Can't open packet capturer:\n" + QString(strerror( errno ) )); + QMessageBox::warning( this, "Wellenreiter II", + tr( "Can't open packet capturer:\n" ) + QString(strerror( errno ) )); return; @@ -369,3 +377,3 @@ void Wellenreiter::startClicked() assert( parent() ); - ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II - replaying capture file..." ); + ( (QMainWindow*) parent() )->setCaption( tr( "Wellenreiter II - replaying capture file..." ) ); } diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro index eb60c4a..7085c5a 100644 --- a/noncore/net/wellenreiter/wellenreiter.pro +++ b/noncore/net/wellenreiter/wellenreiter.pro @@ -14 +14,19 @@ contains( platform, x11 ) { +TRANSLATIONS = ../../../i18n/de/wellenreiter.ts \ + ../../../i18n/nl/wellenreiter.ts \ + ../../../i18n/da/wellenreiter.ts \ + ../../../i18n/xx/wellenreiter.ts \ + ../../../i18n/en/wellenreiter.ts \ + ../../../i18n/es/wellenreiter.ts \ + ../../../i18n/fr/wellenreiter.ts \ + ../../../i18n/hu/wellenreiter.ts \ + ../../../i18n/ja/wellenreiter.ts \ + ../../../i18n/ko/wellenreiter.ts \ + ../../../i18n/no/wellenreiter.ts \ + ../../../i18n/pl/wellenreiter.ts \ + ../../../i18n/pt/wellenreiter.ts \ + ../../../i18n/pt_BR/wellenreiter.ts \ + ../../../i18n/sl/wellenreiter.ts \ + ../../../i18n/zh_CN/wellenreiter.ts \ + ../../../i18n/zh_TW/wellenreiter.ts + |