author | clem <clem> | 2004-09-24 18:03:38 (UTC) |
---|---|---|
committer | clem <clem> | 2004-09-24 18:03:38 (UTC) |
commit | 0fe000754035c737ff0de97e5b2bd2cf03c16337 (patch) (unidiff) | |
tree | 1d594ba4b11f5d16b22571338a90d99a63eab3c7 | |
parent | e3134c9b363c7397e237f7c90b326f4dbf8126c5 (diff) | |
download | opie-0fe000754035c737ff0de97e5b2bd2cf03c16337.zip opie-0fe000754035c737ff0de97e5b2bd2cf03c16337.tar.gz opie-0fe000754035c737ff0de97e5b2bd2cf03c16337.tar.bz2 |
removed non-strings from tr() calls
-rw-r--r-- | core/settings/security/multiauthconfig.cpp | 16 | ||||
-rw-r--r-- | core/settings/security/security.cpp | 18 |
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 | |||
@@ -519,39 +519,39 @@ void MultiauthConfig::deleteListEntry() | |||
519 | { | 519 | { |
520 | m_syncWidget->syncnet->removeItem(m_syncWidget->syncnet->currentItem()); | 520 | m_syncWidget->syncnet->removeItem(m_syncWidget->syncnet->currentItem()); |
521 | } | 521 | } |
522 | 522 | ||
523 | void MultiauthConfig::restoreDefaults() | 523 | void MultiauthConfig::restoreDefaults() |
524 | { | 524 | { |
525 | QMessageBox unrecbox( | 525 | QMessageBox unrecbox( |
526 | tr("Attention"), | 526 | tr("Attention"), |
527 | tr( "<p>All user-defined net ranges will be lost."), | 527 | "<p>" + tr("All user-defined net ranges will be lost.") + "</p>", |
528 | QMessageBox::Warning, | 528 | QMessageBox::Warning, |
529 | QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton, | 529 | QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton, |
530 | 0, QString::null, TRUE, WStyle_StaysOnTop); | 530 | 0, QString::null, TRUE, WStyle_StaysOnTop); |
531 | unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel")); | 531 | unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel")); |
532 | unrecbox.setButtonText(QMessageBox::Yes, tr("Ok")); | 532 | unrecbox.setButtonText(QMessageBox::Yes, tr("Ok")); |
533 | 533 | ||
534 | if ( unrecbox.exec() == QMessageBox::Yes) | 534 | if ( unrecbox.exec() == QMessageBox::Yes) |
535 | { | 535 | { |
536 | m_syncWidget->syncnet->clear(); | 536 | m_syncWidget->syncnet->clear(); |
537 | insertDefaultRanges(); | 537 | insertDefaultRanges(); |
538 | } | 538 | } |
539 | m_syncWidget->syncModeCombo->setCurrentItem( 2 ); | 539 | m_syncWidget->syncModeCombo->setCurrentItem( 2 ); |
540 | } | 540 | } |
541 | 541 | ||
542 | void MultiauthConfig::insertDefaultRanges() | 542 | void MultiauthConfig::insertDefaultRanges() |
543 | { | 543 | { |
544 | m_syncWidget->syncnet->insertItem( tr( "192.168.129.0/24" ) ); | 544 | m_syncWidget->syncnet->insertItem( "192.168.129.0/24" ); |
545 | m_syncWidget->syncnet->insertItem( tr( "192.168.1.0/24" ) ); | 545 | m_syncWidget->syncnet->insertItem( "192.168.1.0/24" ); |
546 | m_syncWidget->syncnet->insertItem( tr( "192.168.0.0/16" ) ); | 546 | m_syncWidget->syncnet->insertItem( "192.168.0.0/16" ); |
547 | m_syncWidget->syncnet->insertItem( tr( "172.16.0.0/12" ) ); | 547 | m_syncWidget->syncnet->insertItem( "172.16.0.0/12" ); |
548 | m_syncWidget->syncnet->insertItem( tr( "10.0.0.0/8" ) ); | 548 | m_syncWidget->syncnet->insertItem( "10.0.0.0/8" ); |
549 | m_syncWidget->syncnet->insertItem( tr( "1.0.0.0/8" ) ); | 549 | m_syncWidget->syncnet->insertItem( "1.0.0.0/8" ); |
550 | m_syncWidget->syncnet->insertItem( tr( "Any" ) ); | 550 | m_syncWidget->syncnet->insertItem( tr( "Any" ) ); |
551 | m_syncWidget->syncnet->insertItem( tr( "None" ) ); | 551 | m_syncWidget->syncnet->insertItem( tr( "None" ) ); |
552 | } | 552 | } |
553 | 553 | ||
554 | void MultiauthConfig::updateGUI() | 554 | void MultiauthConfig::updateGUI() |
555 | { | 555 | { |
556 | m_loginWidget->autologinToggle->setChecked(autoLogin); | 556 | m_loginWidget->autologinToggle->setChecked(autoLogin); |
557 | m_loginWidget->userlist->setEnabled(autoLogin); | 557 | m_loginWidget->userlist->setEnabled(autoLogin); |
@@ -595,17 +595,17 @@ void MultiauthConfig::selectNet(int auth_peer,int auth_peer_bits, bool update) | |||
595 | if (! netrange.isEmpty()){ | 595 | if (! netrange.isEmpty()){ |
596 | //make sure we have no "twin" entries | 596 | //make sure we have no "twin" entries |
597 | for (int i=0; i<m_syncWidget->syncnet->count(); i++) { | 597 | for (int i=0; i<m_syncWidget->syncnet->count(); i++) { |
598 | if ( m_syncWidget->syncnet->text(i) == netrange ) { | 598 | if ( m_syncWidget->syncnet->text(i) == netrange ) { |
599 | already_there=TRUE; | 599 | already_there=TRUE; |
600 | } | 600 | } |
601 | } | 601 | } |
602 | if (! already_there) { | 602 | if (! already_there) { |
603 | m_syncWidget->syncnet->insertItem( tr( netrange ) ); | 603 | m_syncWidget->syncnet->insertItem( netrange ); |
604 | } else { | 604 | } else { |
605 | already_there=FALSE; | 605 | already_there=FALSE; |
606 | } | 606 | } |
607 | } | 607 | } |
608 | } | 608 | } |
609 | } | 609 | } |
610 | } | 610 | } |
611 | 611 | ||
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 | |||
@@ -119,39 +119,39 @@ void Security::deleteListEntry() | |||
119 | { | 119 | { |
120 | syncnet->removeItem(syncnet->currentItem()); | 120 | syncnet->removeItem(syncnet->currentItem()); |
121 | } | 121 | } |
122 | 122 | ||
123 | void Security::restoreDefaults() | 123 | void Security::restoreDefaults() |
124 | { | 124 | { |
125 | QMessageBox unrecbox( | 125 | QMessageBox unrecbox( |
126 | tr("Attention"), | 126 | tr("Attention"), |
127 | tr( "<p>All user-defined net ranges will be lost."), | 127 | "<p>" + tr("All user-defined net ranges will be lost.") + "</p>", |
128 | QMessageBox::Warning, | 128 | QMessageBox::Warning, |
129 | QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton, | 129 | QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton, |
130 | 0, QString::null, TRUE, WStyle_StaysOnTop); | 130 | 0, QString::null, TRUE, WStyle_StaysOnTop); |
131 | unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel")); | 131 | unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel")); |
132 | unrecbox.setButtonText(QMessageBox::Yes, tr("Ok")); | 132 | unrecbox.setButtonText(QMessageBox::Yes, tr("Ok")); |
133 | 133 | ||
134 | if ( unrecbox.exec() == QMessageBox::Yes) | 134 | if ( unrecbox.exec() == QMessageBox::Yes) |
135 | { | 135 | { |
136 | syncnet->clear(); | 136 | syncnet->clear(); |
137 | insertDefaultRanges(); | 137 | insertDefaultRanges(); |
138 | } | 138 | } |
139 | syncModeCombo->setCurrentItem( 2 ); | 139 | syncModeCombo->setCurrentItem( 2 ); |
140 | } | 140 | } |
141 | 141 | ||
142 | void Security::insertDefaultRanges() | 142 | void Security::insertDefaultRanges() |
143 | { | 143 | { |
144 | syncnet->insertItem( tr( "192.168.129.0/24" ) ); | 144 | syncnet->insertItem( "192.168.129.0/24" ); |
145 | syncnet->insertItem( tr( "192.168.1.0/24" ) ); | 145 | syncnet->insertItem( "192.168.1.0/24" ); |
146 | syncnet->insertItem( tr( "192.168.0.0/16" ) ); | 146 | syncnet->insertItem( "192.168.0.0/16" ); |
147 | syncnet->insertItem( tr( "172.16.0.0/12" ) ); | 147 | syncnet->insertItem( "172.16.0.0/12" ); |
148 | syncnet->insertItem( tr( "10.0.0.0/8" ) ); | 148 | syncnet->insertItem( "10.0.0.0/8" ); |
149 | syncnet->insertItem( tr( "1.0.0.0/8" ) ); | 149 | syncnet->insertItem( "1.0.0.0/8" ); |
150 | syncnet->insertItem( tr( "Any" ) ); | 150 | syncnet->insertItem( tr( "Any" ) ); |
151 | syncnet->insertItem( tr( "None" ) ); | 151 | syncnet->insertItem( tr( "None" ) ); |
152 | } | 152 | } |
153 | 153 | ||
154 | void Security::updateGUI() | 154 | void Security::updateGUI() |
155 | { | 155 | { |
156 | bool empty = passcode.isEmpty(); | 156 | bool empty = passcode.isEmpty(); |
157 | 157 | ||
@@ -218,17 +218,17 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) | |||
218 | + QString::number((auth_peer>>8)&0xff) + "." | 218 | + QString::number((auth_peer>>8)&0xff) + "." |
219 | + QString::number((auth_peer>>0)&0xff) + "/" | 219 | + QString::number((auth_peer>>0)&0xff) + "/" |
220 | + QString::number(auth_peer_bits); | 220 | + QString::number(auth_peer_bits); |
221 | } | 221 | } |
222 | 222 | ||
223 | //insert user-defined list of netranges upon start | 223 | //insert user-defined list of netranges upon start |
224 | if (update) { | 224 | if (update) { |
225 | //User selected/active netrange first | 225 | //User selected/active netrange first |
226 | syncnet->insertItem( tr( sn ) ); | 226 | syncnet->insertItem( sn ); |
227 | 227 | ||
228 | Config cfg("Security"); | 228 | Config cfg("Security"); |
229 | cfg.setGroup("Sync"); | 229 | cfg.setGroup("Sync"); |
230 | 230 | ||
231 | //set up defaults if needed, if someone manually deletes net0 he'll get a suprise hehe | 231 | //set up defaults if needed, if someone manually deletes net0 he'll get a suprise hehe |
232 | QString test = cfg.readEntry("net0",""); | 232 | QString test = cfg.readEntry("net0",""); |
233 | if (test.isEmpty()) { | 233 | if (test.isEmpty()) { |
234 | insertDefaultRanges(); | 234 | insertDefaultRanges(); |
@@ -243,17 +243,17 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) | |||
243 | if (! netrange.isEmpty()){ | 243 | if (! netrange.isEmpty()){ |
244 | //make sure we have no "twin" entries | 244 | //make sure we have no "twin" entries |
245 | for (int i=0; i<syncnet->count(); i++) { | 245 | for (int i=0; i<syncnet->count(); i++) { |
246 | if ( syncnet->text(i) == netrange ) { | 246 | if ( syncnet->text(i) == netrange ) { |
247 | already_there=TRUE; | 247 | already_there=TRUE; |
248 | } | 248 | } |
249 | } | 249 | } |
250 | if (! already_there) { | 250 | if (! already_there) { |
251 | syncnet->insertItem( tr( netrange ) ); | 251 | syncnet->insertItem( netrange ); |
252 | } else { | 252 | } else { |
253 | already_there=FALSE; | 253 | already_there=FALSE; |
254 | } | 254 | } |
255 | } | 255 | } |
256 | } | 256 | } |
257 | } | 257 | } |
258 | } | 258 | } |
259 | 259 | ||