summaryrefslogtreecommitdiff
authorclem <clem>2004-09-24 18:03:38 (UTC)
committer clem <clem>2004-09-24 18:03:38 (UTC)
commit0fe000754035c737ff0de97e5b2bd2cf03c16337 (patch) (side-by-side diff)
tree1d594ba4b11f5d16b22571338a90d99a63eab3c7
parente3134c9b363c7397e237f7c90b326f4dbf8126c5 (diff)
downloadopie-0fe000754035c737ff0de97e5b2bd2cf03c16337.zip
opie-0fe000754035c737ff0de97e5b2bd2cf03c16337.tar.gz
opie-0fe000754035c737ff0de97e5b2bd2cf03c16337.tar.bz2
removed non-strings from tr() calls
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/settings/security/multiauthconfig.cpp16
-rw-r--r--core/settings/security/security.cpp18
2 files changed, 17 insertions, 17 deletions
diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp
index 535352a..ff11e49 100644
--- a/core/settings/security/multiauthconfig.cpp
+++ b/core/settings/security/multiauthconfig.cpp
@@ -521,13 +521,13 @@ void MultiauthConfig::deleteListEntry()
}
void MultiauthConfig::restoreDefaults()
{
QMessageBox unrecbox(
tr("Attention"),
- tr( "<p>All user-defined net ranges will be lost."),
+ "<p>" + tr("All user-defined net ranges will be lost.") + "</p>",
QMessageBox::Warning,
QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton,
0, QString::null, TRUE, WStyle_StaysOnTop);
unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel"));
unrecbox.setButtonText(QMessageBox::Yes, tr("Ok"));
@@ -538,18 +538,18 @@ void MultiauthConfig::restoreDefaults()
}
m_syncWidget->syncModeCombo->setCurrentItem( 2 );
}
void MultiauthConfig::insertDefaultRanges()
{
- m_syncWidget->syncnet->insertItem( tr( "192.168.129.0/24" ) );
- m_syncWidget->syncnet->insertItem( tr( "192.168.1.0/24" ) );
- m_syncWidget->syncnet->insertItem( tr( "192.168.0.0/16" ) );
- m_syncWidget->syncnet->insertItem( tr( "172.16.0.0/12" ) );
- m_syncWidget->syncnet->insertItem( tr( "10.0.0.0/8" ) );
- m_syncWidget->syncnet->insertItem( tr( "1.0.0.0/8" ) );
+ m_syncWidget->syncnet->insertItem( "192.168.129.0/24" );
+ m_syncWidget->syncnet->insertItem( "192.168.1.0/24" );
+ m_syncWidget->syncnet->insertItem( "192.168.0.0/16" );
+ m_syncWidget->syncnet->insertItem( "172.16.0.0/12" );
+ m_syncWidget->syncnet->insertItem( "10.0.0.0/8" );
+ m_syncWidget->syncnet->insertItem( "1.0.0.0/8" );
m_syncWidget->syncnet->insertItem( tr( "Any" ) );
m_syncWidget->syncnet->insertItem( tr( "None" ) );
}
void MultiauthConfig::updateGUI()
{
@@ -597,13 +597,13 @@ void MultiauthConfig::selectNet(int auth_peer,int auth_peer_bits, bool update)
for (int i=0; i<m_syncWidget->syncnet->count(); i++) {
if ( m_syncWidget->syncnet->text(i) == netrange ) {
already_there=TRUE;
}
}
if (! already_there) {
- m_syncWidget->syncnet->insertItem( tr( netrange ) );
+ m_syncWidget->syncnet->insertItem( netrange );
} else {
already_there=FALSE;
}
}
}
}
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index b917aea..122dfae 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -121,13 +121,13 @@ void Security::deleteListEntry()
}
void Security::restoreDefaults()
{
QMessageBox unrecbox(
tr("Attention"),
- tr( "<p>All user-defined net ranges will be lost."),
+ "<p>" + tr("All user-defined net ranges will be lost.") + "</p>",
QMessageBox::Warning,
QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton,
0, QString::null, TRUE, WStyle_StaysOnTop);
unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel"));
unrecbox.setButtonText(QMessageBox::Yes, tr("Ok"));
@@ -138,18 +138,18 @@ void Security::restoreDefaults()
}
syncModeCombo->setCurrentItem( 2 );
}
void Security::insertDefaultRanges()
{
- syncnet->insertItem( tr( "192.168.129.0/24" ) );
- syncnet->insertItem( tr( "192.168.1.0/24" ) );
- syncnet->insertItem( tr( "192.168.0.0/16" ) );
- syncnet->insertItem( tr( "172.16.0.0/12" ) );
- syncnet->insertItem( tr( "10.0.0.0/8" ) );
- syncnet->insertItem( tr( "1.0.0.0/8" ) );
+ syncnet->insertItem( "192.168.129.0/24" );
+ syncnet->insertItem( "192.168.1.0/24" );
+ syncnet->insertItem( "192.168.0.0/16" );
+ syncnet->insertItem( "172.16.0.0/12" );
+ syncnet->insertItem( "10.0.0.0/8" );
+ syncnet->insertItem( "1.0.0.0/8" );
syncnet->insertItem( tr( "Any" ) );
syncnet->insertItem( tr( "None" ) );
}
void Security::updateGUI()
{
@@ -220,13 +220,13 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update)
+ QString::number(auth_peer_bits);
}
//insert user-defined list of netranges upon start
if (update) {
//User selected/active netrange first
- syncnet->insertItem( tr( sn ) );
+ syncnet->insertItem( sn );
Config cfg("Security");
cfg.setGroup("Sync");
//set up defaults if needed, if someone manually deletes net0 he'll get a suprise hehe
QString test = cfg.readEntry("net0","");
@@ -245,13 +245,13 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update)
for (int i=0; i<syncnet->count(); i++) {
if ( syncnet->text(i) == netrange ) {
already_there=TRUE;
}
}
if (! already_there) {
- syncnet->insertItem( tr( netrange ) );
+ syncnet->insertItem( netrange );
} else {
already_there=FALSE;
}
}
}
}