changeset
Version 0.4.6a1. Added HLT equipment volume and deadspace settings. In EditProduct the target water selection is now sticky. Changed the water treatment tab. Added a row wich displays the salt adjustments. This can be selected between actual and target values. The treated water show can select between mash or sparge water. The total line will become the final water in the boil kettle. Database update function is expanded with the new settings. Added a popup message warning that the database is upgraded and user action is required for the equipment profiles.
Sat, 08 Jun 2024 15:54:30 +0200
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Sat, 08 Jun 2024 15:54:30 +0200
- changeset 527
- 84091b9cb800
- parent 526
- 3b9abdae181e
- child 528
- 50b057ae50aa
Version 0.4.6a1. Added HLT equipment volume and deadspace settings. In EditProduct the target water selection is now sticky. Changed the water treatment tab. Added a row wich displays the salt adjustments. This can be selected between actual and target values. The treated water show can select between mash or sparge water. The total line will become the final water in the boil kettle. Database update function is expanded with the new settings. Added a popup message warning that the database is upgraded and user action is required for the equipment profiles.
| CMakeLists.txt | file | annotate | diff | comparison | revisions | |
| src/EditEquipment.cpp | file | annotate | diff | comparison | revisions | |
| src/EditProduct.cpp | file | annotate | diff | comparison | revisions | |
| src/EditProduct.h | file | annotate | diff | comparison | revisions | |
| src/EditProductTab1.cpp | file | annotate | diff | comparison | revisions | |
| src/EditProductTab2.cpp | file | annotate | diff | comparison | revisions | |
| src/EditProductTab8.cpp | file | annotate | diff | comparison | revisions | |
| src/MainWindow.cpp | file | annotate | diff | comparison | revisions | |
| src/database/db_product.cpp | file | annotate | diff | comparison | revisions | |
| src/global.h | file | annotate | diff | comparison | revisions | |
| translations/bmsapp_en.ts | file | annotate | diff | comparison | revisions | |
| translations/bmsapp_nl.ts | file | annotate | diff | comparison | revisions | |
| ui/EditEquipment.ui | file | annotate | diff | comparison | revisions | |
| ui/EditProduct.ui | file | annotate | diff | comparison | revisions |
--- a/CMakeLists.txt Sat Jun 01 21:10:54 2024 +0200 +++ b/CMakeLists.txt Sat Jun 08 15:54:30 2024 +0200 @@ -9,7 +9,7 @@ SET( bmsapp_VERSION_MAJOR 0 ) SET( bmsapp_VERSION_MINOR 4 ) -SET( bmsapp_VERSION_PATCH 5 ) +SET( bmsapp_VERSION_PATCH 6a1 ) # Compile flags
--- a/src/EditEquipment.cpp Sat Jun 01 21:10:54 2024 +0200 +++ b/src/EditEquipment.cpp Sat Jun 08 15:54:30 2024 +0200 @@ -67,6 +67,8 @@ ui->chiller_lossEdit->setValue(query.value("chiller_loss").toDouble()); ui->chiller_volumeEdit->setValue(query.value("chiller_volume").toDouble()); ui->chiller_lpmEdit->setValue(query.value("chiller_lpm").toDouble()); + ui->HLT_volumeEdit->setValue(query.value("HLT_volume").toDouble()); + ui->HLT_deadspaceEdit->setValue(query.value("HLT_deadspace").toDouble()); /* * Now we have loaded this record, check if this equipment is * being used by a product. If so, make the name field read-only. @@ -101,6 +103,8 @@ ui->chiller_lossEdit->setValue(0); ui->chiller_volumeEdit->setValue(0.5); ui->chiller_lpmEdit->setValue(0); + ui->HLT_volumeEdit->setValue(20); + ui->HLT_deadspaceEdit->setValue(2); inuse = 0; } /* Block select no chiller used */ @@ -131,6 +135,8 @@ connect(ui->chiller_volumeEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed); connect(ui->chiller_lpmEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed); connect(ui->chiller_lossEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed); + connect(ui->HLT_volumeEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed); + connect(ui->HLT_deadspaceEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed); calcBatchVolume(); ui->saveButton->setEnabled(false); @@ -190,7 +196,8 @@ "notes=:notes, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, " "kettle_height=:kettle_height, mash_volume=:mash_volume, mash_max=:mash_max, " "efficiency=:efficiency, chiller_type=:chiller_type, chiller_to79=:chiller_to79, " - "chiller_volume=:chiller_volume, chiller_lpm=:chiller_lpm, chiller_loss=:chiller_loss"); + "chiller_volume=:chiller_volume, chiller_lpm=:chiller_lpm, chiller_loss=:chiller_loss, " + "HLT_volume=:HLT_volume, HLT_deadspace=:HLT_deadspace"); if (this->recno == -1) { sql.append(", uuid=:uuid"); } else { @@ -222,6 +229,8 @@ query.bindValue(":chiller_volume", QString("%1").arg(ui->chiller_volumeEdit->value(), 3, 'f', 2, '0')); query.bindValue(":chiller_lpm", QString("%1").arg(ui->chiller_lpmEdit->value(), 3, 'f', 2, '0')); query.bindValue(":chiller_loss", QString("%1").arg(ui->chiller_lossEdit->value(), 3, 'f', 2, '0')); + query.bindValue(":HLT_volume", QString("%1").arg(ui->HLT_volumeEdit->value(), 2, 'f', 1, '0')); + query.bindValue(":HLT_deadspace", QString("%1").arg(ui->HLT_deadspaceEdit->value(), 2, 'f', 1, '0')); if (this->recno == -1) { query.bindValue(":uuid", QUuid::createUuid().toString().mid(1, 36)); @@ -259,7 +268,8 @@ "notes=:notes, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, " "kettle_height=:kettle_height, mash_volume=:mash_volume, mash_max=:mash_max, " "efficiency=:efficiency, chiller_type=:chiller_type, chiller_to79=:chiller_to79, " - "chiller_volume=:chiller_volume, chiller_lpm=:chiller_lpm, chiller_loss=:chiller_loss, uuid=:uuid"); + "chiller_volume=:chiller_volume, chiller_lpm=:chiller_lpm, chiller_loss=:chiller_loss, " + "HLT_volume=:HLT_volume, HLT_deadspace=:HLT_deadspace, uuid=:uuid"); query.bindValue(":name", ui->nameEdit->text() + " [copy]"); query.bindValue(":boil_size", QString("%1").arg(ui->boil_sizeEdit->value(), 2, 'f', 1, '0')); @@ -287,6 +297,8 @@ query.bindValue(":chiller_volume", QString("%1").arg(ui->chiller_volumeEdit->value(), 3, 'f', 2, '0')); query.bindValue(":chiller_lpm", QString("%1").arg(ui->chiller_lpmEdit->value(), 3, 'f', 2, '0')); query.bindValue(":chiller_loss", QString("%1").arg(ui->chiller_lossEdit->value(), 3, 'f', 2, '0')); + query.bindValue(":HLT_volume", QString("%1").arg(ui->HLT_volumeEdit->value(), 2, 'f', 1, '0')); + query.bindValue(":HLT_deadspace", QString("%1").arg(ui->HLT_deadspaceEdit->value(), 2, 'f', 1, '0')); query.exec(); if (query.lastError().isValid()) { qWarning() << "EditEquipment" << query.lastError();
--- a/src/EditProduct.cpp Sat Jun 01 21:10:54 2024 +0200 +++ b/src/EditProduct.cpp Sat Jun 08 15:54:30 2024 +0200 @@ -70,9 +70,9 @@ query.prepare("SELECT name FROM profile_water ORDER BY name"); query.exec(); - ui->wt_sourceEdit->addItem(""); + ui->tw_nameEdit->addItem(""); while (query.next()) { - ui->wt_sourceEdit->addItem(query.value(0).toString()); + ui->tw_nameEdit->addItem(query.value(0).toString()); } query.prepare("SELECT name FROM profile_mash ORDER BY name"); @@ -466,6 +466,41 @@ ui->w2_clEdit->setValue(product->w2_chloride); ui->w2_so4Edit->setValue(product->w2_sulfate); ui->w2_phEdit->setValue(product->w2_ph); + + qDebug() << "water target" << product->tw_name; + if (product->tw_name != "") { + query.prepare("SELECT * FROM profile_water WHERE name=:water"); + query.bindValue(":water", product->tw_name); + query.exec(); + if (query.first()) { + ui->tw_nameEdit->setPlaceholderText(QString("["+product->tw_name+"]")); + product->tw_calcium = query.value("calcium").toDouble(); + product->tw_magnesium = query.value("magnesium").toDouble(); + product->tw_total_alkalinity = query.value("total_alkalinity").toDouble(); + product->tw_sodium = query.value("sodium").toDouble(); + product->tw_chloride = query.value("chloride").toDouble(); + product->tw_sulfate = query.value("sulfate").toDouble(); + product->tw_ph = query.value("ph").toDouble(); + ui->tw_hco3Edit->setValue(Utils::Bicarbonate(product->tw_total_alkalinity, product->tw_ph)); + ui->tw_hardnessEdit->setValue(Utils::Hardness(product->tw_calcium, product->tw_magnesium)); + ui->tw_raEdit->setValue(Utils::ResidualAlkalinity(product->tw_total_alkalinity, product->tw_calcium, product->tw_magnesium)); + } else { + product->tw_calcium = product->tw_magnesium = product->tw_total_alkalinity = 0; + product->tw_sodium = product->tw_chloride = product->tw_sulfate = 0; + product->tw_ph = 7; + ui->tw_hco3Edit->setValue(0); + ui->tw_hardnessEdit->setValue(0); + ui->tw_raEdit->setValue(0); + } + } + ui->tw_caEdit->setValue(product->tw_calcium); + ui->tw_mgEdit->setValue(product->tw_magnesium); + ui->tw_caco3Edit->setValue(product->tw_total_alkalinity); + ui->tw_naEdit->setValue(product->tw_sodium); + ui->tw_clEdit->setValue(product->tw_chloride); + ui->tw_so4Edit->setValue(product->tw_sulfate); + ui->tw_phEdit->setValue(product->tw_ph); + ui->mw_autoEdit->setChecked(product->calc_acid); ui->mw_phEdit->setReadOnly(! product->calc_acid); ui->mw_phEdit->setButtonSymbols(product->calc_acid ? QAbstractSpinBox::UpDownArrows : QAbstractSpinBox::NoButtons); @@ -481,6 +516,80 @@ ui->sp_acidpercEdit->setValue(product->sparge_acid_perc); check_waters(); + /* + * At this point, see if we must upgrade the whole water part. + * Old is separated brew and sparge water. + * New is total water and divide into brew/sparge/spare water. + * Calculate brewing salts on the total. + */ + if (product->sparge_source != 2) { + qDebug() << "== Water settings upgrade =="; + qDebug() << " w1" << product->w1_amount << "w2" << product->w2_amount << "wg" << product->wg_amount << "sp" << product->sparge_volume << "se" << product->brew_sparge_est; + qDebug() << " HLT " << product->eq_HLT_volume << " deadspace" << product->eq_HLT_deadspace; + double infused = 0; + for (int i = 0; i < product->mashs.size(); i++) { + if (product->mashs.at(i).step_type == 0) { // Infusion + infused += product->mashs.at(i).step_infuse_amount; + } + } + qDebug() << " mash infusion" << infused; +/* + double bs_cacl2 = 0, ss_cacl2 = 0; + double bs_caso4 = 0, ss_caso4 = 0; + double bs_mgso4 = 0, ss_mgso4 = 0; + double bs_nacl = 0, ss_nacl = 0; + double bs_mgcl2 = 0, ss_mgcl2 = 0; + double bs_nahco3 = 0; + double bs_caco3 = 0; + + for (int i = 0; i < product->miscs.size(); i++) { + if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT && product->miscs.at(i).use_use == MISC_USES_MASH) { + if (product->miscs.at(i).name == "CaCl2") { + bs_cacl2 = product->miscs.at(i).amount; + } else if (product->miscs.at(i).name == "CaSO4") { + bs_caso4 = product->miscs.at(i).amount; + } else if (product->miscs.at(i).name == "MgSO4") { + bs_mgso4 = product->miscs.at(i).amount; + } else if (product->miscs.at(i).name == "NaCl") { + bs_nacl = product->miscs.at(i).amount; + } else if (product->miscs.at(i).name == "MgCl2") { + bs_mgcl2 = product->miscs.at(i).amount; + } else if (product->miscs.at(i).name == "NaHCO3") { + bs_nahco3 = product->miscs.at(i).amount; + } else if (product->miscs.at(i).name == "CaCO3") { + bs_caco3 = product->miscs.at(i).amount; + } + } else if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT && product->miscs.at(i).use_use == MISC_USES_SPARGE) { + if (product->miscs.at(i).name == "CaCl2") { + ss_cacl2 = product->miscs.at(i).amount; + } else if (product->miscs.at(i).name == "CaSO4") { + ss_caso4 = product->miscs.at(i).amount; + } else if (product->miscs.at(i).name == "MgSO4") { + ss_mgso4 = product->miscs.at(i).amount; + } else if (product->miscs.at(i).name == "NaCl") { + ss_nacl = product->miscs.at(i).amount; + } else if (product->miscs.at(i).name == "MgCl2") { + ss_mgcl2 = product->miscs.at(i).amount; + } + } + } + if ((bs_cacl2 + ss_cacl2) > 0) + qDebug() << " CaCl2" << bs_cacl2 << ss_cacl2; + if ((bs_caso4 + ss_caso4) > 0) + qDebug() << " CaSO4" << bs_caso4 << ss_caso4; + if ((bs_mgso4 + ss_mgso4) > 0) + qDebug() << " MgSO4" << bs_mgso4 << ss_mgso4; + if ((bs_nacl + ss_nacl) > 0) + qDebug() << " NaCl" << bs_nacl << ss_nacl; + if ((bs_mgcl2 + ss_mgcl2) > 0) + qDebug() << " MgCl2" << bs_mgcl2 << ss_mgcl2; + if (bs_nahco3 > 0) + qDebug() << " NaHCO3" << bs_nahco3; + if (bs_caco3 > 0) + qDebug() << " CaCO3" << bs_caco3; +*/ + } + // Tab brewday. updateBrewday(); ui->brew_mashphEdit->setValue(product->brew_mash_ph); @@ -655,7 +764,7 @@ connect(ui->mw_phEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::mw_ph_changed); connect(ui->mw_acidvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::mw_acid_changed); connect(ui->mw_acidPick, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::mw_type_changed); - connect(ui->wt_sourceEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::wt_target_changed); + connect(ui->tw_nameEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::wt_target_changed); connect(ui->w1_nameEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::w1_name_changed); connect(ui->w2_nameEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::w2_name_changed); connect(ui->w2_volEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::w2_volume_changed); @@ -664,6 +773,8 @@ connect(ui->sp_acidtypeEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::sp_type_changed); connect(ui->sp_phEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_ph_changed); connect(ui->sp_acidvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_acid_changed); + connect(ui->waterAdjust, &QPushButton::toggled, this, &EditProduct::waterAdjust_Show); + connect(ui->wx_Select, &QPushButton::toggled, this, &EditProduct::waterTreated_Show); /* All signals from tab Brewday */ calcEfficiencyBeforeBoil();
--- a/src/EditProduct.h Sat Jun 01 21:10:54 2024 +0200 +++ b/src/EditProduct.h Sat Jun 08 15:54:30 2024 +0200 @@ -157,6 +157,8 @@ void sp_type_changed(int val); void sp_ph_changed(double val); void sp_acid_changed(double val); + void waterAdjust_Show(bool val); + void waterTreated_Show(bool val); void step_name_changed(QString val); void step_type_changed(int val); void step_temp_changed(double val);
--- a/src/EditProductTab1.cpp Sat Jun 01 21:10:54 2024 +0200 +++ b/src/EditProductTab1.cpp Sat Jun 08 15:54:30 2024 +0200 @@ -324,7 +324,7 @@ ui->mash_pickEdit->setDisabled(stage > PROD_STAGE_BREW); /* Tab 8, water */ - ui->wt_sourceEdit->setDisabled(stage > PROD_STAGE_BREW); + ui->tw_nameEdit->setDisabled(stage > PROD_STAGE_BREW); ui->w1_nameEdit->setDisabled(stage > PROD_STAGE_BREW); ui->w2_nameEdit->setDisabled(stage > PROD_STAGE_BREW); ui->mw_acidPick->setDisabled(stage > PROD_STAGE_BREW);
--- a/src/EditProductTab2.cpp Sat Jun 01 21:10:54 2024 +0200 +++ b/src/EditProductTab2.cpp Sat Jun 08 15:54:30 2024 +0200 @@ -28,10 +28,9 @@ ui->tun_materialEdit->setText(QCoreApplication::translate("TunMaterial", g_tun_materials[product->eq_tun_material])); ui->mash_volumeEdit->setValue(product->eq_mash_volume); ui->mash_maxEdit->setValue(product->eq_mash_max); - - /* Lautering */ ui->lauter_deadspaceEdit->setValue(product->eq_lauter_deadspace); - ui->eq_efficiencyEdit->setValue(product->eq_efficiency); + ui->HLT_volumeEdit->setValue(product->eq_HLT_volume); + ui->HLT_deadspaceEdit->setValue(product->eq_HLT_deadspace); /* Boiling */ ui->kettle_volumeEdit->setValue(product->eq_kettle_volume); @@ -53,6 +52,7 @@ /* Transfer */ ui->topup_waterEdit->setValue(product->eq_top_up_water); ui->vol_fermenterEdit->setValue((product->eq_batch_size / 1.04) - product->eq_trub_loss - product->eq_chiller_loss); + ui->eq_efficiencyEdit->setValue(product->eq_efficiency); } @@ -114,6 +114,8 @@ product->eq_chiller_volume = query.value("chiller_volume").toDouble(); product->eq_chiller_lpm = query.value("chiller_lpm").toDouble(); product->eq_chiller_loss = query.value("chiller_loss").toDouble(); + product->eq_HLT_volume = query.value("HLT_volume").toDouble(); + product->eq_HLT_deadspace = query.value("HLT_deadspace").toDouble(); showEquipment(); /*
--- a/src/EditProductTab8.cpp Sat Jun 01 21:10:54 2024 +0200 +++ b/src/EditProductTab8.cpp Sat Jun 08 15:54:30 2024 +0200 @@ -146,13 +146,13 @@ void EditProduct::setButtons(bool locked) { if (locked) { - /* - * If the brew is done, disable the buttons and that's it. - */ - ui->w1_spButton->setDisabled(true); - ui->w2_spButton->setDisabled(true); - ui->wg_spButton->setDisabled(true); - return; + /* + * If the brew is done, disable the buttons and that's it. + */ + ui->w1_spButton->setDisabled(true); + ui->w2_spButton->setDisabled(true); + ui->wg_spButton->setDisabled(true); + return; } ui->w1_spButton->setDisabled(false); @@ -161,13 +161,13 @@ const QSignalBlocker blocker3(ui->wg_spButton); if (product->w2_name != "") { - ui->w2_spButton->setDisabled(false); - if (product->w2_amount > 0.1 && product->w2_ph > 5) { + ui->w2_spButton->setDisabled(false); + if (product->w2_amount > 0.1 && product->w2_ph > 5) { /* * Water 2 is valid and used for mash, mixed is available. */ ui->wg_spButton->setDisabled(false); - } else { + } else { /* * No mixed water for mash. We can still sparge with source 2. */ @@ -179,16 +179,17 @@ product->sparge_source = 1; ui->w2_spButton->setChecked(true); } - } + } } else { ui->w2_spButton->setDisabled(true); ui->wg_spButton->setDisabled(true); product->sparge_source = 0; // Fallback to source 1 - ui->w1_spButton->setChecked(true); + ui->w1_spButton->setChecked(true); } } + void EditProduct::calcBU() { if (product->stage < PROD_STAGE_WAIT) @@ -303,6 +304,7 @@ /* Save mixed water ions for later */ double wg_calcium = calcium; + double wg_magnesium = magnesium; double wg_sodium = sodium; double wg_total_alkalinity = total_alkalinity; double wg_chloride = chloride; @@ -494,6 +496,31 @@ ui->wb_hco3Edit->setStyleSheet((bicarbonate > 250) ? "background-color: red":"background-color: green"); ui->wb_caco3Edit->setStyleSheet((bicarbonate > 250) ? "background-color: red":"background-color: green"); + /* Calculate Actual Adjustments */ + product->aa_calcium = calcium - product->wg_calcium; + product->aa_magnesium = magnesium - product->wg_magnesium; + product->aa_bicarbonate = bicarbonate - wg_bicarbonate; + product->aa_sodium = sodium - product->wg_sodium; + product->aa_chloride = chloride - product->wg_chloride; + product->aa_sulfate = sulfate - product->wg_sulfate; + product->aa_hardness = Utils::Hardness(calcium, magnesium) - Utils::Hardness(wg_calcium, wg_magnesium); + + if (product->tw_name != "") { + /* Calculate Target Adjustments */ + product->ta_calcium = product->tw_calcium - product->wg_calcium; + product->ta_magnesium = product->tw_magnesium - product->wg_magnesium; + product->ta_bicarbonate = Utils::Bicarbonate(product->tw_total_alkalinity, product->tw_ph) - wg_bicarbonate; + product->ta_sodium = product->tw_sodium - product->wg_sodium; + product->ta_chloride = product->tw_chloride - product->wg_chloride; + product->ta_sulfate = product->tw_sulfate - product->wg_sulfate; + product->ta_hardness = Utils::Hardness(product->tw_calcium, product->tw_magnesium) - Utils::Hardness(product->wg_calcium, product->wg_magnesium); + } else { + product->ta_calcium = product->ta_magnesium = product->ta_bicarbonate = product->ta_sodium = 0; + product->ta_chloride = product->ta_sulfate = product->ta_hardness = 0; + } + + waterTreated_Show(ui->wx_Select->isChecked()); + waterAdjust_Show(false); calcSparge(); } @@ -545,17 +572,7 @@ ui->ss_mgcl2Edit->value() * MMCl / MMMgCl2 * 1000) / product->sparge_volume; } - /* Show the spargewater with salt additions. */ - ui->sp_caEdit->setValue(product->ws_calcium); - ui->sp_mgEdit->setValue(product->ws_magnesium); - ui->sp_hco3Edit->setValue(Utils::Bicarbonate(product->ws_total_alkalinity, Source_pH)); - ui->sp_caco3Edit->setValue(product->ws_total_alkalinity); - ui->sp_naEdit->setValue(product->ws_sodium); - ui->sp_clEdit->setValue(product->ws_chloride); - ui->sp_so4Edit->setValue(product->ws_sulfate); - ui->sp_phShow->setValue(product->sparge_ph); - ui->sp_hardnessEdit->setValue(Utils::Hardness(product->ws_calcium, product->ws_magnesium)); - ui->sp_raEdit->setValue(Utils::ResidualAlkalinity(product->ws_total_alkalinity, product->ws_calcium, product->ws_magnesium)); + waterTreated_Show(ui->wx_Select->isChecked()); int AT = product->sparge_acid_type; if (AT < 0 || AT >= my_acids.size()) { @@ -630,16 +647,110 @@ } + void EditProduct::sp_group_changed(int val) { if (val != product->sparge_source) { product->sparge_source = val; - calcSparge(); - is_changed(); + calcSparge(); + is_changed(); + } +} + + + +void EditProduct::waterAdjust_Show(bool val) +{ + if (val) { + ui->waterAdjust->setText(tr("Target Water Adjustment")); + ui->aa_caEdit->setValue(product->ta_calcium); + ui->aa_mgEdit->setValue(product->ta_magnesium); + ui->aa_hco3Edit->setValue(product->ta_bicarbonate); + ui->aa_naEdit->setValue(product->ta_sodium); + ui->aa_clEdit->setValue(product->ta_chloride); + ui->aa_so4Edit->setValue(product->ta_sulfate); + ui->aa_hardnessEdit->setValue(product->ta_hardness); + } else { + ui->waterAdjust->setText(tr("Actual Water Adjustment")); + ui->aa_caEdit->setValue(product->aa_calcium); + ui->aa_mgEdit->setValue(product->aa_magnesium); + ui->aa_hco3Edit->setValue(product->aa_bicarbonate); + ui->aa_naEdit->setValue(product->aa_sodium); + ui->aa_clEdit->setValue(product->aa_chloride); + ui->aa_so4Edit->setValue(product->aa_sulfate); + ui->aa_hardnessEdit->setValue(product->aa_hardness); } } + +void EditProduct::waterTreated_Show(bool val) +{ + double calcium, magnesium, total_alkalinity, sodium; + double chloride, sulfate, ph, volume, bicarbonate; + + qDebug() << " wx_Select->isChecked()" << ui->wx_Select->isChecked(); + + if (val) { + ui->wx_Select->setText(tr("Treated Sparge Water")); + calcium = product->ws_calcium; + magnesium = product->ws_magnesium; + total_alkalinity = product->ws_total_alkalinity; + sodium = product->ws_sodium; + chloride = product->ws_chloride; + sulfate = product->ws_sulfate; + ph = product->sparge_ph; + volume = product->sparge_volume; + } else { + ui->wx_Select->setText(tr("Treated Mash Water")); + calcium = product->wb_calcium; + magnesium = product->wb_magnesium; + total_alkalinity = product->wb_total_alkalinity; + sodium = product->wb_sodium; + chloride = product->wb_chloride; + sulfate = product->wb_sulfate; + ph = product->wb_ph; + volume = product->wg_amount; + } + + bicarbonate = Utils::Bicarbonate(total_alkalinity, ph); + ui->wx_caEdit->setValue(calcium); + ui->wx_mgEdit->setValue(magnesium); + ui->wx_hco3Edit->setValue(bicarbonate); + ui->wx_caco3Edit->setValue(total_alkalinity); + ui->wx_naEdit->setValue(sodium); + ui->wx_clEdit->setValue(chloride); + ui->wx_so4Edit->setValue(sulfate); + ui->wx_hardnessEdit->setValue(Utils::Hardness(calcium, magnesium)); + ui->wx_raEdit->setValue(Utils::ResidualAlkalinity(total_alkalinity, calcium, magnesium)); + ui->wx_phEdit->setValue(ph); + ui->wx_volEdit->setValue(volume); + + ui->wx_caEdit->setStyleSheet((calcium < 40 || calcium > 150) ? "background-color: red":"background-color: green"); + ui->wx_mgEdit->setStyleSheet((magnesium < 5 || magnesium > 40) ? "background-color: red":"background-color: green"); + ui->wx_naEdit->setStyleSheet((sodium > 150) ? "background-color: red":"background-color: green"); + + /* + * Both chloride and sulfate should be above 50 according to + * John Palmer. So the Cl/SO4 ratio calculation will work. + */ + ui->wx_clEdit->setStyleSheet((chloride <= 50 || chloride > 150) ? "background-color: red":"background-color: green"); + ui->wx_so4Edit->setStyleSheet((sulfate <= 50 || sulfate > 400) ? "background-color: red":"background-color: green"); + + /* + * (cloride + sulfate) > 500 is too high + */ + if ((chloride + sulfate) > 500) { + ui->wx_clEdit->setStyleSheet("background-color: red"); + ui->wx_so4Edit->setStyleSheet("background-color: red"); + } + ui->wx_phEdit->setStyleSheet((ph < 5.2 || ph > 5.6) ? "background-color: red":"background-color: green"); + ui->wx_hco3Edit->setStyleSheet((bicarbonate > 250) ? "background-color: red":"background-color: green"); + ui->wx_caco3Edit->setStyleSheet((bicarbonate > 250) ? "background-color: red":"background-color: green"); +} + + + void EditProduct::sp_volume_changed(double val) { if (! product->calc_acid) { @@ -798,7 +909,7 @@ const QSignalBlocker blocker1(ui->sp_phEdit); product->sparge_ph = round(TargetpH * 100) / 100; ui->sp_phEdit->setValue(product->sparge_ph); - ui->sp_phShow->setValue(product->sparge_ph); +// ui->sp_phShow->setValue(product->sparge_ph); QString w = my_acids[AT].name_en + ' ' + my_acids[AT].name_nl; set_brewing_salt(w, val, MISC_USES_SPARGE); @@ -825,9 +936,9 @@ double EditProduct::GetOptSO4Clratio() { - if (ui->wt_so4Edit->value() > 0 && ui->wt_clEdit->value()) { + if (ui->tw_so4Edit->value() > 0 && ui->tw_clEdit->value()) { /* If target water is selected .. */ - return (ui->wt_so4Edit->value() / ui->wt_clEdit->value()); + return (ui->tw_so4Edit->value() / ui->tw_clEdit->value()); } double BUGU = GetBUGU(); return (-1.2 * BUGU + 1.4); @@ -956,7 +1067,7 @@ qDebug() << "w2_amount too low"; } ui->w2_spButton->setEnabled(true); - ui->wg_spButton->setEnabled(true); + ui->wg_spButton->setEnabled(true); } } else { /* @@ -1081,15 +1192,17 @@ if (val == 0) { /* Clear values */ - ui->wt_caEdit->setValue(0); - ui->wt_mgEdit->setValue(0); - ui->wt_hco3Edit->setValue(0); - ui->wt_caco3Edit->setValue(0); - ui->wt_naEdit->setValue(0); - ui->wt_clEdit->setValue(0); - ui->wt_so4Edit->setValue(0); - ui->wt_hardnessEdit->setValue(0); - ui->wt_raEdit->setValue(0); + product->tw_name = ""; + product->tw_calcium = 0; + product->tw_sulfate = 0; + product->tw_chloride = 0; + product->tw_sodium = 0; + product->tw_magnesium = 0; + product->tw_total_alkalinity = 0; + product->tw_ph = 7; + ui->tw_hco3Edit->setValue(0); + ui->tw_hardnessEdit->setValue(0); + ui->tw_raEdit->setValue(0); } else { query.prepare("SELECT * FROM profile_water ORDER BY name"); query.exec(); @@ -1097,16 +1210,28 @@ for (int i = 0; i < (val - 1); i++) { query.next(); } - ui->wt_caEdit->setValue(query.value("calcium").toDouble()); - ui->wt_mgEdit->setValue(query.value("magnesium").toDouble()); - ui->wt_hco3Edit->setValue(query.value("bicarbonate").toDouble()); - ui->wt_caco3Edit->setValue(query.value("total_alkalinity").toDouble()); - ui->wt_naEdit->setValue(query.value("sodium").toDouble()); - ui->wt_clEdit->setValue(query.value("chloride").toDouble()); - ui->wt_so4Edit->setValue(query.value("sulfate").toDouble()); - ui->wt_hardnessEdit->setValue(Utils::Hardness(query.value("calcium").toDouble(), query.value("magnesium").toDouble())); - ui->wt_raEdit->setValue(Utils::ResidualAlkalinity(query.value("total_alkalinity").toDouble(), query.value("calcium").toDouble(), query.value("magnesium").toDouble())); + product->tw_name = query.value("name").toString(); + product->tw_calcium = query.value("calcium").toDouble(); + product->tw_sulfate = query.value("sulfate").toDouble(); + product->tw_chloride = query.value("chloride").toDouble(); + product->tw_sodium = query.value("sodium").toDouble(); + product->tw_magnesium = query.value("magnesium").toDouble(); + product->tw_total_alkalinity = query.value("total_alkalinity").toDouble(); + product->tw_ph = query.value("ph").toDouble(); + ui->tw_hco3Edit->setValue(query.value("bicarbonate").toDouble()); + ui->tw_hardnessEdit->setValue(Utils::Hardness(query.value("calcium").toDouble(), query.value("magnesium").toDouble())); + ui->tw_raEdit->setValue(Utils::ResidualAlkalinity(query.value("total_alkalinity").toDouble(), query.value("calcium").toDouble(), query.value("magnesium").toDouble())); } + + ui->tw_caEdit->setValue(product->tw_calcium); + ui->tw_mgEdit->setValue(product->tw_magnesium); + ui->tw_caco3Edit->setValue(product->tw_total_alkalinity); + ui->tw_naEdit->setValue(product->tw_sodium); + ui->tw_clEdit->setValue(product->tw_chloride); + ui->tw_so4Edit->setValue(product->tw_sulfate); + ui->tw_phEdit->setValue(product->tw_ph); + + is_changed(); calcWater(); }
--- a/src/MainWindow.cpp Sat Jun 01 21:10:54 2024 +0200 +++ b/src/MainWindow.cpp Sat Jun 08 15:54:30 2024 +0200 @@ -164,7 +164,8 @@ */ void MainWindow::updateDataBase() { - QSqlQuery query1, query2, query4; + QSqlQuery query, query2, query4; + QString sql; int count = 0; bool added_packs = false; @@ -174,7 +175,7 @@ * Version 0.4.0. * Make sure we have the inventory_yeastpack with initial records. */ - query1.exec("CREATE TABLE IF NOT EXISTS `inventory_yeastpack` (" + query.exec("CREATE TABLE IF NOT EXISTS `inventory_yeastpack` (" "`record` int(11) NOT NULL AUTO_INCREMENT," "`uuid` varchar(36) NOT NULL," "`laboratory` varchar(128) NOT NULL," @@ -192,25 +193,25 @@ "UNIQUE KEY `package` (`laboratory`,`form`,`package`)," "KEY `lab_form` (`laboratory`,`form`) USING BTREE" ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Yeast packages data'"); - if (query1.lastError().isValid()) { - qWarning() << " create inventory_yeastpack" << query1.lastError(); + if (query.lastError().isValid()) { + qWarning() << " create inventory_yeastpack" << query.lastError(); } else { - query1.exec("SELECT DISTINCT laboratory,form FROM inventory_yeasts"); - while (query1.next()) { + query.exec("SELECT DISTINCT laboratory,form FROM inventory_yeasts"); + while (query.next()) { query2.prepare("SELECT record FROM inventory_yeastpack WHERE laboratory=:laboratory AND form=:form"); - query2.bindValue(":laboratory", query1.value("laboratory").toString()); - query2.bindValue(":form", query1.value("form").toInt()); + query2.bindValue(":laboratory", query.value("laboratory").toString()); + query2.bindValue(":form", query.value("form").toInt()); query2.exec(); if (! query2.first()) { - qDebug() << " add yeastpack" << query1.value("laboratory").toString() << query1.value("form").toInt(); + qDebug() << " add yeastpack" << query.value("laboratory").toString() << query.value("form").toInt(); query4.prepare("INSERT INTO inventory_yeastpack SET uuid=:uuid, laboratory=:laboratory, " "form=:form, package=:package, viability=:viability, max=:max"); query4.bindValue(":uuid", QUuid::createUuid().toString().mid(1, 36)); - query4.bindValue(":laboratory", query1.value("laboratory").toString()); - query4.bindValue(":form", query1.value("form").toInt()); - query4.bindValue(":package", g_yeast_forms[query1.value("form").toInt()]); - switch (query1.value("form").toInt()) { + query4.bindValue(":laboratory", query.value("laboratory").toString()); + query4.bindValue(":form", query.value("form").toInt()); + query4.bindValue(":package", g_yeast_forms[query.value("form").toInt()]); + switch (query.value("form").toInt()) { case YEAST_FORMS_LIQUID: query4.bindValue(":viability", 0.80); query4.bindValue(":max", 97); break; @@ -234,6 +235,52 @@ } } + /* + * Version 0.4.6 + * Upgrade database extra columns for target water. + */ + query.exec("SHOW COLUMNS FROM `products` LIKE 'tw_name'"); + if (! query.first()) { + qWarning() << "updateDataBase: products with target water"; + sql = "ALTER TABLE `products` ADD `tw_name` VARCHAR(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL AFTER `calc_acid`, "; + sql.append("ADD `tw_calcium` FLOAT NOT NULL DEFAULT '0' AFTER `tw_name`, "); + sql.append("ADD `tw_sulfate` FLOAT NOT NULL DEFAULT '0' AFTER `tw_calcium`, "); + sql.append("ADD `tw_chloride` FLOAT NOT NULL DEFAULT '0' AFTER `tw_sulfate`, "); + sql.append("ADD `tw_sodium` FLOAT NOT NULL DEFAULT '0' AFTER `tw_chloride`, "); + sql.append("ADD `tw_magnesium` FLOAT NOT NULL DEFAULT '0' AFTER `tw_sodium`, "); + sql.append("ADD `tw_total_alkalinity` FLOAT NOT NULL DEFAULT '0' AFTER `tw_magnesium`, "); + sql.append("ADD `tw_ph` FLOAT NOT NULL DEFAULT '7' AFTER `tw_total_alkalinity`, "); + sql.append("ADD `eq_HLT_volume` FLOAT NOT NULL DEFAULT '20' AFTER `eq_chiller_loss`, "); + sql.append("ADD `eq_HLT_deadspace` FLOAT NOT NULL DEFAULT '2' AFTER `eq_HLT_volume`;"); +// qDebug() << sql; + query.exec(sql); + if (query.lastError().isValid()) { + qWarning() << " ALTER products" << query.lastError(); + } else { + count++; + } + } + + /* + * Version 0.4.6 + * Add HLT fields to equipments + */ + query.exec("SHOW COLUMNS FROM `inventory_equipments` LIKE 'HLT_volume'"); + if (! query.first()) { + qWarning() << "updateDataBase: inventory_equipments with HLT"; + sql = "ALTER TABLE `inventory_equipments` ADD `HLT_volume` FLOAT NOT NULL DEFAULT '20' AFTER `chiller_lpm`, "; + sql.append("ADD `HLT_deadspace` FLOAT NOT NULL DEFAULT '2' AFTER `HLT_volume`;"); +// qDebug() << sql; + query.exec(sql); + if (query.lastError().isValid()) { + qWarning() << " ALTER inventory_equipments" << query.lastError(); + } else { + count++; + QMessageBox::information(this, tr("Equipments upgrade"), + tr("The Equipents database has two new HLT fields.\nPlease check the Inventory->Equipents records")); + } + } + qDebug() << "updateDatabase()" << count << "updates"; }
--- a/src/database/db_product.cpp Sat Jun 01 21:10:54 2024 +0200 +++ b/src/database/db_product.cpp Sat Jun 08 15:54:30 2024 +0200 @@ -23,31 +23,6 @@ { QSqlQuery query, yquery; - /* - * Upgrade database extra columns for target water. - */ - query.exec("SHOW COLUMNS FROM `products` LIKE 'tw_name'"); - if (! query.first()) { - qWarning() << "loadProduct upgrade for target water"; - QString sql = "ALTER TABLE `products` ADD `tw_name` VARCHAR(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL AFTER `calc_acid`, "; - sql.append("ADD `tw_calcium` FLOAT NOT NULL DEFAULT '0' AFTER `tw_name`, "); - sql.append("ADD `tw_sulfate` FLOAT NOT NULL DEFAULT '0' AFTER `tw_calcium`, "); - sql.append("ADD `tw_chloride` FLOAT NOT NULL DEFAULT '0' AFTER `tw_sulfate`, "); - sql.append("ADD `tw_sodium` FLOAT NOT NULL DEFAULT '0' AFTER `tw_chloride`, "); - sql.append("ADD `tw_magnesium` FLOAT NOT NULL DEFAULT '0' AFTER `tw_sodium`, "); - sql.append("ADD `tw_total_alkalinity` FLOAT NOT NULL DEFAULT '0' AFTER `tw_magnesium`;"); -// qDebug() << sql; - query.exec(sql); - if (query.lastError().isValid()) { - qWarning() << "loadProduct upgrade" << query.lastError(); - QMessageBox::warning(dialog, QObject::tr("Database error"), - QObject::tr("MySQL error: %1\n%2\n%3") - .arg(query.lastError().nativeErrorCode()) - .arg(query.lastError().driverText()) - .arg(query.lastError().databaseText())); - } - } - query.prepare("SELECT * FROM products WHERE record = :recno"); query.bindValue(":recno", recno); query.exec(); @@ -101,6 +76,8 @@ prod->eq_chiller_volume = query.value("eq_chiller_volume").toDouble(); prod->eq_chiller_lpm = query.value("eq_chiller_lpm").toDouble(); prod->eq_chiller_loss = query.value("eq_chiller_loss").toDouble(); + prod->eq_HLT_volume = query.value("eq_HLT_volume").toDouble(); + prod->eq_HLT_deadspace = query.value("eq_HLT_deadspace").toDouble(); prod->brew_date_start = query.value("brew_date_start").toDateTime(); prod->brew_mash_ph = query.value("brew_mash_ph").toDouble(); @@ -263,6 +240,14 @@ prod->wb_magnesium = query.value("wb_magnesium").toDouble(); prod->wb_total_alkalinity = query.value("wb_total_alkalinity").toDouble(); prod->wb_ph = query.value("wb_ph").toDouble(); + prod->tw_name = query.value("tw_name").toString(); + prod->tw_calcium = query.value("tw_calcium").toDouble(); + prod->tw_sulfate = query.value("tw_sulfate").toDouble(); + prod->tw_chloride = query.value("tw_chloride").toDouble(); + prod->tw_sodium = query.value("tw_sodium").toDouble(); + prod->tw_magnesium = query.value("tw_magnesium").toDouble(); + prod->tw_total_alkalinity = query.value("tw_total_alkalinity").toDouble(); + prod->tw_ph = query.value("tw_ph").toDouble(); prod->wa_acid_name = query.value("wa_acid_name").toInt(); prod->wa_acid_perc = query.value("wa_acid_perc").toDouble(); prod->wa_base_name = query.value("wa_base_name").toInt(); @@ -615,6 +600,7 @@ "eq_kettle_height=:eq_kettle_height, eq_mash_volume=:eq_mash_volume, eq_mash_max=:eq_mash_max, " "eq_chiller_type=:eq_chiller_type, eq_chiller_to79=:eq_chiller_to79, eq_chiller_volume=:eq_chiller_volume, " "eq_chiller_lpm=:eq_chiller_lpm, eq_chiller_loss=:eq_chiller_loss, " + "eq_HLT_volume=:eq_HLT_volume, eq_HLT_deadspace=:eq_HLT_deadspace, " "brew_date_start=:brew_date_start, brew_mash_ph=:brew_mash_ph, brew_mash_sg=:brew_mash_sg, " "brew_mash_efficiency=:brew_mash_efficiency, brew_sparge_temperature=:brew_sparge_temperature, " "brew_sparge_volume=:brew_sparge_volume, brew_sparge_est=:brew_sparge_est, brew_sparge_ph=:brew_sparge_ph, " @@ -665,6 +651,8 @@ "wg_total_alkalinity=:wg_total_alkalinity, wg_ph=:wg_ph, " "wb_calcium=:wb_calcium, wb_sulfate=:wb_sulfate, wb_chloride=:wb_chloride, wb_sodium=:wb_sodium, " "wb_magnesium=:wb_magnesium, wb_total_alkalinity=:wb_total_alkalinity, wb_ph=:wb_ph, " + "tw_name=:tw_name, tw_calcium=:tw_calcium, tw_sulfate=:tw_sulfate, tw_chloride=:tw_chloride, " + "tw_sodium=:tw_sodium, tw_magnesium=:tw_magnesium, tw_total_alkalinity=:tw_total_alkalinity, tw_ph=:tw_ph, " "wa_acid_name=:wa_acid_name, wa_acid_perc=:wa_acid_perc, wa_base_name=:wa_base_name, " "starter_enable=:starter_enable, starter_type=:starter_type, starter_sg=:starter_sg, " "starter_viability=:starter_viability, yeast_prod_date=:yeast_prod_date, yeast_pitchrate=:yeast_pitchrate, " @@ -718,6 +706,8 @@ query.bindValue(":eq_chiller_volume", round(prod->eq_chiller_volume * 100) / 100); query.bindValue(":eq_chiller_lpm", round(prod->eq_chiller_lpm * 100) / 100); query.bindValue(":eq_chiller_loss", round(prod->eq_chiller_loss * 100) / 100); + query.bindValue(":eq_HLT_volume", round(prod->eq_HLT_volume * 10) / 10); + query.bindValue(":eq_HLT_deadspace", round(prod->eq_HLT_deadspace * 10) / 10); query.bindValue(":brew_date_start", prod->brew_date_start); query.bindValue(":brew_mash_ph", round(prod->brew_mash_ph * 100) / 100); query.bindValue(":brew_mash_sg", round(prod->brew_mash_sg * 1000) / 1000); @@ -870,6 +860,14 @@ query.bindValue(":wb_magnesium", round(prod->wb_magnesium * 100000) / 100000); query.bindValue(":wb_total_alkalinity", round(prod->wb_total_alkalinity * 100000) / 100000); query.bindValue(":wb_ph", round(prod->wb_ph * 100) / 100); + query.bindValue(":tw_name", prod->tw_name); + query.bindValue(":tw_calcium", round(prod->tw_calcium * 100000) / 100000); + query.bindValue(":tw_sulfate", round(prod->tw_sulfate * 100000) / 100000); + query.bindValue(":tw_chloride", round(prod->tw_chloride * 100000) / 100000); + query.bindValue(":tw_sodium", round(prod->tw_sodium * 100000) / 100000); + query.bindValue(":tw_magnesium", round(prod->tw_magnesium * 100000) / 100000); + query.bindValue(":tw_total_alkalinity", round(prod->tw_total_alkalinity * 100000) / 100000); + query.bindValue(":tw_ph", round(prod->tw_ph * 100) / 100); query.bindValue(":wa_acid_name", prod->wa_acid_name); query.bindValue(":wa_acid_perc", round(prod->wa_acid_perc * 10) / 10); query.bindValue(":wa_base_name", prod->wa_base_name);
--- a/src/global.h Sat Jun 01 21:10:54 2024 +0200 +++ b/src/global.h Sat Jun 08 15:54:30 2024 +0200 @@ -283,6 +283,8 @@ double mash_max; double efficiency; QString uuid; + double HLT_volume; + double HLT_deadspace; }; @@ -485,6 +487,8 @@ double eq_chiller_volume; double eq_chiller_lpm; double eq_chiller_loss; + double eq_HLT_volume; + double eq_HLT_deadspace; QDateTime brew_date_start; double brew_mash_ph; @@ -617,6 +621,7 @@ double tw_sodium; double tw_magnesium; double tw_total_alkalinity; + double tw_ph; QString w1_name; ///< Water source 1 double w1_amount; @@ -709,16 +714,30 @@ double keg_abv; double keg_bar; QList<Splits> splits; ///< Used during building a split batch - double ws_calcium; ///< Sparge water calculated. - double ws_sulfate; - double ws_chloride; - double ws_sodium; - double ws_magnesium; - double ws_total_alkalinity; + double ws_calcium; ///< Sparge water calculated. + double ws_sulfate; + double ws_chloride; + double ws_sodium; + double ws_magnesium; + double ws_total_alkalinity; + double aa_calcium; ///< Actual adjustments + double aa_magnesium; + double aa_bicarbonate; + double aa_sodium; + double aa_chloride; + double aa_sulfate; + double aa_hardness; + double ta_calcium; ///< Target water adjustments + double ta_magnesium; + double ta_bicarbonate; + double ta_sodium; + double ta_chloride; + double ta_sulfate; + double ta_hardness; QList<Images> images_list; ///< List of loaded images. - int images_count; ///< -1 if not yet loaded. - int images_current; ///< -1 or image in focus. - bool images_dirty; + int images_count; ///< -1 if not yet loaded. + int images_current; ///< -1 or image in focus. + bool images_dirty; };
--- a/translations/bmsapp_en.ts Sat Jun 01 21:10:54 2024 +0200 +++ b/translations/bmsapp_en.ts Sat Jun 08 15:54:30 2024 +0200 @@ -1198,16 +1198,18 @@ <message> <location filename="../ui/EditEquipment.ui" line="177"/> <location filename="../ui/EditEquipment.ui" line="419"/> - <location filename="../ui/EditEquipment.ui" line="539"/> - <location filename="../ui/EditEquipment.ui" line="630"/> - <location filename="../ui/EditEquipment.ui" line="727"/> - <location filename="../ui/EditEquipment.ui" line="887"/> - <location filename="../ui/EditEquipment.ui" line="924"/> - <location filename="../ui/EditEquipment.ui" line="974"/> - <location filename="../ui/EditEquipment.ui" line="1056"/> - <location filename="../ui/EditEquipment.ui" line="1093"/> - <location filename="../ui/EditEquipment.ui" line="1233"/> - <location filename="../ui/EditEquipment.ui" line="1309"/> + <location filename="../ui/EditEquipment.ui" line="507"/> + <location filename="../ui/EditEquipment.ui" line="570"/> + <location filename="../ui/EditEquipment.ui" line="601"/> + <location filename="../ui/EditEquipment.ui" line="661"/> + <location filename="../ui/EditEquipment.ui" line="758"/> + <location filename="../ui/EditEquipment.ui" line="918"/> + <location filename="../ui/EditEquipment.ui" line="955"/> + <location filename="../ui/EditEquipment.ui" line="1005"/> + <location filename="../ui/EditEquipment.ui" line="1087"/> + <location filename="../ui/EditEquipment.ui" line="1124"/> + <location filename="../ui/EditEquipment.ui" line="1311"/> + <location filename="../ui/EditEquipment.ui" line="1387"/> <source> L</source> <translation type="unfinished"></translation> </message> @@ -1238,7 +1240,7 @@ </message> <message> <location filename="../ui/EditEquipment.ui" line="320"/> - <location filename="../ui/EditEquipment.ui" line="680"/> + <location filename="../ui/EditEquipment.ui" line="711"/> <source> cm</source> <translation type="unfinished"></translation> </message> @@ -1249,98 +1251,108 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="501"/> + <location filename="../ui/EditEquipment.ui" line="485"/> <source>Lauter deadspace:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="517"/> + <location filename="../ui/EditEquipment.ui" line="532"/> + <source>HLT Volume:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditEquipment.ui" line="548"/> + <source>HLT deadspace:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditEquipment.ui" line="1180"/> <source>Brewhouse efficiency:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="570"/> + <location filename="../ui/EditEquipment.ui" line="1155"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="608"/> + <location filename="../ui/EditEquipment.ui" line="639"/> <source>Kettle volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="655"/> + <location filename="../ui/EditEquipment.ui" line="686"/> <source>Kettle height:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="705"/> + <location filename="../ui/EditEquipment.ui" line="736"/> <source>Boil size at 100 °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="752"/> + <location filename="../ui/EditEquipment.ui" line="783"/> <source>Evaporation Liter/hour:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="768"/> + <location filename="../ui/EditEquipment.ui" line="799"/> <source>Boil time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="784"/> + <location filename="../ui/EditEquipment.ui" line="815"/> <source>Top up kettle:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="800"/> + <location filename="../ui/EditEquipment.ui" line="831"/> <source>Batch size at 100 °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="822"/> - <source> L/h</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ui/EditEquipment.ui" line="853"/> - <location filename="../ui/EditEquipment.ui" line="1183"/> + <source> L/h</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditEquipment.ui" line="884"/> + <location filename="../ui/EditEquipment.ui" line="1261"/> <source> min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="878"/> + <location filename="../ui/EditEquipment.ui" line="909"/> <source>Added extra water during boil</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="949"/> + <location filename="../ui/EditEquipment.ui" line="980"/> <source>Kettle trub loss:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1015"/> + <location filename="../ui/EditEquipment.ui" line="1046"/> <source>Extra water in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1031"/> + <location filename="../ui/EditEquipment.ui" line="1062"/> <source>Volume in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1047"/> + <location filename="../ui/EditEquipment.ui" line="1078"/> <source>Extra water to add to the fermenter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1267"/> + <location filename="../ui/EditEquipment.ui" line="1345"/> <source>Transfer loss:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1283"/> + <location filename="../ui/EditEquipment.ui" line="1361"/> <source>Immersion chiller:</source> <translation type="unfinished"></translation> </message> @@ -1360,135 +1372,130 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="486"/> - <source>Lautering</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditEquipment.ui" line="596"/> + <location filename="../ui/EditEquipment.ui" line="627"/> <source>Boiling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="671"/> + <location filename="../ui/EditEquipment.ui" line="702"/> <source>Measured inside the kettle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="965"/> + <location filename="../ui/EditEquipment.ui" line="996"/> <source>Trub loss to leave behind in the kettle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1000"/> + <location filename="../ui/EditEquipment.ui" line="1031"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1119"/> + <location filename="../ui/EditEquipment.ui" line="1197"/> <source>Clone</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1136"/> + <location filename="../ui/EditEquipment.ui" line="1214"/> <source>Chilling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1148"/> + <location filename="../ui/EditEquipment.ui" line="1226"/> <source>Wort chiller type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1174"/> + <location filename="../ui/EditEquipment.ui" line="1252"/> <source>Minutes elapsed to cool to 79 °C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1208"/> + <location filename="../ui/EditEquipment.ui" line="1286"/> <source>Minutes to cool to 79 °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1224"/> + <location filename="../ui/EditEquipment.ui" line="1302"/> <source>Volume lost in hoses, pump ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1299"/> + <location filename="../ui/EditEquipment.ui" line="1377"/> <source>Temporary extra volume of the immersion chiller in the kettle. Used to correct the after boil volume.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1334"/> + <location filename="../ui/EditEquipment.ui" line="1412"/> <source>Liters per minute to pump trough the chiller. Used to calculate the time needed to transfer the wort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1344"/> + <location filename="../ui/EditEquipment.ui" line="1422"/> <source> L/m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1369"/> + <location filename="../ui/EditEquipment.ui" line="1447"/> <source>Transfer liters/minute:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="156"/> + <location filename="../src/EditEquipment.cpp" line="162"/> <source>BMSapp - Add new equipment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="158"/> + <location filename="../src/EditEquipment.cpp" line="164"/> <source>BMSapp - Edit equipment %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="175"/> + <location filename="../src/EditEquipment.cpp" line="181"/> <source>Edit Equipment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="175"/> + <location filename="../src/EditEquipment.cpp" line="181"/> <source>Name empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="234"/> - <location filename="../src/EditEquipment.cpp" line="293"/> - <location filename="../src/EditEquipment.cpp" line="318"/> + <location filename="../src/EditEquipment.cpp" line="243"/> + <location filename="../src/EditEquipment.cpp" line="305"/> + <location filename="../src/EditEquipment.cpp" line="330"/> <source>Database error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="235"/> - <location filename="../src/EditEquipment.cpp" line="294"/> - <location filename="../src/EditEquipment.cpp" line="319"/> + <location filename="../src/EditEquipment.cpp" line="244"/> + <location filename="../src/EditEquipment.cpp" line="306"/> + <location filename="../src/EditEquipment.cpp" line="331"/> <source>MySQL error: %1 %2 %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="308"/> + <location filename="../src/EditEquipment.cpp" line="320"/> <source>Delete equipment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="308"/> + <location filename="../src/EditEquipment.cpp" line="320"/> <source>Delete %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="439"/> + <location filename="../src/EditEquipment.cpp" line="451"/> <source>Equipment changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="439"/> + <location filename="../src/EditEquipment.cpp" line="451"/> <source>This equipment has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -2483,14 +2490,14 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="55"/> - <location filename="../ui/EditProduct.ui" line="12264"/> + <location filename="../ui/EditProduct.ui" line="12754"/> <location filename="../src/EditProductTab9.cpp" line="552"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="75"/> - <location filename="../ui/EditProduct.ui" line="12213"/> + <location filename="../ui/EditProduct.ui" line="12703"/> <location filename="../src/EditProductTab3.cpp" line="74"/> <location filename="../src/EditProductTab3.cpp" line="162"/> <location filename="../src/EditProductTab4.cpp" line="60"/> @@ -2535,26 +2542,26 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="240"/> - <location filename="../ui/EditProduct.ui" line="7978"/> - <location filename="../ui/EditProduct.ui" line="8973"/> + <location filename="../ui/EditProduct.ui" line="8468"/> + <location filename="../ui/EditProduct.ui" line="9463"/> <source>Efficiency:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="256"/> - <location filename="../ui/EditProduct.ui" line="2274"/> + <location filename="../ui/EditProduct.ui" line="2317"/> <source>Boil time:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="272"/> - <location filename="../ui/EditProduct.ui" line="2374"/> + <location filename="../ui/EditProduct.ui" line="2417"/> <source>Batch size:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="288"/> - <location filename="../ui/EditProduct.ui" line="2174"/> + <location filename="../ui/EditProduct.ui" line="2217"/> <source>Boil size:</source> <translation type="unfinished"></translation> </message> @@ -2563,39 +2570,39 @@ <location filename="../ui/EditProduct.ui" line="471"/> <location filename="../ui/EditProduct.ui" line="640"/> <location filename="../ui/EditProduct.ui" line="1031"/> - <location filename="../ui/EditProduct.ui" line="1802"/> - <location filename="../ui/EditProduct.ui" line="3370"/> - <location filename="../ui/EditProduct.ui" line="3423"/> - <location filename="../ui/EditProduct.ui" line="4153"/> - <location filename="../ui/EditProduct.ui" line="7671"/> - <location filename="../ui/EditProduct.ui" line="8072"/> - <location filename="../ui/EditProduct.ui" line="9089"/> - <location filename="../ui/EditProduct.ui" line="9690"/> - <location filename="../ui/EditProduct.ui" line="9924"/> - <location filename="../ui/EditProduct.ui" line="10142"/> - <location filename="../ui/EditProduct.ui" line="10244"/> - <location filename="../ui/EditProduct.ui" line="10393"/> - <location filename="../ui/EditProduct.ui" line="10446"/> - <location filename="../ui/EditProduct.ui" line="10650"/> - <location filename="../ui/EditProduct.ui" line="10684"/> - <location filename="../ui/EditProduct.ui" line="10772"/> - <location filename="../ui/EditProduct.ui" line="11050"/> - <location filename="../ui/EditProduct.ui" line="11235"/> - <location filename="../ui/EditProduct.ui" line="11463"/> - <location filename="../ui/EditProduct.ui" line="11626"/> + <location filename="../ui/EditProduct.ui" line="2645"/> + <location filename="../ui/EditProduct.ui" line="3463"/> + <location filename="../ui/EditProduct.ui" line="3516"/> + <location filename="../ui/EditProduct.ui" line="4246"/> + <location filename="../ui/EditProduct.ui" line="8161"/> + <location filename="../ui/EditProduct.ui" line="8562"/> + <location filename="../ui/EditProduct.ui" line="9579"/> + <location filename="../ui/EditProduct.ui" line="10180"/> + <location filename="../ui/EditProduct.ui" line="10414"/> + <location filename="../ui/EditProduct.ui" line="10632"/> + <location filename="../ui/EditProduct.ui" line="10734"/> + <location filename="../ui/EditProduct.ui" line="10883"/> + <location filename="../ui/EditProduct.ui" line="10936"/> + <location filename="../ui/EditProduct.ui" line="11140"/> + <location filename="../ui/EditProduct.ui" line="11174"/> + <location filename="../ui/EditProduct.ui" line="11262"/> + <location filename="../ui/EditProduct.ui" line="11540"/> + <location filename="../ui/EditProduct.ui" line="11725"/> + <location filename="../ui/EditProduct.ui" line="11953"/> + <location filename="../ui/EditProduct.ui" line="12116"/> <source> %</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="335"/> - <location filename="../ui/EditProduct.ui" line="1922"/> - <location filename="../ui/EditProduct.ui" line="2302"/> - <location filename="../ui/EditProduct.ui" line="8289"/> - <location filename="../ui/EditProduct.ui" line="8317"/> - <location filename="../ui/EditProduct.ui" line="8345"/> - <location filename="../ui/EditProduct.ui" line="8373"/> - <location filename="../ui/EditProduct.ui" line="8760"/> - <location filename="../ui/EditProduct.ui" line="8881"/> + <location filename="../ui/EditProduct.ui" line="1965"/> + <location filename="../ui/EditProduct.ui" line="2345"/> + <location filename="../ui/EditProduct.ui" line="8779"/> + <location filename="../ui/EditProduct.ui" line="8807"/> + <location filename="../ui/EditProduct.ui" line="8835"/> + <location filename="../ui/EditProduct.ui" line="8863"/> + <location filename="../ui/EditProduct.ui" line="9250"/> + <location filename="../ui/EditProduct.ui" line="9371"/> <source> min</source> <translation type="unfinished"></translation> </message> @@ -2604,40 +2611,44 @@ <location filename="../ui/EditProduct.ui" line="394"/> <location filename="../ui/EditProduct.ui" line="1576"/> <location filename="../ui/EditProduct.ui" line="1660"/> - <location filename="../ui/EditProduct.ui" line="1752"/> - <location filename="../ui/EditProduct.ui" line="1866"/> - <location filename="../ui/EditProduct.ui" line="1959"/> - <location filename="../ui/EditProduct.ui" line="2073"/> - <location filename="../ui/EditProduct.ui" line="2152"/> - <location filename="../ui/EditProduct.ui" line="2202"/> - <location filename="../ui/EditProduct.ui" line="2252"/> - <location filename="../ui/EditProduct.ui" line="2352"/> - <location filename="../ui/EditProduct.ui" line="2402"/> - <location filename="../ui/EditProduct.ui" line="2452"/> - <location filename="../ui/EditProduct.ui" line="2499"/> - <location filename="../ui/EditProduct.ui" line="2549"/> - <location filename="../ui/EditProduct.ui" line="3122"/> - <location filename="../ui/EditProduct.ui" line="3178"/> - <location filename="../ui/EditProduct.ui" line="4356"/> - <location filename="../ui/EditProduct.ui" line="5692"/> - <location filename="../ui/EditProduct.ui" line="6434"/> - <location filename="../ui/EditProduct.ui" line="6771"/> - <location filename="../ui/EditProduct.ui" line="7100"/> - <location filename="../ui/EditProduct.ui" line="7779"/> - <location filename="../ui/EditProduct.ui" line="7845"/> - <location filename="../ui/EditProduct.ui" line="8097"/> - <location filename="../ui/EditProduct.ui" line="8128"/> - <location filename="../ui/EditProduct.ui" line="8462"/> - <location filename="../ui/EditProduct.ui" line="8490"/> - <location filename="../ui/EditProduct.ui" line="8524"/> - <location filename="../ui/EditProduct.ui" line="8954"/> - <location filename="../ui/EditProduct.ui" line="9039"/> - <location filename="../ui/EditProduct.ui" line="10585"/> - <location filename="../ui/EditProduct.ui" line="10616"/> - <location filename="../ui/EditProduct.ui" line="11022"/> - <location filename="../ui/EditProduct.ui" line="11144"/> - <location filename="../ui/EditProduct.ui" line="11504"/> - <location filename="../ui/EditProduct.ui" line="11585"/> + <location filename="../ui/EditProduct.ui" line="1739"/> + <location filename="../ui/EditProduct.ui" line="1805"/> + <location filename="../ui/EditProduct.ui" line="1842"/> + <location filename="../ui/EditProduct.ui" line="1909"/> + <location filename="../ui/EditProduct.ui" line="2002"/> + <location filename="../ui/EditProduct.ui" line="2116"/> + <location filename="../ui/EditProduct.ui" line="2195"/> + <location filename="../ui/EditProduct.ui" line="2245"/> + <location filename="../ui/EditProduct.ui" line="2295"/> + <location filename="../ui/EditProduct.ui" line="2395"/> + <location filename="../ui/EditProduct.ui" line="2445"/> + <location filename="../ui/EditProduct.ui" line="2495"/> + <location filename="../ui/EditProduct.ui" line="2542"/> + <location filename="../ui/EditProduct.ui" line="2592"/> + <location filename="../ui/EditProduct.ui" line="3215"/> + <location filename="../ui/EditProduct.ui" line="3271"/> + <location filename="../ui/EditProduct.ui" line="4449"/> + <location filename="../ui/EditProduct.ui" line="5582"/> + <location filename="../ui/EditProduct.ui" line="6257"/> + <location filename="../ui/EditProduct.ui" line="6604"/> + <location filename="../ui/EditProduct.ui" line="6936"/> + <location filename="../ui/EditProduct.ui" line="7544"/> + <location filename="../ui/EditProduct.ui" line="7734"/> + <location filename="../ui/EditProduct.ui" line="8269"/> + <location filename="../ui/EditProduct.ui" line="8335"/> + <location filename="../ui/EditProduct.ui" line="8587"/> + <location filename="../ui/EditProduct.ui" line="8618"/> + <location filename="../ui/EditProduct.ui" line="8952"/> + <location filename="../ui/EditProduct.ui" line="8980"/> + <location filename="../ui/EditProduct.ui" line="9014"/> + <location filename="../ui/EditProduct.ui" line="9444"/> + <location filename="../ui/EditProduct.ui" line="9529"/> + <location filename="../ui/EditProduct.ui" line="11075"/> + <location filename="../ui/EditProduct.ui" line="11106"/> + <location filename="../ui/EditProduct.ui" line="11512"/> + <location filename="../ui/EditProduct.ui" line="11634"/> + <location filename="../ui/EditProduct.ui" line="11994"/> + <location filename="../ui/EditProduct.ui" line="12075"/> <location filename="../src/EditProductExport.cpp" line="845"/> <location filename="../src/EditProductExport.cpp" line="853"/> <source> L</source> @@ -2650,20 +2661,20 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="530"/> - <location filename="../ui/EditProduct.ui" line="3342"/> + <location filename="../ui/EditProduct.ui" line="3435"/> <source>Estimated ABV:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="546"/> - <location filename="../ui/EditProduct.ui" line="3295"/> + <location filename="../ui/EditProduct.ui" line="3388"/> <source>Estimated FG:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="582"/> - <location filename="../ui/EditProduct.ui" line="2650"/> - <location filename="../ui/EditProduct.ui" line="3248"/> + <location filename="../ui/EditProduct.ui" line="2743"/> + <location filename="../ui/EditProduct.ui" line="3341"/> <source>Estimated OG:</source> <translation type="unfinished"></translation> </message> @@ -2694,7 +2705,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="843"/> - <location filename="../ui/EditProduct.ui" line="2938"/> + <location filename="../ui/EditProduct.ui" line="3031"/> <source>Estimated IBU:</source> <translation type="unfinished"></translation> </message> @@ -2834,1462 +2845,1521 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="1728"/> - <source>Lautering</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="1774"/> + <location filename="../ui/EditProduct.ui" line="1761"/> <source>Lauter deadspace:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="1841"/> + <location filename="../ui/EditProduct.ui" line="1884"/> <source>Chilling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="1993"/> + <location filename="../ui/EditProduct.ui" line="2036"/> <source>Transfer loss:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2009"/> + <location filename="../ui/EditProduct.ui" line="2052"/> <source>Immersion chiller:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2475"/> + <location filename="../ui/EditProduct.ui" line="2518"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2574"/> + <location filename="../ui/EditProduct.ui" line="2617"/> <source>Volume in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3707"/> + <location filename="../ui/EditProduct.ui" line="3800"/> <source>Retry starter steps:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3755"/> + <location filename="../ui/EditProduct.ui" line="3848"/> <source>Dry yeast calculation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6353"/> - <location filename="../ui/EditProduct.ui" line="6422"/> - <source>Total brew and sparge water supply</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6356"/> - <source>Total needed mixed water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8440"/> - <source>Top up water:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2112"/> - <source>Boiling</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="1824"/> - <source>Brewhouse efficiency:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="1853"/> - <source>Liters per minute to pump trough the chiller. -Used to calculate the time needed to transfer the wort.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="1891"/> - <source>Transfer liters/minute:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="1907"/> - <source>Minutes elapsed to cool to 79 °C</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="1947"/> - <source>Volume lost in hoses, pump ...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2025"/> - <source>Wort chiller type:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2041"/> - <source>Minutes to cool to 79 °C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2057"/> - <source>Temporary extra volume of the immersion chiller in the kettle. -Used to correct the after boil volume.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2124"/> - <source>Kettle volume:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2224"/> - <source>Evaporation / hour:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2324"/> - <source>Top up kettle:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2424"/> - <location filename="../ui/EditProduct.ui" line="8424"/> - <source>Kettle trub loss:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2521"/> - <source>Extra water in fermenter:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2588"/> - <source>Fermentables</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2600"/> - <source>Color EBC:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2697"/> - <source>Mash tun %:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2713"/> - <source>Sugars %:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2729"/> - <source>Cara/crystal %:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2745"/> - <source>Lintner:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2780"/> - <source>%v lintner</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2802"/> - <location filename="../ui/EditProduct.ui" line="2824"/> - <location filename="../ui/EditProduct.ui" line="2846"/> - <location filename="../ui/EditProduct.ui" line="3029"/> - <location filename="../ui/EditProduct.ui" line="3051"/> - <source>%v%</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2859"/> - <location filename="../ui/EditProduct.ui" line="3074"/> - <location filename="../ui/EditProduct.ui" line="3222"/> - <location filename="../ui/EditProduct.ui" line="4072"/> - <location filename="../ui/EditProduct.ui" line="4227"/> - <location filename="../ui/EditProduct.ui" line="12141"/> - <location filename="../src/EditProductExport.cpp" line="873"/> - <source>Add</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2888"/> - <source> kg</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2913"/> - <source>Mash weight:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2926"/> - <source>Hops</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="2988"/> - <source>Hop taste:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3004"/> - <source>Hop aroma:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3091"/> - <source>Boil absorb:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3107"/> - <source>Loss by hop absorption in the boil kettle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3147"/> - <source>Fermenter absorb:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3163"/> - <source>Loss in the fermenter caused by dry-hopping</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3200"/> - <source>Miscs</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3236"/> - <source>Yeasts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3395"/> - <source>Apparent Attenuation:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3509"/> - <source>Pitchrate billion cells/ml/°P:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3535"/> - <source>Starter method:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3551"/> - <source>Starter SG:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3598"/> - <location filename="../ui/EditProduct.ui" line="3687"/> - <location filename="../ui/EditProduct.ui" line="10361"/> - <location filename="../ui/EditProduct.ui" line="11722"/> - <location filename="../ui/EditProduct.ui" line="11803"/> - <location filename="../ui/EditProduct.ui" line="12112"/> - <source>Set or clear date</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3601"/> - <location filename="../ui/EditProduct.ui" line="3690"/> - <location filename="../ui/EditProduct.ui" line="4124"/> - <location filename="../ui/EditProduct.ui" line="4191"/> - <location filename="../ui/EditProduct.ui" line="8150"/> - <location filename="../ui/EditProduct.ui" line="8189"/> - <location filename="../ui/EditProduct.ui" line="8786"/> - <location filename="../ui/EditProduct.ui" line="9111"/> - <location filename="../ui/EditProduct.ui" line="9185"/> - <location filename="../ui/EditProduct.ui" line="9206"/> - <location filename="../ui/EditProduct.ui" line="9245"/> - <location filename="../ui/EditProduct.ui" line="9316"/> - <location filename="../ui/EditProduct.ui" line="9403"/> - <location filename="../ui/EditProduct.ui" line="9712"/> - <location filename="../ui/EditProduct.ui" line="9732"/> - <location filename="../ui/EditProduct.ui" line="9771"/> - <location filename="../ui/EditProduct.ui" line="9946"/> - <location filename="../ui/EditProduct.ui" line="9966"/> - <location filename="../ui/EditProduct.ui" line="10005"/> - <location filename="../ui/EditProduct.ui" line="10164"/> - <location filename="../ui/EditProduct.ui" line="10299"/> - <location filename="../ui/EditProduct.ui" line="10319"/> - <location filename="../ui/EditProduct.ui" line="10364"/> - <location filename="../ui/EditProduct.ui" line="11725"/> - <location filename="../ui/EditProduct.ui" line="11745"/> - <location filename="../ui/EditProduct.ui" line="11806"/> - <location filename="../ui/EditProduct.ui" line="12115"/> - <source>...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3640"/> - <source>Need billion cells:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3730"/> - <source>Yeast starter calculation.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3768"/> - <source>Low grams/hl:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3784"/> - <source>High grams/hl:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3844"/> - <location filename="../ui/EditProduct.ui" line="3860"/> - <source>at</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3935"/> - <source>This recipe pitch grams/hl:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3979"/> - <source>Pitchrate grams/hectoliter:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="3995"/> - <source>Yeast grams needed:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4089"/> - <source>Production date:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4105"/> - <source>Yeast condition:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4121"/> - <location filename="../ui/EditProduct.ui" line="9203"/> - <source>Set the date to today.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4169"/> - <source>Edit the production date.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4172"/> - <location filename="../ui/EditProduct.ui" line="9226"/> - <location filename="../ui/EditProduct.ui" line="9281"/> - <location filename="../ui/EditProduct.ui" line="9752"/> - <location filename="../ui/EditProduct.ui" line="9986"/> - <location filename="../ui/EditProduct.ui" line="11706"/> - <location filename="../ui/EditProduct.ui" line="12096"/> - <source>dd-MM-yyyy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4188"/> - <source>Clear the date</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4205"/> - <location filename="../src/EditProductTab3.cpp" line="1140"/> - <location filename="../src/EditProductTab5.cpp" line="718"/> - <source>Mash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4244"/> - <source>Mash name:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4260"/> - <source>Mash schedule:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4299"/> - <source>Mash time:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4328"/> - <source>Mash total volume:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4372"/> - <source>Water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4384"/> - <source>Water agents</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4396"/> - <source>Calcium Chloride</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4399"/> - <source>CaCl2:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4415"/> - <source>Gypsym</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4418"/> - <source>CaSO4:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4434"/> - <source>Epsom</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4437"/> - <source>MgSO4:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4453"/> - <source>Table salt</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4456"/> - <source>NaCl:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4472"/> - <location filename="../ui/EditProduct.ui" line="4656"/> - <location filename="../ui/EditProduct.ui" line="4876"/> - <source>Magnesium Chloride</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4475"/> - <source>MgCl2:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4491"/> - <location filename="../ui/EditProduct.ui" line="4687"/> - <source>Baking soda</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4494"/> - <source>NaHCO3:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4510"/> - <location filename="../ui/EditProduct.ui" line="4718"/> - <source>Chalk undissolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4513"/> - <source>CaCO3:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4529"/> - <location filename="../ui/EditProduct.ui" line="4844"/> - <source>To change the water profile. This adds Calcium and Chloride. -To improve sweet style beers.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4539"/> - <location filename="../ui/EditProduct.ui" line="4571"/> - <location filename="../ui/EditProduct.ui" line="4602"/> - <location filename="../ui/EditProduct.ui" line="4634"/> - <location filename="../ui/EditProduct.ui" line="4665"/> - <location filename="../ui/EditProduct.ui" line="4696"/> - <location filename="../ui/EditProduct.ui" line="4727"/> - <location filename="../ui/EditProduct.ui" line="4759"/> - <location filename="../ui/EditProduct.ui" line="4790"/> - <location filename="../ui/EditProduct.ui" line="4822"/> - <location filename="../ui/EditProduct.ui" line="4854"/> - <location filename="../ui/EditProduct.ui" line="4885"/> - <location filename="../ui/EditProduct.ui" line="11091"/> - <location filename="../ui/EditProduct.ui" line="11435"/> - <source> gr</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4561"/> - <location filename="../ui/EditProduct.ui" line="4749"/> - <source>Gypsum to change the water profile. This adds Calcium and Sulfate. -To improve bitter beers.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4593"/> - <location filename="../ui/EditProduct.ui" line="4781"/> - <source>Epsom salt to change the water profile. Use with caution!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4624"/> - <location filename="../ui/EditProduct.ui" line="4812"/> - <source>Table salt to change the water profile. This adds Sodium and Chloride. -Improves the sweetness of the beer. The beer will become salty at high doses.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4908"/> - <source>Acid Additions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4920"/> - <source>Desired mash pH:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4936"/> - <source>Auto calculate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4952"/> - <source>Acid to use:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4978"/> - <location filename="../ui/EditProduct.ui" line="6077"/> - <source>Mash pH should be between 5.2 and 5.6. Use 5.2 for light and 5.5 for dark beers.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5018"/> - <location filename="../ui/EditProduct.ui" line="5157"/> - <source>%</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5046"/> - <location filename="../ui/EditProduct.ui" line="5191"/> - <source> ml</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5078"/> - <source>Desired sparge pH:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5119"/> - <source>Acid type:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5213"/> - <location filename="../ui/EditProduct.ui" line="5229"/> - <source>Acid amount:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5246"/> - <source>Bitterness index:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5298"/> - <location filename="../ui/EditProduct.ui" line="5366"/> - <source>N/A</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5314"/> - <source>Preffered SO4:Cl ratio:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5382"/> - <source>Current SO4:Cl ratio:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5439"/> - <source>Estimate pre boil pH:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5683"/> - <source>The total prepared amount of sparge water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5764"/> - <source>If needed, choose a target water profile.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5767"/> - <source>Choose example water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6008"/> - <source>0 to 50 for light beers, 50 to 150 for amber beers, 150 to 250 for dark beers.</source> + <location filename="../ui/EditProduct.ui" line="5748"/> + <location filename="../ui/EditProduct.ui" line="6190"/> + <location filename="../ui/EditProduct.ui" line="6457"/> + <location filename="../ui/EditProduct.ui" line="7215"/> + <location filename="../ui/EditProduct.ui" line="7380"/> + <source>Calcium in mg/L</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5801"/> + <location filename="../ui/EditProduct.ui" line="6326"/> + <location filename="../ui/EditProduct.ui" line="6510"/> + <location filename="../ui/EditProduct.ui" line="6742"/> + <location filename="../ui/EditProduct.ui" line="7439"/> + <source>Magnesium in mg/L.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6005"/> + <location filename="../ui/EditProduct.ui" line="7635"/> + <source>The ideal amount of Calcium is between 40 and 150 mg/L.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="6061"/> - <source>Treated mash water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6105"/> - <source>The ideal amount of Natrium should be below 150.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6158"/> - <source>The ideal Chloride amount is between 50 and 150. -Together with Sulfate it must be below 500.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6187"/> - <source>The ideal amount of Calcium is between 40 and 150.</source> + <location filename="../ui/EditProduct.ui" line="7607"/> + <source>The ideal amount of Magnesium is between 5 and 40 mg/L.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6171"/> + <source>Total brew and sparge water supply</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="6243"/> - <source>The ideal amount of Magnesium is between 5 and 40.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6271"/> + <location filename="../ui/EditProduct.ui" line="7530"/> + <location filename="../ui/EditProduct.ui" line="7720"/> + <source>Total brew and sparge water supply. +In the mash tab set the infusion volumes. +The sparge volume is automatic calculated.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6588"/> + <source>The division between the main and dilution water. +The total volume does not change.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7100"/> + <source>Calcium content should typically fall in the range of 40 to 100 ppm. +Lower calcium content may not provide for the desirable +precipitation of trub and oxalates from wort. High oxalates may lead +to beerstone formation. +Calcium also aids in yeast floculation and beer clarification. + +Calcium should not typically exceed 100 ppm unless it has to be +added to provide a desirable anion like sulfate to the water.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8930"/> + <source>Top up water:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2155"/> + <source>Boiling</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2667"/> + <source>Brewhouse efficiency:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="1896"/> + <source>Liters per minute to pump trough the chiller. +Used to calculate the time needed to transfer the wort.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="1777"/> + <source>HLT Volume:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="1867"/> + <source>HLT deadspace:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="1934"/> + <source>Transfer liters/minute:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="1950"/> + <source>Minutes elapsed to cool to 79 °C</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="1990"/> + <source>Volume lost in hoses, pump ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2068"/> + <source>Wort chiller type:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2084"/> + <source>Minutes to cool to 79 °C:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2100"/> + <source>Temporary extra volume of the immersion chiller in the kettle. +Used to correct the after boil volume.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2167"/> + <source>Kettle volume:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2267"/> + <source>Evaporation / hour:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2367"/> + <source>Top up kettle:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2467"/> + <location filename="../ui/EditProduct.ui" line="8914"/> + <source>Kettle trub loss:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2564"/> + <source>Extra water in fermenter:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2681"/> + <source>Fermentables</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2693"/> + <source>Color EBC:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2790"/> + <source>Mash tun %:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2806"/> + <source>Sugars %:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2822"/> + <source>Cara/crystal %:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2838"/> + <source>Lintner:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2873"/> + <source>%v lintner</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2895"/> + <location filename="../ui/EditProduct.ui" line="2917"/> + <location filename="../ui/EditProduct.ui" line="2939"/> + <location filename="../ui/EditProduct.ui" line="3122"/> + <location filename="../ui/EditProduct.ui" line="3144"/> + <source>%v%</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2952"/> + <location filename="../ui/EditProduct.ui" line="3167"/> + <location filename="../ui/EditProduct.ui" line="3315"/> + <location filename="../ui/EditProduct.ui" line="4165"/> + <location filename="../ui/EditProduct.ui" line="4320"/> + <location filename="../ui/EditProduct.ui" line="12631"/> + <location filename="../src/EditProductExport.cpp" line="873"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2981"/> + <source> kg</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3006"/> + <source>Mash weight:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3019"/> + <source>Hops</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3081"/> + <source>Hop taste:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3097"/> + <source>Hop aroma:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3184"/> + <source>Boil absorb:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3200"/> + <source>Loss by hop absorption in the boil kettle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3240"/> + <source>Fermenter absorb:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3256"/> + <source>Loss in the fermenter caused by dry-hopping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3293"/> + <source>Miscs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3329"/> + <source>Yeasts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3488"/> + <source>Apparent Attenuation:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3602"/> + <source>Pitchrate billion cells/ml/°P:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3628"/> + <source>Starter method:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3644"/> + <source>Starter SG:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3691"/> + <location filename="../ui/EditProduct.ui" line="3780"/> + <location filename="../ui/EditProduct.ui" line="10851"/> + <location filename="../ui/EditProduct.ui" line="12212"/> + <location filename="../ui/EditProduct.ui" line="12293"/> + <location filename="../ui/EditProduct.ui" line="12602"/> + <source>Set or clear date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3694"/> + <location filename="../ui/EditProduct.ui" line="3783"/> + <location filename="../ui/EditProduct.ui" line="4217"/> + <location filename="../ui/EditProduct.ui" line="4284"/> + <location filename="../ui/EditProduct.ui" line="8640"/> + <location filename="../ui/EditProduct.ui" line="8679"/> + <location filename="../ui/EditProduct.ui" line="9276"/> + <location filename="../ui/EditProduct.ui" line="9601"/> + <location filename="../ui/EditProduct.ui" line="9675"/> + <location filename="../ui/EditProduct.ui" line="9696"/> + <location filename="../ui/EditProduct.ui" line="9735"/> + <location filename="../ui/EditProduct.ui" line="9806"/> + <location filename="../ui/EditProduct.ui" line="9893"/> + <location filename="../ui/EditProduct.ui" line="10202"/> + <location filename="../ui/EditProduct.ui" line="10222"/> + <location filename="../ui/EditProduct.ui" line="10261"/> + <location filename="../ui/EditProduct.ui" line="10436"/> + <location filename="../ui/EditProduct.ui" line="10456"/> + <location filename="../ui/EditProduct.ui" line="10495"/> + <location filename="../ui/EditProduct.ui" line="10654"/> + <location filename="../ui/EditProduct.ui" line="10789"/> + <location filename="../ui/EditProduct.ui" line="10809"/> + <location filename="../ui/EditProduct.ui" line="10854"/> + <location filename="../ui/EditProduct.ui" line="12215"/> + <location filename="../ui/EditProduct.ui" line="12235"/> + <location filename="../ui/EditProduct.ui" line="12296"/> + <location filename="../ui/EditProduct.ui" line="12605"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3733"/> + <source>Need billion cells:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3823"/> + <source>Yeast starter calculation.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3861"/> + <source>Low grams/hl:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3877"/> + <source>High grams/hl:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3937"/> + <location filename="../ui/EditProduct.ui" line="3953"/> + <source>at</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4028"/> + <source>This recipe pitch grams/hl:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4072"/> + <source>Pitchrate grams/hectoliter:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4088"/> + <source>Yeast grams needed:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4182"/> + <source>Production date:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4198"/> + <source>Yeast condition:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4214"/> + <location filename="../ui/EditProduct.ui" line="9693"/> + <source>Set the date to today.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4262"/> + <source>Edit the production date.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4265"/> + <location filename="../ui/EditProduct.ui" line="9716"/> + <location filename="../ui/EditProduct.ui" line="9771"/> + <location filename="../ui/EditProduct.ui" line="10242"/> + <location filename="../ui/EditProduct.ui" line="10476"/> + <location filename="../ui/EditProduct.ui" line="12196"/> + <location filename="../ui/EditProduct.ui" line="12586"/> + <source>dd-MM-yyyy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4281"/> + <source>Clear the date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4298"/> + <location filename="../src/EditProductTab3.cpp" line="1140"/> + <location filename="../src/EditProductTab5.cpp" line="718"/> + <source>Mash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4337"/> + <source>Mash name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4353"/> + <source>Mash schedule:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4392"/> + <source>Mash time:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4421"/> + <source>Mash total volume:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4465"/> + <source>Water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4477"/> + <source>Water agents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4489"/> + <source>Calcium Chloride</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4492"/> + <source>CaCl2:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4508"/> + <source>Gypsym</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4511"/> + <source>CaSO4:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4527"/> + <source>Epsom</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4530"/> + <source>MgSO4:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4546"/> + <source>Table salt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4549"/> + <source>NaCl:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4565"/> + <location filename="../ui/EditProduct.ui" line="4749"/> + <location filename="../ui/EditProduct.ui" line="4969"/> + <source>Magnesium Chloride</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4568"/> + <source>MgCl2:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4584"/> + <location filename="../ui/EditProduct.ui" line="4780"/> + <source>Baking soda</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4587"/> + <source>NaHCO3:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4603"/> + <location filename="../ui/EditProduct.ui" line="4811"/> + <source>Chalk undissolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4606"/> + <source>CaCO3:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4622"/> + <location filename="../ui/EditProduct.ui" line="4937"/> + <source>To change the water profile. This adds Calcium and Chloride. +To improve sweet style beers.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4632"/> + <location filename="../ui/EditProduct.ui" line="4664"/> + <location filename="../ui/EditProduct.ui" line="4695"/> + <location filename="../ui/EditProduct.ui" line="4727"/> + <location filename="../ui/EditProduct.ui" line="4758"/> + <location filename="../ui/EditProduct.ui" line="4789"/> + <location filename="../ui/EditProduct.ui" line="4820"/> + <location filename="../ui/EditProduct.ui" line="4852"/> + <location filename="../ui/EditProduct.ui" line="4883"/> + <location filename="../ui/EditProduct.ui" line="4915"/> + <location filename="../ui/EditProduct.ui" line="4947"/> + <location filename="../ui/EditProduct.ui" line="4978"/> + <location filename="../ui/EditProduct.ui" line="11581"/> + <location filename="../ui/EditProduct.ui" line="11925"/> + <source> gr</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4654"/> + <location filename="../ui/EditProduct.ui" line="4842"/> + <source>Gypsum to change the water profile. This adds Calcium and Sulfate. +To improve bitter beers.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4686"/> + <location filename="../ui/EditProduct.ui" line="4874"/> + <source>Epsom salt to change the water profile. Use with caution!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4717"/> + <location filename="../ui/EditProduct.ui" line="4905"/> + <source>Table salt to change the water profile. This adds Sodium and Chloride. +Improves the sweetness of the beer. The beer will become salty at high doses.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5001"/> + <source>Acid Additions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5013"/> + <source>Desired mash pH:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5029"/> + <source>Auto calculate:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5045"/> + <source>Acid to use:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5071"/> + <source>Mash pH should be between 5.2 and 5.6. Use 5.2 for light and 5.5 for dark beers.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5111"/> + <location filename="../ui/EditProduct.ui" line="5250"/> + <source>%</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5139"/> + <location filename="../ui/EditProduct.ui" line="5284"/> + <source> ml</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5171"/> + <source>Desired sparge pH:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5212"/> + <source>Acid type:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5306"/> + <location filename="../ui/EditProduct.ui" line="5322"/> + <source>Acid amount:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5339"/> + <source>Bitterness index:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5391"/> + <location filename="../ui/EditProduct.ui" line="5459"/> + <source>N/A</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5407"/> + <source>Preffered SO4:Cl ratio:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5475"/> + <source>Current SO4:Cl ratio:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5532"/> + <source>Estimate pre boil pH:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5573"/> + <source>The total prepared amount of sparge water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5604"/> + <source>If needed, choose a target water profile.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5607"/> + <source>Choose example water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5854"/> + <location filename="../ui/EditProduct.ui" line="7835"/> + <source>0 to 50 for light beers, 50 to 150 for amber beers, 150 to 250 for dark beers.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5907"/> + <source>Treated total water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5923"/> + <location filename="../ui/EditProduct.ui" line="7692"/> + <source>The ideal amount of Natrium should be below 150.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5976"/> + <location filename="../ui/EditProduct.ui" line="7806"/> + <source>The ideal Chloride amount is between 50 and 150. +Together with Sulfate it must be below 500.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6089"/> + <location filename="../ui/EditProduct.ui" line="7663"/> <source>The ideal Sulfate amount should be between 50 and 400. Together with Chloride it must be below 500.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6756"/> - <source>The division between the main and dilution water. The total volume does not change.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6843"/> + <location filename="../ui/EditProduct.ui" line="6676"/> <source>Optional dilution water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6846"/> + <location filename="../ui/EditProduct.ui" line="6679"/> <source>Choose dilution</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6959"/> + <location filename="../ui/EditProduct.ui" line="6795"/> <source>Hardness</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7000"/> + <location filename="../ui/EditProduct.ui" line="6836"/> <source>Mg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7016"/> + <location filename="../ui/EditProduct.ui" line="6852"/> <location filename="../src/EditProductTab7.cpp" line="35"/> <source>pH</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7044"/> + <location filename="../ui/EditProduct.ui" line="6880"/> <source>RA</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7085"/> + <location filename="../ui/EditProduct.ui" line="6921"/> <source>Total brew and sparge water supply without optional dilution water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7144"/> + <location filename="../ui/EditProduct.ui" line="6980"/> <source>CaCO3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7213"/> + <location filename="../ui/EditProduct.ui" line="7049"/> <source>The main brewing water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7219"/> + <location filename="../ui/EditProduct.ui" line="7055"/> <source>Choose water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7232"/> + <location filename="../ui/EditProduct.ui" line="7068"/> <source>Cl</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7248"/> + <location filename="../ui/EditProduct.ui" line="7084"/> <source>Na</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7264"/> + <location filename="../ui/EditProduct.ui" line="7110"/> <source>Ca</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7280"/> + <location filename="../ui/EditProduct.ui" line="7126"/> <source>SO4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7296"/> + <location filename="../ui/EditProduct.ui" line="7142"/> <location filename="../src/EditProductTab6.cpp" line="342"/> <location filename="../src/EditProductTab7.cpp" line="35"/> <source>Volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7312"/> + <location filename="../ui/EditProduct.ui" line="7158"/> <source>HCO3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7328"/> + <location filename="../ui/EditProduct.ui" line="7174"/> <source>Water profile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7419"/> - <source>Sparge water source 1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7441"/> - <source>Sparge water source 2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7460"/> - <source>Sparge water mixed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7476"/> + <location filename="../ui/EditProduct.ui" line="7982"/> <location filename="../src/EditProductTab5.cpp" line="723"/> <source>Sparge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7492"/> - <source>Treated sparge water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7505"/> + <location filename="../ui/EditProduct.ui" line="7514"/> + <location filename="../src/EditProductTab8.cpp" line="676"/> + <source>Actual Water Adjustment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7470"/> + <source>Sparge volume:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7511"/> + <location filename="../ui/EditProduct.ui" line="7563"/> + <source>Switch between Actual and Target values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7566"/> + <location filename="../src/EditProductTab8.cpp" line="705"/> + <source>Treated Mash Water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7916"/> + <location filename="../ui/EditProduct.ui" line="7941"/> + <location filename="../ui/EditProduct.ui" line="7963"/> + <source>Sparge water source 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7995"/> <source>Brewday</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7517"/> + <location filename="../ui/EditProduct.ui" line="8007"/> <source>Brewday plan:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7533"/> + <location filename="../ui/EditProduct.ui" line="8023"/> <source>Brewday end:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7549"/> + <location filename="../ui/EditProduct.ui" line="8039"/> <source>Mashing and Sparge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7561"/> + <location filename="../ui/EditProduct.ui" line="8051"/> <source>Mash pH:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7690"/> + <location filename="../ui/EditProduct.ui" line="8180"/> <source>Mash SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7706"/> + <location filename="../ui/EditProduct.ui" line="8196"/> <source>Mash efficiency:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7722"/> + <location filename="../ui/EditProduct.ui" line="8212"/> <source>Sparge water pH:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7738"/> + <location filename="../ui/EditProduct.ui" line="8228"/> <source>Sparge supply:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7754"/> + <location filename="../ui/EditProduct.ui" line="8244"/> <source>Sparge estimate:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7798"/> + <location filename="../ui/EditProduct.ui" line="8288"/> <source>Sparge temp:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7876"/> - <location filename="../ui/EditProduct.ui" line="8853"/> - <location filename="../ui/EditProduct.ui" line="9565"/> - <location filename="../ui/EditProduct.ui" line="9593"/> - <location filename="../ui/EditProduct.ui" line="9621"/> - <location filename="../ui/EditProduct.ui" line="9855"/> - <location filename="../ui/EditProduct.ui" line="10073"/> - <location filename="../ui/EditProduct.ui" line="11204"/> - <location filename="../ui/EditProduct.ui" line="11654"/> + <location filename="../ui/EditProduct.ui" line="8366"/> + <location filename="../ui/EditProduct.ui" line="9343"/> + <location filename="../ui/EditProduct.ui" line="10055"/> + <location filename="../ui/EditProduct.ui" line="10083"/> + <location filename="../ui/EditProduct.ui" line="10111"/> + <location filename="../ui/EditProduct.ui" line="10345"/> + <location filename="../ui/EditProduct.ui" line="10563"/> + <location filename="../ui/EditProduct.ui" line="11694"/> + <location filename="../ui/EditProduct.ui" line="12144"/> <source> °C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7918"/> - <source>Pre boil</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7930"/> - <location filename="../ui/EditProduct.ui" line="9061"/> - <location filename="../src/EditProductTab7.cpp" line="635"/> - <source>Measured pH:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7946"/> - <location filename="../ui/EditProduct.ui" line="9128"/> - <location filename="../src/EditProductTab7.cpp" line="667"/> - <source>Measured SG:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7962"/> - <location filename="../ui/EditProduct.ui" line="9144"/> - <source>Volume @100°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8060"/> - <source>Mash, sparge and lauter efficiency.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8147"/> - <location filename="../ui/EditProduct.ui" line="8186"/> - <location filename="../ui/EditProduct.ui" line="9108"/> - <location filename="../ui/EditProduct.ui" line="9182"/> - <source>Edit volume</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8207"/> - <source>Whirlpools</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8219"/> - <source>Whirlpool 72..79°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8235"/> - <source>Whirlpool 60..66°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8251"/> - <source>Whirlpool cold:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8267"/> - <source>Whirlpool 85..100°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8396"/> - <source>Transfer to fermenter</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ui/EditProduct.ui" line="8408"/> + <source>Pre boil</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8420"/> + <location filename="../ui/EditProduct.ui" line="9551"/> + <location filename="../src/EditProductTab7.cpp" line="635"/> + <source>Measured pH:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8436"/> + <location filename="../ui/EditProduct.ui" line="9618"/> + <location filename="../src/EditProductTab7.cpp" line="667"/> + <source>Measured SG:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8452"/> + <location filename="../ui/EditProduct.ui" line="9634"/> + <source>Volume @100°C:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8550"/> + <source>Mash, sparge and lauter efficiency.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8637"/> + <location filename="../ui/EditProduct.ui" line="8676"/> + <location filename="../ui/EditProduct.ui" line="9598"/> + <location filename="../ui/EditProduct.ui" line="9672"/> + <source>Edit volume</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8697"/> + <source>Whirlpools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8709"/> + <source>Whirlpool 72..79°C:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8725"/> + <source>Whirlpool 60..66°C:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8741"/> + <source>Whirlpool cold:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8757"/> + <source>Whirlpool 85..100°C:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8886"/> + <source>Transfer to fermenter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8898"/> <source>Volume to fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8546"/> + <location filename="../ui/EditProduct.ui" line="9036"/> <source>SG in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8562"/> + <location filename="../ui/EditProduct.ui" line="9052"/> <source>EBC color in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8578"/> + <location filename="../ui/EditProduct.ui" line="9068"/> <source>IBU in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8684"/> + <location filename="../ui/EditProduct.ui" line="9174"/> <source>Aeration time & speed:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8706"/> + <location filename="../ui/EditProduct.ui" line="9196"/> <source> L/m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8738"/> + <location filename="../ui/EditProduct.ui" line="9228"/> <source>Aeration with:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8783"/> - <location filename="../ui/EditProduct.ui" line="10296"/> - <location filename="../ui/EditProduct.ui" line="10316"/> - <location filename="../ui/EditProduct.ui" line="11742"/> + <location filename="../ui/EditProduct.ui" line="9273"/> + <location filename="../ui/EditProduct.ui" line="10786"/> + <location filename="../ui/EditProduct.ui" line="10806"/> + <location filename="../ui/EditProduct.ui" line="12232"/> <source>Brew log chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8803"/> + <location filename="../ui/EditProduct.ui" line="9293"/> <source>Cooling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8815"/> + <location filename="../ui/EditProduct.ui" line="9305"/> <source>Cooling method:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8831"/> + <location filename="../ui/EditProduct.ui" line="9321"/> <source>Cooling to:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8903"/> + <location filename="../ui/EditProduct.ui" line="9393"/> <source>Cooling time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8933"/> + <location filename="../ui/EditProduct.ui" line="9423"/> <location filename="../src/EditProductExport.cpp" line="812"/> <source>After boil</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9077"/> + <location filename="../ui/EditProduct.ui" line="9567"/> <source>The overall efficiency.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9223"/> + <location filename="../ui/EditProduct.ui" line="9713"/> <source>Edit the brewdate plan or start.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9242"/> + <location filename="../ui/EditProduct.ui" line="9732"/> <source>Clear planned brewdate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9262"/> + <location filename="../ui/EditProduct.ui" line="9752"/> <source>Edit the brewdate start time.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9265"/> - <location filename="../ui/EditProduct.ui" line="9300"/> + <location filename="../ui/EditProduct.ui" line="9755"/> + <location filename="../ui/EditProduct.ui" line="9790"/> <source>hh:mm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9278"/> + <location filename="../ui/EditProduct.ui" line="9768"/> <source>Edit the brewdate end.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9297"/> + <location filename="../ui/EditProduct.ui" line="9787"/> <source>Edit the brewdate end time.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9313"/> + <location filename="../ui/EditProduct.ui" line="9803"/> <source>Set the brewdate end date.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9333"/> + <location filename="../ui/EditProduct.ui" line="9823"/> <source>End time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9349"/> + <location filename="../ui/EditProduct.ui" line="9839"/> <source>Start time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9365"/> + <location filename="../ui/EditProduct.ui" line="9855"/> <source>Show brewlog:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9384"/> + <location filename="../ui/EditProduct.ui" line="9874"/> <source>Confirm brew done:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9400"/> - <location filename="../ui/EditProduct.ui" line="9768"/> - <location filename="../ui/EditProduct.ui" line="10002"/> + <location filename="../ui/EditProduct.ui" line="9890"/> + <location filename="../ui/EditProduct.ui" line="10258"/> + <location filename="../ui/EditProduct.ui" line="10492"/> <source>Confirm the brew dates and times.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9417"/> + <location filename="../ui/EditProduct.ui" line="9907"/> <source>Fermenting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9429"/> + <location filename="../ui/EditProduct.ui" line="9919"/> <source>Primary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9441"/> + <location filename="../ui/EditProduct.ui" line="9931"/> <source>Start density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9457"/> + <location filename="../ui/EditProduct.ui" line="9947"/> <source>Start temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9473"/> + <location filename="../ui/EditProduct.ui" line="9963"/> <source>Peak temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9489"/> - <location filename="../ui/EditProduct.ui" line="9801"/> + <location filename="../ui/EditProduct.ui" line="9979"/> + <location filename="../ui/EditProduct.ui" line="10291"/> <source>End temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9505"/> - <location filename="../ui/EditProduct.ui" line="9817"/> + <location filename="../ui/EditProduct.ui" line="9995"/> + <location filename="../ui/EditProduct.ui" line="10307"/> <source>End density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9521"/> - <location filename="../ui/EditProduct.ui" line="9833"/> + <location filename="../ui/EditProduct.ui" line="10011"/> + <location filename="../ui/EditProduct.ui" line="10323"/> <source>End date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9665"/> - <location filename="../ui/EditProduct.ui" line="9899"/> - <location filename="../ui/EditProduct.ui" line="10117"/> + <location filename="../ui/EditProduct.ui" line="10155"/> + <location filename="../ui/EditProduct.ui" line="10389"/> + <location filename="../ui/EditProduct.ui" line="10607"/> <source>Apparent attenuation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9709"/> - <location filename="../ui/EditProduct.ui" line="9943"/> - <location filename="../ui/EditProduct.ui" line="10161"/> + <location filename="../ui/EditProduct.ui" line="10199"/> + <location filename="../ui/EditProduct.ui" line="10433"/> + <location filename="../ui/EditProduct.ui" line="10651"/> <source>Edit SG in Plato, Brix or SG</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9729"/> - <location filename="../ui/EditProduct.ui" line="9963"/> - <source>Set the date to today</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="9749"/> - <source>Edit the date the primary fermentation was done.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="9789"/> - <source>Secondary fermentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="9983"/> - <source>Edit the date the secondary fermentation was done.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="10023"/> - <source>Tertiary fermentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="10035"/> - <source>Average temperature:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="10051"/> - <source>Final density:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="10181"/> - <source>Expected end density:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ui/EditProduct.ui" line="10219"/> + <location filename="../ui/EditProduct.ui" line="10453"/> + <source>Set the date to today</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10239"/> + <source>Edit the date the primary fermentation was done.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10279"/> + <source>Secondary fermentation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10473"/> + <source>Edit the date the secondary fermentation was done.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10513"/> + <source>Tertiary fermentation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10525"/> + <source>Average temperature:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10541"/> + <source>Final density:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10671"/> + <source>Expected end density:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10709"/> <source>Alcohol volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10264"/> + <location filename="../ui/EditProduct.ui" line="10754"/> <source>Show fermenter unit log:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10280"/> + <location filename="../ui/EditProduct.ui" line="10770"/> <source>Show fermentation log:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10333"/> + <location filename="../ui/EditProduct.ui" line="10823"/> <source>Package</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10345"/> + <location filename="../ui/EditProduct.ui" line="10835"/> <source>Package date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10418"/> + <location filename="../ui/EditProduct.ui" line="10908"/> <source>Carbonation range:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10471"/> + <location filename="../ui/EditProduct.ui" line="10961"/> <source>Infusion or Dilution</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10483"/> + <location filename="../ui/EditProduct.ui" line="10973"/> <source>Package volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10499"/> + <location filename="../ui/EditProduct.ui" line="10989"/> <source>Extra added volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10515"/> + <location filename="../ui/EditProduct.ui" line="11005"/> <source>Extra remarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10531"/> + <location filename="../ui/EditProduct.ui" line="11021"/> <source>Estimated final ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10825"/> + <location filename="../ui/EditProduct.ui" line="11315"/> <source>Estimated final IBU:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10841"/> + <location filename="../ui/EditProduct.ui" line="11331"/> <source>Estimated final EBC:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10547"/> + <location filename="../ui/EditProduct.ui" line="11037"/> <source>Extra added ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10563"/> + <location filename="../ui/EditProduct.ui" line="6174"/> + <source>Mixed source water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="11053"/> <source>pH from fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10607"/> + <location filename="../ui/EditProduct.ui" line="11097"/> <source>Extra dilution or infusion added to this batch.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10638"/> - <location filename="../ui/EditProduct.ui" line="10760"/> + <location filename="../ui/EditProduct.ui" line="11128"/> + <location filename="../ui/EditProduct.ui" line="11250"/> <source>The ABV including the infusion.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10669"/> + <location filename="../ui/EditProduct.ui" line="11159"/> <source>If there is alcohol in the infusion, give the percentage.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10728"/> + <location filename="../ui/EditProduct.ui" line="11218"/> <source>Could be the description of the infusion.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10744"/> + <location filename="../ui/EditProduct.ui" line="11234"/> <source>Estimated package ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10892"/> + <location filename="../ui/EditProduct.ui" line="11382"/> <source>Bottles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10904"/> - <location filename="../ui/EditProduct.ui" line="11482"/> + <location filename="../ui/EditProduct.ui" line="11394"/> + <location filename="../ui/EditProduct.ui" line="11972"/> <source>Volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10920"/> - <location filename="../ui/EditProduct.ui" line="11340"/> + <location filename="../ui/EditProduct.ui" line="11410"/> + <location filename="../ui/EditProduct.ui" line="11830"/> <source>Desired volume CO2:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10936"/> - <location filename="../ui/EditProduct.ui" line="11407"/> + <location filename="../ui/EditProduct.ui" line="11426"/> + <location filename="../ui/EditProduct.ui" line="11897"/> <source>Priming sugar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10952"/> - <location filename="../ui/EditProduct.ui" line="11324"/> + <location filename="../ui/EditProduct.ui" line="11442"/> + <location filename="../ui/EditProduct.ui" line="11814"/> <source>Sugar amount:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10968"/> - <location filename="../ui/EditProduct.ui" line="11372"/> + <location filename="../ui/EditProduct.ui" line="11458"/> + <location filename="../ui/EditProduct.ui" line="11862"/> <source>Priming:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10984"/> - <location filename="../ui/EditProduct.ui" line="11356"/> + <location filename="../ui/EditProduct.ui" line="11474"/> + <location filename="../ui/EditProduct.ui" line="11846"/> <source>Water amount:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11000"/> + <location filename="../ui/EditProduct.ui" line="11490"/> <source>Bottle fermentation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11119"/> - <location filename="../ui/EditProduct.ui" line="11535"/> + <location filename="../ui/EditProduct.ui" line="11609"/> + <location filename="../ui/EditProduct.ui" line="12025"/> <source> gr/L</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11166"/> + <location filename="../ui/EditProduct.ui" line="11656"/> <source>Expected pressure in bar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11182"/> + <location filename="../ui/EditProduct.ui" line="11672"/> <source>Bottles ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11280"/> + <location filename="../ui/EditProduct.ui" line="11770"/> <source>Kegs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11292"/> + <location filename="../ui/EditProduct.ui" line="11782"/> <source>Kegs ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11308"/> + <location filename="../ui/EditProduct.ui" line="11798"/> <source>Kegs pressure in bar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11388"/> + <location filename="../ui/EditProduct.ui" line="11878"/> <source>Kegs temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11676"/> + <location filename="../ui/EditProduct.ui" line="12166"/> <source>Forced carbonation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11703"/> + <location filename="../ui/EditProduct.ui" line="12193"/> <source>Edit the package date.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11762"/> + <location filename="../ui/EditProduct.ui" line="12252"/> <source>Show carbonation log:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11775"/> + <location filename="../ui/EditProduct.ui" line="12265"/> <source>Tasting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11787"/> + <location filename="../ui/EditProduct.ui" line="12277"/> <source>Taste date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11823"/> + <location filename="../ui/EditProduct.ui" line="12313"/> <source>Taste rate:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11864"/> + <location filename="../ui/EditProduct.ui" line="12354"/> <source>Color:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11880"/> + <location filename="../ui/EditProduct.ui" line="12370"/> <source>Transparency:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11896"/> + <location filename="../ui/EditProduct.ui" line="12386"/> <source>Head:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11951"/> + <location filename="../ui/EditProduct.ui" line="12441"/> <source>Aroma:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11980"/> + <location filename="../ui/EditProduct.ui" line="12470"/> <source>Taste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12009"/> + <location filename="../ui/EditProduct.ui" line="12499"/> <source>Aftertaste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12038"/> + <location filename="../ui/EditProduct.ui" line="12528"/> <source>Mouthfeel:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12067"/> + <location filename="../ui/EditProduct.ui" line="12557"/> <source>Notes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12093"/> + <location filename="../ui/EditProduct.ui" line="12583"/> <source>Edit the tasting date.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12129"/> + <location filename="../ui/EditProduct.ui" line="12619"/> <source>Images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12230"/> + <location filename="../ui/EditProduct.ui" line="12720"/> <source>Previous</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12247"/> + <location filename="../ui/EditProduct.ui" line="12737"/> <source>Next</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12320"/> + <location filename="../ui/EditProduct.ui" line="12810"/> <source>Filename:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12336"/> + <location filename="../ui/EditProduct.ui" line="12826"/> <source>Comment:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12381"/> + <location filename="../ui/EditProduct.ui" line="12871"/> <source>Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12425"/> + <location filename="../ui/EditProduct.ui" line="12915"/> <source>Export</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12281"/> - <location filename="../ui/EditProduct.ui" line="12442"/> + <location filename="../ui/EditProduct.ui" line="12771"/> + <location filename="../ui/EditProduct.ui" line="12932"/> <source>Print</source> <translation type="unfinished"></translation> </message> @@ -4329,43 +4399,43 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="849"/> + <location filename="../src/EditProduct.cpp" line="960"/> <source>BMSapp - Add new product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="851"/> + <location filename="../src/EditProduct.cpp" line="962"/> <source>BMSapp - Edit %1 - %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="867"/> - <location filename="../src/EditProduct.cpp" line="871"/> + <location filename="../src/EditProduct.cpp" line="978"/> + <location filename="../src/EditProduct.cpp" line="982"/> <source>Edit Product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="867"/> + <location filename="../src/EditProduct.cpp" line="978"/> <source>Name empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="871"/> + <location filename="../src/EditProduct.cpp" line="982"/> <source>No beerstyle selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="910"/> + <location filename="../src/EditProduct.cpp" line="1021"/> <source>Delete product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="947"/> + <location filename="../src/EditProduct.cpp" line="1058"/> <source>Product changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="947"/> + <location filename="../src/EditProduct.cpp" line="1058"/> <source>The product has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -4491,7 +4561,7 @@ <location filename="../src/EditProductTab6.cpp" line="913"/> <location filename="../src/EditProductTab7.cpp" line="306"/> <location filename="../src/EditProductTab13.cpp" line="279"/> - <location filename="../src/EditProduct.cpp" line="910"/> + <location filename="../src/EditProduct.cpp" line="1021"/> <source>Delete %1</source> <translation type="unfinished"></translation> </message> @@ -5041,67 +5111,77 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="202"/> + <location filename="../src/EditProductTab8.cpp" line="203"/> <source>Very malty and sweet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="204"/> + <location filename="../src/EditProductTab8.cpp" line="205"/> <source>Malty, sweet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="206"/> - <location filename="../src/EditProductTab8.cpp" line="443"/> + <location filename="../src/EditProductTab8.cpp" line="207"/> + <location filename="../src/EditProductTab8.cpp" line="445"/> <source>Balanced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="208"/> + <location filename="../src/EditProductTab8.cpp" line="209"/> <source>Hoppy, bitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="210"/> + <location filename="../src/EditProductTab8.cpp" line="211"/> <source>Very hoppy, very bitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="437"/> - <source>Too malty</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProductTab8.cpp" line="439"/> - <source>Very malty</source> + <source>Too malty</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab8.cpp" line="441"/> + <source>Very malty</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab8.cpp" line="443"/> <source>Malty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="445"/> - <source>Little bitter</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProductTab8.cpp" line="447"/> - <source>Bitter</source> + <source>Little bitter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab8.cpp" line="449"/> - <source>Very bitter</source> + <source>Bitter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab8.cpp" line="451"/> + <source>Very bitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab8.cpp" line="453"/> <source>Too bitter</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab8.cpp" line="667"/> + <source>Target Water Adjustment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab8.cpp" line="695"/> + <source>Treated Sparge Water</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab9.cpp" line="103"/> <source>Confirm brew</source> <translation type="unfinished"></translation> @@ -5430,7 +5510,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12304"/> + <location filename="../ui/EditProduct.ui" line="12794"/> <location filename="../src/EditProductTab13.cpp" line="210"/> <source>Image here</source> <translation type="unfinished"></translation> @@ -5476,7 +5556,7 @@ <location filename="../src/EditProductTab13.cpp" line="293"/> <location filename="../src/EditProductTab13.cpp" line="406"/> <location filename="../src/EditProductTab13.cpp" line="430"/> - <location filename="../src/EditProduct.cpp" line="924"/> + <location filename="../src/EditProduct.cpp" line="1035"/> <source>Database error</source> <translation type="unfinished"></translation> </message> @@ -5486,7 +5566,7 @@ <location filename="../src/EditProductTab13.cpp" line="293"/> <location filename="../src/EditProductTab13.cpp" line="406"/> <location filename="../src/EditProductTab13.cpp" line="430"/> - <location filename="../src/EditProduct.cpp" line="924"/> + <location filename="../src/EditProduct.cpp" line="1035"/> <source>MySQL error: %1 %2 %3</source> @@ -10009,6 +10089,17 @@ <source>Yeast Packages</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/MainWindow.cpp" line="279"/> + <source>Equipments upgrade</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/MainWindow.cpp" line="280"/> + <source>The Equipents database has two new HLT fields. +Please check the Inventory->Equipents records</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ManoMeter</name> @@ -12494,25 +12585,23 @@ <location filename="../src/database/db_recipe.cpp" line="31"/> <location filename="../src/database/db_recipe.cpp" line="661"/> <location filename="../src/database/db_recipe.cpp" line="694"/> - <location filename="../src/database/db_product.cpp" line="40"/> - <location filename="../src/database/db_product.cpp" line="56"/> - <location filename="../src/database/db_product.cpp" line="1070"/> - <location filename="../src/database/db_product.cpp" line="1103"/> + <location filename="../src/database/db_product.cpp" line="31"/> + <location filename="../src/database/db_product.cpp" line="1068"/> + <location filename="../src/database/db_product.cpp" line="1101"/> <source>Database error</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/database/db_recipe.cpp" line="31"/> - <location filename="../src/database/db_product.cpp" line="56"/> + <location filename="../src/database/db_product.cpp" line="31"/> <source>MySQL error: record %1 not found</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/database/db_recipe.cpp" line="662"/> <location filename="../src/database/db_recipe.cpp" line="695"/> - <location filename="../src/database/db_product.cpp" line="41"/> - <location filename="../src/database/db_product.cpp" line="1071"/> - <location filename="../src/database/db_product.cpp" line="1104"/> + <location filename="../src/database/db_product.cpp" line="1069"/> + <location filename="../src/database/db_product.cpp" line="1102"/> <source>MySQL error: %1 %2 %3</source>
--- a/translations/bmsapp_nl.ts Sat Jun 01 21:10:54 2024 +0200 +++ b/translations/bmsapp_nl.ts Sat Jun 08 15:54:30 2024 +0200 @@ -1312,16 +1312,18 @@ <message> <location filename="../ui/EditEquipment.ui" line="177"/> <location filename="../ui/EditEquipment.ui" line="419"/> - <location filename="../ui/EditEquipment.ui" line="539"/> - <location filename="../ui/EditEquipment.ui" line="630"/> - <location filename="../ui/EditEquipment.ui" line="727"/> - <location filename="../ui/EditEquipment.ui" line="887"/> - <location filename="../ui/EditEquipment.ui" line="924"/> - <location filename="../ui/EditEquipment.ui" line="974"/> - <location filename="../ui/EditEquipment.ui" line="1056"/> - <location filename="../ui/EditEquipment.ui" line="1093"/> - <location filename="../ui/EditEquipment.ui" line="1233"/> - <location filename="../ui/EditEquipment.ui" line="1309"/> + <location filename="../ui/EditEquipment.ui" line="507"/> + <location filename="../ui/EditEquipment.ui" line="570"/> + <location filename="../ui/EditEquipment.ui" line="601"/> + <location filename="../ui/EditEquipment.ui" line="661"/> + <location filename="../ui/EditEquipment.ui" line="758"/> + <location filename="../ui/EditEquipment.ui" line="918"/> + <location filename="../ui/EditEquipment.ui" line="955"/> + <location filename="../ui/EditEquipment.ui" line="1005"/> + <location filename="../ui/EditEquipment.ui" line="1087"/> + <location filename="../ui/EditEquipment.ui" line="1124"/> + <location filename="../ui/EditEquipment.ui" line="1311"/> + <location filename="../ui/EditEquipment.ui" line="1387"/> <source> L</source> <translation> L</translation> </message> @@ -1352,7 +1354,7 @@ </message> <message> <location filename="../ui/EditEquipment.ui" line="320"/> - <location filename="../ui/EditEquipment.ui" line="680"/> + <location filename="../ui/EditEquipment.ui" line="711"/> <source> cm</source> <translation> cm</translation> </message> @@ -1363,88 +1365,98 @@ <translation> Kg</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="501"/> + <location filename="../ui/EditEquipment.ui" line="485"/> <source>Lauter deadspace:</source> <translation>Filterkuip dode ruimte:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="517"/> + <location filename="../ui/EditEquipment.ui" line="532"/> + <source>HLT Volume:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditEquipment.ui" line="548"/> + <source>HLT deadspace:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditEquipment.ui" line="1180"/> <source>Brewhouse efficiency:</source> <translation>Brouwzaal rendement:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="570"/> + <location filename="../ui/EditEquipment.ui" line="1155"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="608"/> + <location filename="../ui/EditEquipment.ui" line="639"/> <source>Kettle volume:</source> <translation>Kookketel volume:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="655"/> + <location filename="../ui/EditEquipment.ui" line="686"/> <source>Kettle height:</source> <translation>Kookketel hoogte:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="705"/> + <location filename="../ui/EditEquipment.ui" line="736"/> <source>Boil size at 100 °C:</source> <translation>Kook volume bij 100 °C:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="752"/> + <location filename="../ui/EditEquipment.ui" line="783"/> <source>Evaporation Liter/hour:</source> <translation>Verdamping Liter per uur:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="768"/> + <location filename="../ui/EditEquipment.ui" line="799"/> <source>Boil time:</source> <translation>Kooktijd:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="784"/> + <location filename="../ui/EditEquipment.ui" line="815"/> <source>Top up kettle:</source> <translation>Extra water bij koken:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="800"/> + <location filename="../ui/EditEquipment.ui" line="831"/> <source>Batch size at 100 °C:</source> <translation>Eind volume bij 100 °C:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="822"/> - <source> L/h</source> - <translation> L/u</translation> - </message> - <message> <location filename="../ui/EditEquipment.ui" line="853"/> - <location filename="../ui/EditEquipment.ui" line="1183"/> + <source> L/h</source> + <translation> L/u</translation> + </message> + <message> + <location filename="../ui/EditEquipment.ui" line="884"/> + <location filename="../ui/EditEquipment.ui" line="1261"/> <source> min</source> <translation> min</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="878"/> + <location filename="../ui/EditEquipment.ui" line="909"/> <source>Added extra water during boil</source> <translation>Toegevoegd extra water tijdens koken</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="949"/> + <location filename="../ui/EditEquipment.ui" line="980"/> <source>Kettle trub loss:</source> <translation>Kookketel trub verlies:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="965"/> + <location filename="../ui/EditEquipment.ui" line="996"/> <source>Trub loss to leave behind in the kettle</source> <translation>Trub verlies wat achterblijft in de kookketel</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1267"/> + <location filename="../ui/EditEquipment.ui" line="1345"/> <source>Transfer loss:</source> <translation>Overbrengen verlies:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1283"/> + <location filename="../ui/EditEquipment.ui" line="1361"/> <source>Immersion chiller:</source> <translation>Dompelkoeler:</translation> </message> @@ -1492,16 +1504,15 @@ <translation type="vanished">Maximum moutstort kg:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="486"/> <source>Lautering</source> - <translation>Filteren</translation> + <translation type="vanished">Filteren</translation> </message> <message> <source>Kettle height cm:</source> <translation type="vanished">Kookketel hoogte cm:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="671"/> + <location filename="../ui/EditEquipment.ui" line="702"/> <source>Measured inside the kettle</source> <translation>Gemeten binnen in de ketel</translation> </message> @@ -1518,42 +1529,42 @@ <translation type="vanished">Kookketel trub verlies L:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1000"/> + <location filename="../ui/EditEquipment.ui" line="1031"/> <source>Transfer</source> <translation>Overbrengen</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1015"/> + <location filename="../ui/EditEquipment.ui" line="1046"/> <source>Extra water in fermenter:</source> <translation>Extra water in gistvat:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1031"/> + <location filename="../ui/EditEquipment.ui" line="1062"/> <source>Volume in fermenter:</source> <translation>Volume naar het gistvat:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1047"/> + <location filename="../ui/EditEquipment.ui" line="1078"/> <source>Extra water to add to the fermenter</source> <translation>Extra water toevoegen in het gistvat</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1148"/> + <location filename="../ui/EditEquipment.ui" line="1226"/> <source>Wort chiller type:</source> <translation>Wort koeler type:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1174"/> + <location filename="../ui/EditEquipment.ui" line="1252"/> <source>Minutes elapsed to cool to 79 °C</source> <translation>Nodige minuten om tot 79 °C te koelen</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1208"/> + <location filename="../ui/EditEquipment.ui" line="1286"/> <source>Minutes to cool to 79 °C:</source> <translation>Minuten koelen tot 79 °C:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1224"/> + <location filename="../ui/EditEquipment.ui" line="1302"/> <source>Volume lost in hoses, pump ...</source> <translation>Verlies in slangen, pomp ...</translation> </message> @@ -1566,26 +1577,26 @@ <translation type="vanished">Dompelkoeler L:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1299"/> + <location filename="../ui/EditEquipment.ui" line="1377"/> <source>Temporary extra volume of the immersion chiller in the kettle. Used to correct the after boil volume.</source> <translation>Tijdelijk extra volume in de kookketel. Wordt gebruikt als correctie voor na koken volume.</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1334"/> + <location filename="../ui/EditEquipment.ui" line="1412"/> <source>Liters per minute to pump trough the chiller. Used to calculate the time needed to transfer the wort.</source> <translation>Liters per minuut pompen door de koeler. Gebruikt om de tijd te berekenen om het wort weg te pompen.</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1344"/> + <location filename="../ui/EditEquipment.ui" line="1422"/> <source> L/m</source> <translation> L/m</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1369"/> + <location filename="../ui/EditEquipment.ui" line="1447"/> <source>Transfer liters/minute:</source> <translation>Overbrengen liters/minuut:</translation> </message> @@ -1606,7 +1617,7 @@ <translation type="vanished">Brouwzaal rendement %:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="596"/> + <location filename="../ui/EditEquipment.ui" line="627"/> <source>Boiling</source> <translation>Koken</translation> </message> @@ -1647,7 +1658,7 @@ <translation type="vanished">100% voor kleine brouwerijen, hoger voor grote.</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1136"/> + <location filename="../ui/EditEquipment.ui" line="1214"/> <source>Chilling</source> <translation>Koelen</translation> </message> @@ -1664,7 +1675,7 @@ <translation type="vanished">Volume naar het gistvat L:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1119"/> + <location filename="../ui/EditEquipment.ui" line="1197"/> <source>Clone</source> <translation>Kloon</translation> </message> @@ -1685,36 +1696,36 @@ <translation type="vanished">Koper</translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="156"/> + <location filename="../src/EditEquipment.cpp" line="162"/> <source>BMSapp - Add new equipment</source> <translation>BMSapp - Nieuwe apparatuur</translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="158"/> + <location filename="../src/EditEquipment.cpp" line="164"/> <source>BMSapp - Edit equipment %1</source> <translation>BMSapp - Wijzig apparatuur %1</translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="175"/> + <location filename="../src/EditEquipment.cpp" line="181"/> <source>Edit Equipment</source> <translation>Wijzig apparatuur</translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="175"/> + <location filename="../src/EditEquipment.cpp" line="181"/> <source>Name empty or too short.</source> <translation>De naam is leeg of te kort.</translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="234"/> - <location filename="../src/EditEquipment.cpp" line="293"/> - <location filename="../src/EditEquipment.cpp" line="318"/> + <location filename="../src/EditEquipment.cpp" line="243"/> + <location filename="../src/EditEquipment.cpp" line="305"/> + <location filename="../src/EditEquipment.cpp" line="330"/> <source>Database error</source> <translation>Database fout</translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="235"/> - <location filename="../src/EditEquipment.cpp" line="294"/> - <location filename="../src/EditEquipment.cpp" line="319"/> + <location filename="../src/EditEquipment.cpp" line="244"/> + <location filename="../src/EditEquipment.cpp" line="306"/> + <location filename="../src/EditEquipment.cpp" line="331"/> <source>MySQL error: %1 %2 %3</source> @@ -1723,22 +1734,22 @@ %3</translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="308"/> + <location filename="../src/EditEquipment.cpp" line="320"/> <source>Delete equipment</source> <translation>Verwijder apparatuur</translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="308"/> + <location filename="../src/EditEquipment.cpp" line="320"/> <source>Delete %1</source> <translation>Verwijder %1</translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="439"/> + <location filename="../src/EditEquipment.cpp" line="451"/> <source>Equipment changed</source> <translation>Apparatuur gewijzigd</translation> </message> <message> - <location filename="../src/EditEquipment.cpp" line="439"/> + <location filename="../src/EditEquipment.cpp" line="451"/> <source>This equipment has been modified. Save changes?</source> <translation>Deze installatie is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -2820,14 +2831,14 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="55"/> - <location filename="../ui/EditProduct.ui" line="12264"/> + <location filename="../ui/EditProduct.ui" line="12754"/> <location filename="../src/EditProductTab9.cpp" line="552"/> <source>Save</source> <translation>Bewaar</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="75"/> - <location filename="../ui/EditProduct.ui" line="12213"/> + <location filename="../ui/EditProduct.ui" line="12703"/> <location filename="../src/EditProductTab3.cpp" line="74"/> <location filename="../src/EditProductTab3.cpp" line="162"/> <location filename="../src/EditProductTab4.cpp" line="60"/> @@ -2872,26 +2883,26 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="240"/> - <location filename="../ui/EditProduct.ui" line="7978"/> - <location filename="../ui/EditProduct.ui" line="8973"/> + <location filename="../ui/EditProduct.ui" line="8468"/> + <location filename="../ui/EditProduct.ui" line="9463"/> <source>Efficiency:</source> <translation>Rendement:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="256"/> - <location filename="../ui/EditProduct.ui" line="2274"/> + <location filename="../ui/EditProduct.ui" line="2317"/> <source>Boil time:</source> <translation>Kooktijd:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="272"/> - <location filename="../ui/EditProduct.ui" line="2374"/> + <location filename="../ui/EditProduct.ui" line="2417"/> <source>Batch size:</source> <translation>Brouw volume:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="288"/> - <location filename="../ui/EditProduct.ui" line="2174"/> + <location filename="../ui/EditProduct.ui" line="2217"/> <source>Boil size:</source> <translation>Kook volume:</translation> </message> @@ -2900,39 +2911,39 @@ <location filename="../ui/EditProduct.ui" line="471"/> <location filename="../ui/EditProduct.ui" line="640"/> <location filename="../ui/EditProduct.ui" line="1031"/> - <location filename="../ui/EditProduct.ui" line="1802"/> - <location filename="../ui/EditProduct.ui" line="3370"/> - <location filename="../ui/EditProduct.ui" line="3423"/> - <location filename="../ui/EditProduct.ui" line="4153"/> - <location filename="../ui/EditProduct.ui" line="7671"/> - <location filename="../ui/EditProduct.ui" line="8072"/> - <location filename="../ui/EditProduct.ui" line="9089"/> - <location filename="../ui/EditProduct.ui" line="9690"/> - <location filename="../ui/EditProduct.ui" line="9924"/> - <location filename="../ui/EditProduct.ui" line="10142"/> - <location filename="../ui/EditProduct.ui" line="10244"/> - <location filename="../ui/EditProduct.ui" line="10393"/> - <location filename="../ui/EditProduct.ui" line="10446"/> - <location filename="../ui/EditProduct.ui" line="10650"/> - <location filename="../ui/EditProduct.ui" line="10684"/> - <location filename="../ui/EditProduct.ui" line="10772"/> - <location filename="../ui/EditProduct.ui" line="11050"/> - <location filename="../ui/EditProduct.ui" line="11235"/> - <location filename="../ui/EditProduct.ui" line="11463"/> - <location filename="../ui/EditProduct.ui" line="11626"/> + <location filename="../ui/EditProduct.ui" line="2645"/> + <location filename="../ui/EditProduct.ui" line="3463"/> + <location filename="../ui/EditProduct.ui" line="3516"/> + <location filename="../ui/EditProduct.ui" line="4246"/> + <location filename="../ui/EditProduct.ui" line="8161"/> + <location filename="../ui/EditProduct.ui" line="8562"/> + <location filename="../ui/EditProduct.ui" line="9579"/> + <location filename="../ui/EditProduct.ui" line="10180"/> + <location filename="../ui/EditProduct.ui" line="10414"/> + <location filename="../ui/EditProduct.ui" line="10632"/> + <location filename="../ui/EditProduct.ui" line="10734"/> + <location filename="../ui/EditProduct.ui" line="10883"/> + <location filename="../ui/EditProduct.ui" line="10936"/> + <location filename="../ui/EditProduct.ui" line="11140"/> + <location filename="../ui/EditProduct.ui" line="11174"/> + <location filename="../ui/EditProduct.ui" line="11262"/> + <location filename="../ui/EditProduct.ui" line="11540"/> + <location filename="../ui/EditProduct.ui" line="11725"/> + <location filename="../ui/EditProduct.ui" line="11953"/> + <location filename="../ui/EditProduct.ui" line="12116"/> <source> %</source> <translation> %</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="335"/> - <location filename="../ui/EditProduct.ui" line="1922"/> - <location filename="../ui/EditProduct.ui" line="2302"/> - <location filename="../ui/EditProduct.ui" line="8289"/> - <location filename="../ui/EditProduct.ui" line="8317"/> - <location filename="../ui/EditProduct.ui" line="8345"/> - <location filename="../ui/EditProduct.ui" line="8373"/> - <location filename="../ui/EditProduct.ui" line="8760"/> - <location filename="../ui/EditProduct.ui" line="8881"/> + <location filename="../ui/EditProduct.ui" line="1965"/> + <location filename="../ui/EditProduct.ui" line="2345"/> + <location filename="../ui/EditProduct.ui" line="8779"/> + <location filename="../ui/EditProduct.ui" line="8807"/> + <location filename="../ui/EditProduct.ui" line="8835"/> + <location filename="../ui/EditProduct.ui" line="8863"/> + <location filename="../ui/EditProduct.ui" line="9250"/> + <location filename="../ui/EditProduct.ui" line="9371"/> <source> min</source> <translation> min</translation> </message> @@ -2941,40 +2952,44 @@ <location filename="../ui/EditProduct.ui" line="394"/> <location filename="../ui/EditProduct.ui" line="1576"/> <location filename="../ui/EditProduct.ui" line="1660"/> - <location filename="../ui/EditProduct.ui" line="1752"/> - <location filename="../ui/EditProduct.ui" line="1866"/> - <location filename="../ui/EditProduct.ui" line="1959"/> - <location filename="../ui/EditProduct.ui" line="2073"/> - <location filename="../ui/EditProduct.ui" line="2152"/> - <location filename="../ui/EditProduct.ui" line="2202"/> - <location filename="../ui/EditProduct.ui" line="2252"/> - <location filename="../ui/EditProduct.ui" line="2352"/> - <location filename="../ui/EditProduct.ui" line="2402"/> - <location filename="../ui/EditProduct.ui" line="2452"/> - <location filename="../ui/EditProduct.ui" line="2499"/> - <location filename="../ui/EditProduct.ui" line="2549"/> - <location filename="../ui/EditProduct.ui" line="3122"/> - <location filename="../ui/EditProduct.ui" line="3178"/> - <location filename="../ui/EditProduct.ui" line="4356"/> - <location filename="../ui/EditProduct.ui" line="5692"/> - <location filename="../ui/EditProduct.ui" line="6434"/> - <location filename="../ui/EditProduct.ui" line="6771"/> - <location filename="../ui/EditProduct.ui" line="7100"/> - <location filename="../ui/EditProduct.ui" line="7779"/> - <location filename="../ui/EditProduct.ui" line="7845"/> - <location filename="../ui/EditProduct.ui" line="8097"/> - <location filename="../ui/EditProduct.ui" line="8128"/> - <location filename="../ui/EditProduct.ui" line="8462"/> - <location filename="../ui/EditProduct.ui" line="8490"/> - <location filename="../ui/EditProduct.ui" line="8524"/> - <location filename="../ui/EditProduct.ui" line="8954"/> - <location filename="../ui/EditProduct.ui" line="9039"/> - <location filename="../ui/EditProduct.ui" line="10585"/> - <location filename="../ui/EditProduct.ui" line="10616"/> - <location filename="../ui/EditProduct.ui" line="11022"/> - <location filename="../ui/EditProduct.ui" line="11144"/> - <location filename="../ui/EditProduct.ui" line="11504"/> - <location filename="../ui/EditProduct.ui" line="11585"/> + <location filename="../ui/EditProduct.ui" line="1739"/> + <location filename="../ui/EditProduct.ui" line="1805"/> + <location filename="../ui/EditProduct.ui" line="1842"/> + <location filename="../ui/EditProduct.ui" line="1909"/> + <location filename="../ui/EditProduct.ui" line="2002"/> + <location filename="../ui/EditProduct.ui" line="2116"/> + <location filename="../ui/EditProduct.ui" line="2195"/> + <location filename="../ui/EditProduct.ui" line="2245"/> + <location filename="../ui/EditProduct.ui" line="2295"/> + <location filename="../ui/EditProduct.ui" line="2395"/> + <location filename="../ui/EditProduct.ui" line="2445"/> + <location filename="../ui/EditProduct.ui" line="2495"/> + <location filename="../ui/EditProduct.ui" line="2542"/> + <location filename="../ui/EditProduct.ui" line="2592"/> + <location filename="../ui/EditProduct.ui" line="3215"/> + <location filename="../ui/EditProduct.ui" line="3271"/> + <location filename="../ui/EditProduct.ui" line="4449"/> + <location filename="../ui/EditProduct.ui" line="5582"/> + <location filename="../ui/EditProduct.ui" line="6257"/> + <location filename="../ui/EditProduct.ui" line="6604"/> + <location filename="../ui/EditProduct.ui" line="6936"/> + <location filename="../ui/EditProduct.ui" line="7544"/> + <location filename="../ui/EditProduct.ui" line="7734"/> + <location filename="../ui/EditProduct.ui" line="8269"/> + <location filename="../ui/EditProduct.ui" line="8335"/> + <location filename="../ui/EditProduct.ui" line="8587"/> + <location filename="../ui/EditProduct.ui" line="8618"/> + <location filename="../ui/EditProduct.ui" line="8952"/> + <location filename="../ui/EditProduct.ui" line="8980"/> + <location filename="../ui/EditProduct.ui" line="9014"/> + <location filename="../ui/EditProduct.ui" line="9444"/> + <location filename="../ui/EditProduct.ui" line="9529"/> + <location filename="../ui/EditProduct.ui" line="11075"/> + <location filename="../ui/EditProduct.ui" line="11106"/> + <location filename="../ui/EditProduct.ui" line="11512"/> + <location filename="../ui/EditProduct.ui" line="11634"/> + <location filename="../ui/EditProduct.ui" line="11994"/> + <location filename="../ui/EditProduct.ui" line="12075"/> <location filename="../src/EditProductExport.cpp" line="845"/> <location filename="../src/EditProductExport.cpp" line="853"/> <source> L</source> @@ -2991,14 +3006,14 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="546"/> - <location filename="../ui/EditProduct.ui" line="3295"/> + <location filename="../ui/EditProduct.ui" line="3388"/> <source>Estimated FG:</source> <translation>Verwacht eind SG:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="582"/> - <location filename="../ui/EditProduct.ui" line="2650"/> - <location filename="../ui/EditProduct.ui" line="3248"/> + <location filename="../ui/EditProduct.ui" line="2743"/> + <location filename="../ui/EditProduct.ui" line="3341"/> <source>Estimated OG:</source> <translation>Verwacht start SG:</translation> </message> @@ -3012,7 +3027,7 @@ <translation type="vanished">Koolzuur volumes:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2600"/> + <location filename="../ui/EditProduct.ui" line="2693"/> <source>Color EBC:</source> <translation>EBC kleur:</translation> </message> @@ -3146,12 +3161,11 @@ <translation>Maischkuip materiaal:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="1728"/> <source>Lautering</source> - <translation>Filteren</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="1774"/> + <translation type="vanished">Filteren</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="1761"/> <source>Lauter deadspace:</source> <translation>Filterkuip dode ruimte:</translation> </message> @@ -3160,7 +3174,7 @@ <translation type="vanished">Filterkuip volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="1841"/> + <location filename="../ui/EditProduct.ui" line="1884"/> <source>Chilling</source> <translation>Koelen</translation> </message> @@ -3169,27 +3183,27 @@ <translation type="vanished">Trub koeler verlies:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8440"/> + <location filename="../ui/EditProduct.ui" line="8930"/> <source>Top up water:</source> <translation>Extra water in gistvat:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2112"/> + <location filename="../ui/EditProduct.ui" line="2155"/> <source>Boiling</source> <translation>Koken</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2124"/> + <location filename="../ui/EditProduct.ui" line="2167"/> <source>Kettle volume:</source> <translation>Kookketel volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2224"/> + <location filename="../ui/EditProduct.ui" line="2267"/> <source>Evaporation / hour:</source> <translation>Verdamping per uur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2324"/> + <location filename="../ui/EditProduct.ui" line="2367"/> <source>Top up kettle:</source> <translation>Extra water bij koken:</translation> </message> @@ -3198,87 +3212,87 @@ <translation type="vanished">Hop efficientie:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2588"/> + <location filename="../ui/EditProduct.ui" line="2681"/> <source>Fermentables</source> <translation>Vergistbaar</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2697"/> + <location filename="../ui/EditProduct.ui" line="2790"/> <source>Mash tun %:</source> <translation>Percentage moutstort:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2713"/> + <location filename="../ui/EditProduct.ui" line="2806"/> <source>Sugars %:</source> <translation>Percentage suikers:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2729"/> + <location filename="../ui/EditProduct.ui" line="2822"/> <source>Cara/crystal %:</source> <translation>Percentage cara:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2745"/> + <location filename="../ui/EditProduct.ui" line="2838"/> <source>Lintner:</source> <translation>Lintner totaal:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2780"/> + <location filename="../ui/EditProduct.ui" line="2873"/> <source>%v lintner</source> <translation>%v lintner</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2802"/> - <location filename="../ui/EditProduct.ui" line="2824"/> - <location filename="../ui/EditProduct.ui" line="2846"/> - <location filename="../ui/EditProduct.ui" line="3029"/> - <location filename="../ui/EditProduct.ui" line="3051"/> + <location filename="../ui/EditProduct.ui" line="2895"/> + <location filename="../ui/EditProduct.ui" line="2917"/> + <location filename="../ui/EditProduct.ui" line="2939"/> + <location filename="../ui/EditProduct.ui" line="3122"/> + <location filename="../ui/EditProduct.ui" line="3144"/> <source>%v%</source> <translation>%v%</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2859"/> - <location filename="../ui/EditProduct.ui" line="3074"/> - <location filename="../ui/EditProduct.ui" line="3222"/> - <location filename="../ui/EditProduct.ui" line="4072"/> - <location filename="../ui/EditProduct.ui" line="4227"/> - <location filename="../ui/EditProduct.ui" line="12141"/> + <location filename="../ui/EditProduct.ui" line="2952"/> + <location filename="../ui/EditProduct.ui" line="3167"/> + <location filename="../ui/EditProduct.ui" line="3315"/> + <location filename="../ui/EditProduct.ui" line="4165"/> + <location filename="../ui/EditProduct.ui" line="4320"/> + <location filename="../ui/EditProduct.ui" line="12631"/> <location filename="../src/EditProductExport.cpp" line="873"/> <source>Add</source> <translation>Nieuw</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2888"/> + <location filename="../ui/EditProduct.ui" line="2981"/> <source> kg</source> <translation></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2913"/> + <location filename="../ui/EditProduct.ui" line="3006"/> <source>Mash weight:</source> <translation>Maisch gewicht:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2926"/> + <location filename="../ui/EditProduct.ui" line="3019"/> <source>Hops</source> <translation>Hoppen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2988"/> + <location filename="../ui/EditProduct.ui" line="3081"/> <source>Hop taste:</source> <translation>Hop smaak:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3004"/> + <location filename="../ui/EditProduct.ui" line="3097"/> <source>Hop aroma:</source> <translation>Hop aroma:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3200"/> + <location filename="../ui/EditProduct.ui" line="3293"/> <source>Miscs</source> <translation>Diversen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3236"/> + <location filename="../ui/EditProduct.ui" line="3329"/> <source>Yeasts</source> <translation>Gisten</translation> </message> @@ -3287,63 +3301,63 @@ <translation type="vanished">Schijnbare vergisting:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3509"/> + <location filename="../ui/EditProduct.ui" line="3602"/> <source>Pitchrate billion cells/ml/°P:</source> <translation>Ent miljard cellen/ml/°P:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3535"/> + <location filename="../ui/EditProduct.ui" line="3628"/> <source>Starter method:</source> <translation>Starter methode:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3551"/> + <location filename="../ui/EditProduct.ui" line="3644"/> <source>Starter SG:</source> <translation>Starter SG:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3598"/> - <location filename="../ui/EditProduct.ui" line="3687"/> - <location filename="../ui/EditProduct.ui" line="10361"/> - <location filename="../ui/EditProduct.ui" line="11722"/> - <location filename="../ui/EditProduct.ui" line="11803"/> - <location filename="../ui/EditProduct.ui" line="12112"/> + <location filename="../ui/EditProduct.ui" line="3691"/> + <location filename="../ui/EditProduct.ui" line="3780"/> + <location filename="../ui/EditProduct.ui" line="10851"/> + <location filename="../ui/EditProduct.ui" line="12212"/> + <location filename="../ui/EditProduct.ui" line="12293"/> + <location filename="../ui/EditProduct.ui" line="12602"/> <source>Set or clear date</source> <translation>Zet of wis datum</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3601"/> - <location filename="../ui/EditProduct.ui" line="3690"/> - <location filename="../ui/EditProduct.ui" line="4124"/> - <location filename="../ui/EditProduct.ui" line="4191"/> - <location filename="../ui/EditProduct.ui" line="8150"/> - <location filename="../ui/EditProduct.ui" line="8189"/> - <location filename="../ui/EditProduct.ui" line="8786"/> - <location filename="../ui/EditProduct.ui" line="9111"/> - <location filename="../ui/EditProduct.ui" line="9185"/> - <location filename="../ui/EditProduct.ui" line="9206"/> - <location filename="../ui/EditProduct.ui" line="9245"/> - <location filename="../ui/EditProduct.ui" line="9316"/> - <location filename="../ui/EditProduct.ui" line="9403"/> - <location filename="../ui/EditProduct.ui" line="9712"/> - <location filename="../ui/EditProduct.ui" line="9732"/> - <location filename="../ui/EditProduct.ui" line="9771"/> - <location filename="../ui/EditProduct.ui" line="9946"/> - <location filename="../ui/EditProduct.ui" line="9966"/> - <location filename="../ui/EditProduct.ui" line="10005"/> - <location filename="../ui/EditProduct.ui" line="10164"/> - <location filename="../ui/EditProduct.ui" line="10299"/> - <location filename="../ui/EditProduct.ui" line="10319"/> - <location filename="../ui/EditProduct.ui" line="10364"/> - <location filename="../ui/EditProduct.ui" line="11725"/> - <location filename="../ui/EditProduct.ui" line="11745"/> - <location filename="../ui/EditProduct.ui" line="11806"/> - <location filename="../ui/EditProduct.ui" line="12115"/> + <location filename="../ui/EditProduct.ui" line="3694"/> + <location filename="../ui/EditProduct.ui" line="3783"/> + <location filename="../ui/EditProduct.ui" line="4217"/> + <location filename="../ui/EditProduct.ui" line="4284"/> + <location filename="../ui/EditProduct.ui" line="8640"/> + <location filename="../ui/EditProduct.ui" line="8679"/> + <location filename="../ui/EditProduct.ui" line="9276"/> + <location filename="../ui/EditProduct.ui" line="9601"/> + <location filename="../ui/EditProduct.ui" line="9675"/> + <location filename="../ui/EditProduct.ui" line="9696"/> + <location filename="../ui/EditProduct.ui" line="9735"/> + <location filename="../ui/EditProduct.ui" line="9806"/> + <location filename="../ui/EditProduct.ui" line="9893"/> + <location filename="../ui/EditProduct.ui" line="10202"/> + <location filename="../ui/EditProduct.ui" line="10222"/> + <location filename="../ui/EditProduct.ui" line="10261"/> + <location filename="../ui/EditProduct.ui" line="10436"/> + <location filename="../ui/EditProduct.ui" line="10456"/> + <location filename="../ui/EditProduct.ui" line="10495"/> + <location filename="../ui/EditProduct.ui" line="10654"/> + <location filename="../ui/EditProduct.ui" line="10789"/> + <location filename="../ui/EditProduct.ui" line="10809"/> + <location filename="../ui/EditProduct.ui" line="10854"/> + <location filename="../ui/EditProduct.ui" line="12215"/> + <location filename="../ui/EditProduct.ui" line="12235"/> + <location filename="../ui/EditProduct.ui" line="12296"/> + <location filename="../ui/EditProduct.ui" line="12605"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3640"/> + <location filename="../ui/EditProduct.ui" line="3733"/> <source>Need billion cells:</source> <translation>Nodig miljard cellen:</translation> </message> @@ -3352,102 +3366,102 @@ <translation type="vanished">Droge gist berekening.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3768"/> + <location filename="../ui/EditProduct.ui" line="3861"/> <source>Low grams/hl:</source> <translation>Laag grammen/hl:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3784"/> + <location filename="../ui/EditProduct.ui" line="3877"/> <source>High grams/hl:</source> <translation>Hoog grammen/hl:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3844"/> - <location filename="../ui/EditProduct.ui" line="3860"/> + <location filename="../ui/EditProduct.ui" line="3937"/> + <location filename="../ui/EditProduct.ui" line="3953"/> <source>at</source> <translation>bij</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3935"/> + <location filename="../ui/EditProduct.ui" line="4028"/> <source>This recipe pitch grams/hl:</source> <translation>Dit recept ent gram/hl:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3979"/> + <location filename="../ui/EditProduct.ui" line="4072"/> <source>Pitchrate grams/hectoliter:</source> <translation>Ent gram/hectoliter:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3995"/> + <location filename="../ui/EditProduct.ui" line="4088"/> <source>Yeast grams needed:</source> <translation>Gist grammen nodig:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4089"/> + <location filename="../ui/EditProduct.ui" line="4182"/> <source>Production date:</source> <translation>Productie datum:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4105"/> + <location filename="../ui/EditProduct.ui" line="4198"/> <source>Yeast condition:</source> <translation>Gist conditie:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4121"/> - <location filename="../ui/EditProduct.ui" line="9203"/> + <location filename="../ui/EditProduct.ui" line="4214"/> + <location filename="../ui/EditProduct.ui" line="9693"/> <source>Set the date to today.</source> <translation>Zet de datum op vandaag.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4169"/> + <location filename="../ui/EditProduct.ui" line="4262"/> <source>Edit the production date.</source> <translation>Wijzig de productie datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4172"/> - <location filename="../ui/EditProduct.ui" line="9226"/> - <location filename="../ui/EditProduct.ui" line="9281"/> - <location filename="../ui/EditProduct.ui" line="9752"/> - <location filename="../ui/EditProduct.ui" line="9986"/> - <location filename="../ui/EditProduct.ui" line="11706"/> - <location filename="../ui/EditProduct.ui" line="12096"/> + <location filename="../ui/EditProduct.ui" line="4265"/> + <location filename="../ui/EditProduct.ui" line="9716"/> + <location filename="../ui/EditProduct.ui" line="9771"/> + <location filename="../ui/EditProduct.ui" line="10242"/> + <location filename="../ui/EditProduct.ui" line="10476"/> + <location filename="../ui/EditProduct.ui" line="12196"/> + <location filename="../ui/EditProduct.ui" line="12586"/> <source>dd-MM-yyyy</source> <translation>dd-MM-yyyy</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4188"/> + <location filename="../ui/EditProduct.ui" line="4281"/> <source>Clear the date</source> <translation>Verwijder de datum</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4205"/> + <location filename="../ui/EditProduct.ui" line="4298"/> <location filename="../src/EditProductTab3.cpp" line="1140"/> <location filename="../src/EditProductTab5.cpp" line="718"/> <source>Mash</source> <translation>Maischen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4244"/> + <location filename="../ui/EditProduct.ui" line="4337"/> <source>Mash name:</source> <translation>Maisch schema:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4260"/> + <location filename="../ui/EditProduct.ui" line="4353"/> <source>Mash schedule:</source> <translation>Kies maisch schema:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4299"/> + <location filename="../ui/EditProduct.ui" line="4392"/> <source>Mash time:</source> <translation>Maisch tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4328"/> + <location filename="../ui/EditProduct.ui" line="4421"/> <source>Mash total volume:</source> <translation>Maisch totaal volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4372"/> + <location filename="../ui/EditProduct.ui" line="4465"/> <source>Water</source> <translation>Water</translation> </message> @@ -3456,125 +3470,125 @@ <translation type="vanished">Water overzicht</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7264"/> + <location filename="../ui/EditProduct.ui" line="7110"/> <source>Ca</source> <translation>Ca</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7000"/> + <location filename="../ui/EditProduct.ui" line="6836"/> <source>Mg</source> <translation>Mg</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7312"/> + <location filename="../ui/EditProduct.ui" line="7158"/> <source>HCO3</source> <translation>HCO3</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7144"/> + <location filename="../ui/EditProduct.ui" line="6980"/> <source>CaCO3</source> <translation>CaCO3</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7248"/> + <location filename="../ui/EditProduct.ui" line="7084"/> <source>Na</source> <translation>Na</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7232"/> + <location filename="../ui/EditProduct.ui" line="7068"/> <source>Cl</source> <translation>Cl</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7280"/> + <location filename="../ui/EditProduct.ui" line="7126"/> <source>SO4</source> <translation>SO4</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7016"/> + <location filename="../ui/EditProduct.ui" line="6852"/> <location filename="../src/EditProductTab7.cpp" line="35"/> <source>pH</source> <translation>pH</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7296"/> + <location filename="../ui/EditProduct.ui" line="7142"/> <location filename="../src/EditProductTab6.cpp" line="342"/> <location filename="../src/EditProductTab7.cpp" line="35"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6756"/> <source>The division between the main and dilution water. The total volume does not change.</source> - <translation>De verdeling tussen het hoofd en verdunnings water. Het totale volume blijft gelijk.</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4978"/> - <location filename="../ui/EditProduct.ui" line="6077"/> + <translation type="vanished">De verdeling tussen het hoofd en verdunnings water. Het totale volume blijft gelijk.</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5071"/> <source>Mash pH should be between 5.2 and 5.6. Use 5.2 for light and 5.5 for dark beers.</source> <translation>De maisch pH moet tussen 5.2 en 5.6 zijn. Gebruik 5.2 voor lichte en 5.5 voor donkere bieren.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6243"/> <source>The ideal amount of Magnesium is between 5 and 40.</source> - <translation>De ideale hoeveelheid magnesium is tussen 5 en 40.</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6008"/> + <translation type="vanished">De ideale hoeveelheid magnesium is tussen 5 en 40.</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5854"/> + <location filename="../ui/EditProduct.ui" line="7835"/> <source>0 to 50 for light beers, 50 to 150 for amber beers, 150 to 250 for dark beers.</source> <translation>0 tot 50 voor licht bier, 50 tot 150 voor amber bier, 150 tot 250 voor donker bier.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6271"/> + <location filename="../ui/EditProduct.ui" line="6089"/> + <location filename="../ui/EditProduct.ui" line="7663"/> <source>The ideal Sulfate amount should be between 50 and 400. Together with Chloride it must be below 500.</source> <translation>De ideale sulfaat hoeveelheid is tussen 50 en 400. Samen met Chloride moet het minder dan 500 zijn.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6187"/> <source>The ideal amount of Calcium is between 40 and 150.</source> - <translation>De ideale hoeveelheid Calcium is tussen 40 en 150.</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6158"/> + <translation type="vanished">De ideale hoeveelheid Calcium is tussen 40 en 150.</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5976"/> + <location filename="../ui/EditProduct.ui" line="7806"/> <source>The ideal Chloride amount is between 50 and 150. Together with Sulfate it must be below 500.</source> <translation>De ideale hoeveelheid Chloride is tussen 50 en 150. Samen met Sulfaat moet dit minder dan 500 zijn.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6105"/> + <location filename="../ui/EditProduct.ui" line="5923"/> + <location filename="../ui/EditProduct.ui" line="7692"/> <source>The ideal amount of Natrium should be below 150.</source> <translation>De ideale hoeveelheid Zout moet minder dan 150 zijn.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7328"/> + <location filename="../ui/EditProduct.ui" line="7174"/> <source>Water profile</source> <translation>Water profiel</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7213"/> + <location filename="../ui/EditProduct.ui" line="7049"/> <source>The main brewing water</source> <translation>Het hoofd brouwwater</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7219"/> + <location filename="../ui/EditProduct.ui" line="7055"/> <source>Choose water</source> <translation>Kies water</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6843"/> + <location filename="../ui/EditProduct.ui" line="6676"/> <source>Optional dilution water</source> <translation>Optioneel meng water</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6846"/> + <location filename="../ui/EditProduct.ui" line="6679"/> <source>Choose dilution</source> <translation>Kies mengwater</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5764"/> + <location filename="../ui/EditProduct.ui" line="5604"/> <source>If needed, choose a target water profile.</source> <translation>Indien nodig, kies een doel water profiel.</translation> </message> @@ -3587,162 +3601,172 @@ <translation type="vanished">Behandeld water</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7044"/> + <location filename="../ui/EditProduct.ui" line="6880"/> <source>RA</source> <translation></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6959"/> + <location filename="../ui/EditProduct.ui" line="6795"/> <source>Hardness</source> <translation>Hardheid</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="1993"/> + <location filename="../ui/EditProduct.ui" line="1777"/> + <source>HLT Volume:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="1867"/> + <source>HLT deadspace:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="2036"/> <source>Transfer loss:</source> <translation>Overbrengen verlies:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2009"/> + <location filename="../ui/EditProduct.ui" line="2052"/> <source>Immersion chiller:</source> <translation>Dompelkoeler:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2475"/> + <location filename="../ui/EditProduct.ui" line="2518"/> <source>Transfer</source> <translation>Overbrengen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2574"/> + <location filename="../ui/EditProduct.ui" line="2617"/> <source>Volume in fermenter:</source> <translation>Volume naar het gistvat:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3707"/> + <location filename="../ui/EditProduct.ui" line="3800"/> <source>Retry starter steps:</source> <translation>Ververs starter stappen:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4384"/> + <location filename="../ui/EditProduct.ui" line="4477"/> <source>Water agents</source> <translation>Brouwzouten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4396"/> + <location filename="../ui/EditProduct.ui" line="4489"/> <source>Calcium Chloride</source> <translation>Calcium Chloride</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4399"/> + <location filename="../ui/EditProduct.ui" line="4492"/> <source>CaCl2:</source> <translation>CaCl2:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4415"/> + <location filename="../ui/EditProduct.ui" line="4508"/> <source>Gypsym</source> <translation>Gips</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4418"/> + <location filename="../ui/EditProduct.ui" line="4511"/> <source>CaSO4:</source> <translation>CaSO4:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4434"/> + <location filename="../ui/EditProduct.ui" line="4527"/> <source>Epsom</source> <translation>Magmesium sulfaat</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4437"/> + <location filename="../ui/EditProduct.ui" line="4530"/> <source>MgSO4:</source> <translation>MgSO4:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4453"/> + <location filename="../ui/EditProduct.ui" line="4546"/> <source>Table salt</source> <translation>Keukenzout</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4456"/> + <location filename="../ui/EditProduct.ui" line="4549"/> <source>NaCl:</source> <translation>NaCl:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4472"/> - <location filename="../ui/EditProduct.ui" line="4656"/> - <location filename="../ui/EditProduct.ui" line="4876"/> + <location filename="../ui/EditProduct.ui" line="4565"/> + <location filename="../ui/EditProduct.ui" line="4749"/> + <location filename="../ui/EditProduct.ui" line="4969"/> <source>Magnesium Chloride</source> <translation>Magnesium Chloride</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4475"/> + <location filename="../ui/EditProduct.ui" line="4568"/> <source>MgCl2:</source> <translation>MgCl2:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4491"/> - <location filename="../ui/EditProduct.ui" line="4687"/> + <location filename="../ui/EditProduct.ui" line="4584"/> + <location filename="../ui/EditProduct.ui" line="4780"/> <source>Baking soda</source> <translation>Baksoda</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4494"/> + <location filename="../ui/EditProduct.ui" line="4587"/> <source>NaHCO3:</source> <translation>NaHCO3:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4510"/> - <location filename="../ui/EditProduct.ui" line="4718"/> + <location filename="../ui/EditProduct.ui" line="4603"/> + <location filename="../ui/EditProduct.ui" line="4811"/> <source>Chalk undissolved</source> <translation>Ongebluste kalk</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4513"/> + <location filename="../ui/EditProduct.ui" line="4606"/> <source>CaCO3:</source> <translation>CaCO3:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4529"/> - <location filename="../ui/EditProduct.ui" line="4844"/> + <location filename="../ui/EditProduct.ui" line="4622"/> + <location filename="../ui/EditProduct.ui" line="4937"/> <source>To change the water profile. This adds Calcium and Chloride. To improve sweet style beers.</source> <translation>Verbeterd het water profiel. Voegt Calcium en Chloride toe. Om de zoetheid van bier te verbeteren.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4539"/> - <location filename="../ui/EditProduct.ui" line="4571"/> - <location filename="../ui/EditProduct.ui" line="4602"/> - <location filename="../ui/EditProduct.ui" line="4634"/> - <location filename="../ui/EditProduct.ui" line="4665"/> - <location filename="../ui/EditProduct.ui" line="4696"/> + <location filename="../ui/EditProduct.ui" line="4632"/> + <location filename="../ui/EditProduct.ui" line="4664"/> + <location filename="../ui/EditProduct.ui" line="4695"/> <location filename="../ui/EditProduct.ui" line="4727"/> - <location filename="../ui/EditProduct.ui" line="4759"/> - <location filename="../ui/EditProduct.ui" line="4790"/> - <location filename="../ui/EditProduct.ui" line="4822"/> - <location filename="../ui/EditProduct.ui" line="4854"/> - <location filename="../ui/EditProduct.ui" line="4885"/> - <location filename="../ui/EditProduct.ui" line="11091"/> - <location filename="../ui/EditProduct.ui" line="11435"/> + <location filename="../ui/EditProduct.ui" line="4758"/> + <location filename="../ui/EditProduct.ui" line="4789"/> + <location filename="../ui/EditProduct.ui" line="4820"/> + <location filename="../ui/EditProduct.ui" line="4852"/> + <location filename="../ui/EditProduct.ui" line="4883"/> + <location filename="../ui/EditProduct.ui" line="4915"/> + <location filename="../ui/EditProduct.ui" line="4947"/> + <location filename="../ui/EditProduct.ui" line="4978"/> + <location filename="../ui/EditProduct.ui" line="11581"/> + <location filename="../ui/EditProduct.ui" line="11925"/> <source> gr</source> <translation> gr</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4561"/> - <location filename="../ui/EditProduct.ui" line="4749"/> + <location filename="../ui/EditProduct.ui" line="4654"/> + <location filename="../ui/EditProduct.ui" line="4842"/> <source>Gypsum to change the water profile. This adds Calcium and Sulfate. To improve bitter beers.</source> <translation>Gips om het waterprofiel te veranderen. Dit voegt Calcium en Sulfaat toe. Verbeterd de beleving van bittere bieren.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4593"/> - <location filename="../ui/EditProduct.ui" line="4781"/> + <location filename="../ui/EditProduct.ui" line="4686"/> + <location filename="../ui/EditProduct.ui" line="4874"/> <source>Epsom salt to change the water profile. Use with caution!</source> <translation>Epsom zout om water aan te passen. Gebruik spaarzaam!</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4624"/> - <location filename="../ui/EditProduct.ui" line="4812"/> + <location filename="../ui/EditProduct.ui" line="4717"/> + <location filename="../ui/EditProduct.ui" line="4905"/> <source>Table salt to change the water profile. This adds Sodium and Chloride. Improves the sweetness of the beer. The beer will become salty at high doses.</source> <translation>Keukenzout om water aan te passen. Voegt Zout en Chloride toe. @@ -3757,24 +3781,24 @@ <translation type="vanished">Gewenste pH:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4936"/> + <location filename="../ui/EditProduct.ui" line="5029"/> <source>Auto calculate:</source> <translation>Auto bereken:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4952"/> + <location filename="../ui/EditProduct.ui" line="5045"/> <source>Acid to use:</source> <translation>Aanzuren met:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5018"/> - <location filename="../ui/EditProduct.ui" line="5157"/> + <location filename="../ui/EditProduct.ui" line="5111"/> + <location filename="../ui/EditProduct.ui" line="5250"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5046"/> - <location filename="../ui/EditProduct.ui" line="5191"/> + <location filename="../ui/EditProduct.ui" line="5139"/> + <location filename="../ui/EditProduct.ui" line="5284"/> <source> ml</source> <translation> ml</translation> </message> @@ -3795,7 +3819,7 @@ <translation type="vanished">Water bron:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5119"/> + <location filename="../ui/EditProduct.ui" line="5212"/> <source>Acid type:</source> <translation>Aanzuren met:</translation> </message> @@ -3808,118 +3832,150 @@ <translation type="vanished">Benodigd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5246"/> + <location filename="../ui/EditProduct.ui" line="5339"/> <source>Bitterness index:</source> <translation>Bitterheidsindex:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5298"/> - <location filename="../ui/EditProduct.ui" line="5366"/> + <location filename="../ui/EditProduct.ui" line="5391"/> + <location filename="../ui/EditProduct.ui" line="5459"/> <source>N/A</source> <translation>N.v.t</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5314"/> + <location filename="../ui/EditProduct.ui" line="5407"/> <source>Preffered SO4:Cl ratio:</source> <translation>Gewenste SO4:Cl verh:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5382"/> + <location filename="../ui/EditProduct.ui" line="5475"/> <source>Current SO4:Cl ratio:</source> <translation>Huidige SO4:Cl verhouding:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5439"/> + <location filename="../ui/EditProduct.ui" line="5532"/> <source>Estimate pre boil pH:</source> <translation>Geschat voor kook pH:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7505"/> + <location filename="../ui/EditProduct.ui" line="6005"/> + <location filename="../ui/EditProduct.ui" line="7635"/> + <source>The ideal amount of Calcium is between 40 and 150 mg/L.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6061"/> + <location filename="../ui/EditProduct.ui" line="7607"/> + <source>The ideal amount of Magnesium is between 5 and 40 mg/L.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6174"/> + <source>Mixed source water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6243"/> + <location filename="../ui/EditProduct.ui" line="7530"/> + <location filename="../ui/EditProduct.ui" line="7720"/> + <source>Total brew and sparge water supply. +In the mash tab set the infusion volumes. +The sparge volume is automatic calculated.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6588"/> + <source>The division between the main and dilution water. +The total volume does not change.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7995"/> <source>Brewday</source> <translation>Brouwdag</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7738"/> + <location filename="../ui/EditProduct.ui" line="8228"/> <source>Sparge supply:</source> <translation>Spoelwater voorraad:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7754"/> + <location filename="../ui/EditProduct.ui" line="8244"/> <source>Sparge estimate:</source> <translation>Spoelwater geschat:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7798"/> + <location filename="../ui/EditProduct.ui" line="8288"/> <source>Sparge temp:</source> <translation>Spoelwater temp:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9441"/> + <location filename="../ui/EditProduct.ui" line="9931"/> <source>Start density:</source> <translation>Begin densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9457"/> + <location filename="../ui/EditProduct.ui" line="9947"/> <source>Start temperature:</source> <translation>Start temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9473"/> + <location filename="../ui/EditProduct.ui" line="9963"/> <source>Peak temperature:</source> <translation>Piek temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9489"/> - <location filename="../ui/EditProduct.ui" line="9801"/> + <location filename="../ui/EditProduct.ui" line="9979"/> + <location filename="../ui/EditProduct.ui" line="10291"/> <source>End temperature:</source> <translation>Eind temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9505"/> - <location filename="../ui/EditProduct.ui" line="9817"/> + <location filename="../ui/EditProduct.ui" line="9995"/> + <location filename="../ui/EditProduct.ui" line="10307"/> <source>End density:</source> <translation>Eind densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9521"/> - <location filename="../ui/EditProduct.ui" line="9833"/> + <location filename="../ui/EditProduct.ui" line="10011"/> + <location filename="../ui/EditProduct.ui" line="10323"/> <source>End date:</source> <translation>Eind datum:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9665"/> - <location filename="../ui/EditProduct.ui" line="9899"/> - <location filename="../ui/EditProduct.ui" line="10117"/> + <location filename="../ui/EditProduct.ui" line="10155"/> + <location filename="../ui/EditProduct.ui" line="10389"/> + <location filename="../ui/EditProduct.ui" line="10607"/> <source>Apparent attenuation:</source> <translation>Schijnbare vergisting:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9983"/> + <location filename="../ui/EditProduct.ui" line="10473"/> <source>Edit the date the secondary fermentation was done.</source> <translation>Wijzig de datum dat de nagisting gereed was.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10035"/> + <location filename="../ui/EditProduct.ui" line="10525"/> <source>Average temperature:</source> <translation>Gemiddelde temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10051"/> + <location filename="../ui/EditProduct.ui" line="10541"/> <source>Final density:</source> <translation>Finale densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10181"/> + <location filename="../ui/EditProduct.ui" line="10671"/> <source>Expected end density:</source> <translation>Verwachte eind densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10499"/> + <location filename="../ui/EditProduct.ui" line="10989"/> <source>Extra added volume:</source> <translation>Toevoeging volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10515"/> + <location filename="../ui/EditProduct.ui" line="11005"/> <source>Extra remarks:</source> <translation>Toevoeging opmerking:</translation> </message> @@ -3929,45 +3985,45 @@ <translation>Finale ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10547"/> + <location filename="../ui/EditProduct.ui" line="11037"/> <source>Extra added ABV %:</source> <translation>Toevoeging extra ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10825"/> + <location filename="../ui/EditProduct.ui" line="11315"/> <source>Estimated final IBU:</source> <translation>Verwacht finale IBU:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10841"/> + <location filename="../ui/EditProduct.ui" line="11331"/> <source>Estimated final EBC:</source> <translation>Verwacht finale EBC:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10904"/> - <location filename="../ui/EditProduct.ui" line="11482"/> + <location filename="../ui/EditProduct.ui" line="11394"/> + <location filename="../ui/EditProduct.ui" line="11972"/> <source>Volume:</source> <translation>Volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10968"/> - <location filename="../ui/EditProduct.ui" line="11372"/> + <location filename="../ui/EditProduct.ui" line="11458"/> + <location filename="../ui/EditProduct.ui" line="11862"/> <source>Priming:</source> <translation>Carbonatie:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11000"/> + <location filename="../ui/EditProduct.ui" line="11490"/> <source>Bottle fermentation:</source> <translation>Flessen hergisting:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11119"/> - <location filename="../ui/EditProduct.ui" line="11535"/> + <location filename="../ui/EditProduct.ui" line="11609"/> + <location filename="../ui/EditProduct.ui" line="12025"/> <source> gr/L</source> <translation> gr/L</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11388"/> + <location filename="../ui/EditProduct.ui" line="11878"/> <source>Kegs temperature:</source> <translation>Fusten temperatuur:</translation> </message> @@ -3976,32 +4032,32 @@ <translation type="vanished">Brouwdag start:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7533"/> + <location filename="../ui/EditProduct.ui" line="8023"/> <source>Brewday end:</source> <translation>Brouwdag eind:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7549"/> + <location filename="../ui/EditProduct.ui" line="8039"/> <source>Mashing and Sparge</source> <translation>Maischen en Spoelen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7561"/> + <location filename="../ui/EditProduct.ui" line="8051"/> <source>Mash pH:</source> <translation>Maisch pH:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7690"/> + <location filename="../ui/EditProduct.ui" line="8180"/> <source>Mash SG:</source> <translation>Maisch SG:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7706"/> + <location filename="../ui/EditProduct.ui" line="8196"/> <source>Mash efficiency:</source> <translation>Maisch rendement:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7722"/> + <location filename="../ui/EditProduct.ui" line="8212"/> <source>Sparge water pH:</source> <translation>Spoelwater pH:</translation> </message> @@ -4034,94 +4090,124 @@ <translation type="vanished">Voor koken rendement:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8147"/> - <location filename="../ui/EditProduct.ui" line="8186"/> - <location filename="../ui/EditProduct.ui" line="9108"/> - <location filename="../ui/EditProduct.ui" line="9182"/> + <location filename="../ui/EditProduct.ui" line="8637"/> + <location filename="../ui/EditProduct.ui" line="8676"/> + <location filename="../ui/EditProduct.ui" line="9598"/> + <location filename="../ui/EditProduct.ui" line="9672"/> <source>Edit volume</source> <translation>Wijzig volume</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8251"/> + <location filename="../ui/EditProduct.ui" line="8741"/> <source>Whirlpool cold:</source> <translation>Whirlpool koud:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8684"/> + <location filename="../ui/EditProduct.ui" line="9174"/> <source>Aeration time & speed:</source> <translation>Beluchten tijd snelheid:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8815"/> + <location filename="../ui/EditProduct.ui" line="9305"/> <source>Cooling method:</source> <translation>Koelen methode:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8903"/> + <location filename="../ui/EditProduct.ui" line="9393"/> <source>Cooling time:</source> <translation>Koelen tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8396"/> + <location filename="../ui/EditProduct.ui" line="8886"/> <source>Transfer to fermenter</source> <translation>Naar gistvat</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7517"/> + <location filename="../ui/EditProduct.ui" line="5748"/> + <location filename="../ui/EditProduct.ui" line="6190"/> + <location filename="../ui/EditProduct.ui" line="6457"/> + <location filename="../ui/EditProduct.ui" line="7215"/> + <location filename="../ui/EditProduct.ui" line="7380"/> + <source>Calcium in mg/L</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5801"/> + <location filename="../ui/EditProduct.ui" line="6326"/> + <location filename="../ui/EditProduct.ui" line="6510"/> + <location filename="../ui/EditProduct.ui" line="6742"/> + <location filename="../ui/EditProduct.ui" line="7439"/> + <source>Magnesium in mg/L.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7100"/> + <source>Calcium content should typically fall in the range of 40 to 100 ppm. +Lower calcium content may not provide for the desirable +precipitation of trub and oxalates from wort. High oxalates may lead +to beerstone formation. +Calcium also aids in yeast floculation and beer clarification. + +Calcium should not typically exceed 100 ppm unless it has to be +added to provide a desirable anion like sulfate to the water.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8007"/> <source>Brewday plan:</source> <translation>Brouwdag plan:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7876"/> - <location filename="../ui/EditProduct.ui" line="8853"/> - <location filename="../ui/EditProduct.ui" line="9565"/> - <location filename="../ui/EditProduct.ui" line="9593"/> - <location filename="../ui/EditProduct.ui" line="9621"/> - <location filename="../ui/EditProduct.ui" line="9855"/> - <location filename="../ui/EditProduct.ui" line="10073"/> - <location filename="../ui/EditProduct.ui" line="11204"/> - <location filename="../ui/EditProduct.ui" line="11654"/> + <location filename="../ui/EditProduct.ui" line="8366"/> + <location filename="../ui/EditProduct.ui" line="9343"/> + <location filename="../ui/EditProduct.ui" line="10055"/> + <location filename="../ui/EditProduct.ui" line="10083"/> + <location filename="../ui/EditProduct.ui" line="10111"/> + <location filename="../ui/EditProduct.ui" line="10345"/> + <location filename="../ui/EditProduct.ui" line="10563"/> + <location filename="../ui/EditProduct.ui" line="11694"/> + <location filename="../ui/EditProduct.ui" line="12144"/> <source> °C</source> <translation> °C</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7918"/> - <source>Pre boil</source> - <translation>Begin koken</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7962"/> - <location filename="../ui/EditProduct.ui" line="9144"/> - <source>Volume @100°C:</source> - <translation>Volume @100°C:</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8060"/> - <source>Mash, sparge and lauter efficiency.</source> - <translation>Maischen, spoelen en filteren rendement.</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8207"/> - <source>Whirlpools</source> - <translation>Whirlpoolen</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8219"/> - <source>Whirlpool 72..79°C:</source> - <translation>Whirlpool 72..79°C:</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8235"/> - <source>Whirlpool 60..66°C:</source> - <translation>Whirlpool 60..66°C:</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8267"/> - <source>Whirlpool 85..100°C:</source> - <translation>Whirlpool 85..100°C:</translation> - </message> - <message> <location filename="../ui/EditProduct.ui" line="8408"/> + <source>Pre boil</source> + <translation>Begin koken</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8452"/> + <location filename="../ui/EditProduct.ui" line="9634"/> + <source>Volume @100°C:</source> + <translation>Volume @100°C:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8550"/> + <source>Mash, sparge and lauter efficiency.</source> + <translation>Maischen, spoelen en filteren rendement.</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8697"/> + <source>Whirlpools</source> + <translation>Whirlpoolen</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8709"/> + <source>Whirlpool 72..79°C:</source> + <translation>Whirlpool 72..79°C:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8725"/> + <source>Whirlpool 60..66°C:</source> + <translation>Whirlpool 60..66°C:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8757"/> + <source>Whirlpool 85..100°C:</source> + <translation>Whirlpool 85..100°C:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8898"/> <source>Volume to fermenter:</source> <translation>Volume naar gistvat:</translation> </message> @@ -4130,17 +4216,17 @@ <translation type="vanished">Trub en koeler verlies:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8546"/> + <location filename="../ui/EditProduct.ui" line="9036"/> <source>SG in fermenter:</source> <translation>SG in gistvat:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8562"/> + <location filename="../ui/EditProduct.ui" line="9052"/> <source>EBC color in fermenter:</source> <translation>EBC kleur in gistvat:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8578"/> + <location filename="../ui/EditProduct.ui" line="9068"/> <source>IBU in fermenter:</source> <translation>IBU in het gistvat:</translation> </message> @@ -4149,7 +4235,7 @@ <translation type="vanished">Beluchten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8738"/> + <location filename="../ui/EditProduct.ui" line="9228"/> <source>Aeration with:</source> <translation>Beluchten met:</translation> </message> @@ -4162,177 +4248,177 @@ <translation type="vanished">Beluchten snelheid:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8706"/> + <location filename="../ui/EditProduct.ui" line="9196"/> <source> L/m</source> <translation> L/m</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8783"/> - <location filename="../ui/EditProduct.ui" line="10296"/> - <location filename="../ui/EditProduct.ui" line="10316"/> - <location filename="../ui/EditProduct.ui" line="11742"/> + <location filename="../ui/EditProduct.ui" line="9273"/> + <location filename="../ui/EditProduct.ui" line="10786"/> + <location filename="../ui/EditProduct.ui" line="10806"/> + <location filename="../ui/EditProduct.ui" line="12232"/> <source>Brew log chart</source> <translation>Brouw log grafiek</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8803"/> + <location filename="../ui/EditProduct.ui" line="9293"/> <source>Cooling</source> <translation>Koelen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8831"/> + <location filename="../ui/EditProduct.ui" line="9321"/> <source>Cooling to:</source> <translation>Koelen tot:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8933"/> + <location filename="../ui/EditProduct.ui" line="9423"/> <location filename="../src/EditProductExport.cpp" line="812"/> <source>After boil</source> <translation>Einde koken</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9077"/> + <location filename="../ui/EditProduct.ui" line="9567"/> <source>The overall efficiency.</source> <translation>Het totale brouwzaal rendement.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9223"/> + <location filename="../ui/EditProduct.ui" line="9713"/> <source>Edit the brewdate plan or start.</source> <translation>Wijzig de brouwdag plan of start datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9242"/> + <location filename="../ui/EditProduct.ui" line="9732"/> <source>Clear planned brewdate</source> <translation>Wis geplande brouwdag</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9262"/> + <location filename="../ui/EditProduct.ui" line="9752"/> <source>Edit the brewdate start time.</source> <translation>Wijzig de brouwdag start tijd.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9265"/> - <location filename="../ui/EditProduct.ui" line="9300"/> + <location filename="../ui/EditProduct.ui" line="9755"/> + <location filename="../ui/EditProduct.ui" line="9790"/> <source>hh:mm</source> <translation>hh:mm</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9278"/> + <location filename="../ui/EditProduct.ui" line="9768"/> <source>Edit the brewdate end.</source> <translation>Wijzig de brouwdag eind datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9297"/> + <location filename="../ui/EditProduct.ui" line="9787"/> <source>Edit the brewdate end time.</source> <translation>Wijzig de brouwdag eind tijd.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9313"/> + <location filename="../ui/EditProduct.ui" line="9803"/> <source>Set the brewdate end date.</source> <translation>Zet de brouwdag eind datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9333"/> + <location filename="../ui/EditProduct.ui" line="9823"/> <source>End time:</source> <translation>Eind tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9349"/> + <location filename="../ui/EditProduct.ui" line="9839"/> <source>Start time:</source> <translation>Start tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9365"/> + <location filename="../ui/EditProduct.ui" line="9855"/> <source>Show brewlog:</source> <translation>Toon brouwlog:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9384"/> + <location filename="../ui/EditProduct.ui" line="9874"/> <source>Confirm brew done:</source> <translation>Bevestig brouwdag:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9400"/> - <location filename="../ui/EditProduct.ui" line="9768"/> - <location filename="../ui/EditProduct.ui" line="10002"/> + <location filename="../ui/EditProduct.ui" line="9890"/> + <location filename="../ui/EditProduct.ui" line="10258"/> + <location filename="../ui/EditProduct.ui" line="10492"/> <source>Confirm the brew dates and times.</source> <translation>Bevestig de brouw datums en tijden.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9417"/> + <location filename="../ui/EditProduct.ui" line="9907"/> <source>Fermenting</source> <translation>Vergisten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9429"/> + <location filename="../ui/EditProduct.ui" line="9919"/> <source>Primary fermentation</source> <translation>Hoofdvergisting</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9709"/> - <location filename="../ui/EditProduct.ui" line="9943"/> - <location filename="../ui/EditProduct.ui" line="10161"/> + <location filename="../ui/EditProduct.ui" line="10199"/> + <location filename="../ui/EditProduct.ui" line="10433"/> + <location filename="../ui/EditProduct.ui" line="10651"/> <source>Edit SG in Plato, Brix or SG</source> <translation>Wijzig SG in Plato, Brix of SG</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9729"/> - <location filename="../ui/EditProduct.ui" line="9963"/> - <source>Set the date to today</source> - <translation>Zet de datum op vandaag</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="9749"/> - <source>Edit the date the primary fermentation was done.</source> - <translation>Wijzig de datum dat de hoofdgisting gereed was.</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="9789"/> - <source>Secondary fermentation</source> - <translation>Nagisting</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="10023"/> - <source>Tertiary fermentation</source> - <translation>Lageren</translation> - </message> - <message> <location filename="../ui/EditProduct.ui" line="10219"/> + <location filename="../ui/EditProduct.ui" line="10453"/> + <source>Set the date to today</source> + <translation>Zet de datum op vandaag</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10239"/> + <source>Edit the date the primary fermentation was done.</source> + <translation>Wijzig de datum dat de hoofdgisting gereed was.</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10279"/> + <source>Secondary fermentation</source> + <translation>Nagisting</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10513"/> + <source>Tertiary fermentation</source> + <translation>Lageren</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10709"/> <source>Alcohol volume:</source> <translation>Alcohol vol%:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10264"/> + <location filename="../ui/EditProduct.ui" line="10754"/> <source>Show fermenter unit log:</source> <translation>Toon gistkast log:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10280"/> + <location filename="../ui/EditProduct.ui" line="10770"/> <source>Show fermentation log:</source> <translation>Toon vergisting log:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10333"/> + <location filename="../ui/EditProduct.ui" line="10823"/> <source>Package</source> <translation>Verpakken</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10345"/> + <location filename="../ui/EditProduct.ui" line="10835"/> <source>Package date:</source> <translation>Verpakken datum:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10418"/> + <location filename="../ui/EditProduct.ui" line="10908"/> <source>Carbonation range:</source> <translation>Koolzuur volumes:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10471"/> + <location filename="../ui/EditProduct.ui" line="10961"/> <source>Infusion or Dilution</source> <translation>Infusie of verdunnen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10483"/> + <location filename="../ui/EditProduct.ui" line="10973"/> <source>Package volume:</source> <translation>Verpakken volume:</translation> </message> @@ -4342,13 +4428,13 @@ <translation>Verpakken ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10563"/> + <location filename="../ui/EditProduct.ui" line="11053"/> <source>pH from fermenter:</source> <translation>pH vanuit gistvat:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="530"/> - <location filename="../ui/EditProduct.ui" line="3342"/> + <location filename="../ui/EditProduct.ui" line="3435"/> <source>Estimated ABV:</source> <translation>Verwacht ABV:</translation> </message> @@ -4364,7 +4450,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="843"/> - <location filename="../ui/EditProduct.ui" line="2938"/> + <location filename="../ui/EditProduct.ui" line="3031"/> <source>Estimated IBU:</source> <translation>Verwacht IBU:</translation> </message> @@ -4394,29 +4480,29 @@ <translation>Fusten CO2:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="1824"/> + <location filename="../ui/EditProduct.ui" line="2667"/> <source>Brewhouse efficiency:</source> <translation>Brouwzaal rendement:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="1853"/> + <location filename="../ui/EditProduct.ui" line="1896"/> <source>Liters per minute to pump trough the chiller. Used to calculate the time needed to transfer the wort.</source> <translation>Liters per minuut pompen door de koeler. Gebruikt om de tijd te berekenen om het wort weg te pompen.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="1891"/> + <location filename="../ui/EditProduct.ui" line="1934"/> <source>Transfer liters/minute:</source> <translation>Overbrengen liters/minuut:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="1907"/> + <location filename="../ui/EditProduct.ui" line="1950"/> <source>Minutes elapsed to cool to 79 °C</source> <translation>Nodige minuten om tot 79 °C te koelen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="1947"/> + <location filename="../ui/EditProduct.ui" line="1990"/> <source>Volume lost in hoses, pump ...</source> <translation>Verlies in slangen, pomp ...</translation> </message> @@ -4429,30 +4515,30 @@ <translation type="vanished">Dompelkoeler L:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2025"/> + <location filename="../ui/EditProduct.ui" line="2068"/> <source>Wort chiller type:</source> <translation>Wort koeler type:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2041"/> + <location filename="../ui/EditProduct.ui" line="2084"/> <source>Minutes to cool to 79 °C:</source> <translation>Minuten koelen tot 79 °C:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2057"/> + <location filename="../ui/EditProduct.ui" line="2100"/> <source>Temporary extra volume of the immersion chiller in the kettle. Used to correct the after boil volume.</source> <translation>Tijdelijk extra volume in de kookketel. Wordt gebruikt als correctie voor na koken volume.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2424"/> - <location filename="../ui/EditProduct.ui" line="8424"/> + <location filename="../ui/EditProduct.ui" line="2467"/> + <location filename="../ui/EditProduct.ui" line="8914"/> <source>Kettle trub loss:</source> <translation>Kookketel trub verlies:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="2521"/> + <location filename="../ui/EditProduct.ui" line="2564"/> <source>Extra water in fermenter:</source> <translation>Extra water in gistvat:</translation> </message> @@ -4461,316 +4547,336 @@ <translation type="vanished">Volume naar het gistvat L:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3091"/> + <location filename="../ui/EditProduct.ui" line="3184"/> <source>Boil absorb:</source> <translation>Kook absorptie:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3107"/> + <location filename="../ui/EditProduct.ui" line="3200"/> <source>Loss by hop absorption in the boil kettle</source> <translation>Verlies door hop absorptie in de kook ketel</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3147"/> + <location filename="../ui/EditProduct.ui" line="3240"/> <source>Fermenter absorb:</source> <translation>Gistvat absorptie:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3163"/> + <location filename="../ui/EditProduct.ui" line="3256"/> <source>Loss in the fermenter caused by dry-hopping</source> <translation>Verlies in het gistvat door het drooghoppen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3395"/> + <location filename="../ui/EditProduct.ui" line="3488"/> <source>Apparent Attenuation:</source> <translation>Schijnbare vergisting:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3730"/> + <location filename="../ui/EditProduct.ui" line="3823"/> <source>Yeast starter calculation.</source> <translation>Giststarter berekening.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3755"/> + <location filename="../ui/EditProduct.ui" line="3848"/> <source>Dry yeast calculation.</source> <translation>Droge gist berekening.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4908"/> + <location filename="../ui/EditProduct.ui" line="5001"/> <source>Acid Additions</source> <translation>Zuur toevoegingen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4920"/> + <location filename="../ui/EditProduct.ui" line="5013"/> <source>Desired mash pH:</source> <translation>Gewenst maisch pH:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5078"/> + <location filename="../ui/EditProduct.ui" line="5171"/> <source>Desired sparge pH:</source> <translation>Gewenst spoel pH:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5213"/> - <location filename="../ui/EditProduct.ui" line="5229"/> + <location filename="../ui/EditProduct.ui" line="5306"/> + <location filename="../ui/EditProduct.ui" line="5322"/> <source>Acid amount:</source> <translation>Zuur hoeveelheid:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5683"/> + <location filename="../ui/EditProduct.ui" line="5573"/> <source>The total prepared amount of sparge water</source> <translation>De totale voorraad spoelwater</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5767"/> + <location filename="../ui/EditProduct.ui" line="5607"/> <source>Choose example water</source> <translation>Kies voorbeeld water</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6061"/> <source>Treated mash water</source> - <translation>Behandeld maisch water</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6353"/> - <location filename="../ui/EditProduct.ui" line="6422"/> + <translation type="vanished">Behandeld maisch water</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6171"/> <source>Total brew and sparge water supply</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6356"/> - <source>Total needed mixed water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7085"/> + <location filename="../ui/EditProduct.ui" line="6921"/> <source>Total brew and sparge water supply without optional dilution water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7419"/> + <location filename="../ui/EditProduct.ui" line="7916"/> + <location filename="../ui/EditProduct.ui" line="7941"/> + <location filename="../ui/EditProduct.ui" line="7963"/> <source>Sparge water source 1</source> <translation>Spoelwater bron 1</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7441"/> <source>Sparge water source 2</source> - <translation>Spoelwater bron 2</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7460"/> + <translation type="vanished">Spoelwater bron 2</translation> + </message> + <message> <source>Sparge water mixed</source> - <translation>Gemengd spoelwater</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7476"/> + <translation type="vanished">Gemengd spoelwater</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7982"/> <location filename="../src/EditProductTab5.cpp" line="723"/> <source>Sparge</source> <translation>Spoel</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7492"/> <source>Treated sparge water</source> - <translation>Behandeld spoelwater</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="10531"/> + <translation type="vanished">Behandeld spoelwater</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7514"/> + <location filename="../src/EditProductTab8.cpp" line="676"/> + <source>Actual Water Adjustment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7470"/> + <source>Sparge volume:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5907"/> + <source>Treated total water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7511"/> + <location filename="../ui/EditProduct.ui" line="7563"/> + <source>Switch between Actual and Target values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7566"/> + <location filename="../src/EditProductTab8.cpp" line="705"/> + <source>Treated Mash Water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="11021"/> <source>Estimated final ABV %:</source> <translation>Verwacht finale ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10607"/> + <location filename="../ui/EditProduct.ui" line="11097"/> <source>Extra dilution or infusion added to this batch.</source> <translation>Toegevoegde verdunning of infusie aan deze batch.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10638"/> - <location filename="../ui/EditProduct.ui" line="10760"/> + <location filename="../ui/EditProduct.ui" line="11128"/> + <location filename="../ui/EditProduct.ui" line="11250"/> <source>The ABV including the infusion.</source> <translation>Het ABV inclusief infusie.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10669"/> + <location filename="../ui/EditProduct.ui" line="11159"/> <source>If there is alcohol in the infusion, give the percentage.</source> <translation>Als er alcohol in de infusie zit, geef hier het percentage.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10728"/> + <location filename="../ui/EditProduct.ui" line="11218"/> <source>Could be the description of the infusion.</source> <translation>Hier kun je de toevoeging beschrijven.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10744"/> + <location filename="../ui/EditProduct.ui" line="11234"/> <source>Estimated package ABV %:</source> <translation>Verwacht verpakken ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10892"/> + <location filename="../ui/EditProduct.ui" line="11382"/> <source>Bottles</source> <translation>Flessen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10920"/> - <location filename="../ui/EditProduct.ui" line="11340"/> + <location filename="../ui/EditProduct.ui" line="11410"/> + <location filename="../ui/EditProduct.ui" line="11830"/> <source>Desired volume CO2:</source> <translation>Gewenst volume CO2:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10936"/> - <location filename="../ui/EditProduct.ui" line="11407"/> + <location filename="../ui/EditProduct.ui" line="11426"/> + <location filename="../ui/EditProduct.ui" line="11897"/> <source>Priming sugar:</source> <translation>Carbonatie suiker:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10952"/> - <location filename="../ui/EditProduct.ui" line="11324"/> + <location filename="../ui/EditProduct.ui" line="11442"/> + <location filename="../ui/EditProduct.ui" line="11814"/> <source>Sugar amount:</source> <translation>Suiker gewicht:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10984"/> - <location filename="../ui/EditProduct.ui" line="11356"/> + <location filename="../ui/EditProduct.ui" line="11474"/> + <location filename="../ui/EditProduct.ui" line="11846"/> <source>Water amount:</source> <translation>Water volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11166"/> + <location filename="../ui/EditProduct.ui" line="11656"/> <source>Expected pressure in bar:</source> <translation>Verwachte druk in bar:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11182"/> + <location filename="../ui/EditProduct.ui" line="11672"/> <source>Bottles ABV %:</source> <translation>Flessen ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11280"/> + <location filename="../ui/EditProduct.ui" line="11770"/> <source>Kegs</source> <translation>Fusten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11292"/> + <location filename="../ui/EditProduct.ui" line="11782"/> <source>Kegs ABV %:</source> <translation>Fusten ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11308"/> + <location filename="../ui/EditProduct.ui" line="11798"/> <source>Kegs pressure in bar:</source> <translation>Fusten druk in bar:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11676"/> + <location filename="../ui/EditProduct.ui" line="12166"/> <source>Forced carbonation:</source> <translation>Geforceerde carbonatie:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11703"/> + <location filename="../ui/EditProduct.ui" line="12193"/> <source>Edit the package date.</source> <translation>Wijzig de verpakkings datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11762"/> + <location filename="../ui/EditProduct.ui" line="12252"/> <source>Show carbonation log:</source> <translation>Toon carbonatie log:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11775"/> + <location filename="../ui/EditProduct.ui" line="12265"/> <source>Tasting</source> <translation>Proeven</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11787"/> + <location filename="../ui/EditProduct.ui" line="12277"/> <source>Taste date:</source> <translation>Proeven datum:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11823"/> + <location filename="../ui/EditProduct.ui" line="12313"/> <source>Taste rate:</source> <translation>Beoordeling cijfer:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11864"/> + <location filename="../ui/EditProduct.ui" line="12354"/> <source>Color:</source> <translation>Kleur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11880"/> + <location filename="../ui/EditProduct.ui" line="12370"/> <source>Transparency:</source> <translation>Helderheid:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11896"/> + <location filename="../ui/EditProduct.ui" line="12386"/> <source>Head:</source> <translation>Schuim:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11951"/> + <location filename="../ui/EditProduct.ui" line="12441"/> <source>Aroma:</source> <translation>Geur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11980"/> + <location filename="../ui/EditProduct.ui" line="12470"/> <source>Taste:</source> <translation>Smaak:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12009"/> + <location filename="../ui/EditProduct.ui" line="12499"/> <source>Aftertaste:</source> <translation>Nasmaak:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12038"/> + <location filename="../ui/EditProduct.ui" line="12528"/> <source>Mouthfeel:</source> <translation>Mondgevoel:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12067"/> + <location filename="../ui/EditProduct.ui" line="12557"/> <source>Notes:</source> <translation>Opmerkingen:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12093"/> + <location filename="../ui/EditProduct.ui" line="12583"/> <source>Edit the tasting date.</source> <translation>Wijzig de datum van proeven.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12129"/> + <location filename="../ui/EditProduct.ui" line="12619"/> <source>Images</source> <translation>Plaatjes</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12230"/> + <location filename="../ui/EditProduct.ui" line="12720"/> <source>Previous</source> <translation>Vorige</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12247"/> + <location filename="../ui/EditProduct.ui" line="12737"/> <source>Next</source> <translation>Volgende</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12320"/> + <location filename="../ui/EditProduct.ui" line="12810"/> <source>Filename:</source> <translation>Bestand:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12336"/> + <location filename="../ui/EditProduct.ui" line="12826"/> <source>Comment:</source> <translation>Bijschrift:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12381"/> + <location filename="../ui/EditProduct.ui" line="12871"/> <source>Type:</source> <translation>Soort:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12425"/> + <location filename="../ui/EditProduct.ui" line="12915"/> <source>Export</source> <translation>Exporteer</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12281"/> - <location filename="../ui/EditProduct.ui" line="12442"/> + <location filename="../ui/EditProduct.ui" line="12771"/> + <location filename="../ui/EditProduct.ui" line="12932"/> <source>Print</source> <translation>Print</translation> </message> @@ -4790,7 +4896,7 @@ <translation>Mout</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="851"/> + <location filename="../src/EditProduct.cpp" line="962"/> <source>BMSapp - Edit %1 - %2</source> <translation>BMSapp - Wijzig %1 - %2</translation> </message> @@ -4843,7 +4949,7 @@ <location filename="../src/EditProductTab13.cpp" line="293"/> <location filename="../src/EditProductTab13.cpp" line="406"/> <location filename="../src/EditProductTab13.cpp" line="430"/> - <location filename="../src/EditProduct.cpp" line="924"/> + <location filename="../src/EditProduct.cpp" line="1035"/> <source>Database error</source> <translation>Database fout</translation> </message> @@ -4861,7 +4967,7 @@ <translation type="vanished">Koken %1 minuten</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="849"/> + <location filename="../src/EditProduct.cpp" line="960"/> <source>BMSapp - Add new product</source> <translation>BMSapp - Nieuw product</translation> </message> @@ -4870,18 +4976,18 @@ <translation type="vanished">BMSapp - Wijzig product %1</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="867"/> - <location filename="../src/EditProduct.cpp" line="871"/> + <location filename="../src/EditProduct.cpp" line="978"/> + <location filename="../src/EditProduct.cpp" line="982"/> <source>Edit Product</source> <translation>Wijzig Product</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="867"/> + <location filename="../src/EditProduct.cpp" line="978"/> <source>Name empty or too short.</source> <translation>De naam is leeg of te kort.</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="871"/> + <location filename="../src/EditProduct.cpp" line="982"/> <source>No beerstyle selected.</source> <translation>Geen bierstijl gekozen.</translation> </message> @@ -4891,7 +4997,7 @@ <location filename="../src/EditProductTab13.cpp" line="293"/> <location filename="../src/EditProductTab13.cpp" line="406"/> <location filename="../src/EditProductTab13.cpp" line="430"/> - <location filename="../src/EditProduct.cpp" line="924"/> + <location filename="../src/EditProduct.cpp" line="1035"/> <source>MySQL error: %1 %2 %3</source> @@ -4900,17 +5006,17 @@ %3</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="910"/> + <location filename="../src/EditProduct.cpp" line="1021"/> <source>Delete product</source> <translation>Verwijder product</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="947"/> + <location filename="../src/EditProduct.cpp" line="1058"/> <source>Product changed</source> <translation>Product gewijzigd</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="947"/> + <location filename="../src/EditProduct.cpp" line="1058"/> <source>The product has been modified. Save changes?</source> <translation>Het product is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -5048,7 +5154,7 @@ <location filename="../src/EditProductTab6.cpp" line="913"/> <location filename="../src/EditProductTab7.cpp" line="306"/> <location filename="../src/EditProductTab13.cpp" line="279"/> - <location filename="../src/EditProduct.cpp" line="910"/> + <location filename="../src/EditProduct.cpp" line="1021"/> <source>Delete %1</source> <translation>Verwijder %1</translation> </message> @@ -5602,8 +5708,8 @@ <translation>Verwarm tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7930"/> - <location filename="../ui/EditProduct.ui" line="9061"/> + <location filename="../ui/EditProduct.ui" line="8420"/> + <location filename="../ui/EditProduct.ui" line="9551"/> <location filename="../src/EditProductTab7.cpp" line="635"/> <source>Measured pH:</source> <translation>Gemeten pH:</translation> @@ -5614,8 +5720,8 @@ <translation>Gemeten Brix:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7946"/> - <location filename="../ui/EditProduct.ui" line="9128"/> + <location filename="../ui/EditProduct.ui" line="8436"/> + <location filename="../ui/EditProduct.ui" line="9618"/> <location filename="../src/EditProductTab7.cpp" line="667"/> <source>Measured SG:</source> <translation>Gemeten SG:</translation> @@ -5631,67 +5737,77 @@ <translation>Infusie temperatuur:</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="202"/> + <location filename="../src/EditProductTab8.cpp" line="203"/> <source>Very malty and sweet</source> <translation>Zeer moutig en zoet</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="204"/> + <location filename="../src/EditProductTab8.cpp" line="205"/> <source>Malty, sweet</source> <translation>Moutig, zoet</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="206"/> - <location filename="../src/EditProductTab8.cpp" line="443"/> + <location filename="../src/EditProductTab8.cpp" line="207"/> + <location filename="../src/EditProductTab8.cpp" line="445"/> <source>Balanced</source> <translation>Gebalanceerd</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="208"/> + <location filename="../src/EditProductTab8.cpp" line="209"/> <source>Hoppy, bitter</source> <translation>Hoppig, bitter</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="210"/> + <location filename="../src/EditProductTab8.cpp" line="211"/> <source>Very hoppy, very bitter</source> <translation>Erg hoppig, erg bitter</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="437"/> - <source>Too malty</source> - <translation>Te moutig</translation> - </message> - <message> <location filename="../src/EditProductTab8.cpp" line="439"/> - <source>Very malty</source> - <translation>Erg moutig</translation> + <source>Too malty</source> + <translation>Te moutig</translation> </message> <message> <location filename="../src/EditProductTab8.cpp" line="441"/> + <source>Very malty</source> + <translation>Erg moutig</translation> + </message> + <message> + <location filename="../src/EditProductTab8.cpp" line="443"/> <source>Malty</source> <translation>Moutig</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="445"/> - <source>Little bitter</source> - <translation>Iets bitter</translation> - </message> - <message> <location filename="../src/EditProductTab8.cpp" line="447"/> - <source>Bitter</source> - <translation>Bitter</translation> + <source>Little bitter</source> + <translation>Iets bitter</translation> </message> <message> <location filename="../src/EditProductTab8.cpp" line="449"/> - <source>Very bitter</source> - <translation>Erg bitter</translation> + <source>Bitter</source> + <translation>Bitter</translation> </message> <message> <location filename="../src/EditProductTab8.cpp" line="451"/> + <source>Very bitter</source> + <translation>Erg bitter</translation> + </message> + <message> + <location filename="../src/EditProductTab8.cpp" line="453"/> <source>Too bitter</source> <translation>Veel te bitter</translation> </message> <message> + <location filename="../src/EditProductTab8.cpp" line="667"/> + <source>Target Water Adjustment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab8.cpp" line="695"/> + <source>Treated Sparge Water</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab9.cpp" line="645"/> <location filename="../src/EditProductTab13.cpp" line="346"/> <location filename="../src/EditProductTab13.cpp" line="349"/> @@ -6083,7 +6199,7 @@ <translation>Kan niet laden %1: %2</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12304"/> + <location filename="../ui/EditProduct.ui" line="12794"/> <location filename="../src/EditProductTab13.cpp" line="210"/> <source>Image here</source> <translation>Plaatje hier</translation> @@ -11159,6 +11275,17 @@ <source>Yeast Packages</source> <translation>Gist verpakkingen</translation> </message> + <message> + <location filename="../src/MainWindow.cpp" line="279"/> + <source>Equipments upgrade</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/MainWindow.cpp" line="280"/> + <source>The Equipents database has two new HLT fields. +Please check the Inventory->Equipents records</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ManoMeter</name> @@ -14190,25 +14317,23 @@ <location filename="../src/database/db_recipe.cpp" line="31"/> <location filename="../src/database/db_recipe.cpp" line="661"/> <location filename="../src/database/db_recipe.cpp" line="694"/> - <location filename="../src/database/db_product.cpp" line="40"/> - <location filename="../src/database/db_product.cpp" line="56"/> - <location filename="../src/database/db_product.cpp" line="1070"/> - <location filename="../src/database/db_product.cpp" line="1103"/> + <location filename="../src/database/db_product.cpp" line="31"/> + <location filename="../src/database/db_product.cpp" line="1068"/> + <location filename="../src/database/db_product.cpp" line="1101"/> <source>Database error</source> <translation>Database fout</translation> </message> <message> <location filename="../src/database/db_recipe.cpp" line="31"/> - <location filename="../src/database/db_product.cpp" line="56"/> + <location filename="../src/database/db_product.cpp" line="31"/> <source>MySQL error: record %1 not found</source> <translation>MySQL fout: record %1 niet gevonden</translation> </message> <message> <location filename="../src/database/db_recipe.cpp" line="662"/> <location filename="../src/database/db_recipe.cpp" line="695"/> - <location filename="../src/database/db_product.cpp" line="41"/> - <location filename="../src/database/db_product.cpp" line="1071"/> - <location filename="../src/database/db_product.cpp" line="1104"/> + <location filename="../src/database/db_product.cpp" line="1069"/> + <location filename="../src/database/db_product.cpp" line="1102"/> <source>MySQL error: %1 %2 %3</source>
--- a/ui/EditEquipment.ui Sat Jun 01 21:10:54 2024 +0200 +++ b/ui/EditEquipment.ui Sat Jun 08 15:54:30 2024 +0200 @@ -146,7 +146,7 @@ <x>10</x> <y>110</y> <width>321</width> - <height>241</height> + <height>331</height> </rect> </property> <property name="title"> @@ -472,27 +472,11 @@ </rect> </property> </widget> - </widget> - <widget class="QGroupBox" name="lauterGroup"> - <property name="geometry"> - <rect> - <x>10</x> - <y>380</y> - <width>321</width> - <height>91</height> - </rect> - </property> - <property name="title"> - <string>Lautering</string> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> <widget class="QLabel" name="lauter_deadspaceLabel"> <property name="geometry"> <rect> <x>10</x> - <y>20</y> + <y>230</y> <width>171</width> <height>20</height> </rect> @@ -504,27 +488,11 @@ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> - <widget class="QLabel" name="efficiencyLabel"> - <property name="geometry"> - <rect> - <x>10</x> - <y>50</y> - <width>171</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Brewhouse efficiency:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> <widget class="QDoubleSpinBox" name="lauter_deadspaceEdit"> <property name="geometry"> <rect> <x>190</x> - <y>20</y> + <y>230</y> <width>101</width> <height>24</height> </rect> @@ -551,11 +519,43 @@ <enum>QAbstractSpinBox::DefaultStepType</enum> </property> </widget> - <widget class="QDoubleSpinBox" name="efficiencyEdit"> + <widget class="QLabel" name="HLT_volumeLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>260</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>HLT Volume:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QLabel" name="HLT_deadspaceLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>290</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>HLT deadspace:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QDoubleSpinBox" name="HLT_volumeEdit"> <property name="geometry"> <rect> <x>190</x> - <y>50</y> + <y>260</y> <width>101</width> <height>24</height> </rect> @@ -567,13 +567,13 @@ <bool>true</bool> </property> <property name="suffix"> - <string>%</string> + <string> L</string> </property> <property name="decimals"> <number>1</number> </property> <property name="maximum"> - <double>100.000000000000000</double> + <double>100000.000000000000000</double> </property> <property name="singleStep"> <double>0.500000000000000</double> @@ -582,6 +582,37 @@ <enum>QAbstractSpinBox::DefaultStepType</enum> </property> </widget> + <widget class="QDoubleSpinBox" name="HLT_deadspaceEdit"> + <property name="geometry"> + <rect> + <x>190</x> + <y>290</y> + <width>101</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="accelerated"> + <bool>true</bool> + </property> + <property name="suffix"> + <string> L</string> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>100000.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.100000000000000</double> + </property> + <property name="stepType"> + <enum>QAbstractSpinBox::DefaultStepType</enum> + </property> + </widget> </widget> <widget class="QGroupBox" name="boilGroup"> <property name="geometry"> @@ -991,9 +1022,9 @@ <property name="geometry"> <rect> <x>670</x> - <y>380</y> + <y>320</y> <width>321</width> - <height>91</height> + <height>121</height> </rect> </property> <property name="title"> @@ -1105,6 +1136,53 @@ <enum>QAbstractSpinBox::DefaultStepType</enum> </property> </widget> + <widget class="QDoubleSpinBox" name="efficiencyEdit"> + <property name="geometry"> + <rect> + <x>190</x> + <y>80</y> + <width>101</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="accelerated"> + <bool>true</bool> + </property> + <property name="suffix"> + <string>%</string> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>100.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.500000000000000</double> + </property> + <property name="stepType"> + <enum>QAbstractSpinBox::DefaultStepType</enum> + </property> + </widget> + <widget class="QLabel" name="efficiencyLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>80</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Brewhouse efficiency:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> </widget> <widget class="QPushButton" name="cloneButton"> <property name="geometry">
--- a/ui/EditProduct.ui Sat Jun 01 21:10:54 2024 +0200 +++ b/ui/EditProduct.ui Sat Jun 08 15:54:30 2024 +0200 @@ -1529,7 +1529,7 @@ <x>10</x> <y>160</y> <width>321</width> - <height>151</height> + <height>241</height> </rect> </property> <property name="title"> @@ -1714,24 +1714,11 @@ <bool>true</bool> </property> </widget> - </widget> - <widget class="QGroupBox" name="lauterBox"> - <property name="geometry"> - <rect> - <x>10</x> - <y>320</y> - <width>321</width> - <height>91</height> - </rect> - </property> - <property name="title"> - <string>Lautering</string> - </property> <widget class="QDoubleSpinBox" name="lauter_deadspaceEdit"> <property name="geometry"> <rect> <x>190</x> - <y>20</y> + <y>140</y> <width>87</width> <height>24</height> </rect> @@ -1765,7 +1752,7 @@ <property name="geometry"> <rect> <x>10</x> - <y>20</y> + <y>140</y> <width>171</width> <height>20</height> </rect> @@ -1777,11 +1764,27 @@ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> - <widget class="QDoubleSpinBox" name="eq_efficiencyEdit"> + <widget class="QLabel" name="HLT_volumeLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>170</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>HLT Volume:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QDoubleSpinBox" name="HLT_volumeEdit"> <property name="geometry"> <rect> <x>190</x> - <y>50</y> + <y>170</y> <width>87</width> <height>24</height> </rect> @@ -1796,10 +1799,10 @@ <enum>QAbstractSpinBox::NoButtons</enum> </property> <property name="accelerated"> - <bool>false</bool> - </property> - <property name="suffix"> - <string> %</string> + <bool>true</bool> + </property> + <property name="suffix"> + <string> L</string> </property> <property name="decimals"> <number>1</number> @@ -1810,18 +1813,58 @@ <property name="singleStep"> <double>0.500000000000000</double> </property> - </widget> - <widget class="QLabel" name="eq_efficiencyLabel"> - <property name="geometry"> - <rect> - <x>10</x> - <y>50</y> + <property name="stepType"> + <enum>QAbstractSpinBox::DefaultStepType</enum> + </property> + </widget> + <widget class="QDoubleSpinBox" name="HLT_deadspaceEdit"> + <property name="geometry"> + <rect> + <x>190</x> + <y>200</y> + <width>87</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="accelerated"> + <bool>true</bool> + </property> + <property name="suffix"> + <string> L</string> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>100000.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.100000000000000</double> + </property> + <property name="stepType"> + <enum>QAbstractSpinBox::DefaultStepType</enum> + </property> + </widget> + <widget class="QLabel" name="HLT_deadspaceLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>200</y> <width>171</width> <height>20</height> </rect> </property> <property name="text"> - <string>Brewhouse efficiency:</string> + <string>HLT deadspace:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -2468,7 +2511,7 @@ <x>820</x> <y>350</y> <width>321</width> - <height>91</height> + <height>121</height> </rect> </property> <property name="title"> @@ -2577,6 +2620,56 @@ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> + <widget class="QDoubleSpinBox" name="eq_efficiencyEdit"> + <property name="geometry"> + <rect> + <x>190</x> + <y>80</y> + <width>87</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="accelerated"> + <bool>false</bool> + </property> + <property name="suffix"> + <string> %</string> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>100000.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.500000000000000</double> + </property> + </widget> + <widget class="QLabel" name="eq_efficiencyLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>80</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Brewhouse efficiency:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> </widget> </widget> <widget class="QWidget" name="fermentables"> @@ -4208,9 +4301,9 @@ <property name="geometry"> <rect> <x>10</x> - <y>120</y> + <y>180</y> <width>1131</width> - <height>381</height> + <height>321</height> </rect> </property> </widget> @@ -4218,7 +4311,7 @@ <property name="geometry"> <rect> <x>170</x> - <y>80</y> + <y>140</y> <width>80</width> <height>23</height> </rect> @@ -4250,9 +4343,9 @@ <widget class="QLabel" name="mash_pickLabel"> <property name="geometry"> <rect> - <x>560</x> - <y>10</y> - <width>171</width> + <x>10</x> + <y>40</y> + <width>151</width> <height>20</height> </rect> </property> @@ -4266,8 +4359,8 @@ <widget class="QComboBox" name="mash_pickEdit"> <property name="geometry"> <rect> - <x>740</x> - <y>10</y> + <x>170</x> + <y>40</y> <width>321</width> <height>23</height> </rect> @@ -4289,9 +4382,9 @@ <widget class="QLabel" name="mash_timeLabel"> <property name="geometry"> <rect> - <x>560</x> - <y>40</y> - <width>171</width> + <x>10</x> + <y>100</y> + <width>151</width> <height>20</height> </rect> </property> @@ -4305,9 +4398,9 @@ <widget class="QLineEdit" name="mash_timeEdit"> <property name="geometry"> <rect> - <x>740</x> - <y>40</y> - <width>71</width> + <x>170</x> + <y>100</y> + <width>81</width> <height>23</height> </rect> </property> @@ -4319,7 +4412,7 @@ <property name="geometry"> <rect> <x>10</x> - <y>40</y> + <y>70</y> <width>151</width> <height>20</height> </rect> @@ -4335,7 +4428,7 @@ <property name="geometry"> <rect> <x>170</x> - <y>40</y> + <y>70</y> <width>80</width> <height>24</height> </rect> @@ -5467,214 +5560,11 @@ <double>1000.000000000000000</double> </property> </widget> - <widget class="QDoubleSpinBox" name="sp_clEdit"> - <property name="geometry"> - <rect> - <x>750</x> - <y>220</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>1000.000000000000000</double> - </property> - </widget> - <widget class="QDoubleSpinBox" name="sp_naEdit"> - <property name="geometry"> - <rect> - <x>670</x> - <y>220</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>1000.000000000000000</double> - </property> - </widget> - <widget class="QDoubleSpinBox" name="sp_caco3Edit"> - <property name="geometry"> - <rect> - <x>590</x> - <y>220</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>1000.000000000000000</double> - </property> - </widget> - <widget class="QDoubleSpinBox" name="sp_raEdit"> - <property name="geometry"> - <rect> - <x>1070</x> - <y>220</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="minimum"> - <double>-1000.000000000000000</double> - </property> - <property name="maximum"> - <double>1000.000000000000000</double> - </property> - </widget> - <widget class="QDoubleSpinBox" name="sp_phShow"> - <property name="geometry"> - <rect> - <x>910</x> - <y>220</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>2</number> - </property> - <property name="maximum"> - <double>1000.000000000000000</double> - </property> - </widget> - <widget class="QDoubleSpinBox" name="sp_so4Edit"> - <property name="geometry"> - <rect> - <x>830</x> - <y>220</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>1000.000000000000000</double> - </property> - </widget> - <widget class="QDoubleSpinBox" name="sp_mgEdit"> - <property name="geometry"> - <rect> - <x>430</x> - <y>220</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>1000.000000000000000</double> - </property> - </widget> - <widget class="QDoubleSpinBox" name="sp_hco3Edit"> - <property name="geometry"> - <rect> - <x>510</x> - <y>220</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>1000.000000000000000</double> - </property> - </widget> <widget class="QDoubleSpinBox" name="sp_volEdit"> <property name="geometry"> <rect> - <x>250</x> - <y>220</y> + <x>520</x> + <y>420</y> <width>81</width> <height>24</height> </rect> @@ -5701,57 +5591,7 @@ <double>0.500000000000000</double> </property> </widget> - <widget class="QDoubleSpinBox" name="sp_hardnessEdit"> - <property name="geometry"> - <rect> - <x>990</x> - <y>220</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>1000.000000000000000</double> - </property> - </widget> - <widget class="QDoubleSpinBox" name="sp_caEdit"> - <property name="geometry"> - <rect> - <x>350</x> - <y>220</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>1000.000000000000000</double> - </property> - </widget> - <widget class="QComboBox" name="wt_sourceEdit"> + <widget class="QComboBox" name="tw_nameEdit"> <property name="geometry"> <rect> <x>10</x> @@ -5767,10 +5607,10 @@ <string>Choose example water</string> </property> </widget> - <widget class="QDoubleSpinBox" name="wt_hardnessEdit"> - <property name="geometry"> - <rect> - <x>990</x> + <widget class="QDoubleSpinBox" name="tw_hardnessEdit"> + <property name="geometry"> + <rect> + <x>760</x> <y>40</y> <width>71</width> <height>24</height> @@ -5792,10 +5632,10 @@ <double>1000.000000000000000</double> </property> </widget> - <widget class="QDoubleSpinBox" name="wt_so4Edit"> - <property name="geometry"> - <rect> - <x>830</x> + <widget class="QDoubleSpinBox" name="tw_so4Edit"> + <property name="geometry"> + <rect> + <x>680</x> <y>40</y> <width>71</width> <height>24</height> @@ -5817,10 +5657,10 @@ <double>1000.000000000000000</double> </property> </widget> - <widget class="QDoubleSpinBox" name="wt_naEdit"> - <property name="geometry"> - <rect> - <x>670</x> + <widget class="QDoubleSpinBox" name="tw_naEdit"> + <property name="geometry"> + <rect> + <x>520</x> <y>40</y> <width>71</width> <height>24</height> @@ -5842,10 +5682,10 @@ <double>1000.000000000000000</double> </property> </widget> - <widget class="QDoubleSpinBox" name="wt_raEdit"> - <property name="geometry"> - <rect> - <x>1070</x> + <widget class="QDoubleSpinBox" name="tw_raEdit"> + <property name="geometry"> + <rect> + <x>840</x> <y>40</y> <width>71</width> <height>24</height> @@ -5870,35 +5710,10 @@ <double>1000.000000000000000</double> </property> </widget> - <widget class="QDoubleSpinBox" name="wt_caco3Edit"> - <property name="geometry"> - <rect> - <x>590</x> - <y>40</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>1000.000000000000000</double> - </property> - </widget> - <widget class="QDoubleSpinBox" name="wt_caEdit"> - <property name="geometry"> - <rect> - <x>350</x> + <widget class="QDoubleSpinBox" name="tw_caco3Edit"> + <property name="geometry"> + <rect> + <x>440</x> <y>40</y> <width>71</width> <height>24</height> @@ -5920,10 +5735,38 @@ <double>1000.000000000000000</double> </property> </widget> - <widget class="QDoubleSpinBox" name="wt_clEdit"> - <property name="geometry"> - <rect> - <x>750</x> + <widget class="QDoubleSpinBox" name="tw_caEdit"> + <property name="geometry"> + <rect> + <x>200</x> + <y>40</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>Calcium in mg/L</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="tw_clEdit"> + <property name="geometry"> + <rect> + <x>600</x> <y>40</y> <width>71</width> <height>24</height> @@ -5945,15 +5788,18 @@ <double>1000.000000000000000</double> </property> </widget> - <widget class="QDoubleSpinBox" name="wt_mgEdit"> - <property name="geometry"> - <rect> - <x>430</x> + <widget class="QDoubleSpinBox" name="tw_mgEdit"> + <property name="geometry"> + <rect> + <x>280</x> <y>40</y> <width>71</width> <height>24</height> </rect> </property> + <property name="toolTip"> + <string>Magnesium in mg/L.</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -5970,10 +5816,10 @@ <double>1000.000000000000000</double> </property> </widget> - <widget class="QDoubleSpinBox" name="wt_hco3Edit"> - <property name="geometry"> - <rect> - <x>510</x> + <widget class="QDoubleSpinBox" name="tw_hco3Edit"> + <property name="geometry"> + <rect> + <x>360</x> <y>40</y> <width>71</width> <height>24</height> @@ -5998,8 +5844,8 @@ <widget class="QDoubleSpinBox" name="wb_hco3Edit"> <property name="geometry"> <rect> - <x>510</x> - <y>190</y> + <x>360</x> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -6026,8 +5872,8 @@ <widget class="QDoubleSpinBox" name="wb_hardnessEdit"> <property name="geometry"> <rect> - <x>990</x> - <y>190</y> + <x>760</x> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -6052,51 +5898,23 @@ <property name="geometry"> <rect> <x>10</x> - <y>190</y> - <width>171</width> + <y>220</y> + <width>181</width> <height>21</height> </rect> </property> <property name="text"> - <string>Treated mash water</string> + <string>Treated total water</string> </property> <property name="alignment"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> </property> </widget> - <widget class="QDoubleSpinBox" name="wb_phEdit"> - <property name="geometry"> - <rect> - <x>910</x> - <y>190</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="toolTip"> - <string>Mash pH should be between 5.2 and 5.6. Use 5.2 for light and 5.5 for dark beers.</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>2</number> - </property> - <property name="maximum"> - <double>1000.000000000000000</double> - </property> - </widget> <widget class="QDoubleSpinBox" name="wb_naEdit"> <property name="geometry"> <rect> - <x>670</x> - <y>190</y> + <x>520</x> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -6123,8 +5941,8 @@ <widget class="QDoubleSpinBox" name="wb_caco3Edit"> <property name="geometry"> <rect> - <x>590</x> - <y>190</y> + <x>440</x> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -6148,8 +5966,8 @@ <widget class="QDoubleSpinBox" name="wb_clEdit"> <property name="geometry"> <rect> - <x>750</x> - <y>190</y> + <x>600</x> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -6177,14 +5995,14 @@ <widget class="QDoubleSpinBox" name="wb_caEdit"> <property name="geometry"> <rect> - <x>350</x> - <y>190</y> + <x>200</x> + <y>220</y> <width>71</width> <height>24</height> </rect> </property> <property name="toolTip"> - <string>The ideal amount of Calcium is between 40 and 150.</string> + <string>The ideal amount of Calcium is between 40 and 150 mg/L.</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -6205,8 +6023,8 @@ <widget class="QDoubleSpinBox" name="wb_raEdit"> <property name="geometry"> <rect> - <x>1070</x> - <y>190</y> + <x>840</x> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -6233,14 +6051,14 @@ <widget class="QDoubleSpinBox" name="wb_mgEdit"> <property name="geometry"> <rect> - <x>430</x> - <y>190</y> + <x>280</x> + <y>220</y> <width>71</width> <height>24</height> </rect> </property> <property name="toolTip"> - <string>The ideal amount of Magnesium is between 5 and 40.</string> + <string>The ideal amount of Magnesium is between 5 and 40 mg/L.</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -6261,8 +6079,8 @@ <widget class="QDoubleSpinBox" name="wb_so4Edit"> <property name="geometry"> <rect> - <x>830</x> - <y>190</y> + <x>680</x> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -6290,7 +6108,7 @@ <widget class="QDoubleSpinBox" name="wg_hco3Edit"> <property name="geometry"> <rect> - <x>510</x> + <x>360</x> <y>130</y> <width>71</width> <height>24</height> @@ -6315,7 +6133,7 @@ <widget class="QDoubleSpinBox" name="wg_raEdit"> <property name="geometry"> <rect> - <x>1070</x> + <x>840</x> <y>130</y> <width>71</width> <height>24</height> @@ -6345,7 +6163,7 @@ <rect> <x>10</x> <y>130</y> - <width>171</width> + <width>181</width> <height>21</height> </rect> </property> @@ -6353,7 +6171,7 @@ <string>Total brew and sparge water supply</string> </property> <property name="text"> - <string>Total needed mixed water</string> + <string>Mixed source water</string> </property> <property name="alignment"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> @@ -6362,12 +6180,15 @@ <widget class="QDoubleSpinBox" name="wg_caEdit"> <property name="geometry"> <rect> - <x>350</x> + <x>200</x> <y>130</y> <width>71</width> <height>24</height> </rect> </property> + <property name="toolTip"> + <string>Calcium in mg/L</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -6387,7 +6208,7 @@ <widget class="QDoubleSpinBox" name="wg_hardnessEdit"> <property name="geometry"> <rect> - <x>990</x> + <x>760</x> <y>130</y> <width>71</width> <height>24</height> @@ -6412,14 +6233,16 @@ <widget class="QDoubleSpinBox" name="wg_volEdit"> <property name="geometry"> <rect> - <x>250</x> + <x>1060</x> <y>130</y> <width>71</width> <height>24</height> </rect> </property> <property name="toolTip"> - <string>Total brew and sparge water supply</string> + <string>Total brew and sparge water supply. +In the mash tab set the infusion volumes. +The sparge volume is automatic calculated.</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -6443,7 +6266,7 @@ <widget class="QDoubleSpinBox" name="wg_naEdit"> <property name="geometry"> <rect> - <x>670</x> + <x>520</x> <y>130</y> <width>71</width> <height>24</height> @@ -6468,7 +6291,7 @@ <widget class="QDoubleSpinBox" name="wg_clEdit"> <property name="geometry"> <rect> - <x>750</x> + <x>600</x> <y>130</y> <width>71</width> <height>24</height> @@ -6493,12 +6316,15 @@ <widget class="QDoubleSpinBox" name="wg_mgEdit"> <property name="geometry"> <rect> - <x>430</x> + <x>280</x> <y>130</y> <width>71</width> <height>24</height> </rect> </property> + <property name="toolTip"> + <string>Magnesium in mg/L.</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -6518,7 +6344,7 @@ <widget class="QDoubleSpinBox" name="wg_so4Edit"> <property name="geometry"> <rect> - <x>830</x> + <x>680</x> <y>130</y> <width>71</width> <height>24</height> @@ -6543,7 +6369,7 @@ <widget class="QDoubleSpinBox" name="wg_caco3Edit"> <property name="geometry"> <rect> - <x>590</x> + <x>440</x> <y>130</y> <width>71</width> <height>24</height> @@ -6568,7 +6394,7 @@ <widget class="QDoubleSpinBox" name="wg_phEdit"> <property name="geometry"> <rect> - <x>910</x> + <x>920</x> <y>130</y> <width>71</width> <height>24</height> @@ -6593,7 +6419,7 @@ <widget class="QDoubleSpinBox" name="w2_raEdit"> <property name="geometry"> <rect> - <x>1070</x> + <x>840</x> <y>100</y> <width>71</width> <height>24</height> @@ -6621,12 +6447,15 @@ <widget class="QDoubleSpinBox" name="w2_caEdit"> <property name="geometry"> <rect> - <x>350</x> + <x>200</x> <y>100</y> <width>71</width> <height>24</height> </rect> </property> + <property name="toolTip"> + <string>Calcium in mg/L</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -6646,7 +6475,7 @@ <widget class="QDoubleSpinBox" name="w2_so4Edit"> <property name="geometry"> <rect> - <x>830</x> + <x>680</x> <y>100</y> <width>71</width> <height>24</height> @@ -6671,12 +6500,15 @@ <widget class="QDoubleSpinBox" name="w2_mgEdit"> <property name="geometry"> <rect> - <x>430</x> + <x>280</x> <y>100</y> <width>71</width> <height>24</height> </rect> </property> + <property name="toolTip"> + <string>Magnesium in mg/L.</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -6696,7 +6528,7 @@ <widget class="QDoubleSpinBox" name="w2_phEdit"> <property name="geometry"> <rect> - <x>910</x> + <x>920</x> <y>100</y> <width>71</width> <height>24</height> @@ -6721,7 +6553,7 @@ <widget class="QDoubleSpinBox" name="w2_hardnessEdit"> <property name="geometry"> <rect> - <x>990</x> + <x>760</x> <y>100</y> <width>71</width> <height>24</height> @@ -6746,14 +6578,15 @@ <widget class="QDoubleSpinBox" name="w2_volEdit"> <property name="geometry"> <rect> - <x>250</x> + <x>1060</x> <y>100</y> <width>85</width> <height>24</height> </rect> </property> <property name="toolTip"> - <string>The division between the main and dilution water. The total volume does not change.</string> + <string>The division between the main and dilution water. +The total volume does not change.</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -6783,7 +6616,7 @@ <widget class="QDoubleSpinBox" name="w2_naEdit"> <property name="geometry"> <rect> - <x>670</x> + <x>520</x> <y>100</y> <width>71</width> <height>24</height> @@ -6808,7 +6641,7 @@ <widget class="QDoubleSpinBox" name="w2_clEdit"> <property name="geometry"> <rect> - <x>750</x> + <x>600</x> <y>100</y> <width>71</width> <height>24</height> @@ -6849,7 +6682,7 @@ <widget class="QDoubleSpinBox" name="w2_caco3Edit"> <property name="geometry"> <rect> - <x>590</x> + <x>440</x> <y>100</y> <width>71</width> <height>24</height> @@ -6874,7 +6707,7 @@ <widget class="QDoubleSpinBox" name="w2_hco3Edit"> <property name="geometry"> <rect> - <x>510</x> + <x>360</x> <y>100</y> <width>71</width> <height>24</height> @@ -6899,12 +6732,15 @@ <widget class="QDoubleSpinBox" name="w1_mgEdit"> <property name="geometry"> <rect> - <x>430</x> + <x>280</x> <y>70</y> <width>71</width> <height>24</height> </rect> </property> + <property name="toolTip"> + <string>Magnesium in mg/L.</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -6924,7 +6760,7 @@ <widget class="QDoubleSpinBox" name="w1_hco3Edit"> <property name="geometry"> <rect> - <x>510</x> + <x>360</x> <y>70</y> <width>71</width> <height>24</height> @@ -6949,7 +6785,7 @@ <widget class="QLabel" name="hardnessLabel"> <property name="geometry"> <rect> - <x>990</x> + <x>760</x> <y>10</y> <width>71</width> <height>20</height> @@ -6965,7 +6801,7 @@ <widget class="QDoubleSpinBox" name="w1_phEdit"> <property name="geometry"> <rect> - <x>910</x> + <x>920</x> <y>70</y> <width>71</width> <height>24</height> @@ -6990,7 +6826,7 @@ <widget class="QLabel" name="mgLabel"> <property name="geometry"> <rect> - <x>430</x> + <x>280</x> <y>10</y> <width>71</width> <height>20</height> @@ -7006,7 +6842,7 @@ <widget class="QLabel" name="phLabel"> <property name="geometry"> <rect> - <x>910</x> + <x>920</x> <y>10</y> <width>71</width> <height>20</height> @@ -7022,7 +6858,7 @@ <widget class="QLabel" name="raLabel"> <property name="geometry"> <rect> - <x>1070</x> + <x>840</x> <y>10</y> <width>71</width> <height>20</height> @@ -7050,7 +6886,7 @@ <widget class="QDoubleSpinBox" name="w1_hardnessEdit"> <property name="geometry"> <rect> - <x>990</x> + <x>760</x> <y>70</y> <width>71</width> <height>24</height> @@ -7075,7 +6911,7 @@ <widget class="QDoubleSpinBox" name="w1_volEdit"> <property name="geometry"> <rect> - <x>250</x> + <x>1060</x> <y>70</y> <width>71</width> <height>24</height> @@ -7109,7 +6945,7 @@ <widget class="QDoubleSpinBox" name="w1_so4Edit"> <property name="geometry"> <rect> - <x>830</x> + <x>680</x> <y>70</y> <width>71</width> <height>24</height> @@ -7134,7 +6970,7 @@ <widget class="QLabel" name="caco3Label"> <property name="geometry"> <rect> - <x>590</x> + <x>440</x> <y>10</y> <width>71</width> <height>20</height> @@ -7150,7 +6986,7 @@ <widget class="QDoubleSpinBox" name="w1_caco3Edit"> <property name="geometry"> <rect> - <x>590</x> + <x>440</x> <y>70</y> <width>71</width> <height>24</height> @@ -7175,7 +7011,7 @@ <widget class="QDoubleSpinBox" name="w1_raEdit"> <property name="geometry"> <rect> - <x>1070</x> + <x>840</x> <y>70</y> <width>71</width> <height>24</height> @@ -7222,7 +7058,7 @@ <widget class="QLabel" name="clLabel"> <property name="geometry"> <rect> - <x>750</x> + <x>600</x> <y>10</y> <width>71</width> <height>20</height> @@ -7238,7 +7074,7 @@ <widget class="QLabel" name="naLabel"> <property name="geometry"> <rect> - <x>670</x> + <x>520</x> <y>10</y> <width>71</width> <height>20</height> @@ -7254,12 +7090,22 @@ <widget class="QLabel" name="caLabel"> <property name="geometry"> <rect> - <x>350</x> + <x>200</x> <y>10</y> <width>71</width> <height>20</height> </rect> </property> + <property name="toolTip"> + <string>Calcium content should typically fall in the range of 40 to 100 ppm. +Lower calcium content may not provide for the desirable +precipitation of trub and oxalates from wort. High oxalates may lead +to beerstone formation. +Calcium also aids in yeast floculation and beer clarification. + +Calcium should not typically exceed 100 ppm unless it has to be +added to provide a desirable anion like sulfate to the water.</string> + </property> <property name="text"> <string>Ca</string> </property> @@ -7270,7 +7116,7 @@ <widget class="QLabel" name="so4Label"> <property name="geometry"> <rect> - <x>830</x> + <x>680</x> <y>10</y> <width>71</width> <height>20</height> @@ -7286,7 +7132,7 @@ <widget class="QLabel" name="volLabel"> <property name="geometry"> <rect> - <x>260</x> + <x>1070</x> <y>10</y> <width>61</width> <height>20</height> @@ -7302,7 +7148,7 @@ <widget class="QLabel" name="hco3Label"> <property name="geometry"> <rect> - <x>510</x> + <x>360</x> <y>10</y> <width>71</width> <height>20</height> @@ -7334,7 +7180,7 @@ <widget class="QDoubleSpinBox" name="w1_clEdit"> <property name="geometry"> <rect> - <x>750</x> + <x>600</x> <y>70</y> <width>71</width> <height>24</height> @@ -7359,12 +7205,15 @@ <widget class="QDoubleSpinBox" name="w1_caEdit"> <property name="geometry"> <rect> - <x>350</x> + <x>200</x> <y>70</y> <width>71</width> <height>24</height> </rect> </property> + <property name="toolTip"> + <string>Calcium in mg/L</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -7384,7 +7233,7 @@ <widget class="QDoubleSpinBox" name="w1_naEdit"> <property name="geometry"> <rect> - <x>670</x> + <x>520</x> <y>70</y> <width>71</width> <height>24</height> @@ -7406,10 +7255,658 @@ <double>1000.000000000000000</double> </property> </widget> + <widget class="QDoubleSpinBox" name="aa_clEdit"> + <property name="geometry"> + <rect> + <x>600</x> + <y>160</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="minimum"> + <double>-1000.000000000000000</double> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="aa_hco3Edit"> + <property name="geometry"> + <rect> + <x>360</x> + <y>160</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="minimum"> + <double>-1000.000000000000000</double> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="aa_naEdit"> + <property name="geometry"> + <rect> + <x>520</x> + <y>160</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="minimum"> + <double>-1000.000000000000000</double> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="aa_so4Edit"> + <property name="geometry"> + <rect> + <x>680</x> + <y>160</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="minimum"> + <double>-1000.000000000000000</double> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="aa_caEdit"> + <property name="geometry"> + <rect> + <x>200</x> + <y>160</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>Calcium in mg/L</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="minimum"> + <double>-1000.000000000000000</double> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="aa_hardnessEdit"> + <property name="geometry"> + <rect> + <x>760</x> + <y>160</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="minimum"> + <double>-1000.000000000000000</double> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="aa_mgEdit"> + <property name="geometry"> + <rect> + <x>280</x> + <y>160</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>Magnesium in mg/L.</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="minimum"> + <double>-1000.000000000000000</double> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QLabel" name="preboil_phLabel_2"> + <property name="geometry"> + <rect> + <x>330</x> + <y>420</y> + <width>181</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Sparge volume:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QDoubleSpinBox" name="tw_phEdit"> + <property name="geometry"> + <rect> + <x>920</x> + <y>40</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>2</number> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QPushButton" name="waterAdjust"> + <property name="geometry"> + <rect> + <x>10</x> + <y>160</y> + <width>181</width> + <height>23</height> + </rect> + </property> + <property name="toolTip"> + <string>Switch between Actual and Target values</string> + </property> + <property name="text"> + <string>Actual Water Adjustment</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + <widget class="QDoubleSpinBox" name="wb_volEdit"> + <property name="geometry"> + <rect> + <x>1060</x> + <y>220</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>Total brew and sparge water supply. +In the mash tab set the infusion volumes. +The sparge volume is automatic calculated.</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="suffix"> + <string> L</string> + </property> + <property name="decimals"> + <number>2</number> + </property> + <property name="maximum"> + <double>100000.000000000000000</double> + </property> + </widget> + <widget class="QPushButton" name="wx_Select"> + <property name="geometry"> + <rect> + <x>10</x> + <y>190</y> + <width>181</width> + <height>23</height> + </rect> + </property> + <property name="toolTip"> + <string>Switch between Actual and Target values</string> + </property> + <property name="text"> + <string>Treated Mash Water</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + <widget class="QDoubleSpinBox" name="wx_caco3Edit"> + <property name="geometry"> + <rect> + <x>440</x> + <y>190</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="wx_mgEdit"> + <property name="geometry"> + <rect> + <x>280</x> + <y>190</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>The ideal amount of Magnesium is between 5 and 40 mg/L.</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="wx_caEdit"> + <property name="geometry"> + <rect> + <x>200</x> + <y>190</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>The ideal amount of Calcium is between 40 and 150 mg/L.</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="wx_so4Edit"> + <property name="geometry"> + <rect> + <x>680</x> + <y>190</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>The ideal Sulfate amount should be between 50 and 400. +Together with Chloride it must be below 500.</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="wx_naEdit"> + <property name="geometry"> + <rect> + <x>520</x> + <y>190</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>The ideal amount of Natrium should be below 150.</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="wx_volEdit"> + <property name="geometry"> + <rect> + <x>1060</x> + <y>190</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>Total brew and sparge water supply. +In the mash tab set the infusion volumes. +The sparge volume is automatic calculated.</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="suffix"> + <string> L</string> + </property> + <property name="decimals"> + <number>2</number> + </property> + <property name="maximum"> + <double>100000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="wx_hardnessEdit"> + <property name="geometry"> + <rect> + <x>760</x> + <y>190</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="wx_raEdit"> + <property name="geometry"> + <rect> + <x>840</x> + <y>190</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="minimum"> + <double>-1000.000000000000000</double> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="wx_clEdit"> + <property name="geometry"> + <rect> + <x>600</x> + <y>190</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>The ideal Chloride amount is between 50 and 150. +Together with Sulfate it must be below 500.</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="wx_hco3Edit"> + <property name="geometry"> + <rect> + <x>360</x> + <y>190</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>0 to 50 for light beers, 50 to 150 for amber beers, 150 to 250 for dark beers.</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="wx_phEdit"> + <property name="geometry"> + <rect> + <x>920</x> + <y>190</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>2</number> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="wb_phEdit"> + <property name="geometry"> + <rect> + <x>920</x> + <y>220</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>2</number> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + </widget> <widget class="QRadioButton" name="w1_spButton"> - <property name="geometry"> - <rect> - <x>210</x> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="geometry"> + <rect> + <x>1020</x> <y>70</y> <width>21</width> <height>21</height> @@ -7418,6 +7915,9 @@ <property name="toolTip"> <string>Sparge water source 1</string> </property> + <property name="text"> + <string/> + </property> <property name="checked"> <bool>true</bool> </property> @@ -7431,14 +7931,17 @@ </property> <property name="geometry"> <rect> - <x>210</x> + <x>1020</x> <y>100</y> <width>21</width> <height>21</height> </rect> </property> <property name="toolTip"> - <string>Sparge water source 2</string> + <string>Sparge water source 1</string> + </property> + <property name="checked"> + <bool>false</bool> </property> <attribute name="buttonGroup"> <string notr="true">spargeGroup</string> @@ -7450,25 +7953,28 @@ </property> <property name="geometry"> <rect> - <x>210</x> + <x>1020</x> <y>130</y> <width>21</width> <height>21</height> </rect> </property> <property name="toolTip"> - <string>Sparge water mixed</string> + <string>Sparge water source 1</string> + </property> + <property name="checked"> + <bool>false</bool> </property> <attribute name="buttonGroup"> <string notr="true">spargeGroup</string> </attribute> </widget> - <widget class="QLabel" name="wspLabel"> - <property name="geometry"> - <rect> - <x>190</x> + <widget class="QLabel" name="volLabel_2"> + <property name="geometry"> + <rect> + <x>1010</x> <y>10</y> - <width>61</width> + <width>41</width> <height>20</height> </rect> </property> @@ -7476,23 +7982,7 @@ <string>Sparge</string> </property> <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - <widget class="QLabel" name="sp_treatedLabel"> - <property name="geometry"> - <rect> - <x>10</x> - <y>220</y> - <width>171</width> - <height>21</height> - </rect> - </property> - <property name="text"> - <string>Treated sparge water</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> </widget>
