changeset
Version 0.3.3. Removed several obsolete debug messages. IBU and Fermentation calculation debug messages are now controlled by conditional defines in global.h. In the brewday tab update the preboil and afterboil reference volumes. In the brewday tab the chiller type is a read only field directy linked to the selected equipment.
Thu, 12 Jan 2023 14:34:14 +0100
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Thu, 12 Jan 2023 14:34:14 +0100
- changeset 454
- 2dfead81c72f
- parent 453
- fc0c10d79539
- child 455
- deea5047be32
Version 0.3.3. Removed several obsolete debug messages. IBU and Fermentation calculation debug messages are now controlled by conditional defines in global.h. In the brewday tab update the preboil and afterboil reference volumes. In the brewday tab the chiller type is a read only field directy linked to the selected equipment.
--- a/CMakeLists.txt Tue Jan 10 16:56:21 2023 +0100 +++ b/CMakeLists.txt Thu Jan 12 14:34:14 2023 +0100 @@ -9,7 +9,7 @@ SET( bmsapp_VERSION_MAJOR 0 ) SET( bmsapp_VERSION_MINOR 3 ) -SET( bmsapp_VERSION_PATCH 2 ) +SET( bmsapp_VERSION_PATCH 3 ) # Compile flags
--- a/src/EditProduct.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditProduct.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -89,9 +89,6 @@ ui->beerstyleEdit->addItem(query.value(0).toString()+" "+query.value(1).toString()+" "+query.value(2).toString()); } - for (int i = 0; i < 5; i++) - ui->brew_coolwithEdit->addItem(QCoreApplication::translate("ChillerType", g_chiller_types[i])); - ui->brew_aerwithEdit->addItem(tr("None")); ui->brew_aerwithEdit->addItem(tr("Air")); ui->brew_aerwithEdit->addItem(tr("Oxygen")); @@ -503,7 +500,7 @@ ui->brew_whirlpool6Edit->setValue(product->brew_whirlpool6); ui->brew_whirlpool2Edit->setValue(product->brew_whirlpool2); ui->brew_cooltoEdit->setValue(product->brew_cooling_to); - ui->brew_coolwithEdit->setCurrentIndex(product->brew_cooling_method); + ui->brew_coolwithShow->setText(QCoreApplication::translate("ChillerType", g_chiller_types[product->eq_chiller_type])); ui->brew_cooltimeEdit->setValue(product->brew_cooling_time); ui->brew_trublossEdit->setValue(product->brew_fermenter_tcloss); @@ -673,7 +670,6 @@ connect(ui->brew_aboilsgEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_aboilsg_changed); connect(ui->brew_aboilvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_aboilvol_changed); connect(ui->brew_aboilButton, SIGNAL(clicked()), this, SLOT(brew_aboil_button())); - connect(ui->brew_coolwithEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::brew_cooling_method_changed); connect(ui->brew_cooltoEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_cooling_to_changed); connect(ui->brew_cooltimeEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_cooling_time_changed); connect(ui->brew_whirlpool9Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_whirlpool9_changed);
--- a/src/EditProduct.h Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditProduct.h Thu Jan 12 14:34:14 2023 +0100 @@ -184,7 +184,6 @@ void brew_aboilvol_changed(double val); void brew_aboil_cm_changed(double val); void brew_aboil_button(); - void brew_cooling_method_changed(int val); void brew_cooling_to_changed(double val); void brew_cooling_time_changed(double val); void brew_whirlpool9_changed(double val);
--- a/src/EditProductTab1.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditProductTab1.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -476,7 +476,6 @@ ui->brew_cooltoEdit->setButtonSymbols( (stage > PROD_STAGE_BREW) ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows); ui->brew_cooltimeEdit->setReadOnly(stage > PROD_STAGE_BREW); ui->brew_cooltimeEdit->setButtonSymbols( (stage > PROD_STAGE_BREW) ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows); - ui->brew_coolwithEdit->setDisabled(stage > PROD_STAGE_BREW); ui->brew_whirlpool9Edit->setReadOnly(stage > PROD_STAGE_BREW); ui->brew_whirlpool9Edit->setButtonSymbols( (stage > PROD_STAGE_BREW) ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows); ui->brew_whirlpool7Edit->setReadOnly(stage > PROD_STAGE_BREW);
--- a/src/EditProductTab2.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditProductTab2.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -44,6 +44,7 @@ /* Chilling */ ui->chiller_typeEdit->setText(QCoreApplication::translate("ChillerType", g_chiller_types[product->eq_chiller_type])); + ui->brew_coolwithShow->setText(QCoreApplication::translate("ChillerType", g_chiller_types[product->eq_chiller_type])); ui->chiller_to79Edit->setValue(product->eq_chiller_to79); ui->chiller_volumeEdit->setValue(product->eq_chiller_volume); ui->chiller_lpmEdit->setValue(product->eq_chiller_lpm); @@ -112,7 +113,7 @@ product->eq_mash_volume = query.value("mash_volume").toDouble(); product->eq_mash_max = query.value("mash_max").toDouble(); product->eq_efficiency = query.value("efficiency").toDouble(); - product->eq_chiller_type = query.value("chiller_type").toInt(); + product->eq_chiller_type = product->brew_cooling_method = query.value("chiller_type").toInt(); product->eq_chiller_to79 = query.value("chiller_to79").toDouble(); product->eq_chiller_volume = query.value("chiller_volume").toDouble(); product->eq_chiller_lpm = query.value("chiller_lpm").toDouble(); @@ -138,6 +139,8 @@ ui->boil_sizeEdit->setValue(product->boil_size); ui->boil_timeEdit->setValue(product->boil_time); ui->efficiencyEdit->setValue(product->efficiency); + ui->brew_preboilvolShow->setValue(product->boil_size * 1.04); + ui->brew_aboilvolShow->setValue(product->batch_size * 1.04); calcFermentablesFromOG(estog); adjustWaters(factor);
--- a/src/EditProductTab3.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditProductTab3.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -68,7 +68,6 @@ QHBoxLayout* pLayout; QTableWidgetItem *item; - qDebug() << "refreshFermentables" << product->fermentables.size(); std::sort(product->fermentables.begin(), product->fermentables.end(), ferment_sort_test); const QStringList labels({tr("Supplier"), tr("Fermentable"), tr("EBC"), tr("Type"), tr("Graintype"), tr("When"), tr("Yield"), @@ -345,11 +344,13 @@ product->fermentables_ok = false; } } -// qDebug() << " adjust to 100" << product->fermentables_use100; -// qDebug() << " supplies" << product->fermentables_ok; -// qDebug() << " colort" << colort << "colorh" << colorh << "colorn" << colorn; -// qDebug() << " psugar" << psugar << "pcara" << pcara << "mvol" << mvol; -// qDebug() << " sugarsf" << sugarsf << "sugarsm" << sugarsm; +#ifdef DEBUG_FERMENTABLES + qDebug() << " adjust to 100" << product->fermentables_use100; + qDebug() << " supplies" << product->fermentables_ok; + qDebug() << " colort" << colort << "colorh" << colorh << "colorn" << colorn; + qDebug() << " psugar" << psugar << "pcara" << pcara << "mvol" << mvol; + qDebug() << " sugarsf" << sugarsf << "sugarsm" << sugarsm; +#endif double v = s / sugardensity + mvol; s = 1000 * s / (v * 10); //deg. Plato @@ -358,7 +359,9 @@ /* Estimate total recipe OG */ product->est_og = Utils::estimate_sg(sugarsf + addedS, product->batch_size); -// qDebug() << " OG" << ui->est_ogEdit->value() << product->est_og; +#ifdef DEBUG_FERMENTABLES + qDebug() << " OG" << ui->est_ogEdit->value() << product->est_og; +#endif if (product->stage > PROD_STAGE_BREW) { ui->est_ogLabel->setText(tr("Final OG:")); ui->est_ogEdit->setValue(product->og); @@ -377,7 +380,9 @@ /* Estimate SG in kettle before boil */ product->preboil_sg = Utils::estimate_sg(sugarsm, product->boil_size); ui->brew_preboilsgShow->setValue(product->preboil_sg); -// qDebug() << " preboil SG" << product->preboil_sg; +#ifdef DEBUG_FERMENTABLES + qDebug() << " preboil SG" << product->preboil_sg; +#endif /* * Recalculate volumes @@ -453,9 +458,13 @@ } else { cw = colort / product->batch_size * 8.34436; color = Utils::kw_to_ebc(product->color_method, cw); - //qDebug() << " oud EBC" << color << "new EBC" << Utils::kw_to_newebc(product->color_method, cw) << "SRM" << Utils::kw_to_srm(product->color_method, cw); +#ifdef DEBUG_FERMENTABLES + qDebug() << " oud EBC" << color << "new EBC" << Utils::kw_to_newebc(product->color_method, cw) << "SRM" << Utils::kw_to_srm(product->color_method, cw); +#endif } - //qDebug() << " color" << ui->est_colorEdit->value() << color << product->est_color; +#ifdef DEBUG_FERMENTABLES + qDebug() << " color" << ui->est_colorEdit->value() << color << product->est_color; +#endif product->est_color = color; ui->est_color2Edit->setValue(color); ui->est_color2Edit->setStyleSheet(Utils::ebc_to_style(color)); @@ -479,10 +488,14 @@ ui->perc_sugarsShow->setValue(round(psugar)); ui->perc_caraShow->setValue(round(pcara)); if (product->mashs_kg > 0) { -// qDebug() << " lintner" << lintner << " mashkg" << product->mashs_kg << "final" << round(lintner / product->mashs_kg); +#ifdef DEBUG_FERMENTABLES + qDebug() << " lintner" << lintner << " mashkg" << product->mashs_kg << "final" << round(lintner / product->mashs_kg); +#endif ui->lintnerShow->setValue(round(lintner / product->mashs_kg)); } else { -// qDebug() << " lintner N/A"; +#ifdef DEBUG_FERMENTABLES + qDebug() << " lintner N/A"; +#endif ui->lintnerShow->setValue(0); } @@ -514,7 +527,9 @@ product->yeasts_ok = false; } } -// qDebug() << " est SVG" << svg; +#ifdef DEBUG_FERMENTABLES + qDebug() << " est SVG" << svg; +#endif } if (svg == 0) svg = 77.0; @@ -526,7 +541,9 @@ product->est_fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, product->est_og, sta1); qDebug() << " est FG" << ui->est_fgEdit->value() << product->est_fg; product->est_abv = Utils::abvol(product->est_og, product->est_fg); -// qDebug() << " est ABV" << ui->est_abvEdit->value() << product->est_abv; +#ifdef DEBUG_FERMENTABLES + qDebug() << " est ABV" << ui->est_abvEdit->value() << product->est_abv; +#endif if (product->stage > PROD_STAGE_TERTIARY) { ui->est_fgLabel->setText(tr("Final FG:")); @@ -791,7 +808,9 @@ double oldperc = product->fermentables.at(product->fermentables_row).percentage; double diffp = val - oldperc; double diffw = (diffp / 100) * total; +#ifdef DEBUG_FERMENTABLES qDebug() << "row100" << row100 << "total" << total << "diff kg" << diffw << "diff %" << diffp; +#endif product->fermentables[product->fermentables_row].percentage += diffp; product->fermentables[product->fermentables_row].amount += diffw;
--- a/src/EditProductTab4.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditProductTab4.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -50,7 +50,6 @@ QHBoxLayout* pLayout; QTableWidgetItem *item; - qDebug() << "refreshHops" << product->hops.size(); std::sort(product->hops.begin(), product->hops.end(), hop_sort_test); const QStringList labels({tr("Origin"), tr("Hop"), tr("Type"), tr("Form"), tr("Alpha"), tr("Use at"), tr("Time"),
--- a/src/EditProductTab5.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditProductTab5.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -53,7 +53,6 @@ QHBoxLayout* pLayout; QTableWidgetItem *item; - qDebug() << "refreshMiscs" << product->miscs.size(); std::sort(product->miscs.begin(), product->miscs.end(), misc_sort_test); const QSignalBlocker blocker1(ui->bs_cacl2Edit);
--- a/src/EditProductTab6.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditProductTab6.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -49,7 +49,6 @@ QHBoxLayout* pLayout; QTableWidgetItem *item; - qDebug() << "refreshYeasts" << product->yeasts.size(); std::sort(product->yeasts.begin(), product->yeasts.end(), yeast_sort_test); const QStringList labels({tr("Yeast"), tr("Laboratory"), tr("Code"), tr("Type"), tr("Use for"), tr("Min."), tr("Max."),
--- a/src/EditProductTab7.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditProductTab7.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -26,8 +26,6 @@ QTableWidgetItem *item; QIcon down_icon, up_icon, del_icon, ed_icon; - qDebug() << "refreshMashs" << product->mashs.size(); - down_icon.addFile(QString::fromUtf8(":/icons/silk/bullet_arrow_down.png"), QSize(), QIcon::Normal, QIcon::Off); up_icon.addFile(QString::fromUtf8(":/icons/silk/bullet_arrow_up.png"), QSize(), QIcon::Normal, QIcon::Off); del_icon.addFile(QString::fromUtf8(":/icons/silk/delete.png"), QSize(), QIcon::Normal, QIcon::Off);
--- a/src/EditProductTab9.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditProductTab9.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -368,13 +368,6 @@ } -void EditProduct::brew_cooling_method_changed(int val) -{ - product->brew_cooling_method = val; - is_changed(); -} - - void EditProduct::brew_cooling_to_changed(double val) { product->brew_cooling_to = val;
--- a/src/EditRecipeTab2.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditRecipeTab2.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -54,7 +54,6 @@ QHBoxLayout* pLayout; QTableWidgetItem *item; - qDebug() << "refreshFermentables" << recipe->fermentables.size(); std::sort(recipe->fermentables.begin(), recipe->fermentables.end(), ferment_sort_test); const QStringList labels({tr("Supplier"), tr("Fermentable"), tr("EBC"), tr("Type"), tr("Graintype"), tr("When"), tr("Yield"),
--- a/src/EditRecipeTab3.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditRecipeTab3.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -42,7 +42,6 @@ QHBoxLayout* pLayout; QTableWidgetItem *item; - qDebug() << "refreshHops" << recipe->hops.size(); std::sort(recipe->hops.begin(), recipe->hops.end(), hop_sort_test); const QStringList labels({tr("Origin"), tr("Hop"), tr("Type"), tr("Form"), tr("Alpha"), tr("Use at"), tr("Time"),
--- a/src/EditRecipeTab4.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditRecipeTab4.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -39,7 +39,6 @@ QHBoxLayout* pLayout; QTableWidgetItem *item; - qDebug() << "refreshMiscs" << recipe->miscs.size(); std::sort(recipe->miscs.begin(), recipe->miscs.end(), misc_sort_test); const QSignalBlocker blocker1(ui->bs_cacl2Edit);
--- a/src/EditRecipeTab5.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditRecipeTab5.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -35,7 +35,6 @@ QHBoxLayout* pLayout; QTableWidgetItem *item; - qDebug() << "refreshYeasts" << recipe->yeasts.size(); std::sort(recipe->yeasts.begin(), recipe->yeasts.end(), yeast_sort_test); const QStringList labels({tr("Yeast"), tr("Laboratory"), tr("Code"), tr("Type"), tr("Use for"), tr("Min. °C"), tr("Max. °C"),
--- a/src/EditRecipeTab6.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/EditRecipeTab6.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -26,8 +26,6 @@ QTableWidgetItem *item; QIcon down_icon, up_icon; - qDebug() << "refreshMashs" << recipe->mashs.size(); - down_icon.addFile(QString::fromUtf8(":/icons/silk/bullet_arrow_down.png"), QSize(), QIcon::Normal, QIcon::Off); up_icon.addFile(QString::fromUtf8(":/icons/silk/bullet_arrow_up.png"), QSize(), QIcon::Normal, QIcon::Off);
--- a/src/Utils.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/Utils.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -444,9 +444,11 @@ double BoilTime_factor1 = ((1 - exp(-0.04 * T1)) / kUtilisation); double BoilTime_factor2 = ((1 - exp(-0.04 * T2)) / kUtilisation); double ibu = Bigness_factor * (BoilTime_factor2 - BoilTime_factor1) * AddedAlphaAcids; - //qDebug() << "TinsethIBU" << SG << Amount << Alpha << Volume << kUtilisation << Bigness_factor * (BoilTime_factor2 - BoilTime_factor1) << "ibu:" << ibu; - //qDebug() << "boilIBU" << Form << SG << Volume << Amount << BoilTime_factor2 << BoilTime_factor1 << Alpha << "IBU:" << ibu; +#ifdef DEBUG_IBU + qDebug() << "TinsethIBU" << SG << Amount << Alpha << Volume << kUtilisation << Bigness_factor * (BoilTime_factor2 - BoilTime_factor1) << "ibu:" << ibu; + qDebug() << " boilIBU" << Form << SG << Volume << Amount << BoilTime_factor2 << BoilTime_factor1 << Alpha << "IBU:" << ibu; +#endif return ibu; } @@ -501,7 +503,9 @@ double flameout_time = 1; double fibu = TinsethIBU(Form, postSG, Volume, Amount, boil_time, boil_time + flameout_time, Alpha, Utilisation, BU_factor); fibu *= IBU_reduction(bp - 0.5); /* Boilpoint minus 0.5 degree */ - //qDebug() << "during flameout" << fibu << bp; +#ifdef DEBUG_IBU + qDebug() << "during flameout" << fibu << bp; +#endif nibu += fibu; if ((Cooltype == CHILLER_TYPE_IMMERSION || Cooltype == CHILLER_TYPE_AUBAINMARIE || Cooltype == CHILLER_TYPE_NOCHILL) && CoolTo79 > 0) { @@ -512,10 +516,14 @@ for (int i = 1; i < int(CoolTo79); i++) { tibu = TinsethIBU(Form, postSG, Volume, Amount, boil_time + flameout_time + i, boil_time + flameout_time + i + 1, Alpha, Utilisation, BU_factor); tibu *= IBU_reduction((bp - 1) - (i * ((bp - 80) / CoolTo79))); - //qDebug() << " chill" << i << "time" << boil_time + flameout_time + i << "temp" << (bp - 1) - (i * ((bp - 80) / CoolTo79)) << "ibu" << tibu; +#ifdef DEBUG_IBU + qDebug() << " chill" << i << "time" << boil_time + flameout_time + i << "temp" << (bp - 1) - (i * ((bp - 80) / CoolTo79)) << "ibu" << tibu; +#endif cibu += tibu; } - //qDebug() << " immersion" << cibu; +#ifdef DEBUG_IBU + qDebug() << " immersion" << cibu; +#endif nibu += cibu; } @@ -534,10 +542,14 @@ * Asume 0.1 degree per minute. */ tibu *= IBU_reduction((bp - 1) - (i * 0.1)); - //qDebug() << " chill" << i << steps << "left" << V << A << "time" << boil_time + flameout_time + i << "ibu" << tibu; +#ifdef DEBUG_IBU + qDebug() << " chill" << i << steps << "left" << V << A << "time" << boil_time + flameout_time + i << "ibu" << tibu; +#endif cibu += tibu; } - //qDebug() << " counterflow" << cibu; +#ifdef DEBUG_IBU + qDebug() << " counterflow" << cibu; +#endif nibu += cibu; } @@ -547,22 +559,30 @@ if (Whirlpool9) { double wibu9 = TinsethIBU(Form, postSG, Volume, Amount, boil_time + flameout_time, boil_time + flameout_time + Whirlpool9, Alpha, Utilisation, BU_factor); wibu9 *= IBU_reduction(87.0); - //qDebug() << "during whirlpool9" << wibu9; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool9" << wibu9; +#endif nibu += wibu9; } if (Whirlpool7) { double wibu7 = TinsethIBU(Form, postSG, Volume, Amount, boil_time + flameout_time, boil_time + flameout_time + Whirlpool7, Alpha, Utilisation, BU_factor); wibu7 *= IBU_reduction(74.0); - //qDebug() << "during whirlpool7" << wibu7; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool7" << wibu7; +#endif nibu += wibu7; } if (Whirlpool6) { double wibu6 = TinsethIBU(Form, postSG, Volume, Amount, boil_time + flameout_time, boil_time + flameout_time + Whirlpool6, Alpha, Utilisation, BU_factor); wibu6 *= IBU_reduction(63.0); - //qDebug() << "during whirlpool6" << wibu6; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool6" << wibu6; +#endif nibu += wibu6; } - //qDebug() << "Old IBU" << ibu << "New IBU" << nibu; +#ifdef DEBUG_IBU + qDebug() << "Old IBU" << ibu << "New IBU" << nibu; +#endif ibu = nibu; } @@ -582,10 +602,14 @@ for (int i = 1; i < int(CoolTo79); i++) { tibu = TinsethIBU(Form, postSG, Volume, Amount, flameout_time + i, flameout_time + i + 1, Alpha, Utilisation, BU_factor); tibu *= IBU_reduction((bp - 1) - (i * ((bp - 80) / CoolTo79))); - //qDebug() << " chill" << i << "time" << flameout_time + i << "temp" << (bp - 1) - (i * ((bp - 80) / CoolTo79)) << "ibu" << tibu; +#ifdef DEBUG_IBU + qDebug() << " chill" << i << "time" << flameout_time + i << "temp" << (bp - 1) - (i * ((bp - 80) / CoolTo79)) << "ibu" << tibu; +#endif cibu += tibu; } - //qDebug() << " immersion" << cibu; +#ifdef DEBUG_IBU + qDebug() << " immersion" << cibu; +#endif ibu += cibu; } @@ -604,10 +628,14 @@ * Asume 0.1 degree per minute. */ tibu *= IBU_reduction((bp - 1) - (i * 0.1)); - //qDebug() << " chill" << i << steps << "left" << V << A << "time" << flameout_time + i << "ibu" << tibu; +#ifdef DEBUG_IBU + qDebug() << " chill" << i << steps << "left" << V << A << "time" << flameout_time + i << "ibu" << tibu; +#endif cibu += tibu; } - //qDebug() << " counterflow" << cibu; +#ifdef DEBUG_IBU + qDebug() << " counterflow" << cibu; +#endif ibu += cibu; } @@ -617,19 +645,25 @@ if (Whirlpool9) { double wibu9 = TinsethIBU(Form, postSG, Volume, Amount, flameout_time, flameout_time + Whirlpool9, Alpha, Utilisation, BU_factor); wibu9 *= IBU_reduction(87.0); - //qDebug() << "during whirlpool9" << wibu9; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool9" << wibu9; +#endif ibu += wibu9; } if (Whirlpool7) { double wibu7 = TinsethIBU(Form, postSG, Volume, Amount, flameout_time, flameout_time + Whirlpool7, Alpha, Utilisation, BU_factor); wibu7 *= IBU_reduction(74.0); - //qDebug() << "during whirlpool7" << wibu7; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool7" << wibu7; +#endif ibu += wibu7; } if (Whirlpool6) { double wibu6 = TinsethIBU(Form, postSG, Volume, Amount, flameout_time, flameout_time + Whirlpool6, Alpha, Utilisation, BU_factor); wibu6 *= IBU_reduction(63.0); - //qDebug() << "during whirlpool6" << wibu6; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool6" << wibu6; +#endif ibu += wibu6; } @@ -640,19 +674,25 @@ if (Whirlpool9) { double wibu9 = TinsethIBU(Form, postSG, Volume, Amount, 0, Whirlpool9, Alpha, Utilisation, BU_factor); wibu9 *= IBU_reduction(87.0); - //qDebug() << "during whirlpool9" << wibu9; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool9" << wibu9; +#endif ibu = wibu9; } if (Whirlpool7) { double wibu7 = TinsethIBU(Form, postSG, Volume, Amount, 0, Whirlpool7, Alpha, Utilisation, BU_factor); wibu7 *= IBU_reduction(74.0); - //qDebug() << "during whirlpool7" << wibu7; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool7" << wibu7; +#endif ibu = wibu7; } if (Whirlpool6) { double wibu6 = TinsethIBU(Form, postSG, Volume, Amount, 0, Whirlpool6, Alpha, Utilisation, BU_factor); wibu6 *= IBU_reduction(63.0); - //qDebug() << "during whirlpool6" << wibu6; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool6" << wibu6; +#endif ibu = wibu6; } } else if (Use == HOP_USEAT_BOTTLING) { @@ -672,7 +712,9 @@ double rc = round(ibu * 1000.0) / 1000.0; +#ifdef DEBUG_IBU qDebug() << "toIBU" << Use << Form << preSG << postSG << Volume << Amount << Boiltime << Alpha << Method << Whirlpool9 << Whirlpool7 << Whirlpool6 << Fulltime << Cooltype << CoolTo79 << CoolLPM << Utilisation << BU_factor << "rc:" << rc; +#endif return rc; }
--- a/src/global.h Tue Jan 10 16:56:21 2023 +0100 +++ b/src/global.h Thu Jan 12 14:34:14 2023 +0100 @@ -8,6 +8,13 @@ #include <QJsonDocument> #include <QWebSocket> +/* + * Debug log switches for building + */ +// #define DEBUG_IBU 1 +#define DEBUG_FERMENTABLES 1 +#define DEBUG_VOLUMES 1 + #define Ka1 0.0000004445 #define Ka2 0.0000000000468
--- a/translations/bmsapp_en.ts Tue Jan 10 16:56:21 2023 +0100 +++ b/translations/bmsapp_en.ts Thu Jan 12 14:34:14 2023 +0100 @@ -2277,20 +2277,20 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="55"/> - <location filename="../src/EditProductTab9.cpp" line="467"/> + <location filename="../src/EditProductTab9.cpp" line="460"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="75"/> - <location filename="../src/EditProductTab3.cpp" line="75"/> - <location filename="../src/EditProductTab3.cpp" line="163"/> - <location filename="../src/EditProductTab4.cpp" line="57"/> - <location filename="../src/EditProductTab4.cpp" line="150"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> - <location filename="../src/EditProductTab5.cpp" line="166"/> - <location filename="../src/EditProductTab6.cpp" line="56"/> - <location filename="../src/EditProductTab6.cpp" line="143"/> + <location filename="../src/EditProductTab3.cpp" line="74"/> + <location filename="../src/EditProductTab3.cpp" line="162"/> + <location filename="../src/EditProductTab4.cpp" line="56"/> + <location filename="../src/EditProductTab4.cpp" line="149"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> + <location filename="../src/EditProductTab5.cpp" line="165"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> + <location filename="../src/EditProductTab6.cpp" line="142"/> <location filename="../src/EditProductExport.cpp" line="874"/> <source>Delete</source> <translation type="unfinished"></translation> @@ -2328,7 +2328,7 @@ <message> <location filename="../ui/EditProduct.ui" line="240"/> <location filename="../ui/EditProduct.ui" line="7897"/> - <location filename="../ui/EditProduct.ui" line="8869"/> + <location filename="../ui/EditProduct.ui" line="8872"/> <source>Efficiency:</source> <translation type="unfinished"></translation> </message> @@ -2361,20 +2361,20 @@ <location filename="../ui/EditProduct.ui" line="4085"/> <location filename="../ui/EditProduct.ui" line="7590"/> <location filename="../ui/EditProduct.ui" line="7991"/> - <location filename="../ui/EditProduct.ui" line="8985"/> - <location filename="../ui/EditProduct.ui" line="9566"/> - <location filename="../ui/EditProduct.ui" line="9800"/> - <location filename="../ui/EditProduct.ui" line="10018"/> - <location filename="../ui/EditProduct.ui" line="10120"/> - <location filename="../ui/EditProduct.ui" line="10265"/> - <location filename="../ui/EditProduct.ui" line="10318"/> - <location filename="../ui/EditProduct.ui" line="10522"/> - <location filename="../ui/EditProduct.ui" line="10556"/> - <location filename="../ui/EditProduct.ui" line="10644"/> - <location filename="../ui/EditProduct.ui" line="10922"/> - <location filename="../ui/EditProduct.ui" line="11107"/> - <location filename="../ui/EditProduct.ui" line="11335"/> - <location filename="../ui/EditProduct.ui" line="11498"/> + <location filename="../ui/EditProduct.ui" line="8988"/> + <location filename="../ui/EditProduct.ui" line="9569"/> + <location filename="../ui/EditProduct.ui" line="9803"/> + <location filename="../ui/EditProduct.ui" line="10021"/> + <location filename="../ui/EditProduct.ui" line="10123"/> + <location filename="../ui/EditProduct.ui" line="10268"/> + <location filename="../ui/EditProduct.ui" line="10321"/> + <location filename="../ui/EditProduct.ui" line="10525"/> + <location filename="../ui/EditProduct.ui" line="10559"/> + <location filename="../ui/EditProduct.ui" line="10647"/> + <location filename="../ui/EditProduct.ui" line="10925"/> + <location filename="../ui/EditProduct.ui" line="11110"/> + <location filename="../ui/EditProduct.ui" line="11338"/> + <location filename="../ui/EditProduct.ui" line="11501"/> <source> %</source> <translation type="unfinished"></translation> </message> @@ -2422,14 +2422,14 @@ <location filename="../ui/EditProduct.ui" line="8361"/> <location filename="../ui/EditProduct.ui" line="8389"/> <location filename="../ui/EditProduct.ui" line="8423"/> - <location filename="../ui/EditProduct.ui" line="8850"/> - <location filename="../ui/EditProduct.ui" line="8935"/> - <location filename="../ui/EditProduct.ui" line="10457"/> - <location filename="../ui/EditProduct.ui" line="10488"/> - <location filename="../ui/EditProduct.ui" line="10894"/> - <location filename="../ui/EditProduct.ui" line="11016"/> - <location filename="../ui/EditProduct.ui" line="11376"/> - <location filename="../ui/EditProduct.ui" line="11457"/> + <location filename="../ui/EditProduct.ui" line="8853"/> + <location filename="../ui/EditProduct.ui" line="8938"/> + <location filename="../ui/EditProduct.ui" line="10460"/> + <location filename="../ui/EditProduct.ui" line="10491"/> + <location filename="../ui/EditProduct.ui" line="10897"/> + <location filename="../ui/EditProduct.ui" line="11019"/> + <location filename="../ui/EditProduct.ui" line="11379"/> + <location filename="../ui/EditProduct.ui" line="11460"/> <location filename="../src/EditProductExport.cpp" line="838"/> <location filename="../src/EditProductExport.cpp" line="846"/> <source> L</source> @@ -2873,10 +2873,10 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="3589"/> - <location filename="../ui/EditProduct.ui" line="10233"/> - <location filename="../ui/EditProduct.ui" line="11594"/> - <location filename="../ui/EditProduct.ui" line="11671"/> - <location filename="../ui/EditProduct.ui" line="11980"/> + <location filename="../ui/EditProduct.ui" line="10236"/> + <location filename="../ui/EditProduct.ui" line="11597"/> + <location filename="../ui/EditProduct.ui" line="11674"/> + <location filename="../ui/EditProduct.ui" line="11983"/> <source>Set or clear date</source> <translation type="unfinished"></translation> </message> @@ -2886,25 +2886,25 @@ <location filename="../ui/EditProduct.ui" line="4123"/> <location filename="../ui/EditProduct.ui" line="8069"/> <location filename="../ui/EditProduct.ui" line="8685"/> - <location filename="../ui/EditProduct.ui" line="9007"/> - <location filename="../ui/EditProduct.ui" line="9082"/> - <location filename="../ui/EditProduct.ui" line="9121"/> - <location filename="../ui/EditProduct.ui" line="9192"/> - <location filename="../ui/EditProduct.ui" line="9279"/> - <location filename="../ui/EditProduct.ui" line="9588"/> - <location filename="../ui/EditProduct.ui" line="9608"/> - <location filename="../ui/EditProduct.ui" line="9647"/> - <location filename="../ui/EditProduct.ui" line="9822"/> - <location filename="../ui/EditProduct.ui" line="9842"/> - <location filename="../ui/EditProduct.ui" line="9881"/> - <location filename="../ui/EditProduct.ui" line="10040"/> - <location filename="../ui/EditProduct.ui" line="10175"/> - <location filename="../ui/EditProduct.ui" line="10195"/> - <location filename="../ui/EditProduct.ui" line="10236"/> - <location filename="../ui/EditProduct.ui" line="11597"/> - <location filename="../ui/EditProduct.ui" line="11617"/> - <location filename="../ui/EditProduct.ui" line="11674"/> - <location filename="../ui/EditProduct.ui" line="11983"/> + <location filename="../ui/EditProduct.ui" line="9010"/> + <location filename="../ui/EditProduct.ui" line="9085"/> + <location filename="../ui/EditProduct.ui" line="9124"/> + <location filename="../ui/EditProduct.ui" line="9195"/> + <location filename="../ui/EditProduct.ui" line="9282"/> + <location filename="../ui/EditProduct.ui" line="9591"/> + <location filename="../ui/EditProduct.ui" line="9611"/> + <location filename="../ui/EditProduct.ui" line="9650"/> + <location filename="../ui/EditProduct.ui" line="9825"/> + <location filename="../ui/EditProduct.ui" line="9845"/> + <location filename="../ui/EditProduct.ui" line="9884"/> + <location filename="../ui/EditProduct.ui" line="10043"/> + <location filename="../ui/EditProduct.ui" line="10178"/> + <location filename="../ui/EditProduct.ui" line="10198"/> + <location filename="../ui/EditProduct.ui" line="10239"/> + <location filename="../ui/EditProduct.ui" line="11600"/> + <location filename="../ui/EditProduct.ui" line="11620"/> + <location filename="../ui/EditProduct.ui" line="11677"/> + <location filename="../ui/EditProduct.ui" line="11986"/> <source>...</source> <translation type="unfinished"></translation> </message> @@ -2956,7 +2956,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="4053"/> - <location filename="../ui/EditProduct.ui" line="9079"/> + <location filename="../ui/EditProduct.ui" line="9082"/> <source>Set the date to today.</source> <translation type="unfinished"></translation> </message> @@ -2967,12 +2967,12 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="4104"/> - <location filename="../ui/EditProduct.ui" line="9102"/> - <location filename="../ui/EditProduct.ui" line="9157"/> - <location filename="../ui/EditProduct.ui" line="9628"/> - <location filename="../ui/EditProduct.ui" line="9862"/> - <location filename="../ui/EditProduct.ui" line="11578"/> - <location filename="../ui/EditProduct.ui" line="11964"/> + <location filename="../ui/EditProduct.ui" line="9105"/> + <location filename="../ui/EditProduct.ui" line="9160"/> + <location filename="../ui/EditProduct.ui" line="9631"/> + <location filename="../ui/EditProduct.ui" line="9865"/> + <location filename="../ui/EditProduct.ui" line="11581"/> + <location filename="../ui/EditProduct.ui" line="11967"/> <source>dd-MM-yyyy</source> <translation type="unfinished"></translation> </message> @@ -2983,8 +2983,8 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="4137"/> - <location filename="../src/EditProductTab3.cpp" line="1119"/> - <location filename="../src/EditProductTab5.cpp" line="719"/> + <location filename="../src/EditProductTab3.cpp" line="1138"/> + <location filename="../src/EditProductTab5.cpp" line="718"/> <source>Mash</source> <translation type="unfinished"></translation> </message> @@ -3112,8 +3112,8 @@ <location filename="../ui/EditProduct.ui" line="4754"/> <location filename="../ui/EditProduct.ui" line="4786"/> <location filename="../ui/EditProduct.ui" line="4817"/> - <location filename="../ui/EditProduct.ui" line="10963"/> - <location filename="../ui/EditProduct.ui" line="11307"/> + <location filename="../ui/EditProduct.ui" line="10966"/> + <location filename="../ui/EditProduct.ui" line="11310"/> <source> gr</source> <translation type="unfinished"></translation> </message> @@ -3301,7 +3301,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="6942"/> - <location filename="../src/EditProductTab7.cpp" line="37"/> + <location filename="../src/EditProductTab7.cpp" line="35"/> <source>pH</source> <translation type="unfinished"></translation> </message> @@ -3347,8 +3347,8 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="7219"/> - <location filename="../src/EditProductTab6.cpp" line="296"/> - <location filename="../src/EditProductTab7.cpp" line="37"/> + <location filename="../src/EditProductTab6.cpp" line="295"/> + <location filename="../src/EditProductTab7.cpp" line="35"/> <source>Volume</source> <translation type="unfinished"></translation> </message> @@ -3379,7 +3379,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="7399"/> - <location filename="../src/EditProductTab5.cpp" line="724"/> + <location filename="../src/EditProductTab5.cpp" line="723"/> <source>Sparge</source> <translation type="unfinished"></translation> </message> @@ -3446,13 +3446,13 @@ <message> <location filename="../ui/EditProduct.ui" line="7795"/> <location filename="../ui/EditProduct.ui" line="8752"/> - <location filename="../ui/EditProduct.ui" line="9441"/> - <location filename="../ui/EditProduct.ui" line="9469"/> - <location filename="../ui/EditProduct.ui" line="9497"/> - <location filename="../ui/EditProduct.ui" line="9731"/> - <location filename="../ui/EditProduct.ui" line="9949"/> - <location filename="../ui/EditProduct.ui" line="11076"/> - <location filename="../ui/EditProduct.ui" line="11526"/> + <location filename="../ui/EditProduct.ui" line="9444"/> + <location filename="../ui/EditProduct.ui" line="9472"/> + <location filename="../ui/EditProduct.ui" line="9500"/> + <location filename="../ui/EditProduct.ui" line="9734"/> + <location filename="../ui/EditProduct.ui" line="9952"/> + <location filename="../ui/EditProduct.ui" line="11079"/> + <location filename="../ui/EditProduct.ui" line="11529"/> <source> °C</source> <translation type="unfinished"></translation> </message> @@ -3463,21 +3463,21 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="7849"/> - <location filename="../ui/EditProduct.ui" line="8957"/> - <location filename="../src/EditProductTab7.cpp" line="637"/> + <location filename="../ui/EditProduct.ui" line="8960"/> + <location filename="../src/EditProductTab7.cpp" line="635"/> <source>Measured pH:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="7865"/> - <location filename="../ui/EditProduct.ui" line="9024"/> - <location filename="../src/EditProductTab7.cpp" line="669"/> + <location filename="../ui/EditProduct.ui" line="9027"/> + <location filename="../src/EditProductTab7.cpp" line="667"/> <source>Measured SG:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="7881"/> - <location filename="../ui/EditProduct.ui" line="9040"/> + <location filename="../ui/EditProduct.ui" line="9043"/> <source>Volume @100°C:</source> <translation type="unfinished"></translation> </message> @@ -3488,7 +3488,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="8066"/> - <location filename="../ui/EditProduct.ui" line="9004"/> + <location filename="../ui/EditProduct.ui" line="9007"/> <source>Edit volume</source> <translation type="unfinished"></translation> </message> @@ -3564,9 +3564,9 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="8682"/> - <location filename="../ui/EditProduct.ui" line="10172"/> - <location filename="../ui/EditProduct.ui" line="10192"/> - <location filename="../ui/EditProduct.ui" line="11614"/> + <location filename="../ui/EditProduct.ui" line="10175"/> + <location filename="../ui/EditProduct.ui" line="10195"/> + <location filename="../ui/EditProduct.ui" line="11617"/> <source>Brew log chart</source> <translation type="unfinished"></translation> </message> @@ -3586,447 +3586,447 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8812"/> + <location filename="../ui/EditProduct.ui" line="8802"/> <source>Cooling time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8829"/> + <location filename="../ui/EditProduct.ui" line="8832"/> <location filename="../src/EditProductExport.cpp" line="805"/> <source>After boil</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8973"/> + <location filename="../ui/EditProduct.ui" line="8976"/> <source>The overall efficiency.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9099"/> + <location filename="../ui/EditProduct.ui" line="9102"/> <source>Edit the brewdate plan or start.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9118"/> + <location filename="../ui/EditProduct.ui" line="9121"/> <source>Clear planned brewdate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9138"/> - <source>Edit the brewdate start time.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ui/EditProduct.ui" line="9141"/> - <location filename="../ui/EditProduct.ui" line="9176"/> + <source>Edit the brewdate start time.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="9144"/> + <location filename="../ui/EditProduct.ui" line="9179"/> <source>hh:mm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9154"/> + <location filename="../ui/EditProduct.ui" line="9157"/> <source>Edit the brewdate end.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9173"/> + <location filename="../ui/EditProduct.ui" line="9176"/> <source>Edit the brewdate end time.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9189"/> + <location filename="../ui/EditProduct.ui" line="9192"/> <source>Set the brewdate end date.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9209"/> + <location filename="../ui/EditProduct.ui" line="9212"/> <source>End time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9225"/> + <location filename="../ui/EditProduct.ui" line="9228"/> <source>Start time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9241"/> + <location filename="../ui/EditProduct.ui" line="9244"/> <source>Show brewlog:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9260"/> + <location filename="../ui/EditProduct.ui" line="9263"/> <source>Confirm brew done:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9276"/> - <location filename="../ui/EditProduct.ui" line="9644"/> - <location filename="../ui/EditProduct.ui" line="9878"/> + <location filename="../ui/EditProduct.ui" line="9279"/> + <location filename="../ui/EditProduct.ui" line="9647"/> + <location filename="../ui/EditProduct.ui" line="9881"/> <source>Confirm the brew dates and times.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9293"/> + <location filename="../ui/EditProduct.ui" line="9296"/> <source>Fermenting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9305"/> + <location filename="../ui/EditProduct.ui" line="9308"/> <source>Primary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9317"/> + <location filename="../ui/EditProduct.ui" line="9320"/> <source>Start density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9333"/> + <location filename="../ui/EditProduct.ui" line="9336"/> <source>Start temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9349"/> + <location filename="../ui/EditProduct.ui" line="9352"/> <source>Peak temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9365"/> - <location filename="../ui/EditProduct.ui" line="9677"/> + <location filename="../ui/EditProduct.ui" line="9368"/> + <location filename="../ui/EditProduct.ui" line="9680"/> <source>End temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9381"/> - <location filename="../ui/EditProduct.ui" line="9693"/> + <location filename="../ui/EditProduct.ui" line="9384"/> + <location filename="../ui/EditProduct.ui" line="9696"/> <source>End density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9397"/> - <location filename="../ui/EditProduct.ui" line="9709"/> + <location filename="../ui/EditProduct.ui" line="9400"/> + <location filename="../ui/EditProduct.ui" line="9712"/> <source>End date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9541"/> - <location filename="../ui/EditProduct.ui" line="9775"/> - <location filename="../ui/EditProduct.ui" line="9993"/> + <location filename="../ui/EditProduct.ui" line="9544"/> + <location filename="../ui/EditProduct.ui" line="9778"/> + <location filename="../ui/EditProduct.ui" line="9996"/> <source>Apparent attenuation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9585"/> - <location filename="../ui/EditProduct.ui" line="9819"/> - <location filename="../ui/EditProduct.ui" line="10037"/> + <location filename="../ui/EditProduct.ui" line="9588"/> + <location filename="../ui/EditProduct.ui" line="9822"/> + <location filename="../ui/EditProduct.ui" line="10040"/> <source>Edit SG in Plato, Brix or SG</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9605"/> - <location filename="../ui/EditProduct.ui" line="9839"/> + <location filename="../ui/EditProduct.ui" line="9608"/> + <location filename="../ui/EditProduct.ui" line="9842"/> <source>Set the date to today</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9625"/> + <location filename="../ui/EditProduct.ui" line="9628"/> <source>Edit the date the primary fermentation was done.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9665"/> + <location filename="../ui/EditProduct.ui" line="9668"/> <source>Secondary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9859"/> + <location filename="../ui/EditProduct.ui" line="9862"/> <source>Edit the date the secondary fermentation was done.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9899"/> + <location filename="../ui/EditProduct.ui" line="9902"/> <source>Tertiary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9911"/> + <location filename="../ui/EditProduct.ui" line="9914"/> <source>Average temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9927"/> + <location filename="../ui/EditProduct.ui" line="9930"/> <source>Final density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10057"/> + <location filename="../ui/EditProduct.ui" line="10060"/> <source>Expected end density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10095"/> + <location filename="../ui/EditProduct.ui" line="10098"/> <source>Alcohol volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10140"/> + <location filename="../ui/EditProduct.ui" line="10143"/> <source>Show fermenter unit log:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10156"/> + <location filename="../ui/EditProduct.ui" line="10159"/> <source>Show fermentation log:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10205"/> + <location filename="../ui/EditProduct.ui" line="10208"/> <source>Package</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10217"/> + <location filename="../ui/EditProduct.ui" line="10220"/> <source>Package date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10290"/> + <location filename="../ui/EditProduct.ui" line="10293"/> <source>Carbonation range:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10343"/> + <location filename="../ui/EditProduct.ui" line="10346"/> <source>Infusion or Dilution</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10355"/> + <location filename="../ui/EditProduct.ui" line="10358"/> <source>Package volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10371"/> + <location filename="../ui/EditProduct.ui" line="10374"/> <source>Extra added volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10387"/> + <location filename="../ui/EditProduct.ui" line="10390"/> <source>Extra remarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10403"/> + <location filename="../ui/EditProduct.ui" line="10406"/> <source>Estimated final ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10697"/> + <location filename="../ui/EditProduct.ui" line="10700"/> <source>Estimated final IBU:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10713"/> + <location filename="../ui/EditProduct.ui" line="10716"/> <source>Estimated final EBC:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10419"/> + <location filename="../ui/EditProduct.ui" line="10422"/> <source>Extra added ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10435"/> + <location filename="../ui/EditProduct.ui" line="10438"/> <source>pH from fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10479"/> + <location filename="../ui/EditProduct.ui" line="10482"/> <source>Extra dilution or infusion added to this batch.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10510"/> - <location filename="../ui/EditProduct.ui" line="10632"/> + <location filename="../ui/EditProduct.ui" line="10513"/> + <location filename="../ui/EditProduct.ui" line="10635"/> <source>The ABV including the infusion.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10541"/> + <location filename="../ui/EditProduct.ui" line="10544"/> <source>If there is alcohol in the infusion, give the percentage.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10600"/> + <location filename="../ui/EditProduct.ui" line="10603"/> <source>Could be the description of the infusion.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10616"/> + <location filename="../ui/EditProduct.ui" line="10619"/> <source>Estimated package ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10764"/> + <location filename="../ui/EditProduct.ui" line="10767"/> <source>Bottles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10776"/> - <location filename="../ui/EditProduct.ui" line="11354"/> + <location filename="../ui/EditProduct.ui" line="10779"/> + <location filename="../ui/EditProduct.ui" line="11357"/> <source>Volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10792"/> - <location filename="../ui/EditProduct.ui" line="11212"/> + <location filename="../ui/EditProduct.ui" line="10795"/> + <location filename="../ui/EditProduct.ui" line="11215"/> <source>Desired volume CO2:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10808"/> - <location filename="../ui/EditProduct.ui" line="11279"/> + <location filename="../ui/EditProduct.ui" line="10811"/> + <location filename="../ui/EditProduct.ui" line="11282"/> <source>Priming sugar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10824"/> - <location filename="../ui/EditProduct.ui" line="11196"/> + <location filename="../ui/EditProduct.ui" line="10827"/> + <location filename="../ui/EditProduct.ui" line="11199"/> <source>Sugar amount:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10840"/> - <location filename="../ui/EditProduct.ui" line="11244"/> + <location filename="../ui/EditProduct.ui" line="10843"/> + <location filename="../ui/EditProduct.ui" line="11247"/> <source>Priming:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10856"/> - <location filename="../ui/EditProduct.ui" line="11228"/> + <location filename="../ui/EditProduct.ui" line="10859"/> + <location filename="../ui/EditProduct.ui" line="11231"/> <source>Water amount:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10872"/> + <location filename="../ui/EditProduct.ui" line="10875"/> <source>Bottle fermentation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10991"/> - <location filename="../ui/EditProduct.ui" line="11407"/> + <location filename="../ui/EditProduct.ui" line="10994"/> + <location filename="../ui/EditProduct.ui" line="11410"/> <source> gr/L</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11038"/> + <location filename="../ui/EditProduct.ui" line="11041"/> <source>Expected pressure in bar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11054"/> + <location filename="../ui/EditProduct.ui" line="11057"/> <source>Bottles ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11152"/> + <location filename="../ui/EditProduct.ui" line="11155"/> <source>Kegs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11164"/> + <location filename="../ui/EditProduct.ui" line="11167"/> <source>Kegs ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11180"/> + <location filename="../ui/EditProduct.ui" line="11183"/> <source>Kegs pressure in bar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11260"/> + <location filename="../ui/EditProduct.ui" line="11263"/> <source>Kegs temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11548"/> + <location filename="../ui/EditProduct.ui" line="11551"/> <source>Forced carbonation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11575"/> + <location filename="../ui/EditProduct.ui" line="11578"/> <source>Edit the package date.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11634"/> + <location filename="../ui/EditProduct.ui" line="11637"/> <source>Show carbonation log:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11643"/> + <location filename="../ui/EditProduct.ui" line="11646"/> <source>Tasting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11655"/> + <location filename="../ui/EditProduct.ui" line="11658"/> <source>Taste date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11691"/> + <location filename="../ui/EditProduct.ui" line="11694"/> <source>Taste rate:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11732"/> + <location filename="../ui/EditProduct.ui" line="11735"/> <source>Color:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11748"/> + <location filename="../ui/EditProduct.ui" line="11751"/> <source>Transparency:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11764"/> + <location filename="../ui/EditProduct.ui" line="11767"/> <source>Head:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11819"/> + <location filename="../ui/EditProduct.ui" line="11822"/> <source>Aroma:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11848"/> + <location filename="../ui/EditProduct.ui" line="11851"/> <source>Taste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11877"/> + <location filename="../ui/EditProduct.ui" line="11880"/> <source>Aftertaste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11906"/> + <location filename="../ui/EditProduct.ui" line="11909"/> <source>Mouthfeel:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11935"/> + <location filename="../ui/EditProduct.ui" line="11938"/> <source>Notes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11961"/> + <location filename="../ui/EditProduct.ui" line="11964"/> <source>Edit the tasting date.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12002"/> + <location filename="../ui/EditProduct.ui" line="12005"/> <source>Export</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12019"/> + <location filename="../ui/EditProduct.ui" line="12022"/> <source>Print</source> <translation type="unfinished"></translation> </message> @@ -4046,678 +4046,678 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="95"/> + <location filename="../src/EditProduct.cpp" line="92"/> <source>None</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="96"/> + <location filename="../src/EditProduct.cpp" line="93"/> <source>Air</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="97"/> + <location filename="../src/EditProduct.cpp" line="94"/> <source>Oxygen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="306"/> + <location filename="../src/EditProduct.cpp" line="303"/> <source>%1, part %2 of %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="810"/> + <location filename="../src/EditProduct.cpp" line="806"/> <source>BMSapp - Add new product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="812"/> + <location filename="../src/EditProduct.cpp" line="808"/> <source>BMSapp - Edit %1 - %2</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProduct.cpp" line="824"/> <location filename="../src/EditProduct.cpp" line="828"/> - <location filename="../src/EditProduct.cpp" line="832"/> <source>Edit Product</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProduct.cpp" line="824"/> + <source>Name empty or too short.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProduct.cpp" line="828"/> - <source>Name empty or too short.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProduct.cpp" line="832"/> <source>No beerstyle selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="870"/> + <location filename="../src/EditProduct.cpp" line="866"/> <source>Delete product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="894"/> + <location filename="../src/EditProduct.cpp" line="890"/> <source>Product changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="894"/> + <location filename="../src/EditProduct.cpp" line="890"/> <source>The product has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab3.cpp" line="73"/> + <source>Supplier</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="73"/> + <source>Fermentable</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="73"/> + <source>EBC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="73"/> + <location filename="../src/EditProductTab4.cpp" line="55"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <location filename="../src/EditProductTab7.cpp" line="34"/> + <source>Type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="73"/> + <source>Graintype</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="73"/> + <source>When</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="73"/> + <source>Yield</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab3.cpp" line="74"/> - <source>Supplier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="74"/> - <source>Fermentable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="74"/> - <source>EBC</source> + <location filename="../src/EditProductTab4.cpp" line="56"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> + <source>Amount</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="74"/> <location filename="../src/EditProductTab4.cpp" line="56"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> <location filename="../src/EditProductTab6.cpp" line="55"/> - <location filename="../src/EditProductTab7.cpp" line="36"/> - <source>Type</source> + <source>Stock</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="74"/> - <source>Graintype</source> + <source>Procent</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="74"/> - <source>When</source> + <source>100%</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="74"/> - <source>Yield</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="75"/> - <location filename="../src/EditProductTab4.cpp" line="57"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> - <location filename="../src/EditProductTab6.cpp" line="56"/> - <source>Amount</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="75"/> - <location filename="../src/EditProductTab4.cpp" line="57"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> - <location filename="../src/EditProductTab6.cpp" line="56"/> - <source>Stock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="75"/> - <source>Procent</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="75"/> - <source>100%</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="75"/> - <location filename="../src/EditProductTab3.cpp" line="174"/> - <location filename="../src/EditProductTab4.cpp" line="57"/> - <location filename="../src/EditProductTab4.cpp" line="161"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> - <location filename="../src/EditProductTab5.cpp" line="177"/> - <location filename="../src/EditProductTab6.cpp" line="56"/> - <location filename="../src/EditProductTab6.cpp" line="154"/> + <location filename="../src/EditProductTab3.cpp" line="173"/> + <location filename="../src/EditProductTab4.cpp" line="56"/> + <location filename="../src/EditProductTab4.cpp" line="160"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> + <location filename="../src/EditProductTab5.cpp" line="176"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> + <location filename="../src/EditProductTab6.cpp" line="153"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="147"/> - <location filename="../src/EditProductTab3.cpp" line="150"/> + <location filename="../src/EditProductTab3.cpp" line="146"/> + <location filename="../src/EditProductTab3.cpp" line="149"/> <source>Edit this from the package tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="154"/> - <location filename="../src/EditProductTab3.cpp" line="157"/> + <location filename="../src/EditProductTab3.cpp" line="153"/> + <location filename="../src/EditProductTab3.cpp" line="156"/> <source>Fermentable already used</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="363"/> + <location filename="../src/EditProductTab3.cpp" line="366"/> <source>Final OG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="463"/> - <location filename="../src/EditProductTab3.cpp" line="467"/> + <location filename="../src/EditProductTab3.cpp" line="472"/> + <location filename="../src/EditProductTab3.cpp" line="476"/> <source>Final EBC:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="532"/> + <location filename="../src/EditProductTab3.cpp" line="549"/> <source>Final FG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="535"/> + <location filename="../src/EditProductTab3.cpp" line="552"/> <source>Final ABV:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="713"/> + <location filename="../src/EditProductTab3.cpp" line="730"/> <source>Delete fermentable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="713"/> - <location filename="../src/EditProductTab4.cpp" line="362"/> - <location filename="../src/EditProductTab5.cpp" line="400"/> - <location filename="../src/EditProductTab6.cpp" line="748"/> - <location filename="../src/EditProductTab7.cpp" line="308"/> - <location filename="../src/EditProduct.cpp" line="870"/> + <location filename="../src/EditProductTab3.cpp" line="730"/> + <location filename="../src/EditProductTab4.cpp" line="361"/> + <location filename="../src/EditProductTab5.cpp" line="399"/> + <location filename="../src/EditProductTab6.cpp" line="747"/> + <location filename="../src/EditProductTab7.cpp" line="306"/> + <location filename="../src/EditProduct.cpp" line="866"/> <source>Delete %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1029"/> - <location filename="../src/EditProductTab5.cpp" line="644"/> + <location filename="../src/EditProductTab3.cpp" line="1048"/> + <location filename="../src/EditProductTab5.cpp" line="643"/> <source>Current ingredient:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1034"/> + <location filename="../src/EditProductTab3.cpp" line="1053"/> <source>Supplier:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1039"/> + <location filename="../src/EditProductTab3.cpp" line="1058"/> <source>Amount in kg:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1044"/> + <location filename="../src/EditProductTab3.cpp" line="1063"/> <source>Percentage in batch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1049"/> + <location filename="../src/EditProductTab3.cpp" line="1068"/> <source>Auto fill to 100%:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1054"/> - <location filename="../src/EditProductTab4.cpp" line="634"/> - <location filename="../src/EditProductTab6.cpp" line="1007"/> + <location filename="../src/EditProductTab3.cpp" line="1073"/> + <location filename="../src/EditProductTab4.cpp" line="633"/> + <location filename="../src/EditProductTab6.cpp" line="1006"/> <source>Use at:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1059"/> - <location filename="../src/EditProductTab5.cpp" line="670"/> + <location filename="../src/EditProductTab3.cpp" line="1078"/> + <location filename="../src/EditProductTab5.cpp" line="669"/> <source>Select ingredient:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1064"/> - <location filename="../src/EditProductTab4.cpp" line="644"/> - <location filename="../src/EditProductTab5.cpp" line="675"/> - <location filename="../src/EditProductTab6.cpp" line="992"/> + <location filename="../src/EditProductTab3.cpp" line="1083"/> + <location filename="../src/EditProductTab4.cpp" line="643"/> + <location filename="../src/EditProductTab5.cpp" line="674"/> + <location filename="../src/EditProductTab6.cpp" line="991"/> <source>In stock:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1069"/> + <location filename="../src/EditProductTab3.cpp" line="1088"/> <source>Max in batch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1120"/> - <location filename="../src/EditProductTab5.cpp" line="720"/> + <location filename="../src/EditProductTab3.cpp" line="1139"/> + <location filename="../src/EditProductTab5.cpp" line="719"/> <source>Boil</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1121"/> + <location filename="../src/EditProductTab3.cpp" line="1140"/> <source>Fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1122"/> + <location filename="../src/EditProductTab3.cpp" line="1141"/> <source>Lagering</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab4.cpp" line="55"/> + <source>Origin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="55"/> + <source>Hop</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="55"/> + <source>Form</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="55"/> + <source>Alpha</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="55"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> + <source>Use at</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="55"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> + <location filename="../src/EditProductTab9.cpp" line="512"/> + <source>Time</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab4.cpp" line="56"/> - <source>Origin</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="56"/> - <source>Hop</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="56"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="56"/> - <source>Alpha</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="56"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> - <source>Use at</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="56"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> - <location filename="../src/EditProductTab9.cpp" line="519"/> - <source>Time</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="57"/> <source>IBU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="141"/> - <location filename="../src/EditProductTab4.cpp" line="144"/> + <location filename="../src/EditProductTab4.cpp" line="140"/> + <location filename="../src/EditProductTab4.cpp" line="143"/> <source>Hop already used</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="177"/> - <location filename="../src/EditProductTab4.cpp" line="217"/> + <location filename="../src/EditProductTab4.cpp" line="176"/> + <location filename="../src/EditProductTab4.cpp" line="216"/> <source>Very low</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="183"/> - <location filename="../src/EditProductTab4.cpp" line="223"/> + <location filename="../src/EditProductTab4.cpp" line="182"/> + <location filename="../src/EditProductTab4.cpp" line="222"/> <source>Low</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="190"/> - <location filename="../src/EditProductTab4.cpp" line="230"/> + <location filename="../src/EditProductTab4.cpp" line="189"/> + <location filename="../src/EditProductTab4.cpp" line="229"/> <source>Moderate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="198"/> - <location filename="../src/EditProductTab4.cpp" line="238"/> + <location filename="../src/EditProductTab4.cpp" line="197"/> + <location filename="../src/EditProductTab4.cpp" line="237"/> <source>High</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="205"/> - <location filename="../src/EditProductTab4.cpp" line="245"/> + <location filename="../src/EditProductTab4.cpp" line="204"/> + <location filename="../src/EditProductTab4.cpp" line="244"/> <source>Very high</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="303"/> + <location filename="../src/EditProductTab4.cpp" line="302"/> <location filename="../src/EditProductTab11.cpp" line="68"/> <source>Final IBU:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="362"/> + <location filename="../src/EditProductTab4.cpp" line="361"/> <source>Delete hop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="567"/> - <location filename="../src/EditProductTab4.cpp" line="628"/> - <location filename="../src/EditProductTab5.cpp" line="515"/> - <location filename="../src/EditProductTab5.cpp" line="604"/> - <location filename="../src/EditProductTab5.cpp" line="662"/> + <location filename="../src/EditProductTab4.cpp" line="566"/> + <location filename="../src/EditProductTab4.cpp" line="627"/> + <location filename="../src/EditProductTab5.cpp" line="514"/> + <location filename="../src/EditProductTab5.cpp" line="603"/> + <location filename="../src/EditProductTab5.cpp" line="661"/> <source>Time in minutes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="572"/> - <location filename="../src/EditProductTab4.cpp" line="626"/> - <location filename="../src/EditProductTab5.cpp" line="510"/> - <location filename="../src/EditProductTab5.cpp" line="599"/> - <location filename="../src/EditProductTab5.cpp" line="660"/> + <location filename="../src/EditProductTab4.cpp" line="571"/> + <location filename="../src/EditProductTab4.cpp" line="625"/> + <location filename="../src/EditProductTab5.cpp" line="509"/> + <location filename="../src/EditProductTab5.cpp" line="598"/> + <location filename="../src/EditProductTab5.cpp" line="659"/> <source>Time in days:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="610"/> + <location filename="../src/EditProductTab4.cpp" line="609"/> <source>Current hop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="615"/> + <location filename="../src/EditProductTab4.cpp" line="614"/> <source>Origin:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="620"/> - <location filename="../src/EditProductTab5.cpp" line="526"/> - <location filename="../src/EditProductTab5.cpp" line="651"/> - <location filename="../src/EditProductTab6.cpp" line="862"/> - <location filename="../src/EditProductTab6.cpp" line="1000"/> + <location filename="../src/EditProductTab4.cpp" line="619"/> + <location filename="../src/EditProductTab5.cpp" line="525"/> + <location filename="../src/EditProductTab5.cpp" line="650"/> + <location filename="../src/EditProductTab6.cpp" line="861"/> + <location filename="../src/EditProductTab6.cpp" line="999"/> <source>Amount in gr:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="639"/> + <location filename="../src/EditProductTab4.cpp" line="638"/> <source>Select hop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="649"/> + <location filename="../src/EditProductTab4.cpp" line="648"/> <source>Bitterness IBU:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="76"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> <source>Ingredient</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="141"/> - <location filename="../src/EditProductTab5.cpp" line="145"/> + <location filename="../src/EditProductTab5.cpp" line="140"/> + <location filename="../src/EditProductTab5.cpp" line="144"/> <source>Edit this from the water tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="150"/> - <location filename="../src/EditProductTab5.cpp" line="154"/> + <location filename="../src/EditProductTab5.cpp" line="149"/> + <location filename="../src/EditProductTab5.cpp" line="153"/> <source>Misc already used</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="400"/> + <location filename="../src/EditProductTab5.cpp" line="399"/> <source>Delete misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="529"/> - <location filename="../src/EditProductTab5.cpp" line="653"/> - <location filename="../src/EditProductTab6.cpp" line="869"/> - <location filename="../src/EditProductTab6.cpp" line="1002"/> + <location filename="../src/EditProductTab5.cpp" line="528"/> + <location filename="../src/EditProductTab5.cpp" line="652"/> + <location filename="../src/EditProductTab6.cpp" line="868"/> + <location filename="../src/EditProductTab6.cpp" line="1001"/> <source>Amount in ml:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="718"/> + <location filename="../src/EditProductTab5.cpp" line="717"/> <source>Starter</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab5.cpp" line="720"/> + <location filename="../src/EditProductTab6.cpp" line="1055"/> + <source>Primary</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab5.cpp" line="721"/> <location filename="../src/EditProductTab6.cpp" line="1056"/> - <source>Primary</source> + <source>Secondary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab5.cpp" line="722"/> - <location filename="../src/EditProductTab6.cpp" line="1057"/> - <source>Secondary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab5.cpp" line="723"/> <source>Bottling</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <source>Yeast</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <source>Laboratory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <source>Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <source>Use for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <source>Min.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <source>Max.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab6.cpp" line="55"/> - <source>Yeast</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="55"/> - <source>Laboratory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="55"/> - <source>Code</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="55"/> - <source>Use for</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="55"/> - <source>Min.</source> + <source>Tol.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab6.cpp" line="55"/> - <source>Max.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="56"/> - <source>Tol.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="56"/> <source>Attn.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="133"/> - <location filename="../src/EditProductTab6.cpp" line="137"/> + <location filename="../src/EditProductTab6.cpp" line="132"/> + <location filename="../src/EditProductTab6.cpp" line="136"/> <source>Yeast already used</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="296"/> + <location filename="../src/EditProductTab6.cpp" line="295"/> <source>Method</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="296"/> + <location filename="../src/EditProductTab6.cpp" line="295"/> <source>Inj. factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="296"/> + <location filename="../src/EditProductTab6.cpp" line="295"/> <source>New cells</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="296"/> + <location filename="../src/EditProductTab6.cpp" line="295"/> <source>Total cells</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="296"/> + <location filename="../src/EditProductTab6.cpp" line="295"/> <source>Grow factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="650"/> + <location filename="../src/EditProductTab6.cpp" line="649"/> <source>Start step type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="655"/> + <location filename="../src/EditProductTab6.cpp" line="654"/> <source>Starter step volume:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab6.cpp" line="661"/> + <source>Stirred</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab6.cpp" line="662"/> - <source>Stirred</source> + <source>Shaken</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab6.cpp" line="663"/> - <source>Shaken</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="664"/> <source>Simple</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="748"/> + <location filename="../src/EditProductTab6.cpp" line="747"/> <source>Delete yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="855"/> - <location filename="../src/EditProductTab6.cpp" line="998"/> + <location filename="../src/EditProductTab6.cpp" line="854"/> + <location filename="../src/EditProductTab6.cpp" line="997"/> <source>Total packs:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="972"/> + <location filename="../src/EditProductTab6.cpp" line="971"/> <source>Yeast name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="977"/> - <location filename="../src/EditProductTab6.cpp" line="982"/> + <location filename="../src/EditProductTab6.cpp" line="976"/> + <location filename="../src/EditProductTab6.cpp" line="981"/> <source>Laboratory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="987"/> + <location filename="../src/EditProductTab6.cpp" line="986"/> <source>Select yeast:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab6.cpp" line="1057"/> + <source>Tertiary</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab6.cpp" line="1058"/> - <source>Tertiary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="1059"/> <source>Bottle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="36"/> + <location filename="../src/EditProductTab7.cpp" line="34"/> <source>Step name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="36"/> + <location filename="../src/EditProductTab7.cpp" line="34"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="36"/> + <location filename="../src/EditProductTab7.cpp" line="34"/> <source>End</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="36"/> + <location filename="../src/EditProductTab7.cpp" line="34"/> <source>Rest</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="36"/> + <location filename="../src/EditProductTab7.cpp" line="34"/> <source>Ramp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="37"/> + <location filename="../src/EditProductTab7.cpp" line="35"/> <source>Inf/dec</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="37"/> + <location filename="../src/EditProductTab7.cpp" line="35"/> <source>W/G ratio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="37"/> + <location filename="../src/EditProductTab7.cpp" line="35"/> <source>SG</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="308"/> + <location filename="../src/EditProductTab7.cpp" line="306"/> <source>Delete mash step</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="558"/> + <location filename="../src/EditProductTab7.cpp" line="556"/> <source>Step name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="568"/> + <location filename="../src/EditProductTab7.cpp" line="566"/> <source>Step type:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab7.cpp" line="572"/> + <source>Infusion</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab7.cpp" line="573"/> + <source>Temperature</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab7.cpp" line="574"/> - <source>Infusion</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab7.cpp" line="575"/> - <source>Temperature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab7.cpp" line="576"/> <source>Decoction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="581"/> + <location filename="../src/EditProductTab7.cpp" line="579"/> <source>Step start temp:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="596"/> + <location filename="../src/EditProductTab7.cpp" line="594"/> <source>Step end temp:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="611"/> + <location filename="../src/EditProductTab7.cpp" line="609"/> <source>Step rest time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="625"/> + <location filename="../src/EditProductTab7.cpp" line="623"/> <source>Step ramp time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="655"/> + <location filename="../src/EditProductTab7.cpp" line="653"/> <source>Measured Brix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="689"/> + <location filename="../src/EditProductTab7.cpp" line="687"/> <source>Infusion volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="706"/> + <location filename="../src/EditProductTab7.cpp" line="704"/> <source>Infusion Temperature:</source> <translation type="unfinished"></translation> </message> @@ -4803,22 +4803,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab9.cpp" line="530"/> + <location filename="../src/EditProductTab9.cpp" line="523"/> <source>Temperature °C or Power %</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab9.cpp" line="558"/> + <location filename="../src/EditProductTab9.cpp" line="551"/> <source>Save Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab9.cpp" line="558"/> + <location filename="../src/EditProductTab9.cpp" line="551"/> <source>Image (*.png)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab9.cpp" line="560"/> + <location filename="../src/EditProductTab9.cpp" line="553"/> <location filename="../src/EditProductExport.cpp" line="37"/> <location filename="../src/EditProductExport.cpp" line="40"/> <location filename="../src/EditProductExport.cpp" line="264"/> @@ -4826,7 +4826,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab9.cpp" line="560"/> + <location filename="../src/EditProductTab9.cpp" line="553"/> <source>No image file selected.</source> <translation type="unfinished"></translation> </message> @@ -5847,16 +5847,16 @@ </message> <message> <location filename="../ui/EditRecipe.ui" line="75"/> - <location filename="../src/EditRecipeTab2.cpp" line="61"/> - <location filename="../src/EditRecipeTab2.cpp" line="123"/> - <location filename="../src/EditRecipeTab3.cpp" line="49"/> - <location filename="../src/EditRecipeTab3.cpp" line="118"/> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> - <location filename="../src/EditRecipeTab4.cpp" line="128"/> - <location filename="../src/EditRecipeTab5.cpp" line="42"/> - <location filename="../src/EditRecipeTab5.cpp" line="103"/> - <location filename="../src/EditRecipeTab6.cpp" line="35"/> - <location filename="../src/EditRecipeTab6.cpp" line="133"/> + <location filename="../src/EditRecipeTab2.cpp" line="60"/> + <location filename="../src/EditRecipeTab2.cpp" line="122"/> + <location filename="../src/EditRecipeTab3.cpp" line="48"/> + <location filename="../src/EditRecipeTab3.cpp" line="117"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> + <location filename="../src/EditRecipeTab4.cpp" line="127"/> + <location filename="../src/EditRecipeTab5.cpp" line="41"/> + <location filename="../src/EditRecipeTab5.cpp" line="102"/> + <location filename="../src/EditRecipeTab6.cpp" line="33"/> + <location filename="../src/EditRecipeTab6.cpp" line="131"/> <source>Delete</source> <translation type="unfinished"></translation> </message> @@ -6099,7 +6099,7 @@ </message> <message> <location filename="../ui/EditRecipe.ui" line="1505"/> - <location filename="../src/EditRecipeTab3.cpp" line="613"/> + <location filename="../src/EditRecipeTab3.cpp" line="612"/> <source>Bitterness IBU:</source> <translation type="unfinished"></translation> </message> @@ -6196,9 +6196,9 @@ </message> <message> <location filename="../ui/EditRecipe.ui" line="2419"/> - <location filename="../src/EditRecipeTab2.cpp" line="927"/> - <location filename="../src/EditRecipeTab3.cpp" line="667"/> - <location filename="../src/EditRecipeTab4.cpp" line="653"/> + <location filename="../src/EditRecipeTab2.cpp" line="926"/> + <location filename="../src/EditRecipeTab3.cpp" line="666"/> + <location filename="../src/EditRecipeTab4.cpp" line="652"/> <source>Mash</source> <translation type="unfinished"></translation> </message> @@ -6538,7 +6538,7 @@ </message> <message> <location filename="../ui/EditRecipe.ui" line="5064"/> - <location filename="../src/EditRecipeTab6.cpp" line="35"/> + <location filename="../src/EditRecipeTab6.cpp" line="33"/> <source>Volume</source> <translation type="unfinished"></translation> </message> @@ -6574,7 +6574,7 @@ </message> <message> <location filename="../ui/EditRecipe.ui" line="5569"/> - <location filename="../src/EditRecipeTab4.cpp" line="658"/> + <location filename="../src/EditRecipeTab4.cpp" line="657"/> <source>Sparge</source> <translation type="unfinished"></translation> </message> @@ -6605,7 +6605,7 @@ </message> <message> <location filename="../src/EditRecipe.cpp" line="41"/> - <location filename="../src/EditRecipeTab3.cpp" line="684"/> + <location filename="../src/EditRecipeTab3.cpp" line="683"/> <source>Extract</source> <translation type="unfinished"></translation> </message> @@ -6661,551 +6661,551 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="60"/> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> <source>Supplier</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="60"/> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> <source>Fermentable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="60"/> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> <source>EBC</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> + <location filename="../src/EditRecipeTab6.cpp" line="32"/> + <source>Type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> + <source>Graintype</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> + <source>When</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> + <source>Yield</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditRecipeTab2.cpp" line="60"/> <location filename="../src/EditRecipeTab3.cpp" line="48"/> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <location filename="../src/EditRecipeTab6.cpp" line="34"/> - <source>Type</source> + <source>Amount</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="60"/> - <source>Graintype</source> + <source>Procent</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="60"/> - <source>When</source> + <source>100%</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="60"/> - <source>Yield</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab2.cpp" line="61"/> - <location filename="../src/EditRecipeTab3.cpp" line="49"/> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> - <location filename="../src/EditRecipeTab5.cpp" line="42"/> - <source>Amount</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab2.cpp" line="61"/> - <source>Procent</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab2.cpp" line="61"/> - <source>100%</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab2.cpp" line="61"/> - <location filename="../src/EditRecipeTab2.cpp" line="134"/> - <location filename="../src/EditRecipeTab3.cpp" line="49"/> - <location filename="../src/EditRecipeTab3.cpp" line="129"/> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> - <location filename="../src/EditRecipeTab4.cpp" line="139"/> - <location filename="../src/EditRecipeTab5.cpp" line="42"/> - <location filename="../src/EditRecipeTab5.cpp" line="114"/> - <location filename="../src/EditRecipeTab6.cpp" line="35"/> - <location filename="../src/EditRecipeTab6.cpp" line="144"/> + <location filename="../src/EditRecipeTab2.cpp" line="133"/> + <location filename="../src/EditRecipeTab3.cpp" line="48"/> + <location filename="../src/EditRecipeTab3.cpp" line="128"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> + <location filename="../src/EditRecipeTab4.cpp" line="138"/> + <location filename="../src/EditRecipeTab5.cpp" line="41"/> + <location filename="../src/EditRecipeTab5.cpp" line="113"/> + <location filename="../src/EditRecipeTab6.cpp" line="33"/> + <location filename="../src/EditRecipeTab6.cpp" line="142"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="527"/> + <location filename="../src/EditRecipeTab2.cpp" line="526"/> <source>Delete fermentable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="527"/> - <location filename="../src/EditRecipeTab3.cpp" line="297"/> - <location filename="../src/EditRecipeTab4.cpp" line="344"/> - <location filename="../src/EditRecipeTab5.cpp" line="262"/> - <location filename="../src/EditRecipeTab6.cpp" line="285"/> + <location filename="../src/EditRecipeTab2.cpp" line="526"/> + <location filename="../src/EditRecipeTab3.cpp" line="296"/> + <location filename="../src/EditRecipeTab4.cpp" line="343"/> + <location filename="../src/EditRecipeTab5.cpp" line="261"/> + <location filename="../src/EditRecipeTab6.cpp" line="283"/> <location filename="../src/EditRecipe.cpp" line="515"/> <source>Delete %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="837"/> - <location filename="../src/EditRecipeTab4.cpp" line="578"/> + <location filename="../src/EditRecipeTab2.cpp" line="836"/> + <location filename="../src/EditRecipeTab4.cpp" line="577"/> <source>Current ingredient:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="842"/> + <location filename="../src/EditRecipeTab2.cpp" line="841"/> <source>Supplier:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="847"/> + <location filename="../src/EditRecipeTab2.cpp" line="846"/> <source>Amount in kg:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="852"/> + <location filename="../src/EditRecipeTab2.cpp" line="851"/> <source>Percentage in batch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="857"/> + <location filename="../src/EditRecipeTab2.cpp" line="856"/> <source>Auto fill to 100%:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="862"/> - <location filename="../src/EditRecipeTab3.cpp" line="593"/> - <location filename="../src/EditRecipeTab5.cpp" line="498"/> + <location filename="../src/EditRecipeTab2.cpp" line="861"/> + <location filename="../src/EditRecipeTab3.cpp" line="592"/> + <location filename="../src/EditRecipeTab5.cpp" line="497"/> <source>Use at:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="867"/> - <location filename="../src/EditRecipeTab4.cpp" line="604"/> + <location filename="../src/EditRecipeTab2.cpp" line="866"/> + <location filename="../src/EditRecipeTab4.cpp" line="603"/> <source>Select ingredient:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="872"/> - <location filename="../src/EditRecipeTab3.cpp" line="608"/> - <location filename="../src/EditRecipeTab4.cpp" line="609"/> - <location filename="../src/EditRecipeTab5.cpp" line="483"/> + <location filename="../src/EditRecipeTab2.cpp" line="871"/> + <location filename="../src/EditRecipeTab3.cpp" line="607"/> + <location filename="../src/EditRecipeTab4.cpp" line="608"/> + <location filename="../src/EditRecipeTab5.cpp" line="482"/> <source>In stock:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="877"/> + <location filename="../src/EditRecipeTab2.cpp" line="876"/> <source>Max in batch:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditRecipeTab2.cpp" line="927"/> + <location filename="../src/EditRecipeTab3.cpp" line="668"/> + <location filename="../src/EditRecipeTab4.cpp" line="653"/> + <source>Boil</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditRecipeTab2.cpp" line="928"/> - <location filename="../src/EditRecipeTab3.cpp" line="669"/> - <location filename="../src/EditRecipeTab4.cpp" line="654"/> - <source>Boil</source> + <source>Fermentation</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="929"/> - <source>Fermentation</source> + <source>Lagering</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="930"/> - <source>Lagering</source> + <location filename="../src/EditRecipeTab5.cpp" line="548"/> + <source>Bottle</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="931"/> - <location filename="../src/EditRecipeTab5.cpp" line="549"/> - <source>Bottle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab2.cpp" line="932"/> <source>Kegs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="48"/> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> <source>Origin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="48"/> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> <source>Hop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="48"/> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> <source>Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="48"/> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> <source>Alpha</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> + <source>Use at</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> + <source>Time</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditRecipeTab3.cpp" line="48"/> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> - <source>Use at</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab3.cpp" line="48"/> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> - <source>Time</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab3.cpp" line="49"/> <source>IBU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="144"/> - <location filename="../src/EditRecipeTab3.cpp" line="184"/> + <location filename="../src/EditRecipeTab3.cpp" line="143"/> + <location filename="../src/EditRecipeTab3.cpp" line="183"/> <source>Very low</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="150"/> - <location filename="../src/EditRecipeTab3.cpp" line="190"/> + <location filename="../src/EditRecipeTab3.cpp" line="149"/> + <location filename="../src/EditRecipeTab3.cpp" line="189"/> <source>Low</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="157"/> - <location filename="../src/EditRecipeTab3.cpp" line="197"/> + <location filename="../src/EditRecipeTab3.cpp" line="156"/> + <location filename="../src/EditRecipeTab3.cpp" line="196"/> <source>Moderate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="165"/> - <location filename="../src/EditRecipeTab3.cpp" line="205"/> + <location filename="../src/EditRecipeTab3.cpp" line="164"/> + <location filename="../src/EditRecipeTab3.cpp" line="204"/> <source>High</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="172"/> - <location filename="../src/EditRecipeTab3.cpp" line="212"/> + <location filename="../src/EditRecipeTab3.cpp" line="171"/> + <location filename="../src/EditRecipeTab3.cpp" line="211"/> <source>Very high</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="297"/> + <location filename="../src/EditRecipeTab3.cpp" line="296"/> <source>Delete hop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="499"/> - <location filename="../src/EditRecipeTab3.cpp" line="585"/> - <location filename="../src/EditRecipeTab4.cpp" line="458"/> - <location filename="../src/EditRecipeTab4.cpp" line="538"/> - <location filename="../src/EditRecipeTab4.cpp" line="596"/> + <location filename="../src/EditRecipeTab3.cpp" line="498"/> + <location filename="../src/EditRecipeTab3.cpp" line="584"/> + <location filename="../src/EditRecipeTab4.cpp" line="457"/> + <location filename="../src/EditRecipeTab4.cpp" line="537"/> + <location filename="../src/EditRecipeTab4.cpp" line="595"/> <source>Time in minutes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="503"/> - <location filename="../src/EditRecipeTab3.cpp" line="583"/> - <location filename="../src/EditRecipeTab4.cpp" line="453"/> - <location filename="../src/EditRecipeTab4.cpp" line="533"/> - <location filename="../src/EditRecipeTab4.cpp" line="594"/> + <location filename="../src/EditRecipeTab3.cpp" line="502"/> + <location filename="../src/EditRecipeTab3.cpp" line="582"/> + <location filename="../src/EditRecipeTab4.cpp" line="452"/> + <location filename="../src/EditRecipeTab4.cpp" line="532"/> + <location filename="../src/EditRecipeTab4.cpp" line="593"/> <source>Time in days:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="562"/> + <location filename="../src/EditRecipeTab3.cpp" line="561"/> <source>Current hop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="567"/> + <location filename="../src/EditRecipeTab3.cpp" line="566"/> <source>Origin:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="572"/> - <location filename="../src/EditRecipeTab4.cpp" line="469"/> - <location filename="../src/EditRecipeTab4.cpp" line="585"/> - <location filename="../src/EditRecipeTab5.cpp" line="366"/> - <location filename="../src/EditRecipeTab5.cpp" line="491"/> + <location filename="../src/EditRecipeTab3.cpp" line="571"/> + <location filename="../src/EditRecipeTab4.cpp" line="468"/> + <location filename="../src/EditRecipeTab4.cpp" line="584"/> + <location filename="../src/EditRecipeTab5.cpp" line="365"/> + <location filename="../src/EditRecipeTab5.cpp" line="490"/> <source>Amount in gr:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="577"/> + <location filename="../src/EditRecipeTab3.cpp" line="576"/> <source>Alpha percent:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="598"/> + <location filename="../src/EditRecipeTab3.cpp" line="597"/> <source>Hop form:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="603"/> + <location filename="../src/EditRecipeTab3.cpp" line="602"/> <source>Select hop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="668"/> + <location filename="../src/EditRecipeTab3.cpp" line="667"/> <source>First wort</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditRecipeTab3.cpp" line="669"/> + <source>Aroma</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditRecipeTab3.cpp" line="670"/> - <source>Aroma</source> + <source>Whirlpool</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="671"/> - <source>Whirlpool</source> + <source>Dry hop</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="672"/> - <source>Dry hop</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab3.cpp" line="673"/> - <location filename="../src/EditRecipeTab4.cpp" line="657"/> + <location filename="../src/EditRecipeTab4.cpp" line="656"/> <source>Bottling</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditRecipeTab3.cpp" line="678"/> + <source>Pellet</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditRecipeTab3.cpp" line="679"/> - <source>Pellet</source> + <source>Plug</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="680"/> - <source>Plug</source> + <source>Leaf</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="681"/> - <source>Leaf</source> + <source>Wet leaf</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="682"/> - <source>Wet leaf</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab3.cpp" line="683"/> <source>Cryo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> <source>Ingredient</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="113"/> - <location filename="../src/EditRecipeTab4.cpp" line="116"/> + <location filename="../src/EditRecipeTab4.cpp" line="112"/> + <location filename="../src/EditRecipeTab4.cpp" line="115"/> <source>Edit this from the water tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="344"/> + <location filename="../src/EditRecipeTab4.cpp" line="343"/> <source>Delete misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="472"/> - <location filename="../src/EditRecipeTab4.cpp" line="587"/> - <location filename="../src/EditRecipeTab5.cpp" line="370"/> - <location filename="../src/EditRecipeTab5.cpp" line="493"/> + <location filename="../src/EditRecipeTab4.cpp" line="471"/> + <location filename="../src/EditRecipeTab4.cpp" line="586"/> + <location filename="../src/EditRecipeTab5.cpp" line="369"/> + <location filename="../src/EditRecipeTab5.cpp" line="492"/> <source>Amount in ml:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="652"/> + <location filename="../src/EditRecipeTab4.cpp" line="651"/> <source>Starter</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditRecipeTab4.cpp" line="654"/> + <location filename="../src/EditRecipeTab5.cpp" line="545"/> + <source>Primary</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditRecipeTab4.cpp" line="655"/> <location filename="../src/EditRecipeTab5.cpp" line="546"/> - <source>Primary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab4.cpp" line="656"/> - <location filename="../src/EditRecipeTab5.cpp" line="547"/> <source>Secondary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="41"/> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> <source>Yeast</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> + <source>Laboratory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> + <source>Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> + <source>Use for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> + <source>Min. °C</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> + <source>Max. °C</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <source>Laboratory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <source>Code</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <source>Use for</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <source>Min. °C</source> + <source>Tol. %</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <source>Max. °C</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab5.cpp" line="42"/> - <source>Tol. %</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab5.cpp" line="42"/> <source>Attn. %</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="262"/> + <location filename="../src/EditRecipeTab5.cpp" line="261"/> <source>Delete yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="362"/> - <location filename="../src/EditRecipeTab5.cpp" line="489"/> + <location filename="../src/EditRecipeTab5.cpp" line="361"/> + <location filename="../src/EditRecipeTab5.cpp" line="488"/> <source>Total packs:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="463"/> + <location filename="../src/EditRecipeTab5.cpp" line="462"/> <source>Yeast name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="468"/> - <location filename="../src/EditRecipeTab5.cpp" line="473"/> + <location filename="../src/EditRecipeTab5.cpp" line="467"/> + <location filename="../src/EditRecipeTab5.cpp" line="472"/> <source>Laboratory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="478"/> + <location filename="../src/EditRecipeTab5.cpp" line="477"/> <source>Select yeast:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="548"/> + <location filename="../src/EditRecipeTab5.cpp" line="547"/> <source>Tertiary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="34"/> + <location filename="../src/EditRecipeTab6.cpp" line="32"/> <source>Step name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="34"/> + <location filename="../src/EditRecipeTab6.cpp" line="32"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="34"/> + <location filename="../src/EditRecipeTab6.cpp" line="32"/> <source>End</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="34"/> + <location filename="../src/EditRecipeTab6.cpp" line="32"/> <source>Rest</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="34"/> + <location filename="../src/EditRecipeTab6.cpp" line="32"/> <source>Ramp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="35"/> + <location filename="../src/EditRecipeTab6.cpp" line="33"/> <source>Inf/dec</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="35"/> + <location filename="../src/EditRecipeTab6.cpp" line="33"/> <source>W/G ratio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="285"/> + <location filename="../src/EditRecipeTab6.cpp" line="283"/> <source>Delete mash step</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="453"/> + <location filename="../src/EditRecipeTab6.cpp" line="451"/> <source>Step name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="463"/> + <location filename="../src/EditRecipeTab6.cpp" line="461"/> <source>Step type:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditRecipeTab6.cpp" line="467"/> + <source>Infusion</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab6.cpp" line="468"/> + <source>Temperature</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditRecipeTab6.cpp" line="469"/> - <source>Infusion</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab6.cpp" line="470"/> - <source>Temperature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab6.cpp" line="471"/> <source>Decoction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="476"/> + <location filename="../src/EditRecipeTab6.cpp" line="474"/> <source>Step start temp:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="491"/> + <location filename="../src/EditRecipeTab6.cpp" line="489"/> <source>Step end temp:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="506"/> + <location filename="../src/EditRecipeTab6.cpp" line="504"/> <source>Step rest time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="520"/> + <location filename="../src/EditRecipeTab6.cpp" line="518"/> <source>Step ramp time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="535"/> + <location filename="../src/EditRecipeTab6.cpp" line="533"/> <source>Infusion volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="552"/> + <location filename="../src/EditRecipeTab6.cpp" line="550"/> <source>Infusion Temperature:</source> <translation type="unfinished"></translation> </message>
--- a/translations/bmsapp_nl.ts Tue Jan 10 16:56:21 2023 +0100 +++ b/translations/bmsapp_nl.ts Thu Jan 12 14:34:14 2023 +0100 @@ -2485,20 +2485,20 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="55"/> - <location filename="../src/EditProductTab9.cpp" line="467"/> + <location filename="../src/EditProductTab9.cpp" line="460"/> <source>Save</source> <translation>Bewaar</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="75"/> - <location filename="../src/EditProductTab3.cpp" line="75"/> - <location filename="../src/EditProductTab3.cpp" line="163"/> - <location filename="../src/EditProductTab4.cpp" line="57"/> - <location filename="../src/EditProductTab4.cpp" line="150"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> - <location filename="../src/EditProductTab5.cpp" line="166"/> - <location filename="../src/EditProductTab6.cpp" line="56"/> - <location filename="../src/EditProductTab6.cpp" line="143"/> + <location filename="../src/EditProductTab3.cpp" line="74"/> + <location filename="../src/EditProductTab3.cpp" line="162"/> + <location filename="../src/EditProductTab4.cpp" line="56"/> + <location filename="../src/EditProductTab4.cpp" line="149"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> + <location filename="../src/EditProductTab5.cpp" line="165"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> + <location filename="../src/EditProductTab6.cpp" line="142"/> <location filename="../src/EditProductExport.cpp" line="874"/> <source>Delete</source> <translation>Verwijder</translation> @@ -2536,7 +2536,7 @@ <message> <location filename="../ui/EditProduct.ui" line="240"/> <location filename="../ui/EditProduct.ui" line="7897"/> - <location filename="../ui/EditProduct.ui" line="8869"/> + <location filename="../ui/EditProduct.ui" line="8872"/> <source>Efficiency:</source> <translation>Rendement:</translation> </message> @@ -2569,20 +2569,20 @@ <location filename="../ui/EditProduct.ui" line="4085"/> <location filename="../ui/EditProduct.ui" line="7590"/> <location filename="../ui/EditProduct.ui" line="7991"/> - <location filename="../ui/EditProduct.ui" line="8985"/> - <location filename="../ui/EditProduct.ui" line="9566"/> - <location filename="../ui/EditProduct.ui" line="9800"/> - <location filename="../ui/EditProduct.ui" line="10018"/> - <location filename="../ui/EditProduct.ui" line="10120"/> - <location filename="../ui/EditProduct.ui" line="10265"/> - <location filename="../ui/EditProduct.ui" line="10318"/> - <location filename="../ui/EditProduct.ui" line="10522"/> - <location filename="../ui/EditProduct.ui" line="10556"/> - <location filename="../ui/EditProduct.ui" line="10644"/> - <location filename="../ui/EditProduct.ui" line="10922"/> - <location filename="../ui/EditProduct.ui" line="11107"/> - <location filename="../ui/EditProduct.ui" line="11335"/> - <location filename="../ui/EditProduct.ui" line="11498"/> + <location filename="../ui/EditProduct.ui" line="8988"/> + <location filename="../ui/EditProduct.ui" line="9569"/> + <location filename="../ui/EditProduct.ui" line="9803"/> + <location filename="../ui/EditProduct.ui" line="10021"/> + <location filename="../ui/EditProduct.ui" line="10123"/> + <location filename="../ui/EditProduct.ui" line="10268"/> + <location filename="../ui/EditProduct.ui" line="10321"/> + <location filename="../ui/EditProduct.ui" line="10525"/> + <location filename="../ui/EditProduct.ui" line="10559"/> + <location filename="../ui/EditProduct.ui" line="10647"/> + <location filename="../ui/EditProduct.ui" line="10925"/> + <location filename="../ui/EditProduct.ui" line="11110"/> + <location filename="../ui/EditProduct.ui" line="11338"/> + <location filename="../ui/EditProduct.ui" line="11501"/> <source> %</source> <translation> %</translation> </message> @@ -2630,14 +2630,14 @@ <location filename="../ui/EditProduct.ui" line="8361"/> <location filename="../ui/EditProduct.ui" line="8389"/> <location filename="../ui/EditProduct.ui" line="8423"/> - <location filename="../ui/EditProduct.ui" line="8850"/> - <location filename="../ui/EditProduct.ui" line="8935"/> - <location filename="../ui/EditProduct.ui" line="10457"/> - <location filename="../ui/EditProduct.ui" line="10488"/> - <location filename="../ui/EditProduct.ui" line="10894"/> - <location filename="../ui/EditProduct.ui" line="11016"/> - <location filename="../ui/EditProduct.ui" line="11376"/> - <location filename="../ui/EditProduct.ui" line="11457"/> + <location filename="../ui/EditProduct.ui" line="8853"/> + <location filename="../ui/EditProduct.ui" line="8938"/> + <location filename="../ui/EditProduct.ui" line="10460"/> + <location filename="../ui/EditProduct.ui" line="10491"/> + <location filename="../ui/EditProduct.ui" line="10897"/> + <location filename="../ui/EditProduct.ui" line="11019"/> + <location filename="../ui/EditProduct.ui" line="11379"/> + <location filename="../ui/EditProduct.ui" line="11460"/> <location filename="../src/EditProductExport.cpp" line="838"/> <location filename="../src/EditProductExport.cpp" line="846"/> <source> L</source> @@ -2690,7 +2690,7 @@ <translation>Energie inhoud kcal/l:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="649"/> + <location filename="../src/EditProductTab4.cpp" line="648"/> <source>Bitterness IBU:</source> <translation>Bitterheid IBU:</translation> </message> @@ -2965,10 +2965,10 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="3589"/> - <location filename="../ui/EditProduct.ui" line="10233"/> - <location filename="../ui/EditProduct.ui" line="11594"/> - <location filename="../ui/EditProduct.ui" line="11671"/> - <location filename="../ui/EditProduct.ui" line="11980"/> + <location filename="../ui/EditProduct.ui" line="10236"/> + <location filename="../ui/EditProduct.ui" line="11597"/> + <location filename="../ui/EditProduct.ui" line="11674"/> + <location filename="../ui/EditProduct.ui" line="11983"/> <source>Set or clear date</source> <translation>Zet of wis datum</translation> </message> @@ -2978,25 +2978,25 @@ <location filename="../ui/EditProduct.ui" line="4123"/> <location filename="../ui/EditProduct.ui" line="8069"/> <location filename="../ui/EditProduct.ui" line="8685"/> - <location filename="../ui/EditProduct.ui" line="9007"/> - <location filename="../ui/EditProduct.ui" line="9082"/> - <location filename="../ui/EditProduct.ui" line="9121"/> - <location filename="../ui/EditProduct.ui" line="9192"/> - <location filename="../ui/EditProduct.ui" line="9279"/> - <location filename="../ui/EditProduct.ui" line="9588"/> - <location filename="../ui/EditProduct.ui" line="9608"/> - <location filename="../ui/EditProduct.ui" line="9647"/> - <location filename="../ui/EditProduct.ui" line="9822"/> - <location filename="../ui/EditProduct.ui" line="9842"/> - <location filename="../ui/EditProduct.ui" line="9881"/> - <location filename="../ui/EditProduct.ui" line="10040"/> - <location filename="../ui/EditProduct.ui" line="10175"/> - <location filename="../ui/EditProduct.ui" line="10195"/> - <location filename="../ui/EditProduct.ui" line="10236"/> - <location filename="../ui/EditProduct.ui" line="11597"/> - <location filename="../ui/EditProduct.ui" line="11617"/> - <location filename="../ui/EditProduct.ui" line="11674"/> - <location filename="../ui/EditProduct.ui" line="11983"/> + <location filename="../ui/EditProduct.ui" line="9010"/> + <location filename="../ui/EditProduct.ui" line="9085"/> + <location filename="../ui/EditProduct.ui" line="9124"/> + <location filename="../ui/EditProduct.ui" line="9195"/> + <location filename="../ui/EditProduct.ui" line="9282"/> + <location filename="../ui/EditProduct.ui" line="9591"/> + <location filename="../ui/EditProduct.ui" line="9611"/> + <location filename="../ui/EditProduct.ui" line="9650"/> + <location filename="../ui/EditProduct.ui" line="9825"/> + <location filename="../ui/EditProduct.ui" line="9845"/> + <location filename="../ui/EditProduct.ui" line="9884"/> + <location filename="../ui/EditProduct.ui" line="10043"/> + <location filename="../ui/EditProduct.ui" line="10178"/> + <location filename="../ui/EditProduct.ui" line="10198"/> + <location filename="../ui/EditProduct.ui" line="10239"/> + <location filename="../ui/EditProduct.ui" line="11600"/> + <location filename="../ui/EditProduct.ui" line="11620"/> + <location filename="../ui/EditProduct.ui" line="11677"/> + <location filename="../ui/EditProduct.ui" line="11986"/> <source>...</source> <translation>...</translation> </message> @@ -3052,7 +3052,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="4053"/> - <location filename="../ui/EditProduct.ui" line="9079"/> + <location filename="../ui/EditProduct.ui" line="9082"/> <source>Set the date to today.</source> <translation>Zet de datum op vandaag.</translation> </message> @@ -3063,12 +3063,12 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="4104"/> - <location filename="../ui/EditProduct.ui" line="9102"/> - <location filename="../ui/EditProduct.ui" line="9157"/> - <location filename="../ui/EditProduct.ui" line="9628"/> - <location filename="../ui/EditProduct.ui" line="9862"/> - <location filename="../ui/EditProduct.ui" line="11578"/> - <location filename="../ui/EditProduct.ui" line="11964"/> + <location filename="../ui/EditProduct.ui" line="9105"/> + <location filename="../ui/EditProduct.ui" line="9160"/> + <location filename="../ui/EditProduct.ui" line="9631"/> + <location filename="../ui/EditProduct.ui" line="9865"/> + <location filename="../ui/EditProduct.ui" line="11581"/> + <location filename="../ui/EditProduct.ui" line="11967"/> <source>dd-MM-yyyy</source> <translation>dd-MM-yyyy</translation> </message> @@ -3079,8 +3079,8 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="4137"/> - <location filename="../src/EditProductTab3.cpp" line="1119"/> - <location filename="../src/EditProductTab5.cpp" line="719"/> + <location filename="../src/EditProductTab3.cpp" line="1138"/> + <location filename="../src/EditProductTab5.cpp" line="718"/> <source>Mash</source> <translation>Maischen</translation> </message> @@ -3150,14 +3150,14 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="6942"/> - <location filename="../src/EditProductTab7.cpp" line="37"/> + <location filename="../src/EditProductTab7.cpp" line="35"/> <source>pH</source> <translation>pH</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="7219"/> - <location filename="../src/EditProductTab6.cpp" line="296"/> - <location filename="../src/EditProductTab7.cpp" line="37"/> + <location filename="../src/EditProductTab6.cpp" line="295"/> + <location filename="../src/EditProductTab7.cpp" line="35"/> <source>Volume</source> <translation>Volume</translation> </message> @@ -3375,8 +3375,8 @@ <location filename="../ui/EditProduct.ui" line="4754"/> <location filename="../ui/EditProduct.ui" line="4786"/> <location filename="../ui/EditProduct.ui" line="4817"/> - <location filename="../ui/EditProduct.ui" line="10963"/> - <location filename="../ui/EditProduct.ui" line="11307"/> + <location filename="../ui/EditProduct.ui" line="10966"/> + <location filename="../ui/EditProduct.ui" line="11310"/> <source> gr</source> <translation> gr</translation> </message> @@ -3508,72 +3508,72 @@ <translation>Spoelwater temp:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9317"/> + <location filename="../ui/EditProduct.ui" line="9320"/> <source>Start density:</source> <translation>Begin densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9333"/> + <location filename="../ui/EditProduct.ui" line="9336"/> <source>Start temperature:</source> <translation>Start temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9349"/> + <location filename="../ui/EditProduct.ui" line="9352"/> <source>Peak temperature:</source> <translation>Piek temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9365"/> - <location filename="../ui/EditProduct.ui" line="9677"/> + <location filename="../ui/EditProduct.ui" line="9368"/> + <location filename="../ui/EditProduct.ui" line="9680"/> <source>End temperature:</source> <translation>Eind temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9381"/> - <location filename="../ui/EditProduct.ui" line="9693"/> + <location filename="../ui/EditProduct.ui" line="9384"/> + <location filename="../ui/EditProduct.ui" line="9696"/> <source>End density:</source> <translation>Eind densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9397"/> - <location filename="../ui/EditProduct.ui" line="9709"/> + <location filename="../ui/EditProduct.ui" line="9400"/> + <location filename="../ui/EditProduct.ui" line="9712"/> <source>End date:</source> <translation>Eind datum:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9541"/> - <location filename="../ui/EditProduct.ui" line="9775"/> - <location filename="../ui/EditProduct.ui" line="9993"/> + <location filename="../ui/EditProduct.ui" line="9544"/> + <location filename="../ui/EditProduct.ui" line="9778"/> + <location filename="../ui/EditProduct.ui" line="9996"/> <source>Apparent attenuation:</source> <translation>Schijnbare vergisting:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9859"/> + <location filename="../ui/EditProduct.ui" line="9862"/> <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="9911"/> + <location filename="../ui/EditProduct.ui" line="9914"/> <source>Average temperature:</source> <translation>Gemiddelde temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9927"/> + <location filename="../ui/EditProduct.ui" line="9930"/> <source>Final density:</source> <translation>Finale densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10057"/> + <location filename="../ui/EditProduct.ui" line="10060"/> <source>Expected end density:</source> <translation>Verwachte eind densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10371"/> + <location filename="../ui/EditProduct.ui" line="10374"/> <source>Extra added volume:</source> <translation>Toevoeging volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10387"/> + <location filename="../ui/EditProduct.ui" line="10390"/> <source>Extra remarks:</source> <translation>Toevoeging opmerking:</translation> </message> @@ -3583,45 +3583,45 @@ <translation>Finale ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10419"/> + <location filename="../ui/EditProduct.ui" line="10422"/> <source>Extra added ABV %:</source> <translation>Toevoeging extra ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10697"/> + <location filename="../ui/EditProduct.ui" line="10700"/> <source>Estimated final IBU:</source> <translation>Verwacht finale IBU:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10713"/> + <location filename="../ui/EditProduct.ui" line="10716"/> <source>Estimated final EBC:</source> <translation>Verwacht finale EBC:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10776"/> - <location filename="../ui/EditProduct.ui" line="11354"/> + <location filename="../ui/EditProduct.ui" line="10779"/> + <location filename="../ui/EditProduct.ui" line="11357"/> <source>Volume:</source> <translation>Volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10840"/> - <location filename="../ui/EditProduct.ui" line="11244"/> + <location filename="../ui/EditProduct.ui" line="10843"/> + <location filename="../ui/EditProduct.ui" line="11247"/> <source>Priming:</source> <translation>Carbonatie:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10872"/> + <location filename="../ui/EditProduct.ui" line="10875"/> <source>Bottle fermentation:</source> <translation>Flessen hergisting:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10991"/> - <location filename="../ui/EditProduct.ui" line="11407"/> + <location filename="../ui/EditProduct.ui" line="10994"/> + <location filename="../ui/EditProduct.ui" line="11410"/> <source> gr/L</source> <translation> gr/L</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11260"/> + <location filename="../ui/EditProduct.ui" line="11263"/> <source>Kegs temperature:</source> <translation>Fusten temperatuur:</translation> </message> @@ -3689,7 +3689,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="8066"/> - <location filename="../ui/EditProduct.ui" line="9004"/> + <location filename="../ui/EditProduct.ui" line="9007"/> <source>Edit volume</source> <translation>Wijzig volume</translation> </message> @@ -3709,7 +3709,7 @@ <translation>Koelen methode:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8812"/> + <location filename="../ui/EditProduct.ui" line="8802"/> <source>Cooling time:</source> <translation>Koelen tijd:</translation> </message> @@ -3726,13 +3726,13 @@ <message> <location filename="../ui/EditProduct.ui" line="7795"/> <location filename="../ui/EditProduct.ui" line="8752"/> - <location filename="../ui/EditProduct.ui" line="9441"/> - <location filename="../ui/EditProduct.ui" line="9469"/> - <location filename="../ui/EditProduct.ui" line="9497"/> - <location filename="../ui/EditProduct.ui" line="9731"/> - <location filename="../ui/EditProduct.ui" line="9949"/> - <location filename="../ui/EditProduct.ui" line="11076"/> - <location filename="../ui/EditProduct.ui" line="11526"/> + <location filename="../ui/EditProduct.ui" line="9444"/> + <location filename="../ui/EditProduct.ui" line="9472"/> + <location filename="../ui/EditProduct.ui" line="9500"/> + <location filename="../ui/EditProduct.ui" line="9734"/> + <location filename="../ui/EditProduct.ui" line="9952"/> + <location filename="../ui/EditProduct.ui" line="11079"/> + <location filename="../ui/EditProduct.ui" line="11529"/> <source> °C</source> <translation> °C</translation> </message> @@ -3743,7 +3743,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="7881"/> - <location filename="../ui/EditProduct.ui" line="9040"/> + <location filename="../ui/EditProduct.ui" line="9043"/> <source>Volume @100°C:</source> <translation>Volume @100°C:</translation> </message> @@ -3821,9 +3821,9 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="8682"/> - <location filename="../ui/EditProduct.ui" line="10172"/> - <location filename="../ui/EditProduct.ui" line="10192"/> - <location filename="../ui/EditProduct.ui" line="11614"/> + <location filename="../ui/EditProduct.ui" line="10175"/> + <location filename="../ui/EditProduct.ui" line="10195"/> + <location filename="../ui/EditProduct.ui" line="11617"/> <source>Brew log chart</source> <translation>Brouw log grafiek</translation> </message> @@ -3838,154 +3838,154 @@ <translation>Koelen tot:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8829"/> + <location filename="../ui/EditProduct.ui" line="8832"/> <location filename="../src/EditProductExport.cpp" line="805"/> <source>After boil</source> <translation>Einde koken</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8973"/> + <location filename="../ui/EditProduct.ui" line="8976"/> <source>The overall efficiency.</source> <translation>Het totale brouwzaal rendement.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9099"/> + <location filename="../ui/EditProduct.ui" line="9102"/> <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="9118"/> + <location filename="../ui/EditProduct.ui" line="9121"/> <source>Clear planned brewdate</source> <translation>Wis geplande brouwdag</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9138"/> - <source>Edit the brewdate start time.</source> - <translation>Wijzig de brouwdag start tijd.</translation> - </message> - <message> <location filename="../ui/EditProduct.ui" line="9141"/> - <location filename="../ui/EditProduct.ui" line="9176"/> + <source>Edit the brewdate start time.</source> + <translation>Wijzig de brouwdag start tijd.</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="9144"/> + <location filename="../ui/EditProduct.ui" line="9179"/> <source>hh:mm</source> <translation>hh:mm</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9154"/> + <location filename="../ui/EditProduct.ui" line="9157"/> <source>Edit the brewdate end.</source> <translation>Wijzig de brouwdag eind datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9173"/> + <location filename="../ui/EditProduct.ui" line="9176"/> <source>Edit the brewdate end time.</source> <translation>Wijzig de brouwdag eind tijd.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9189"/> + <location filename="../ui/EditProduct.ui" line="9192"/> <source>Set the brewdate end date.</source> <translation>Zet de brouwdag eind datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9209"/> + <location filename="../ui/EditProduct.ui" line="9212"/> <source>End time:</source> <translation>Eind tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9225"/> + <location filename="../ui/EditProduct.ui" line="9228"/> <source>Start time:</source> <translation>Start tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9241"/> + <location filename="../ui/EditProduct.ui" line="9244"/> <source>Show brewlog:</source> <translation>Toon brouwlog:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9260"/> + <location filename="../ui/EditProduct.ui" line="9263"/> <source>Confirm brew done:</source> <translation>Bevestig brouwdag:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9276"/> - <location filename="../ui/EditProduct.ui" line="9644"/> - <location filename="../ui/EditProduct.ui" line="9878"/> + <location filename="../ui/EditProduct.ui" line="9279"/> + <location filename="../ui/EditProduct.ui" line="9647"/> + <location filename="../ui/EditProduct.ui" line="9881"/> <source>Confirm the brew dates and times.</source> <translation>Bevestig de brouw datums en tijden.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9293"/> + <location filename="../ui/EditProduct.ui" line="9296"/> <source>Fermenting</source> <translation>Vergisten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9305"/> + <location filename="../ui/EditProduct.ui" line="9308"/> <source>Primary fermentation</source> <translation>Hoofdvergisting</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9585"/> - <location filename="../ui/EditProduct.ui" line="9819"/> - <location filename="../ui/EditProduct.ui" line="10037"/> + <location filename="../ui/EditProduct.ui" line="9588"/> + <location filename="../ui/EditProduct.ui" line="9822"/> + <location filename="../ui/EditProduct.ui" line="10040"/> <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="9605"/> - <location filename="../ui/EditProduct.ui" line="9839"/> + <location filename="../ui/EditProduct.ui" line="9608"/> + <location filename="../ui/EditProduct.ui" line="9842"/> <source>Set the date to today</source> <translation>Zet de datum op vandaag</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9625"/> + <location filename="../ui/EditProduct.ui" line="9628"/> <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="9665"/> + <location filename="../ui/EditProduct.ui" line="9668"/> <source>Secondary fermentation</source> <translation>Nagisting</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9899"/> + <location filename="../ui/EditProduct.ui" line="9902"/> <source>Tertiary fermentation</source> <translation>Lageren</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10095"/> + <location filename="../ui/EditProduct.ui" line="10098"/> <source>Alcohol volume:</source> <translation>Alcohol vol%:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10140"/> + <location filename="../ui/EditProduct.ui" line="10143"/> <source>Show fermenter unit log:</source> <translation>Toon gistkast log:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10156"/> + <location filename="../ui/EditProduct.ui" line="10159"/> <source>Show fermentation log:</source> <translation>Toon vergisting log:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10205"/> + <location filename="../ui/EditProduct.ui" line="10208"/> <source>Package</source> <translation>Verpakken</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10217"/> + <location filename="../ui/EditProduct.ui" line="10220"/> <source>Package date:</source> <translation>Verpakken datum:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10290"/> + <location filename="../ui/EditProduct.ui" line="10293"/> <source>Carbonation range:</source> <translation>Koolzuur volumes:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10343"/> + <location filename="../ui/EditProduct.ui" line="10346"/> <source>Infusion or Dilution</source> <translation>Infusie of verdunnen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10355"/> + <location filename="../ui/EditProduct.ui" line="10358"/> <source>Package volume:</source> <translation>Verpakken volume:</translation> </message> @@ -3995,7 +3995,7 @@ <translation>Verpakken ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10435"/> + <location filename="../ui/EditProduct.ui" line="10438"/> <source>pH from fermenter:</source> <translation>pH vanuit gistvat:</translation> </message> @@ -4195,7 +4195,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="7399"/> - <location filename="../src/EditProductTab5.cpp" line="724"/> + <location filename="../src/EditProductTab5.cpp" line="723"/> <source>Sparge</source> <translation>Spoel</translation> </message> @@ -4205,172 +4205,172 @@ <translation>Behandeld spoelwater</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10403"/> + <location filename="../ui/EditProduct.ui" line="10406"/> <source>Estimated final ABV %:</source> <translation>Verwacht finale ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10479"/> + <location filename="../ui/EditProduct.ui" line="10482"/> <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="10510"/> - <location filename="../ui/EditProduct.ui" line="10632"/> + <location filename="../ui/EditProduct.ui" line="10513"/> + <location filename="../ui/EditProduct.ui" line="10635"/> <source>The ABV including the infusion.</source> <translation>Het ABV inclusief infusie.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10541"/> + <location filename="../ui/EditProduct.ui" line="10544"/> <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="10600"/> + <location filename="../ui/EditProduct.ui" line="10603"/> <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="10616"/> + <location filename="../ui/EditProduct.ui" line="10619"/> <source>Estimated package ABV %:</source> <translation>Verwacht verpakken ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10764"/> + <location filename="../ui/EditProduct.ui" line="10767"/> <source>Bottles</source> <translation>Flessen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10792"/> - <location filename="../ui/EditProduct.ui" line="11212"/> + <location filename="../ui/EditProduct.ui" line="10795"/> + <location filename="../ui/EditProduct.ui" line="11215"/> <source>Desired volume CO2:</source> <translation>Gewenst volume CO2:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10808"/> - <location filename="../ui/EditProduct.ui" line="11279"/> + <location filename="../ui/EditProduct.ui" line="10811"/> + <location filename="../ui/EditProduct.ui" line="11282"/> <source>Priming sugar:</source> <translation>Carbonatie suiker:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10824"/> - <location filename="../ui/EditProduct.ui" line="11196"/> + <location filename="../ui/EditProduct.ui" line="10827"/> + <location filename="../ui/EditProduct.ui" line="11199"/> <source>Sugar amount:</source> <translation>Suiker gewicht:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10856"/> - <location filename="../ui/EditProduct.ui" line="11228"/> + <location filename="../ui/EditProduct.ui" line="10859"/> + <location filename="../ui/EditProduct.ui" line="11231"/> <source>Water amount:</source> <translation>Water volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11038"/> + <location filename="../ui/EditProduct.ui" line="11041"/> <source>Expected pressure in bar:</source> <translation>Verwachte druk in bar:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11054"/> + <location filename="../ui/EditProduct.ui" line="11057"/> <source>Bottles ABV %:</source> <translation>Flessen ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11152"/> + <location filename="../ui/EditProduct.ui" line="11155"/> <source>Kegs</source> <translation>Fusten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11164"/> + <location filename="../ui/EditProduct.ui" line="11167"/> <source>Kegs ABV %:</source> <translation>Fusten ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11180"/> + <location filename="../ui/EditProduct.ui" line="11183"/> <source>Kegs pressure in bar:</source> <translation>Fusten druk in bar:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11548"/> + <location filename="../ui/EditProduct.ui" line="11551"/> <source>Forced carbonation:</source> <translation>Geforceerde carbonatie:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11575"/> + <location filename="../ui/EditProduct.ui" line="11578"/> <source>Edit the package date.</source> <translation>Wijzig de verpakkings datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11634"/> + <location filename="../ui/EditProduct.ui" line="11637"/> <source>Show carbonation log:</source> <translation>Toon carbonatie log:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11643"/> + <location filename="../ui/EditProduct.ui" line="11646"/> <source>Tasting</source> <translation>Proeven</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11655"/> + <location filename="../ui/EditProduct.ui" line="11658"/> <source>Taste date:</source> <translation>Proeven datum:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11691"/> + <location filename="../ui/EditProduct.ui" line="11694"/> <source>Taste rate:</source> <translation>Beoordeling cijfer:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11732"/> + <location filename="../ui/EditProduct.ui" line="11735"/> <source>Color:</source> <translation>Kleur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11748"/> + <location filename="../ui/EditProduct.ui" line="11751"/> <source>Transparency:</source> <translation>Helderheid:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11764"/> + <location filename="../ui/EditProduct.ui" line="11767"/> <source>Head:</source> <translation>Schuim:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11819"/> + <location filename="../ui/EditProduct.ui" line="11822"/> <source>Aroma:</source> <translation>Geur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11848"/> + <location filename="../ui/EditProduct.ui" line="11851"/> <source>Taste:</source> <translation>Smaak:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11877"/> + <location filename="../ui/EditProduct.ui" line="11880"/> <source>Aftertaste:</source> <translation>Nasmaak:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11906"/> + <location filename="../ui/EditProduct.ui" line="11909"/> <source>Mouthfeel:</source> <translation>Mondgevoel:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11935"/> + <location filename="../ui/EditProduct.ui" line="11938"/> <source>Notes:</source> <translation>Opmerkingen:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11961"/> + <location filename="../ui/EditProduct.ui" line="11964"/> <source>Edit the tasting date.</source> <translation>Wijzig de datum van proeven.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12002"/> + <location filename="../ui/EditProduct.ui" line="12005"/> <source>Export</source> <translation>Exporteer</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12019"/> + <location filename="../ui/EditProduct.ui" line="12022"/> <source>Print</source> <translation>Print</translation> </message> @@ -4390,7 +4390,7 @@ <translation>Mout</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="812"/> + <location filename="../src/EditProduct.cpp" line="808"/> <source>BMSapp - Edit %1 - %2</source> <translation>BMSapp - Wijzig %1 - %2</translation> </message> @@ -4423,17 +4423,17 @@ <translation type="vanished">Afkoelen</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="95"/> + <location filename="../src/EditProduct.cpp" line="92"/> <source>None</source> <translation>Geen</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="96"/> + <location filename="../src/EditProduct.cpp" line="93"/> <source>Air</source> <translation>Lucht</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="97"/> + <location filename="../src/EditProduct.cpp" line="94"/> <source>Oxygen</source> <translation>Zuurstof</translation> </message> @@ -4446,7 +4446,7 @@ <translation type="vanished">MySQL fout: record %1 niet gevonden</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="306"/> + <location filename="../src/EditProduct.cpp" line="303"/> <source>%1, part %2 of %3</source> <translation>%1, deel %2 van %3</translation> </message> @@ -4455,7 +4455,7 @@ <translation type="vanished">Koken %1 minuten</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="810"/> + <location filename="../src/EditProduct.cpp" line="806"/> <source>BMSapp - Add new product</source> <translation>BMSapp - Nieuw product</translation> </message> @@ -4464,18 +4464,18 @@ <translation type="vanished">BMSapp - Wijzig product %1</translation> </message> <message> + <location filename="../src/EditProduct.cpp" line="824"/> <location filename="../src/EditProduct.cpp" line="828"/> - <location filename="../src/EditProduct.cpp" line="832"/> <source>Edit Product</source> <translation>Wijzig Product</translation> </message> <message> + <location filename="../src/EditProduct.cpp" line="824"/> + <source>Name empty or too short.</source> + <translation>De naam is leeg of te kort.</translation> + </message> + <message> <location filename="../src/EditProduct.cpp" line="828"/> - <source>Name empty or too short.</source> - <translation>De naam is leeg of te kort.</translation> - </message> - <message> - <location filename="../src/EditProduct.cpp" line="832"/> <source>No beerstyle selected.</source> <translation>Geen bierstijl gekozen.</translation> </message> @@ -4488,127 +4488,127 @@ %3</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="870"/> + <location filename="../src/EditProduct.cpp" line="866"/> <source>Delete product</source> <translation>Verwijder product</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="894"/> + <location filename="../src/EditProduct.cpp" line="890"/> <source>Product changed</source> <translation>Product gewijzigd</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="894"/> + <location filename="../src/EditProduct.cpp" line="890"/> <source>The product has been modified. Save changes?</source> <translation>Het product is gewijzigd. Wijzigingen opslaan?</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="74"/> + <location filename="../src/EditProductTab3.cpp" line="73"/> <source>Supplier</source> <translation>Producent</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="74"/> + <location filename="../src/EditProductTab3.cpp" line="73"/> <source>Fermentable</source> <translation>Vergistbaar ingredient</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="74"/> + <location filename="../src/EditProductTab3.cpp" line="73"/> <source>EBC</source> <translation>EBC</translation> </message> <message> + <location filename="../src/EditProductTab3.cpp" line="73"/> + <location filename="../src/EditProductTab4.cpp" line="55"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <location filename="../src/EditProductTab7.cpp" line="34"/> + <source>Type</source> + <translation>Soort</translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="73"/> + <source>Graintype</source> + <translation>Graan type</translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="73"/> + <source>When</source> + <translation>Moment</translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="73"/> + <source>Yield</source> + <translation>Opbrengst</translation> + </message> + <message> <location filename="../src/EditProductTab3.cpp" line="74"/> <location filename="../src/EditProductTab4.cpp" line="56"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> <location filename="../src/EditProductTab6.cpp" line="55"/> - <location filename="../src/EditProductTab7.cpp" line="36"/> - <source>Type</source> - <translation>Soort</translation> + <source>Amount</source> + <translation>Hoeveel</translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="74"/> - <source>Graintype</source> - <translation>Graan type</translation> + <location filename="../src/EditProductTab4.cpp" line="56"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> + <source>Stock</source> + <translation>Voorraad</translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="74"/> - <source>When</source> - <translation>Moment</translation> + <source>Procent</source> + <translation>Procent</translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="74"/> + <source>100%</source> + <translation>100%</translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="74"/> - <source>Yield</source> - <translation>Opbrengst</translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="75"/> - <location filename="../src/EditProductTab4.cpp" line="57"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> - <location filename="../src/EditProductTab6.cpp" line="56"/> - <source>Amount</source> - <translation>Hoeveel</translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="75"/> - <location filename="../src/EditProductTab4.cpp" line="57"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> - <location filename="../src/EditProductTab6.cpp" line="56"/> - <source>Stock</source> - <translation>Voorraad</translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="75"/> - <source>Procent</source> - <translation>Procent</translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="75"/> - <source>100%</source> - <translation>100%</translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="75"/> - <location filename="../src/EditProductTab3.cpp" line="174"/> - <location filename="../src/EditProductTab4.cpp" line="57"/> - <location filename="../src/EditProductTab4.cpp" line="161"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> - <location filename="../src/EditProductTab5.cpp" line="177"/> - <location filename="../src/EditProductTab6.cpp" line="56"/> - <location filename="../src/EditProductTab6.cpp" line="154"/> + <location filename="../src/EditProductTab3.cpp" line="173"/> + <location filename="../src/EditProductTab4.cpp" line="56"/> + <location filename="../src/EditProductTab4.cpp" line="160"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> + <location filename="../src/EditProductTab5.cpp" line="176"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> + <location filename="../src/EditProductTab6.cpp" line="153"/> <source>Edit</source> <translation>Wijzig</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="147"/> - <location filename="../src/EditProductTab3.cpp" line="150"/> + <location filename="../src/EditProductTab3.cpp" line="146"/> + <location filename="../src/EditProductTab3.cpp" line="149"/> <source>Edit this from the package tab</source> <translation>Wijzig dit vanaf het verpakken tabblad</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="154"/> - <location filename="../src/EditProductTab3.cpp" line="157"/> + <location filename="../src/EditProductTab3.cpp" line="153"/> + <location filename="../src/EditProductTab3.cpp" line="156"/> <source>Fermentable already used</source> <translation>Vergistbaar ingredient is al verwerkt</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="363"/> + <location filename="../src/EditProductTab3.cpp" line="366"/> <source>Final OG:</source> <translation>Finale OG:</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="463"/> - <location filename="../src/EditProductTab3.cpp" line="467"/> + <location filename="../src/EditProductTab3.cpp" line="472"/> + <location filename="../src/EditProductTab3.cpp" line="476"/> <source>Final EBC:</source> <translation>Finale EBC:</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="532"/> + <location filename="../src/EditProductTab3.cpp" line="549"/> <source>Final FG:</source> <translation>Finale FG:</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="535"/> + <location filename="../src/EditProductTab3.cpp" line="552"/> <source>Final ABV:</source> <translation>Finale ABV:</translation> </message> @@ -4625,212 +4625,212 @@ <translation type="vanished">Finale FG:</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="713"/> + <location filename="../src/EditProductTab3.cpp" line="730"/> <source>Delete fermentable</source> <translation>Verwijder vergistbaar ingredient</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="713"/> - <location filename="../src/EditProductTab4.cpp" line="362"/> - <location filename="../src/EditProductTab5.cpp" line="400"/> - <location filename="../src/EditProductTab6.cpp" line="748"/> - <location filename="../src/EditProductTab7.cpp" line="308"/> - <location filename="../src/EditProduct.cpp" line="870"/> + <location filename="../src/EditProductTab3.cpp" line="730"/> + <location filename="../src/EditProductTab4.cpp" line="361"/> + <location filename="../src/EditProductTab5.cpp" line="399"/> + <location filename="../src/EditProductTab6.cpp" line="747"/> + <location filename="../src/EditProductTab7.cpp" line="306"/> + <location filename="../src/EditProduct.cpp" line="866"/> <source>Delete %1</source> <translation>Verwijder %1</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1029"/> - <location filename="../src/EditProductTab5.cpp" line="644"/> + <location filename="../src/EditProductTab3.cpp" line="1048"/> + <location filename="../src/EditProductTab5.cpp" line="643"/> <source>Current ingredient:</source> <translation>Huidig ingredient:</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1034"/> + <location filename="../src/EditProductTab3.cpp" line="1053"/> <source>Supplier:</source> <translation>Leverancier:</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1039"/> + <location filename="../src/EditProductTab3.cpp" line="1058"/> <source>Amount in kg:</source> <translation>Gewicht in kg:</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1044"/> + <location filename="../src/EditProductTab3.cpp" line="1063"/> <source>Percentage in batch:</source> <translation>Percentage in stort:</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1049"/> + <location filename="../src/EditProductTab3.cpp" line="1068"/> <source>Auto fill to 100%:</source> <translation>Aanvullen tot 100%:</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1054"/> - <location filename="../src/EditProductTab4.cpp" line="634"/> - <location filename="../src/EditProductTab6.cpp" line="1007"/> + <location filename="../src/EditProductTab3.cpp" line="1073"/> + <location filename="../src/EditProductTab4.cpp" line="633"/> + <location filename="../src/EditProductTab6.cpp" line="1006"/> <source>Use at:</source> <translation>Toevoegen bij:</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1059"/> - <location filename="../src/EditProductTab5.cpp" line="670"/> + <location filename="../src/EditProductTab3.cpp" line="1078"/> + <location filename="../src/EditProductTab5.cpp" line="669"/> <source>Select ingredient:</source> <translation>Kies ingredient:</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1064"/> - <location filename="../src/EditProductTab4.cpp" line="644"/> - <location filename="../src/EditProductTab5.cpp" line="675"/> - <location filename="../src/EditProductTab6.cpp" line="992"/> + <location filename="../src/EditProductTab3.cpp" line="1083"/> + <location filename="../src/EditProductTab4.cpp" line="643"/> + <location filename="../src/EditProductTab5.cpp" line="674"/> + <location filename="../src/EditProductTab6.cpp" line="991"/> <source>In stock:</source> <translation>In voorraad:</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1069"/> + <location filename="../src/EditProductTab3.cpp" line="1088"/> <source>Max in batch:</source> <translation>Max. in stort:</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1120"/> - <location filename="../src/EditProductTab5.cpp" line="720"/> + <location filename="../src/EditProductTab3.cpp" line="1139"/> + <location filename="../src/EditProductTab5.cpp" line="719"/> <source>Boil</source> <translation>Koken</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1121"/> + <location filename="../src/EditProductTab3.cpp" line="1140"/> <source>Fermentation</source> <translation>Hoofdvergisting</translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1122"/> + <location filename="../src/EditProductTab3.cpp" line="1141"/> <source>Lagering</source> <translation>Nagisting/lagering</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="56"/> + <location filename="../src/EditProductTab4.cpp" line="55"/> <source>Origin</source> <translation>Herkomst</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="56"/> + <location filename="../src/EditProductTab4.cpp" line="55"/> <source>Hop</source> <translation>Hop</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="56"/> + <location filename="../src/EditProductTab4.cpp" line="55"/> <source>Form</source> <translation>Vorm</translation> </message> <message> + <location filename="../src/EditProductTab4.cpp" line="55"/> + <source>Alpha</source> + <translation>Alpha</translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="55"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> + <source>Use at</source> + <translation>Toepassing</translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="55"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> + <location filename="../src/EditProductTab9.cpp" line="512"/> + <source>Time</source> + <translation>Tijd</translation> + </message> + <message> <location filename="../src/EditProductTab4.cpp" line="56"/> - <source>Alpha</source> - <translation>Alpha</translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="56"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> - <source>Use at</source> - <translation>Toepassing</translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="56"/> - <location filename="../src/EditProductTab5.cpp" line="76"/> - <location filename="../src/EditProductTab9.cpp" line="519"/> - <source>Time</source> - <translation>Tijd</translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="57"/> <source>IBU</source> <translation>IBU</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="141"/> - <location filename="../src/EditProductTab4.cpp" line="144"/> + <location filename="../src/EditProductTab4.cpp" line="140"/> + <location filename="../src/EditProductTab4.cpp" line="143"/> <source>Hop already used</source> <translation>Hop is al verwerkt</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="177"/> - <location filename="../src/EditProductTab4.cpp" line="217"/> + <location filename="../src/EditProductTab4.cpp" line="176"/> + <location filename="../src/EditProductTab4.cpp" line="216"/> <source>Very low</source> <translation>Zeer laag</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="183"/> - <location filename="../src/EditProductTab4.cpp" line="223"/> + <location filename="../src/EditProductTab4.cpp" line="182"/> + <location filename="../src/EditProductTab4.cpp" line="222"/> <source>Low</source> <translation>Laag</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="190"/> - <location filename="../src/EditProductTab4.cpp" line="230"/> + <location filename="../src/EditProductTab4.cpp" line="189"/> + <location filename="../src/EditProductTab4.cpp" line="229"/> <source>Moderate</source> <translation>Gemiddeld</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="198"/> - <location filename="../src/EditProductTab4.cpp" line="238"/> + <location filename="../src/EditProductTab4.cpp" line="197"/> + <location filename="../src/EditProductTab4.cpp" line="237"/> <source>High</source> <translation>Hoog</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="205"/> - <location filename="../src/EditProductTab4.cpp" line="245"/> + <location filename="../src/EditProductTab4.cpp" line="204"/> + <location filename="../src/EditProductTab4.cpp" line="244"/> <source>Very high</source> <translation>Zeer hoog</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="303"/> + <location filename="../src/EditProductTab4.cpp" line="302"/> <location filename="../src/EditProductTab11.cpp" line="68"/> <source>Final IBU:</source> <translation>Finale IBU:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="362"/> + <location filename="../src/EditProductTab4.cpp" line="361"/> <source>Delete hop</source> <translation>Verwijder hop</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="567"/> - <location filename="../src/EditProductTab4.cpp" line="628"/> - <location filename="../src/EditProductTab5.cpp" line="515"/> - <location filename="../src/EditProductTab5.cpp" line="604"/> - <location filename="../src/EditProductTab5.cpp" line="662"/> + <location filename="../src/EditProductTab4.cpp" line="566"/> + <location filename="../src/EditProductTab4.cpp" line="627"/> + <location filename="../src/EditProductTab5.cpp" line="514"/> + <location filename="../src/EditProductTab5.cpp" line="603"/> + <location filename="../src/EditProductTab5.cpp" line="661"/> <source>Time in minutes:</source> <translation>Tijd in minuten:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="572"/> - <location filename="../src/EditProductTab4.cpp" line="626"/> - <location filename="../src/EditProductTab5.cpp" line="510"/> - <location filename="../src/EditProductTab5.cpp" line="599"/> - <location filename="../src/EditProductTab5.cpp" line="660"/> + <location filename="../src/EditProductTab4.cpp" line="571"/> + <location filename="../src/EditProductTab4.cpp" line="625"/> + <location filename="../src/EditProductTab5.cpp" line="509"/> + <location filename="../src/EditProductTab5.cpp" line="598"/> + <location filename="../src/EditProductTab5.cpp" line="659"/> <source>Time in days:</source> <translation>Tijd in dagen:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="610"/> + <location filename="../src/EditProductTab4.cpp" line="609"/> <source>Current hop:</source> <translation>Huidige hop:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="615"/> + <location filename="../src/EditProductTab4.cpp" line="614"/> <source>Origin:</source> <translation>Herkomst:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="620"/> - <location filename="../src/EditProductTab5.cpp" line="526"/> - <location filename="../src/EditProductTab5.cpp" line="651"/> - <location filename="../src/EditProductTab6.cpp" line="862"/> - <location filename="../src/EditProductTab6.cpp" line="1000"/> + <location filename="../src/EditProductTab4.cpp" line="619"/> + <location filename="../src/EditProductTab5.cpp" line="525"/> + <location filename="../src/EditProductTab5.cpp" line="650"/> + <location filename="../src/EditProductTab6.cpp" line="861"/> + <location filename="../src/EditProductTab6.cpp" line="999"/> <source>Amount in gr:</source> <translation>Gewicht in gr:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="639"/> + <location filename="../src/EditProductTab4.cpp" line="638"/> <source>Select hop:</source> <translation>Kies hop:</translation> </message> @@ -4859,306 +4859,306 @@ <translation type="vanished">Koudhop</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="76"/> + <location filename="../src/EditProductTab5.cpp" line="75"/> <source>Ingredient</source> <translation>Ingredient</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="141"/> - <location filename="../src/EditProductTab5.cpp" line="145"/> + <location filename="../src/EditProductTab5.cpp" line="140"/> + <location filename="../src/EditProductTab5.cpp" line="144"/> <source>Edit this from the water tab</source> <translation>Wijzig dit vanaf het water tabblad</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="150"/> - <location filename="../src/EditProductTab5.cpp" line="154"/> + <location filename="../src/EditProductTab5.cpp" line="149"/> + <location filename="../src/EditProductTab5.cpp" line="153"/> <source>Misc already used</source> <translation>Divers ingredient is al verwerkt</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="400"/> + <location filename="../src/EditProductTab5.cpp" line="399"/> <source>Delete misc</source> <translation>Verwijder divers ingredient</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="529"/> - <location filename="../src/EditProductTab5.cpp" line="653"/> - <location filename="../src/EditProductTab6.cpp" line="869"/> - <location filename="../src/EditProductTab6.cpp" line="1002"/> + <location filename="../src/EditProductTab5.cpp" line="528"/> + <location filename="../src/EditProductTab5.cpp" line="652"/> + <location filename="../src/EditProductTab6.cpp" line="868"/> + <location filename="../src/EditProductTab6.cpp" line="1001"/> <source>Amount in ml:</source> <translation>Hoeveelheid in ml:</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="718"/> + <location filename="../src/EditProductTab5.cpp" line="717"/> <source>Starter</source> <translation>Starter</translation> </message> <message> + <location filename="../src/EditProductTab5.cpp" line="720"/> + <location filename="../src/EditProductTab6.cpp" line="1055"/> + <source>Primary</source> + <translation>Hoofdgisting</translation> + </message> + <message> <location filename="../src/EditProductTab5.cpp" line="721"/> <location filename="../src/EditProductTab6.cpp" line="1056"/> - <source>Primary</source> - <translation>Hoofdgisting</translation> + <source>Secondary</source> + <translation>Nagisting/lagering</translation> </message> <message> <location filename="../src/EditProductTab5.cpp" line="722"/> - <location filename="../src/EditProductTab6.cpp" line="1057"/> - <source>Secondary</source> - <translation>Nagisting/lagering</translation> - </message> - <message> - <location filename="../src/EditProductTab5.cpp" line="723"/> <source>Bottling</source> <translation>Bottelen</translation> </message> <message> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <source>Yeast</source> + <translation>Gist</translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <source>Laboratory</source> + <translation>Laboratorium</translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <source>Code</source> + <translation>Product code</translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <source>Use for</source> + <translation>Toepassing</translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <source>Min.</source> + <translation></translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="54"/> + <source>Max.</source> + <translation></translation> + </message> + <message> <location filename="../src/EditProductTab6.cpp" line="55"/> - <source>Yeast</source> - <translation>Gist</translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="55"/> - <source>Laboratory</source> - <translation>Laboratorium</translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="55"/> - <source>Code</source> - <translation>Product code</translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="55"/> - <source>Use for</source> - <translation>Toepassing</translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="55"/> - <source>Min.</source> + <source>Tol.</source> <translation></translation> </message> <message> <location filename="../src/EditProductTab6.cpp" line="55"/> - <source>Max.</source> - <translation></translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="56"/> - <source>Tol.</source> - <translation></translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="56"/> <source>Attn.</source> <translation></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="133"/> - <location filename="../src/EditProductTab6.cpp" line="137"/> + <location filename="../src/EditProductTab6.cpp" line="132"/> + <location filename="../src/EditProductTab6.cpp" line="136"/> <source>Yeast already used</source> <translation>Gist is al verwerkt</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="296"/> + <location filename="../src/EditProductTab6.cpp" line="295"/> <source>Method</source> <translation>Methode</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="296"/> + <location filename="../src/EditProductTab6.cpp" line="295"/> <source>Inj. factor</source> <translation>Injectie</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="296"/> + <location filename="../src/EditProductTab6.cpp" line="295"/> <source>New cells</source> <translation>Celgroei</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="296"/> + <location filename="../src/EditProductTab6.cpp" line="295"/> <source>Total cells</source> <translation>Totaal</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="296"/> + <location filename="../src/EditProductTab6.cpp" line="295"/> <source>Grow factor</source> <translation>Groeifactor</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="650"/> + <location filename="../src/EditProductTab6.cpp" line="649"/> <source>Start step type:</source> <translation>Starter stap type:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="655"/> + <location filename="../src/EditProductTab6.cpp" line="654"/> <source>Starter step volume:</source> <translation>Starter stap volume:</translation> </message> <message> + <location filename="../src/EditProductTab6.cpp" line="661"/> + <source>Stirred</source> + <translation>Geroerd</translation> + </message> + <message> <location filename="../src/EditProductTab6.cpp" line="662"/> - <source>Stirred</source> - <translation>Geroerd</translation> + <source>Shaken</source> + <translation>Geschud</translation> </message> <message> <location filename="../src/EditProductTab6.cpp" line="663"/> - <source>Shaken</source> - <translation>Geschud</translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="664"/> <source>Simple</source> <translation>Simpel</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="748"/> + <location filename="../src/EditProductTab6.cpp" line="747"/> <source>Delete yeast</source> <translation>Verwijder gist</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="855"/> - <location filename="../src/EditProductTab6.cpp" line="998"/> + <location filename="../src/EditProductTab6.cpp" line="854"/> + <location filename="../src/EditProductTab6.cpp" line="997"/> <source>Total packs:</source> <translation>Aantal pakken:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="972"/> + <location filename="../src/EditProductTab6.cpp" line="971"/> <source>Yeast name:</source> <translation>Gist naam:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="977"/> - <location filename="../src/EditProductTab6.cpp" line="982"/> + <location filename="../src/EditProductTab6.cpp" line="976"/> + <location filename="../src/EditProductTab6.cpp" line="981"/> <source>Laboratory:</source> <translation>Laboratorium:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="987"/> + <location filename="../src/EditProductTab6.cpp" line="986"/> <source>Select yeast:</source> <translation>Kies gist:</translation> </message> <message> + <location filename="../src/EditProductTab6.cpp" line="1057"/> + <source>Tertiary</source> + <translation>Lageren</translation> + </message> + <message> <location filename="../src/EditProductTab6.cpp" line="1058"/> - <source>Tertiary</source> - <translation>Lageren</translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="1059"/> <source>Bottle</source> <translation>Bottelen</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="36"/> + <location filename="../src/EditProductTab7.cpp" line="34"/> <source>Step name</source> <translation>Stap naam</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="36"/> + <location filename="../src/EditProductTab7.cpp" line="34"/> <source>Start</source> <translation>Start</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="36"/> + <location filename="../src/EditProductTab7.cpp" line="34"/> <source>End</source> <translation>Eind</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="36"/> + <location filename="../src/EditProductTab7.cpp" line="34"/> <source>Rest</source> <translation>Rust</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="36"/> + <location filename="../src/EditProductTab7.cpp" line="34"/> <source>Ramp</source> <translation>Verwarm</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="37"/> + <location filename="../src/EditProductTab7.cpp" line="35"/> <source>Inf/dec</source> <translation>Inf/dec</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="37"/> + <location filename="../src/EditProductTab7.cpp" line="35"/> <source>W/G ratio</source> <translation>L/Kg</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="37"/> + <location filename="../src/EditProductTab7.cpp" line="35"/> <source>SG</source> <translation>SG</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="308"/> + <location filename="../src/EditProductTab7.cpp" line="306"/> <source>Delete mash step</source> <translation>Verwijder maisch stap</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="558"/> + <location filename="../src/EditProductTab7.cpp" line="556"/> <source>Step name:</source> <translation>Stap naam:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="568"/> + <location filename="../src/EditProductTab7.cpp" line="566"/> <source>Step type:</source> <translation>Stap type:</translation> </message> <message> + <location filename="../src/EditProductTab7.cpp" line="572"/> + <source>Infusion</source> + <translation>Infusie</translation> + </message> + <message> + <location filename="../src/EditProductTab7.cpp" line="573"/> + <source>Temperature</source> + <translation>Verwarmen</translation> + </message> + <message> <location filename="../src/EditProductTab7.cpp" line="574"/> - <source>Infusion</source> - <translation>Infusie</translation> - </message> - <message> - <location filename="../src/EditProductTab7.cpp" line="575"/> - <source>Temperature</source> - <translation>Verwarmen</translation> - </message> - <message> - <location filename="../src/EditProductTab7.cpp" line="576"/> <source>Decoction</source> <translation>Decoctie</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="581"/> + <location filename="../src/EditProductTab7.cpp" line="579"/> <source>Step start temp:</source> <translation>Start temperatuur:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="596"/> + <location filename="../src/EditProductTab7.cpp" line="594"/> <source>Step end temp:</source> <translation>Eind temperatuur:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="611"/> + <location filename="../src/EditProductTab7.cpp" line="609"/> <source>Step rest time:</source> <translation>Rust tijd:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="625"/> + <location filename="../src/EditProductTab7.cpp" line="623"/> <source>Step ramp time:</source> <translation>Verwarm tijd:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="7849"/> - <location filename="../ui/EditProduct.ui" line="8957"/> - <location filename="../src/EditProductTab7.cpp" line="637"/> + <location filename="../ui/EditProduct.ui" line="8960"/> + <location filename="../src/EditProductTab7.cpp" line="635"/> <source>Measured pH:</source> <translation>Gemeten pH:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="655"/> + <location filename="../src/EditProductTab7.cpp" line="653"/> <source>Measured Brix:</source> <translation>Gemeten Brix:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="7865"/> - <location filename="../ui/EditProduct.ui" line="9024"/> - <location filename="../src/EditProductTab7.cpp" line="669"/> + <location filename="../ui/EditProduct.ui" line="9027"/> + <location filename="../src/EditProductTab7.cpp" line="667"/> <source>Measured SG:</source> <translation>Gemeten SG:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="689"/> + <location filename="../src/EditProductTab7.cpp" line="687"/> <source>Infusion volume:</source> <translation>Infusie volume:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="706"/> + <location filename="../src/EditProductTab7.cpp" line="704"/> <source>Infusion Temperature:</source> <translation>Infusie temperatuur:</translation> </message> @@ -5224,7 +5224,7 @@ <translation>Veel te bitter</translation> </message> <message> - <location filename="../src/EditProductTab9.cpp" line="560"/> + <location filename="../src/EditProductTab9.cpp" line="553"/> <location filename="../src/EditProductExport.cpp" line="37"/> <location filename="../src/EditProductExport.cpp" line="40"/> <location filename="../src/EditProductExport.cpp" line="264"/> @@ -5467,22 +5467,22 @@ <translation> cm</translation> </message> <message> - <location filename="../src/EditProductTab9.cpp" line="530"/> + <location filename="../src/EditProductTab9.cpp" line="523"/> <source>Temperature °C or Power %</source> <translation>Temperatuur °C of Power %</translation> </message> <message> - <location filename="../src/EditProductTab9.cpp" line="558"/> + <location filename="../src/EditProductTab9.cpp" line="551"/> <source>Save Image</source> <translation>Opslaan plaatje</translation> </message> <message> - <location filename="../src/EditProductTab9.cpp" line="558"/> + <location filename="../src/EditProductTab9.cpp" line="551"/> <source>Image (*.png)</source> <translation>Plaatje (*.png)</translation> </message> <message> - <location filename="../src/EditProductTab9.cpp" line="560"/> + <location filename="../src/EditProductTab9.cpp" line="553"/> <source>No image file selected.</source> <translation>Geen plaatjes bestand gekozen.</translation> </message> @@ -6393,16 +6393,16 @@ </message> <message> <location filename="../ui/EditRecipe.ui" line="75"/> - <location filename="../src/EditRecipeTab2.cpp" line="61"/> - <location filename="../src/EditRecipeTab2.cpp" line="123"/> - <location filename="../src/EditRecipeTab3.cpp" line="49"/> - <location filename="../src/EditRecipeTab3.cpp" line="118"/> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> - <location filename="../src/EditRecipeTab4.cpp" line="128"/> - <location filename="../src/EditRecipeTab5.cpp" line="42"/> - <location filename="../src/EditRecipeTab5.cpp" line="103"/> - <location filename="../src/EditRecipeTab6.cpp" line="35"/> - <location filename="../src/EditRecipeTab6.cpp" line="133"/> + <location filename="../src/EditRecipeTab2.cpp" line="60"/> + <location filename="../src/EditRecipeTab2.cpp" line="122"/> + <location filename="../src/EditRecipeTab3.cpp" line="48"/> + <location filename="../src/EditRecipeTab3.cpp" line="117"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> + <location filename="../src/EditRecipeTab4.cpp" line="127"/> + <location filename="../src/EditRecipeTab5.cpp" line="41"/> + <location filename="../src/EditRecipeTab5.cpp" line="102"/> + <location filename="../src/EditRecipeTab6.cpp" line="33"/> + <location filename="../src/EditRecipeTab6.cpp" line="131"/> <source>Delete</source> <translation>Verwijder</translation> </message> @@ -6527,7 +6527,7 @@ </message> <message> <location filename="../ui/EditRecipe.ui" line="1505"/> - <location filename="../src/EditRecipeTab3.cpp" line="613"/> + <location filename="../src/EditRecipeTab3.cpp" line="612"/> <source>Bitterness IBU:</source> <translation>Bitterheid IBU:</translation> </message> @@ -6715,9 +6715,9 @@ </message> <message> <location filename="../ui/EditRecipe.ui" line="2419"/> - <location filename="../src/EditRecipeTab2.cpp" line="927"/> - <location filename="../src/EditRecipeTab3.cpp" line="667"/> - <location filename="../src/EditRecipeTab4.cpp" line="653"/> + <location filename="../src/EditRecipeTab2.cpp" line="926"/> + <location filename="../src/EditRecipeTab3.cpp" line="666"/> + <location filename="../src/EditRecipeTab4.cpp" line="652"/> <source>Mash</source> <translation>Maischen</translation> </message> @@ -6787,7 +6787,7 @@ </message> <message> <location filename="../ui/EditRecipe.ui" line="5064"/> - <location filename="../src/EditRecipeTab6.cpp" line="35"/> + <location filename="../src/EditRecipeTab6.cpp" line="33"/> <source>Volume</source> <translation>Volume</translation> </message> @@ -7173,7 +7173,7 @@ </message> <message> <location filename="../ui/EditRecipe.ui" line="5569"/> - <location filename="../src/EditRecipeTab4.cpp" line="658"/> + <location filename="../src/EditRecipeTab4.cpp" line="657"/> <source>Sparge</source> <translation>Spoel</translation> </message> @@ -7204,7 +7204,7 @@ </message> <message> <location filename="../src/EditRecipe.cpp" line="41"/> - <location filename="../src/EditRecipeTab3.cpp" line="684"/> + <location filename="../src/EditRecipeTab3.cpp" line="683"/> <source>Extract</source> <translation>Extract</translation> </message> @@ -7288,282 +7288,282 @@ <translation>Het recept is gewijzigd. Wijzigingen opslaan?</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="60"/> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> <source>Supplier</source> <translation>Producent</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="60"/> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> <source>Fermentable</source> <translation>Vergistbaar ingredient</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="60"/> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> <source>EBC</source> <translation>EBC</translation> </message> <message> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> + <location filename="../src/EditRecipeTab6.cpp" line="32"/> + <source>Type</source> + <translation>Soort</translation> + </message> + <message> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> + <source>Graintype</source> + <translation>Graan type</translation> + </message> + <message> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> + <source>When</source> + <translation>Moment</translation> + </message> + <message> + <location filename="../src/EditRecipeTab2.cpp" line="59"/> + <source>Yield</source> + <translation>Opbrengst</translation> + </message> + <message> <location filename="../src/EditRecipeTab2.cpp" line="60"/> <location filename="../src/EditRecipeTab3.cpp" line="48"/> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <location filename="../src/EditRecipeTab6.cpp" line="34"/> - <source>Type</source> - <translation>Soort</translation> + <source>Amount</source> + <translation>Hoeveel</translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="60"/> - <source>Graintype</source> - <translation>Graan type</translation> + <source>Procent</source> + <translation>Procent</translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="60"/> - <source>When</source> - <translation>Moment</translation> + <source>100%</source> + <translation>100%</translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="60"/> - <source>Yield</source> - <translation>Opbrengst</translation> - </message> - <message> - <location filename="../src/EditRecipeTab2.cpp" line="61"/> - <location filename="../src/EditRecipeTab3.cpp" line="49"/> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> - <location filename="../src/EditRecipeTab5.cpp" line="42"/> - <source>Amount</source> - <translation>Hoeveel</translation> - </message> - <message> - <location filename="../src/EditRecipeTab2.cpp" line="61"/> - <source>Procent</source> - <translation>Procent</translation> - </message> - <message> - <location filename="../src/EditRecipeTab2.cpp" line="61"/> - <source>100%</source> - <translation>100%</translation> - </message> - <message> - <location filename="../src/EditRecipeTab2.cpp" line="61"/> - <location filename="../src/EditRecipeTab2.cpp" line="134"/> - <location filename="../src/EditRecipeTab3.cpp" line="49"/> - <location filename="../src/EditRecipeTab3.cpp" line="129"/> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> - <location filename="../src/EditRecipeTab4.cpp" line="139"/> - <location filename="../src/EditRecipeTab5.cpp" line="42"/> - <location filename="../src/EditRecipeTab5.cpp" line="114"/> - <location filename="../src/EditRecipeTab6.cpp" line="35"/> - <location filename="../src/EditRecipeTab6.cpp" line="144"/> + <location filename="../src/EditRecipeTab2.cpp" line="133"/> + <location filename="../src/EditRecipeTab3.cpp" line="48"/> + <location filename="../src/EditRecipeTab3.cpp" line="128"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> + <location filename="../src/EditRecipeTab4.cpp" line="138"/> + <location filename="../src/EditRecipeTab5.cpp" line="41"/> + <location filename="../src/EditRecipeTab5.cpp" line="113"/> + <location filename="../src/EditRecipeTab6.cpp" line="33"/> + <location filename="../src/EditRecipeTab6.cpp" line="142"/> <source>Edit</source> <translation>Wijzig</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="527"/> + <location filename="../src/EditRecipeTab2.cpp" line="526"/> <source>Delete fermentable</source> <translation>Verwijder vergistbaar ingredient</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="527"/> - <location filename="../src/EditRecipeTab3.cpp" line="297"/> - <location filename="../src/EditRecipeTab4.cpp" line="344"/> - <location filename="../src/EditRecipeTab5.cpp" line="262"/> - <location filename="../src/EditRecipeTab6.cpp" line="285"/> + <location filename="../src/EditRecipeTab2.cpp" line="526"/> + <location filename="../src/EditRecipeTab3.cpp" line="296"/> + <location filename="../src/EditRecipeTab4.cpp" line="343"/> + <location filename="../src/EditRecipeTab5.cpp" line="261"/> + <location filename="../src/EditRecipeTab6.cpp" line="283"/> <location filename="../src/EditRecipe.cpp" line="515"/> <source>Delete %1</source> <translation>Verwijder %1</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="837"/> - <location filename="../src/EditRecipeTab4.cpp" line="578"/> + <location filename="../src/EditRecipeTab2.cpp" line="836"/> + <location filename="../src/EditRecipeTab4.cpp" line="577"/> <source>Current ingredient:</source> <translation>Huidig ingredient:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="842"/> + <location filename="../src/EditRecipeTab2.cpp" line="841"/> <source>Supplier:</source> <translation>Leverancier:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="847"/> + <location filename="../src/EditRecipeTab2.cpp" line="846"/> <source>Amount in kg:</source> <translation>Gewicht in kg:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="852"/> + <location filename="../src/EditRecipeTab2.cpp" line="851"/> <source>Percentage in batch:</source> <translation>Percentage in stort:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="857"/> + <location filename="../src/EditRecipeTab2.cpp" line="856"/> <source>Auto fill to 100%:</source> <translation>Aanvullen tot 100%:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="862"/> - <location filename="../src/EditRecipeTab3.cpp" line="593"/> - <location filename="../src/EditRecipeTab5.cpp" line="498"/> + <location filename="../src/EditRecipeTab2.cpp" line="861"/> + <location filename="../src/EditRecipeTab3.cpp" line="592"/> + <location filename="../src/EditRecipeTab5.cpp" line="497"/> <source>Use at:</source> <translation>Toevoegen bij:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="867"/> - <location filename="../src/EditRecipeTab4.cpp" line="604"/> + <location filename="../src/EditRecipeTab2.cpp" line="866"/> + <location filename="../src/EditRecipeTab4.cpp" line="603"/> <source>Select ingredient:</source> <translation>Kies ingredient:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="872"/> - <location filename="../src/EditRecipeTab3.cpp" line="608"/> - <location filename="../src/EditRecipeTab4.cpp" line="609"/> - <location filename="../src/EditRecipeTab5.cpp" line="483"/> + <location filename="../src/EditRecipeTab2.cpp" line="871"/> + <location filename="../src/EditRecipeTab3.cpp" line="607"/> + <location filename="../src/EditRecipeTab4.cpp" line="608"/> + <location filename="../src/EditRecipeTab5.cpp" line="482"/> <source>In stock:</source> <translation>In voorraad:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="877"/> + <location filename="../src/EditRecipeTab2.cpp" line="876"/> <source>Max in batch:</source> <translation>Max. in stort:</translation> </message> <message> + <location filename="../src/EditRecipeTab2.cpp" line="927"/> + <location filename="../src/EditRecipeTab3.cpp" line="668"/> + <location filename="../src/EditRecipeTab4.cpp" line="653"/> + <source>Boil</source> + <translation>Koken</translation> + </message> + <message> <location filename="../src/EditRecipeTab2.cpp" line="928"/> - <location filename="../src/EditRecipeTab3.cpp" line="669"/> - <location filename="../src/EditRecipeTab4.cpp" line="654"/> - <source>Boil</source> - <translation>Koken</translation> + <source>Fermentation</source> + <translation>Hoofdvergisting</translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="929"/> - <source>Fermentation</source> - <translation>Hoofdvergisting</translation> + <source>Lagering</source> + <translation>Nagisting/lagering</translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="930"/> - <source>Lagering</source> - <translation>Nagisting/lagering</translation> + <location filename="../src/EditRecipeTab5.cpp" line="548"/> + <source>Bottle</source> + <translation>Bottelen</translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="931"/> - <location filename="../src/EditRecipeTab5.cpp" line="549"/> - <source>Bottle</source> - <translation>Bottelen</translation> - </message> - <message> - <location filename="../src/EditRecipeTab2.cpp" line="932"/> <source>Kegs</source> <translation>Fusten</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="48"/> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> <source>Origin</source> <translation>Herkomst</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="48"/> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> <source>Hop</source> <translation>Hop</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="48"/> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> <source>Form</source> <translation>Vorm</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="48"/> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> <source>Alpha</source> <translation>Alpha</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="48"/> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> <source>Use at</source> <translation>Toepassing</translation> </message> <message> + <location filename="../src/EditRecipeTab3.cpp" line="47"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> + <source>Time</source> + <translation>Tijd</translation> + </message> + <message> <location filename="../src/EditRecipeTab3.cpp" line="48"/> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> - <source>Time</source> - <translation>Tijd</translation> - </message> - <message> - <location filename="../src/EditRecipeTab3.cpp" line="49"/> <source>IBU</source> <translation>IBU</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="144"/> - <location filename="../src/EditRecipeTab3.cpp" line="184"/> + <location filename="../src/EditRecipeTab3.cpp" line="143"/> + <location filename="../src/EditRecipeTab3.cpp" line="183"/> <source>Very low</source> <translation>Zeer laag</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="150"/> - <location filename="../src/EditRecipeTab3.cpp" line="190"/> + <location filename="../src/EditRecipeTab3.cpp" line="149"/> + <location filename="../src/EditRecipeTab3.cpp" line="189"/> <source>Low</source> <translation>Laag</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="157"/> - <location filename="../src/EditRecipeTab3.cpp" line="197"/> + <location filename="../src/EditRecipeTab3.cpp" line="156"/> + <location filename="../src/EditRecipeTab3.cpp" line="196"/> <source>Moderate</source> <translation>Gemiddeld</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="165"/> - <location filename="../src/EditRecipeTab3.cpp" line="205"/> + <location filename="../src/EditRecipeTab3.cpp" line="164"/> + <location filename="../src/EditRecipeTab3.cpp" line="204"/> <source>High</source> <translation>Hoog</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="172"/> - <location filename="../src/EditRecipeTab3.cpp" line="212"/> + <location filename="../src/EditRecipeTab3.cpp" line="171"/> + <location filename="../src/EditRecipeTab3.cpp" line="211"/> <source>Very high</source> <translation>Zeer hoog</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="297"/> + <location filename="../src/EditRecipeTab3.cpp" line="296"/> <source>Delete hop</source> <translation>Verwijder hop</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="499"/> - <location filename="../src/EditRecipeTab3.cpp" line="585"/> - <location filename="../src/EditRecipeTab4.cpp" line="458"/> - <location filename="../src/EditRecipeTab4.cpp" line="538"/> - <location filename="../src/EditRecipeTab4.cpp" line="596"/> + <location filename="../src/EditRecipeTab3.cpp" line="498"/> + <location filename="../src/EditRecipeTab3.cpp" line="584"/> + <location filename="../src/EditRecipeTab4.cpp" line="457"/> + <location filename="../src/EditRecipeTab4.cpp" line="537"/> + <location filename="../src/EditRecipeTab4.cpp" line="595"/> <source>Time in minutes:</source> <translation>Tijd in minuten:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="503"/> - <location filename="../src/EditRecipeTab3.cpp" line="583"/> - <location filename="../src/EditRecipeTab4.cpp" line="453"/> - <location filename="../src/EditRecipeTab4.cpp" line="533"/> - <location filename="../src/EditRecipeTab4.cpp" line="594"/> + <location filename="../src/EditRecipeTab3.cpp" line="502"/> + <location filename="../src/EditRecipeTab3.cpp" line="582"/> + <location filename="../src/EditRecipeTab4.cpp" line="452"/> + <location filename="../src/EditRecipeTab4.cpp" line="532"/> + <location filename="../src/EditRecipeTab4.cpp" line="593"/> <source>Time in days:</source> <translation>Tijd in dagen:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="562"/> + <location filename="../src/EditRecipeTab3.cpp" line="561"/> <source>Current hop:</source> <translation>Huidige hop:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="567"/> + <location filename="../src/EditRecipeTab3.cpp" line="566"/> <source>Origin:</source> <translation>Herkomst:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="572"/> - <location filename="../src/EditRecipeTab4.cpp" line="469"/> - <location filename="../src/EditRecipeTab4.cpp" line="585"/> - <location filename="../src/EditRecipeTab5.cpp" line="366"/> - <location filename="../src/EditRecipeTab5.cpp" line="491"/> + <location filename="../src/EditRecipeTab3.cpp" line="571"/> + <location filename="../src/EditRecipeTab4.cpp" line="468"/> + <location filename="../src/EditRecipeTab4.cpp" line="584"/> + <location filename="../src/EditRecipeTab5.cpp" line="365"/> + <location filename="../src/EditRecipeTab5.cpp" line="490"/> <source>Amount in gr:</source> <translation>Gewicht in gr:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="577"/> + <location filename="../src/EditRecipeTab3.cpp" line="576"/> <source>Alpha percent:</source> <translation>Alpha procent:</translation> </message> @@ -7572,271 +7572,271 @@ <translation type="vanished">Alpha percentage:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="598"/> + <location filename="../src/EditRecipeTab3.cpp" line="597"/> <source>Hop form:</source> <translation>Hop vorm:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="603"/> + <location filename="../src/EditRecipeTab3.cpp" line="602"/> <source>Select hop:</source> <translation>Kies hop:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="668"/> + <location filename="../src/EditRecipeTab3.cpp" line="667"/> <source>First wort</source> <translation>Maischhop</translation> </message> <message> + <location filename="../src/EditRecipeTab3.cpp" line="669"/> + <source>Aroma</source> + <translation>Aromahop</translation> + </message> + <message> <location filename="../src/EditRecipeTab3.cpp" line="670"/> - <source>Aroma</source> - <translation>Aromahop</translation> + <source>Whirlpool</source> + <translation>Whirlpool hop</translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="671"/> - <source>Whirlpool</source> - <translation>Whirlpool hop</translation> - </message> - <message> - <location filename="../src/EditRecipeTab3.cpp" line="672"/> <source>Dry hop</source> <translation>Koudhop</translation> </message> <message> + <location filename="../src/EditRecipeTab3.cpp" line="678"/> + <source>Pellet</source> + <translation>Pellets</translation> + </message> + <message> <location filename="../src/EditRecipeTab3.cpp" line="679"/> - <source>Pellet</source> - <translation>Pellets</translation> + <source>Plug</source> + <translation>Plugs</translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="680"/> - <source>Plug</source> - <translation>Plugs</translation> + <source>Leaf</source> + <translation>Bloemen</translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="681"/> - <source>Leaf</source> - <translation>Bloemen</translation> + <source>Wet leaf</source> + <translation>Nat, vers</translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="682"/> - <source>Wet leaf</source> - <translation>Nat, vers</translation> - </message> - <message> - <location filename="../src/EditRecipeTab3.cpp" line="683"/> <source>Cryo</source> <translation>Cryo hop</translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="62"/> + <location filename="../src/EditRecipeTab4.cpp" line="61"/> <source>Ingredient</source> <translation>Ingredient</translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="113"/> - <location filename="../src/EditRecipeTab4.cpp" line="116"/> + <location filename="../src/EditRecipeTab4.cpp" line="112"/> + <location filename="../src/EditRecipeTab4.cpp" line="115"/> <source>Edit this from the water tab</source> <translation>Wijzig dit vanaf het water tabblad</translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="344"/> + <location filename="../src/EditRecipeTab4.cpp" line="343"/> <source>Delete misc</source> <translation>Verwijder divers ingredient</translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="472"/> - <location filename="../src/EditRecipeTab4.cpp" line="587"/> - <location filename="../src/EditRecipeTab5.cpp" line="370"/> - <location filename="../src/EditRecipeTab5.cpp" line="493"/> + <location filename="../src/EditRecipeTab4.cpp" line="471"/> + <location filename="../src/EditRecipeTab4.cpp" line="586"/> + <location filename="../src/EditRecipeTab5.cpp" line="369"/> + <location filename="../src/EditRecipeTab5.cpp" line="492"/> <source>Amount in ml:</source> <translation>Hoeveelheid in ml:</translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="652"/> + <location filename="../src/EditRecipeTab4.cpp" line="651"/> <source>Starter</source> <translation>Starter</translation> </message> <message> + <location filename="../src/EditRecipeTab4.cpp" line="654"/> + <location filename="../src/EditRecipeTab5.cpp" line="545"/> + <source>Primary</source> + <translation>Hoofdgisting</translation> + </message> + <message> <location filename="../src/EditRecipeTab4.cpp" line="655"/> <location filename="../src/EditRecipeTab5.cpp" line="546"/> - <source>Primary</source> - <translation>Hoofdgisting</translation> - </message> - <message> - <location filename="../src/EditRecipeTab4.cpp" line="656"/> - <location filename="../src/EditRecipeTab5.cpp" line="547"/> <source>Secondary</source> <translation>Nagisting/lagering</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="673"/> - <location filename="../src/EditRecipeTab4.cpp" line="657"/> + <location filename="../src/EditRecipeTab3.cpp" line="672"/> + <location filename="../src/EditRecipeTab4.cpp" line="656"/> <source>Bottling</source> <translation>Bottelen</translation> </message> <message> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> + <source>Yeast</source> + <translation>Gist</translation> + </message> + <message> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> + <source>Laboratory</source> + <translation>Laboratorium</translation> + </message> + <message> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> + <source>Code</source> + <translation>Product code</translation> + </message> + <message> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> + <source>Use for</source> + <translation>Toepassing</translation> + </message> + <message> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> + <source>Min. °C</source> + <translation>Min. °C</translation> + </message> + <message> + <location filename="../src/EditRecipeTab5.cpp" line="40"/> + <source>Max. °C</source> + <translation>Max. °C</translation> + </message> + <message> <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <source>Yeast</source> - <translation>Gist</translation> - </message> - <message> - <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <source>Laboratory</source> - <translation>Laboratorium</translation> - </message> - <message> - <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <source>Code</source> - <translation>Product code</translation> - </message> - <message> - <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <source>Use for</source> - <translation>Toepassing</translation> - </message> - <message> - <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <source>Min. °C</source> - <translation>Min. °C</translation> + <source>Tol. %</source> + <translation>Tol. %</translation> </message> <message> <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <source>Max. °C</source> - <translation>Max. °C</translation> - </message> - <message> - <location filename="../src/EditRecipeTab5.cpp" line="42"/> - <source>Tol. %</source> - <translation>Tol. %</translation> - </message> - <message> - <location filename="../src/EditRecipeTab5.cpp" line="42"/> <source>Attn. %</source> <translation>SVG %</translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="262"/> + <location filename="../src/EditRecipeTab5.cpp" line="261"/> <source>Delete yeast</source> <translation>Verwijder gist</translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="362"/> - <location filename="../src/EditRecipeTab5.cpp" line="489"/> + <location filename="../src/EditRecipeTab5.cpp" line="361"/> + <location filename="../src/EditRecipeTab5.cpp" line="488"/> <source>Total packs:</source> <translation>Aantal pakken:</translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="463"/> + <location filename="../src/EditRecipeTab5.cpp" line="462"/> <source>Yeast name:</source> <translation>Gist naam:</translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="468"/> - <location filename="../src/EditRecipeTab5.cpp" line="473"/> + <location filename="../src/EditRecipeTab5.cpp" line="467"/> + <location filename="../src/EditRecipeTab5.cpp" line="472"/> <source>Laboratory:</source> <translation>Laboratorium:</translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="478"/> + <location filename="../src/EditRecipeTab5.cpp" line="477"/> <source>Select yeast:</source> <translation>Kies gist:</translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="548"/> + <location filename="../src/EditRecipeTab5.cpp" line="547"/> <source>Tertiary</source> <translation>Lageren</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="34"/> + <location filename="../src/EditRecipeTab6.cpp" line="32"/> <source>Step name</source> <translation>Stap naam</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="34"/> + <location filename="../src/EditRecipeTab6.cpp" line="32"/> <source>Start</source> <translation>Start</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="34"/> + <location filename="../src/EditRecipeTab6.cpp" line="32"/> <source>End</source> <translation>Eind</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="34"/> + <location filename="../src/EditRecipeTab6.cpp" line="32"/> <source>Rest</source> <translation>Rust</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="34"/> + <location filename="../src/EditRecipeTab6.cpp" line="32"/> <source>Ramp</source> <translation>Verwarm</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="35"/> + <location filename="../src/EditRecipeTab6.cpp" line="33"/> <source>Inf/dec</source> <translation>Inf/dec</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="35"/> + <location filename="../src/EditRecipeTab6.cpp" line="33"/> <source>W/G ratio</source> <translation>L/Kg</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="285"/> + <location filename="../src/EditRecipeTab6.cpp" line="283"/> <source>Delete mash step</source> <translation>Verwijder maisch stap</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="453"/> + <location filename="../src/EditRecipeTab6.cpp" line="451"/> <source>Step name:</source> <translation>Stap naam:</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="463"/> + <location filename="../src/EditRecipeTab6.cpp" line="461"/> <source>Step type:</source> <translation>Stap type:</translation> </message> <message> + <location filename="../src/EditRecipeTab6.cpp" line="467"/> + <source>Infusion</source> + <translation>Infusie</translation> + </message> + <message> + <location filename="../src/EditRecipeTab6.cpp" line="468"/> + <source>Temperature</source> + <translation>Verwarmen</translation> + </message> + <message> <location filename="../src/EditRecipeTab6.cpp" line="469"/> - <source>Infusion</source> - <translation>Infusie</translation> - </message> - <message> - <location filename="../src/EditRecipeTab6.cpp" line="470"/> - <source>Temperature</source> - <translation>Verwarmen</translation> - </message> - <message> - <location filename="../src/EditRecipeTab6.cpp" line="471"/> <source>Decoction</source> <translation>Decoctie</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="476"/> + <location filename="../src/EditRecipeTab6.cpp" line="474"/> <source>Step start temp:</source> <translation>Start temperatuur:</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="491"/> + <location filename="../src/EditRecipeTab6.cpp" line="489"/> <source>Step end temp:</source> <translation>Eind temperatuur:</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="506"/> + <location filename="../src/EditRecipeTab6.cpp" line="504"/> <source>Step rest time:</source> <translation>Rust tijd:</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="520"/> + <location filename="../src/EditRecipeTab6.cpp" line="518"/> <source>Step ramp time:</source> <translation>Verwarm tijd:</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="535"/> + <location filename="../src/EditRecipeTab6.cpp" line="533"/> <source>Infusion volume:</source> <translation>Infusie volume:</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="552"/> + <location filename="../src/EditRecipeTab6.cpp" line="550"/> <source>Infusion Temperature:</source> <translation>Infusie temperatuur:</translation> </message>
--- a/ui/EditProduct.ui Tue Jan 10 16:56:21 2023 +0100 +++ b/ui/EditProduct.ui Thu Jan 12 14:34:14 2023 +0100 @@ -8789,16 +8789,6 @@ <double>1.000000000000000</double> </property> </widget> - <widget class="QComboBox" name="brew_coolwithEdit"> - <property name="geometry"> - <rect> - <x>150</x> - <y>50</y> - <width>161</width> - <height>23</height> - </rect> - </property> - </widget> <widget class="QLabel" name="brew_cooltimeLabel"> <property name="geometry"> <rect> @@ -8815,6 +8805,19 @@ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> + <widget class="QLineEdit" name="brew_coolwithShow"> + <property name="geometry"> + <rect> + <x>150</x> + <y>50</y> + <width>121</width> + <height>23</height> + </rect> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> </widget> <widget class="QGroupBox" name="afterboilBox"> <property name="geometry"> @@ -12176,7 +12179,6 @@ <tabstop>brew_aboilButton</tabstop> <tabstop>brew_aboileffShow</tabstop> <tabstop>brew_cooltoEdit</tabstop> - <tabstop>brew_coolwithEdit</tabstop> <tabstop>brew_cooltimeEdit</tabstop> <tabstop>brew_whirlpool9Edit</tabstop> <tabstop>brew_whirlpool7Edit</tabstop>
