diff -Nurp swscanner-0.2.2-2ubuntu1-old/AUTHORS swscanner-0.2.2-2ubuntu1/AUTHORS --- swscanner-0.2.2-2ubuntu1-old/AUTHORS 2005-12-19 20:11:13.000000000 +0000 +++ swscanner-0.2.2-2ubuntu1/AUTHORS 2006-10-23 01:27:14.000000000 +0100 @@ -1,10 +1,10 @@ -*Developper: +*Developer: Ivan Forcada Atienza *Debian packagers: Andrés Seco Hernández - ˇAlso collabored: + ˇAlso collaborated: Eugenio J. Sánchez diff -Nurp swscanner-0.2.2-2ubuntu1-old/src/configpopupmenu.cpp swscanner-0.2.2-2ubuntu1/src/configpopupmenu.cpp --- swscanner-0.2.2-2ubuntu1-old/src/configpopupmenu.cpp 2005-12-19 20:11:13.000000000 +0000 +++ swscanner-0.2.2-2ubuntu1/src/configpopupmenu.cpp 2006-10-23 00:37:47.000000000 +0100 @@ -24,7 +24,7 @@ configPopupMenu::configPopupMenu(QWidget this->insertTitle(SmallIcon(wep?"redled":"greenled"), " " + essid + " (" + mac + ")", -1, 0); //Create actions: - asociateAction = new KAction(i18n("Asociate with") + " " + iface, "connect_creating", KShortcut("Ctrl+A"), parentWidget(), + asociateAction = new KAction(i18n("Associate with") + " " + iface, "connect_creating", KShortcut("Ctrl+A"), parentWidget(), SLOT(asociate()), apActions, "action_asociate"); asociateAction->plug(this); this->insertSeparator(); diff -Nurp swscanner-0.2.2-2ubuntu1-old/src/dlgConfig.ui swscanner-0.2.2-2ubuntu1/src/dlgConfig.ui --- swscanner-0.2.2-2ubuntu1-old/src/dlgConfig.ui 2005-12-19 20:11:13.000000000 +0000 +++ swscanner-0.2.2-2ubuntu1/src/dlgConfig.ui 2006-10-23 00:39:46.000000000 +0100 @@ -185,7 +185,7 @@ false - Maintain &this configuration for all MAC's with the same ESSID + Maintain &this configuration for all MACs with the same ESSID Alt+T @@ -210,7 +210,7 @@ textLabel1_4 - Execute this script after asociating: + Execute this script after associating: diff -Nurp swscanner-0.2.2-2ubuntu1-old/src/dlgUtils.ui swscanner-0.2.2-2ubuntu1/src/dlgUtils.ui --- swscanner-0.2.2-2ubuntu1-old/src/dlgUtils.ui 2005-12-19 20:11:13.000000000 +0000 +++ swscanner-0.2.2-2ubuntu1/src/dlgUtils.ui 2006-10-23 01:07:48.000000000 +0100 @@ -202,7 +202,7 @@ - SWScaner files (*.sws) + SWScanner files (*.sws) diff -Nurp swscanner-0.2.2-2ubuntu1-old/src/filehandler.cpp swscanner-0.2.2-2ubuntu1/src/filehandler.cpp --- swscanner-0.2.2-2ubuntu1-old/src/filehandler.cpp 2005-12-19 20:11:13.000000000 +0000 +++ swscanner-0.2.2-2ubuntu1/src/filehandler.cpp 2006-10-23 00:44:44.000000000 +0100 @@ -45,8 +45,8 @@ if (line.contains("xml version") > 0) else { // Old format, warning to instance people to upgrade version - cout << "Parsing old version .sws file. Please, re-save it once opened to convert it to new versions." << endl; - QMessageBox::warning(0, QString::null, i18n("This is an old version .sws file. Please, re-save it once opened to convert it to new versions.")); + cout << "Parsing old version .sws file. Please re-save it after opening to convert it to the new version." << endl; + QMessageBox::warning(0, QString::null, i18n("This is an old version .sws file. Please re-save it after opening to convert it to the new version.")); // Old versions "xml" format. Need to be adapted first: fileContent = stream.read(); // add some xml stuff: diff -Nurp swscanner-0.2.2-2ubuntu1-old/src/frmconfig.cpp swscanner-0.2.2-2ubuntu1/src/frmconfig.cpp --- swscanner-0.2.2-2ubuntu1-old/src/frmconfig.cpp 2005-12-19 20:11:13.000000000 +0000 +++ swscanner-0.2.2-2ubuntu1/src/frmconfig.cpp 2006-10-23 00:47:01.000000000 +0100 @@ -198,7 +198,7 @@ void frmconfig::slotUser1() d->txtMask3->text().length() == 0 || d->txtMask4->text().length() == 0 )) { - KMessageBox::error(this, i18n("You have seleced a static IP and left blank one or more boxes")); + KMessageBox::error(this, i18n("You have selected a static IP and left blank one or more boxes")); return; } @@ -209,7 +209,7 @@ void frmconfig::slotUser1() d->txtGat3->text().length() == 0 || d->txtGat4->text().length() == 0 )) { - KMessageBox::error(this, i18n("You have seleced to use a gateway but haved left blank one or more of it's boxes")); + KMessageBox::error(this, i18n("You have selected to use a gateway but have left blank one or more of its boxes")); return; } diff -Nurp swscanner-0.2.2-2ubuntu1-old/src/frmutils.cpp swscanner-0.2.2-2ubuntu1/src/frmutils.cpp --- swscanner-0.2.2-2ubuntu1-old/src/frmutils.cpp 2005-12-19 20:11:13.000000000 +0000 +++ swscanner-0.2.2-2ubuntu1/src/frmutils.cpp 2006-10-23 00:50:17.000000000 +0100 @@ -201,7 +201,7 @@ void frmUtils::slotUser1() // Necessary to complete both origin and destiny to continue if ( d->txtSource->text() == "" || d->txtDest->text() == "") { - KMessageBox::information( this, i18n("It's needed to select both source and destination files.")); + KMessageBox::information( this, i18n("You need to select both source and destination files.")); return; } @@ -253,7 +253,7 @@ void frmUtils::slotUser1() if ( KMessageBox::warningContinueCancel( 0, i18n("Although using 'nsf' format will allow you to open this\n" "file with NetStumbler, take into account that no geographical\n" - "data will be saved on it " )) == KMessageBox::Cancel ) + "data will be saved with it " )) == KMessageBox::Cancel ) return; if (fileHandler::readFromSWS(&source, list) == 0) { diff -Nurp swscanner-0.2.2-2ubuntu1-old/src/gpserial.cpp swscanner-0.2.2-2ubuntu1/src/gpserial.cpp --- swscanner-0.2.2-2ubuntu1-old/src/gpserial.cpp 2005-12-19 20:11:13.000000000 +0000 +++ swscanner-0.2.2-2ubuntu1/src/gpserial.cpp 2006-10-23 01:12:23.000000000 +0100 @@ -36,7 +36,7 @@ void GPSerial::run() { if (QString(buf).left(6) == "$GPRMC") printf ("%s", buf); } - printf("Connecion to GPS is lost\n"); + printf("Connection to GPS is lost\n"); } void GPSerial::closePort(int d) diff -Nurp swscanner-0.2.2-2ubuntu1-old/src/main.cpp swscanner-0.2.2-2ubuntu1/src/main.cpp --- swscanner-0.2.2-2ubuntu1-old/src/main.cpp 2005-12-19 20:11:13.000000000 +0000 +++ swscanner-0.2.2-2ubuntu1/src/main.cpp 2006-10-23 00:59:21.000000000 +0100 @@ -51,7 +51,7 @@ int main(int argc, char **argv) { KAboutData about("swscanner", "SWScanner", VERSION, description, KAboutData::License_GPL, "(c) 2005 Ivan Forcada Atienza", 0, "http://www.swscanner.org", "swscanner@swscanner.org"); - about.addAuthor( "Ivan Forcada Atienza", I18N_NOOP("Original autor. Developer"), "ivan@swscanner.org", "http://ivan.forcada.info"); + about.addAuthor( "Ivan Forcada Atienza", I18N_NOOP("Original author. Developer"), "ivan@swscanner.org", "http://ivan.forcada.info"); about.addCredit( "Andres Seco Hernandez", I18N_NOOP("Creator and maintainer of Debian package"), "andressh@alamin.org"); //about.addCredit( "Pablo Bustamante", I18N_NOOP("SWScanner icon and web page CSS styles creator"), "pablobh@gmail.com"); about.addCredit( "Eugenio J. Sanchez", I18N_NOOP("Initial testing. Beta packager"), "eugenio@humaneswireless.net"); diff -Nurp swscanner-0.2.2-2ubuntu1-old/src/mainwindow.cpp swscanner-0.2.2-2ubuntu1/src/mainwindow.cpp --- swscanner-0.2.2-2ubuntu1-old/src/mainwindow.cpp 2005-12-19 20:11:13.000000000 +0000 +++ swscanner-0.2.2-2ubuntu1/src/mainwindow.cpp 2006-10-23 01:04:19.000000000 +0100 @@ -172,7 +172,7 @@ MainWindow::MainWindow ( const char * na layout3->addItem( spacer4 ); textLabel1 = new QLabel( centralWidget(), "textLabel1" ); - textLabel1->setText( i18n( "AccessPoints in list:" ) ); + textLabel1->setText( i18n( "Access points in list:" ) ); textLabel1->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); layout3->addWidget( textLabel1 ); @@ -193,8 +193,8 @@ MainWindow::MainWindow ( const char * na layout4 = new QHBoxLayout( 0, 0, 6, "layout4"); chkPreserve = new QCheckBox( centralWidget(), "chkPreserve" ); - chkPreserve->setText(i18n("Show all AccessPoints")); - QToolTip::add( chkPreserve, i18n("Showing all AccessPoints in memory")); + chkPreserve->setText(i18n("Show all access points")); + QToolTip::add( chkPreserve, i18n("Showing all access points in memory")); chkPreserve->setChecked( TRUE ); layout4->addWidget( chkPreserve ); @@ -202,7 +202,7 @@ MainWindow::MainWindow ( const char * na layout4->addItem( spacer15 ); chkSound = new QCheckBox( centralWidget(), "chkSound" ); - chkSound->setText(i18n("Using sound")); + chkSound->setText(i18n("Sound on")); chkSound->setChecked( FALSE ); QToolTip::add(chkSound, i18n("Sound disabled")); layout4->addWidget(chkSound); @@ -449,7 +449,7 @@ MainWindow::MainWindow ( const char * na layout10->addItem( spacer11, 0, 6 ); textLabel17 = new QLabel( grpGPS, "textLabel17" ); - textLabel17->setText( i18n( "AP's" ) ); + textLabel17->setText( i18n( "APs" ) ); textLabel17->setFont(fontBold); textLabel17->setMinimumSize( QSize( 0, 0 ) ); textLabel17->setMaximumSize( QSize( 30, 16 ) ); @@ -784,7 +784,7 @@ void MainWindow::fileSave() // Warning if there are hidden accesspoint rows if (tblScan->childCount() > (int)tblScan->visiblesCount()) { - int msgResponse = KMessageBox::warningContinueCancel(this, i18n("There are some hidden AccessPoints which will not be included in the saved file")); + int msgResponse = KMessageBox::warningContinueCancel(this, i18n("There are some hidden access points which will not be included in the saved file")); switch(msgResponse) { case KMessageBox::Continue: @@ -798,7 +798,7 @@ void MainWindow::fileSave() KFileDialog dlg(":", QString::null, this, "filesavedialog",true); dlg.setOperationMode( KFileDialog::Saving ); dlg.setFilter("*.sws|" + i18n("SWScanner files") + " (*.sws) \n *.nsf|" + i18n("NetStumbler Summary files") + " (*.nsf)"); - dlg.setCaption(i18n("Choose a filename to save under")); + dlg.setCaption(i18n("Choose a filename to save as")); // Stop scanning if (isActive) @@ -825,7 +825,7 @@ void MainWindow::fileSave() // Add the apropriate extension if user didn't added it if (filename.right(3).lower() != extension) { - if ( KMessageBox::questionYesNo(this, i18n("You haven't typed an extension. Sould I add it for you?")) == KMessageBox::Yes ) + if ( KMessageBox::questionYesNo(this, i18n("You haven't typed an extension. Should I add it for you?")) == KMessageBox::Yes ) filename.append("." + extension); } @@ -842,7 +842,7 @@ void MainWindow::fileSave() if ( KMessageBox::warningContinueCancel(this, i18n("Although using 'nsf' format will allow you to open this\n" "file with NetStumbler, take into account that no geographical\n" - "data will be saved on it" )) == KMessageBox::Cancel ) + "data will be saved with it" )) == KMessageBox::Cancel ) { delete list; return; @@ -1096,9 +1096,9 @@ void MainWindow::chkPreserveClick() tblScan->setPreserve(chkPreserve->isChecked()); if (chkPreserve->isChecked()) { -// chkPreserve->setText(i18n("Show all AccessPoints in memory")); +// chkPreserve->setText(i18n("Show all access points in memory")); QToolTip::remove (chkPreserve); - QToolTip::add( chkPreserve, i18n("Showing all AccessPoints in memory")); + QToolTip::add( chkPreserve, i18n("Showing all access points in memory")); while ( it ) { if (lstFilter->passTheFilter(it)) { @@ -1110,9 +1110,9 @@ void MainWindow::chkPreserveClick() it=it->nextSibling(); } } else { -// chkPreserve->setText(i18n("Show active AccessPoints")); +// chkPreserve->setText(i18n("Show active access points")); QToolTip::remove (chkPreserve); - QToolTip::add( chkPreserve, i18n("Showing only active AccessPoints")); + QToolTip::add( chkPreserve, i18n("Showing only active access points")); while ( it ) { if (lstFilter->passTheFilter(it) && it->text(tblScan->getCol(i18n("SIGNAL")))!=i18n("N.A.")) { diff -Nurp swscanner-0.2.2-2ubuntu1-old/src/scanthread.cpp swscanner-0.2.2-2ubuntu1/src/scanthread.cpp --- swscanner-0.2.2-2ubuntu1-old/src/scanthread.cpp 2005-12-19 20:11:13.000000000 +0000 +++ swscanner-0.2.2-2ubuntu1/src/scanthread.cpp 2006-10-23 01:15:48.000000000 +0100 @@ -60,7 +60,7 @@ void ScanThread::run() errorString=i18n("Allocation failed"); break; case -3: - errorString=i18n(" Failed to read scan data"); + errorString=i18n("Failed to read scan data"); break; } scanErrorEvent* ev = new scanErrorEvent (errorString); diff -Nurp swscanner-0.2.2-2ubuntu1-old/src/swsystemtray.cpp swscanner-0.2.2-2ubuntu1/src/swsystemtray.cpp --- swscanner-0.2.2-2ubuntu1-old/src/swsystemtray.cpp 2005-12-19 20:11:13.000000000 +0000 +++ swscanner-0.2.2-2ubuntu1/src/swsystemtray.cpp 2006-10-23 01:05:00.000000000 +0100 @@ -31,7 +31,7 @@ SWSystemTray::SWSystemTray(QString ifc, aplist = new KPopupMenu(this, "accesspointlist"); connect (aplist, SIGNAL( highlighted(int) ), this, SLOT( itemHighlighted(int) )); - contextMenu()->insertItem(UserIcon("signal_good"), i18n("AccessPoints"), aplist); + contextMenu()->insertItem(UserIcon("signal_good"), i18n("Access points"), aplist); } SWSystemTray::~SWSystemTray()