fixes bug #133 -- added two tr("")

1 files changed, 2 insertions, 2 deletions

diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index 6c1931a..2821f4b 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -1,234 +1,234 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "security.h"
 
 #include <qpe/config.h>
 #include <qpe/password.h>
 #include <qpe/qpedialog.h>
 
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qmessagebox.h>
 
 Security::Security( QWidget* parent,  const char* name, WFlags fl )
     : SecurityBase( parent, name, TRUE, fl )
 {
     valid=FALSE;
     Config cfg("Security");
     cfg.setGroup("Passcode");
     passcode = cfg.readEntry("passcode");
     passcode_poweron->setChecked(cfg.readBoolEntry("passcode_poweron",FALSE));
     cfg.setGroup("Sync");
     int auth_peer = cfg.readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24
     int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24);
     selectNet(auth_peer,auth_peer_bits);
     connect(syncnet, SIGNAL(textChanged(const QString&)),
       this, SLOT(setSyncNet(const QString&)));
 
     /*
     cfg.setGroup("Remote");
     if ( telnetAvailable() )
   telnet->setChecked(cfg.readEntry("allow_telnet"));
     else
   telnet->hide();
 
     if ( sshAvailable() )
   ssh->setChecked(cfg.readEntry("allow_ssh"));
     else
   ssh->hide();
     */
 
     connect(changepasscode,SIGNAL(clicked()), this, SLOT(changePassCode()));
     connect(clearpasscode,SIGNAL(clicked()), this, SLOT(clearPassCode()));
     updateGUI();
 
     dl = new QPEDialogListener(this);
 }
 
 Security::~Security()
 {
 }
 
 
 void Security::updateGUI()
 {
     bool empty = passcode.isEmpty();
 
     changepasscode->setText( empty ? tr("Set passcode" ) 
            : tr("Change passcode" )  );
     passcode_poweron->setEnabled( !empty );
     clearpasscode->setEnabled( !empty );
 }
 
 
 void Security::show()
 {
     valid=FALSE;
     setEnabled(FALSE);
     SecurityBase::show();
     if ( passcode.isEmpty() ) {
   // could insist...
   //changePassCode();
   //if ( passcode.isEmpty() )
       //reject();
     } else {
   QString pc = enterPassCode(tr("Enter passcode"));
   if ( pc != passcode ) {
       QMessageBox::critical(this, tr("Passcode incorrect"), 
         tr("The passcode entered is incorrect.\nAccess denied"));
       reject();
       return;
   }
     }
     setEnabled(TRUE);
     valid=TRUE;
 }
 
 void Security::accept()
 {
     applySecurity();
     QDialog::accept();
 }
 
 void Security::done(int r)
 {
     QDialog::done(r);
     close();
 }
 
 void Security::selectNet(int auth_peer,int auth_peer_bits)
 {
     QString sn;
     if ( auth_peer_bits == 0 && auth_peer == 0 ) {
   sn = tr("Any");
     } else if ( auth_peer_bits == 32 && auth_peer == 0 ) {
   sn = tr("None");
     } else {
   sn =
       QString::number((auth_peer>>24)&0xff) + "."
       + QString::number((auth_peer>>16)&0xff) + "."
       + QString::number((auth_peer>>8)&0xff) + "."
       + QString::number((auth_peer>>0)&0xff) + "/"
       + QString::number(auth_peer_bits);
     }
     for (int i=0; i<syncnet->count(); i++) {
   if ( syncnet->text(i).left(sn.length()) == sn ) {
       syncnet->setCurrentItem(i);
       return;
   }
     }
     qDebug("No match for \"%s\"",sn.latin1());
 }
 
 void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits)
 {
     auth_peer=0;
     if ( sn == tr("Any") ) {
   auth_peer = 0;
   auth_peer_bits = 0;
     } else if ( sn == tr("None") ) {
   auth_peer = 0;
   auth_peer_bits = 32;
     } else {
   int x=0;
   for (int i=0; i<4; i++) {
       int nx = sn.find(QChar(i==3 ? '/' : '.'),x);
       auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt();
       x = nx+1;
   }
   uint n = (uint)sn.find(' ',x)-x;
   auth_peer_bits = sn.mid(x,n).toInt();
     }
 }
 
 void Security::setSyncNet(const QString& sn)
 {
     int auth_peer,auth_peer_bits;
     parseNet(sn,auth_peer,auth_peer_bits);
     selectNet(auth_peer,auth_peer_bits);
 }
 
 void Security::applySecurity()
 {
     if ( valid ) {
   Config cfg("Security");
   cfg.setGroup("Passcode");
   cfg.writeEntry("passcode",passcode);
   cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked());
   cfg.setGroup("Sync");
   int auth_peer=0;
   int auth_peer_bits;
   QString sn = syncnet->currentText();
   parseNet(sn,auth_peer,auth_peer_bits);
   cfg.writeEntry("auth_peer",auth_peer);
   cfg.writeEntry("auth_peer_bits",auth_peer_bits);
   /*
   cfg.setGroup("Remote");
   if ( telnetAvailable() )
       cfg.writeEntry("allow_telnet",telnet->isChecked());
   if ( sshAvailable() )
       cfg.writeEntry("allow_ssh",ssh->isChecked());
   // ### write ssh/telnet sys config files
   */
     }
 }
 
 void Security::changePassCode()
 {
     QString new1;
     QString new2;
 
     do {
-  new1 = enterPassCode("Enter new passcode");
+  new1 = enterPassCode(tr("Enter new passcode"));
   if ( new1.isNull() )
       return;
-  new2 = enterPassCode("Re-enter new passcode");
+  new2 = enterPassCode(tr("Re-enter new passcode"));
   if ( new2.isNull() )
       return;
     } while (new1 != new2);
 
     passcode = new1;
     updateGUI();
 }
 
 void Security::clearPassCode()
 {
     passcode = QString::null;
     updateGUI();
 }
 
 
 QString Security::enterPassCode(const QString& prompt)
 {
     return Password::getPassword(prompt);
 }
 
 bool Security::telnetAvailable() const
 {
     // ### not implemented
     return FALSE;
 }
 
 bool Security::sshAvailable() const
 {
     // ### not implemented
     return FALSE;
 }