-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 | |||
@@ -525,5 +525,5 @@ void MultiauthConfig::restoreDefaults() | |||
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, |
@@ -542,10 +542,10 @@ void MultiauthConfig::restoreDefaults() | |||
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" ) ); |
@@ -601,5 +601,5 @@ void MultiauthConfig::selectNet(int auth_peer,int auth_peer_bits, bool update) | |||
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; |
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 | |||
@@ -125,5 +125,5 @@ void Security::restoreDefaults() | |||
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, |
@@ -142,10 +142,10 @@ void Security::restoreDefaults() | |||
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" ) ); |
@@ -224,5 +224,5 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) | |||
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"); |
@@ -249,5 +249,5 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) | |||
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; |