onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-24 20:27:22 +01:00
Code Issues Releases Wiki Activity

fixed strings that should be translated

Browse Source
This commit is contained in:
Vadim Kurland 2011-12-07 12:54:59 -08:00
parent 739edc8c35
commit 0aae126c00
10 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/ChangeLog
View File

@ -1,3 +1,9 @@
2011-12-07 Vadim Kurland <vadim@netcitadel.com>
* iptAdvancedDialog.cpp (iptAdvancedDialog::iptAdvancedDialog):
fixed strings that should be translated; these strings
caused problems when translation was loaded at the run time.
2011-11-30 Vadim Kurland <vadim@netcitadel.com>
* NATCompiler_pf.cpp (NATCompiler_pf::compile): fixes #2674

8
src/libgui/DialogData.cpp
View File

@ -199,11 +199,9 @@ void DialogData::saveAll(FWObject *new_obj)
QComboBox *cbx = dynamic_cast<QComboBox*>(i->w);
QString s = cbx->currentText();
if (fwbdebug)
qDebug() <<
QString("DialogData::saveAll() QComboBox %1 (i->mapping.empty()=%2) s=%3")
.arg(i->w->objectName())
.arg(i->mapping.empty())
.arg(s);
qDebug() << "DialogData::saveAll() QComboBox"
<< i->w->objectName()
<< "s=" << s.toUtf8();
if ( !i->mapping.empty() && !s.isNull() )
{

4
src/libgui/iosaclAdvancedDialog.cpp
View File

@ -198,9 +198,9 @@ iosaclAdvancedDialog::iosaclAdvancedDialog(QWidget *parent,FWObject *o)
data.registerOption(m_dialog->ipv4before_2, fwoptions,
"ipv4_6_order",
QStringList() << "IPv4 before IPv6"
QStringList() << tr("IPv4 before IPv6")
<< "ipv4_first"
<< "IPv6 before IPv4"
<< tr("IPv6 before IPv4")
<< "ipv6_first"
);
/* Page "Compiler Options" */

4
src/libgui/ipcopAdvancedDialog.cpp
View File

@ -89,8 +89,8 @@ ipcopAdvancedDialog::ipcopAdvancedDialog(QWidget *parent,FWObject *o)
//QString s = fwoptions->getStr("ipv4_6_order")
data.registerOption(m_dialog->ipv4before, fwoptions, "ipv4_6_order",
QStringList() << "IPv4 before IPv6"
<<"ipv4_first" << "IPv6 before IPv4" << "ipv6_first");
QStringList() << tr("IPv4 before IPv6")
<<"ipv4_first" << tr("IPv6 before IPv4") << "ipv6_first");
data.registerOption(m_dialog->logTCPseq, fwoptions, "log_tcp_seq");
data.registerOption(m_dialog->logTCPopt, fwoptions, "log_tcp_opt");

3
src/libgui/ipfAdvancedDialog.cpp
View File

@ -83,7 +83,8 @@ ipfAdvancedDialog::ipfAdvancedDialog(QWidget *parent,FWObject *o)
}
m_dialog->tabWidget->setTabEnabled(6,false); //Disable tab
data.registerOption(m_dialog->ipv4before_2, fwopt, "ipv4_6_order", QStringList() << "IPv4 before IPv6" <<"ipv4_first" << "IPv6 before IPv4" << "ipv6_first" );
data.registerOption(m_dialog->ipv4before_2, fwopt, "ipv4_6_order",
QStringList() << tr("IPv4 before IPv6") <<"ipv4_first" << tr("IPv6 before IPv4") << "ipv6_first");
data.registerOption( m_dialog->ipf_log_or_block,fwopt, "ipf_log_or_block" );
data.registerOption( m_dialog->ipf_log_body,fwopt, "ipf_log_body" );
data.registerOption( m_dialog->ipf_check_shadowing,fwopt, "check_shading" );

4
src/libgui/ipfwAdvancedDialog.cpp
View File

@ -87,9 +87,9 @@ ipfwAdvancedDialog::ipfwAdvancedDialog(QWidget *parent,FWObject *o)
data.registerOption(m_dialog->ipv4before_2,
fwopt,
"ipv4_6_order",
QStringList() << "IPv4 before IPv6"
QStringList() << tr("IPv4 before IPv6")
<<"ipv4_first" <<
"IPv6 before IPv4"
tr("IPv6 before IPv4")
<< "ipv6_first"
);

4
src/libgui/iptAdvancedDialog.cpp
View File

@ -81,7 +81,9 @@ iptAdvancedDialog::iptAdvancedDialog(QWidget *parent,FWObject *o)
obj->getStr("host_OS"),"user_can_change_install_dir").c_str());
//QString s = fwoptions->getStr("ipv4_6_order")
data.registerOption(m_dialog->ipv4before, fwoptions, "ipv4_6_order", QStringList() << "IPv4 before IPv6" <<"ipv4_first" << "IPv6 before IPv4" << "ipv6_first");
data.registerOption(m_dialog->ipv4before, fwoptions, "ipv4_6_order",
QStringList() << tr("IPv4 before IPv6")
<<"ipv4_first" << tr("IPv6 before IPv4") << "ipv6_first");
data.registerOption(m_dialog->logTCPseq, fwoptions, "log_tcp_seq");
data.registerOption(m_dialog->logTCPopt, fwoptions, "log_tcp_opt");

4
src/libgui/pfAdvancedDialog.cpp
View File

@ -124,9 +124,9 @@ pfAdvancedDialog::pfAdvancedDialog(QWidget *parent,FWObject *o)
data.registerOption(m_dialog->ipv4before, fwopt,
"ipv4_6_order",
QStringList() << "IPv4 before IPv6"
QStringList() << tr("IPv4 before IPv6")
<<"ipv4_first"
<< "IPv6 before IPv4"
<< tr("IPv6 before IPv4")
<< "ipv6_first");
data.registerOption( m_dialog->pf_log_prefix,fwopt, "log_prefix");

3
src/libgui/pixAdvancedDialog.cpp
View File

@ -212,7 +212,8 @@ pixAdvancedDialog::pixAdvancedDialog(QWidget*parent, FWObject *o)
m_dialog->tabWidget->setTabEnabled(9,false); //Disable tab
data.registerOption(m_dialog->ipv4before_2, fwoptions,
"ipv4_6_order",
QStringList() << "IPv4 before IPv6" <<"ipv4_first" << "IPv6 before IPv4" << "ipv6_first");
QStringList() << tr("IPv4 before IPv6")
<<"ipv4_first" << tr("IPv6 before IPv4") << "ipv6_first");
data.registerOption( m_dialog->outputFileName, fwoptions,
"output_file");

6
src/libgui/procurveaclAdvancedDialog.cpp
View File

@ -206,10 +206,8 @@ procurveaclAdvancedDialog::procurveaclAdvancedDialog(QWidget *parent,FWObject *o
data.registerOption(m_dialog->ipv4before_2, fwoptions,
"ipv4_6_order",
QStringList() << "IPv4 before IPv6"
<< "ipv4_first"
<< "IPv6 before IPv4"
<< "ipv6_first"
QStringList() << tr("IPv4 before IPv6")
<< "ipv4_first" << tr("IPv6 before IPv4") << "ipv6_first"
);
/* Page "Compiler Options" */