diff --git a/src/Gui/DlgSettingsUnitsImp.cpp b/src/Gui/DlgSettingsUnitsImp.cpp index 2b29834895..0873b3d46f 100644 --- a/src/Gui/DlgSettingsUnitsImp.cpp +++ b/src/Gui/DlgSettingsUnitsImp.cpp @@ -24,6 +24,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ +# include # include #endif @@ -43,6 +44,17 @@ using namespace Base; /* TRANSLATOR Gui::Dialog::DlgSettingsUnitsImp */ +#if 0 // needed for Qt's lupdate utility + qApp->translate("Gui::Dialog::DlgSettingsUnits", "Standard (mm/kg/s/degree)"); + qApp->translate("Gui::Dialog::DlgSettingsUnits", "MKS (m/kg/s/degree)"); + qApp->translate("Gui::Dialog::DlgSettingsUnits", "US customary (in/lb)"); + qApp->translate("Gui::Dialog::DlgSettingsUnits", "Imperial decimal (in/lb)"); + qApp->translate("Gui::Dialog::DlgSettingsUnits", "Building Euro (cm/m²/m³)"); + qApp->translate("Gui::Dialog::DlgSettingsUnits", "Building US (ft-in/sqft/cft)"); + qApp->translate("Gui::Dialog::DlgSettingsUnits", "Metric small parts & CNC(mm, mm/min)"); + qApp->translate("Gui::Dialog::DlgSettingsUnits", "Imperial for Civil Eng (ft, ft/sec)"); +#endif + /** * Constructs a DlgSettingsUnitsImp which is a child of 'parent', with the * name 'name' and widget flags set to 'f' @@ -55,7 +67,7 @@ DlgSettingsUnitsImp::DlgSettingsUnitsImp(QWidget* parent) int num = static_cast(Base::UnitSystem::NumUnitSystemTypes); for (int i = 0; i < num; i++) { - QString item = QString::fromUtf8(Base::UnitsApi::getDescription(static_cast(i))); + QString item = qApp->translate("Gui::Dialog::DlgSettingsUnits", Base::UnitsApi::getDescription(static_cast(i))); ui->comboBox_ViewSystem->addItem(item, i); } diff --git a/src/Gui/DlgUnitsCalculatorImp.cpp b/src/Gui/DlgUnitsCalculatorImp.cpp index 825f34e1ff..b93399ce5f 100644 --- a/src/Gui/DlgUnitsCalculatorImp.cpp +++ b/src/Gui/DlgUnitsCalculatorImp.cpp @@ -53,7 +53,7 @@ DlgUnitsCalculator::DlgUnitsCalculator( QWidget* parent, Qt::WindowFlags fl ) ui->comboBoxScheme->addItem(QString::fromLatin1("Preference system"), static_cast(-1)); int num = static_cast(Base::UnitSystem::NumUnitSystemTypes); for (int i=0; i(i))); + QString item = qApp->translate("Gui::Dialog::DlgSettingsUnits", Base::UnitsApi::getDescription(static_cast(i))); ui->comboBoxScheme->addItem(item, i); }