changeset
Renamed trub_chiller_loss fields to trub_loss
Sat, 14 Jan 2023 11:34:51 +0100
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Sat, 14 Jan 2023 11:34:51 +0100
- changeset 458
- ac216a75ca9b
- parent 457
- 5028c1c4c526
- child 459
- fbb250c725bb
Renamed trub_chiller_loss fields to trub_loss
--- a/src/EditEquipment.cpp Fri Jan 13 15:08:57 2023 +0100 +++ b/src/EditEquipment.cpp Sat Jan 14 11:34:51 2023 +0100 @@ -51,7 +51,7 @@ ui->tun_materialEdit->setCurrentIndex(query.value("tun_material").toInt()); ui->tun_heightEdit->setValue(query.value("tun_height").toDouble() * 100.0); ui->top_up_waterEdit->setValue(query.value("top_up_water").toDouble()); - ui->trub_lossEdit->setValue(query.value("trub_chiller_loss").toDouble()); + ui->trub_lossEdit->setValue(query.value("trub_loss").toDouble()); ui->evap_rateEdit->setValue(query.value("evap_rate").toDouble()); ui->boil_timeEdit->setValue(query.value("boil_time").toDouble()); ui->calcboilEdit->setChecked(query.value("calc_boil_volume").toInt() ? true:false); @@ -188,7 +188,7 @@ sql.append(" inventory_equipments SET name=:name, boil_size=:boil_size, " "batch_size=:batch_size, tun_volume=:tun_volume, tun_weight=:tun_weight, " "tun_specific_heat=:tun_specific_heat, tun_material=:tun_material, tun_height=:tun_height, " - "top_up_water=:top_up_water, trub_chiller_loss=:trub_loss, evap_rate=:evap_rate, " + "top_up_water=:top_up_water, trub_loss=:trub_loss, evap_rate=:evap_rate, " "boil_time=:boil_time, calc_boil_volume=:calcboil, top_up_kettle=:top_up_kettle, " "notes=:notes, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, " "kettle_height=:kettle_height, mash_volume=:mash_volume, mash_max=:mash_max, " @@ -258,7 +258,7 @@ query.prepare("INSERT INTO inventory_equipments SET name=:name, boil_size=:boil_size, " "batch_size=:batch_size, tun_volume=:tun_volume, tun_weight=:tun_weight, " "tun_specific_heat=:tun_specific_heat, tun_material=:tun_material, tun_height=:tun_height, " - "top_up_water=:top_up_water, trub_chiller_loss=:trub_loss, evap_rate=:evap_rate, " + "top_up_water=:top_up_water, trub_loss=:trub_loss, evap_rate=:evap_rate, " "boil_time=:boil_time, calc_boil_volume=:calcboil, top_up_kettle=:top_up_kettle, " "notes=:notes, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, " "kettle_height=:kettle_height, mash_volume=:mash_volume, mash_max=:mash_max, "
--- a/src/EditProduct.cpp Fri Jan 13 15:08:57 2023 +0100 +++ b/src/EditProduct.cpp Sat Jan 14 11:34:51 2023 +0100 @@ -176,7 +176,7 @@ product->eq_tun_volume = product->eq_tun_height = 20; product->eq_tun_weight = 2; product->eq_top_up_water = 0; - product->eq_trub_chiller_loss = 0.5; + product->eq_trub_loss = 0.5; product->eq_evap_rate = 1.8; // product->eq_calc_boil_volume = true; product->eq_top_up_kettle = 0;
--- a/src/EditProductTab2.cpp Fri Jan 13 15:08:57 2023 +0100 +++ b/src/EditProductTab2.cpp Sat Jan 14 11:34:51 2023 +0100 @@ -35,7 +35,7 @@ /* Boiling */ ui->kettle_volumeEdit->setValue(product->eq_kettle_volume); - ui->kettle_lossEdit->setValue(product->eq_trub_chiller_loss); + ui->kettle_lossEdit->setValue(product->eq_trub_loss); ui->eqboil_sizeEdit->setValue(product->eq_boil_size); ui->evap_rateEdit->setValue(product->eq_evap_rate); ui->eqboil_timeEdit->setValue(product->eq_boil_time); @@ -52,7 +52,7 @@ /* Transfer */ ui->topup_waterEdit->setValue(product->eq_top_up_water); - ui->vol_fermenterEdit->setValue((product->eq_batch_size / 1.04) - product->eq_trub_chiller_loss - product->eq_chiller_loss); + ui->vol_fermenterEdit->setValue((product->eq_batch_size / 1.04) - product->eq_trub_loss - product->eq_chiller_loss); } @@ -99,7 +99,7 @@ product->eq_tun_material = query.value("tun_material").toInt(); product->eq_tun_height = query.value("tun_height").toDouble(); product->eq_top_up_water = query.value("top_up_water").toDouble(); - product->eq_trub_chiller_loss = query.value("trub_chiller_loss").toDouble(); + product->eq_trub_loss = query.value("trub_loss").toDouble(); product->eq_evap_rate = query.value("evap_rate").toDouble(); product->eq_boil_time = query.value("boil_time").toDouble(); //product->eq_calc_boil_volume = query.value("calc_boil_volume").toInt() ? true:false;
--- a/src/EditProductTab3.cpp Fri Jan 13 15:08:57 2023 +0100 +++ b/src/EditProductTab3.cpp Sat Jan 14 11:34:51 2023 +0100 @@ -391,7 +391,7 @@ if (product->brew_aboil_volume > 0) aboil_volume = product->brew_aboil_volume / 1.04; // Volume @ 20 degrees. if (product->brew_fermenter_tcloss == 0) { - product->brew_fermenter_tcloss = product->eq_trub_chiller_loss; + product->brew_fermenter_tcloss = product->eq_trub_loss; ui->brew_trublossEdit->setValue(product->brew_fermenter_tcloss); } product->brew_fermenter_volume = aboil_volume - product->brew_fermenter_tcloss + product->brew_fermenter_extrawater;
--- a/src/EditProductTab6.cpp Fri Jan 13 15:08:57 2023 +0100 +++ b/src/EditProductTab6.cpp Sat Jan 14 11:34:51 2023 +0100 @@ -207,7 +207,7 @@ if (product->brew_fermenter_extrawater > 0) volume += product->brew_fermenter_extrawater; } else { - volume = product->batch_size - product->eq_trub_chiller_loss; + volume = product->batch_size - product->eq_trub_loss; } if (product->yeasts.size() == 0)
--- a/src/EditRecipeExport.cpp Fri Jan 13 15:08:57 2023 +0100 +++ b/src/EditRecipeExport.cpp Sat Jan 14 11:34:51 2023 +0100 @@ -313,7 +313,7 @@ p->eq_tun_volume = p->eq_tun_height = 20; p->eq_tun_weight = 2; p->eq_top_up_water = 0; - p->eq_trub_chiller_loss = 0.5; + p->eq_trub_loss = 0.5; p->eq_evap_rate = 1.8; p->eq_top_up_kettle = 0; p->eq_kettle_volume = p->eq_kettle_height = p->eq_mash_volume = 20;
--- a/src/ImportXML.cpp Fri Jan 13 15:08:57 2023 +0100 +++ b/src/ImportXML.cpp Sat Jan 14 11:34:51 2023 +0100 @@ -102,7 +102,7 @@ query.prepare("INSERT INTO inventory_equipments SET name=:name, boil_size=:boil_size, " "batch_size=:batch_size, tun_volume=:tun_volume, tun_weight=:tun_weight, " "tun_specific_heat=:tun_specific_heat, tun_material=:tun_material, tun_height=:tun_height, " - "top_up_water=:top_up_water, trub_chiller_loss=:chiller_loss, evap_rate=:evap_rate, " + "top_up_water=:top_up_water, trub_loss=:chiller_loss, evap_rate=:evap_rate, " "boil_time=:boil_time, calc_boil_volume=:calcboil, top_up_kettle=:top_up_kettle, " "hop_utilization=:hopfactor, notes=:notes, lauter_volume=:lauter_volume, " "lauter_height=:lauter_height, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, " @@ -117,7 +117,7 @@ query.bindValue(":tun_material", eq->tun_material); query.bindValue(":tun_height", QString("%1").arg(eq->tun_height, 4, 'f', 3, '0')); query.bindValue(":top_up_water", QString("%1").arg(eq->top_up_water, 2, 'f', 1, '0')); - query.bindValue(":chiller_loss", QString("%1").arg(eq->trub_chiller_loss, 2, 'f', 1, '0')); + query.bindValue(":chiller_loss", QString("%1").arg(eq->trub_loss, 2, 'f', 1, '0')); /* The evaporation in beerxml is percentage, but we use the real volume per hour */ query.bindValue(":evap_rate", QString("%1").arg((eq->evap_rate / 100) * eq->boil_size, 3, 'f', 2, '0')); query.bindValue(":boil_time", QString("%1").arg(eq->boil_time, 1, 'f', 0, '0')); @@ -178,7 +178,7 @@ } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "TUN_HEIGHT")) { eq->tun_height = xml->readElementText().toDouble(); } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "TRUB_CHILLER_LOSS")) { - eq->trub_chiller_loss = xml->readElementText().toDouble(); + eq->trub_loss = xml->readElementText().toDouble(); } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "EVAP_RATE")) { eq->evap_rate = xml->readElementText().toDouble(); } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "BOIL_TIME")) {
--- a/src/PrinterDialog.cpp Fri Jan 13 15:08:57 2023 +0100 +++ b/src/PrinterDialog.cpp Sat Jan 14 11:34:51 2023 +0100 @@ -1269,9 +1269,9 @@ y += 25; painter.fillRect( 20, y, 715, 20, c_line1); painter.drawText( 20, y+4, 230, 20, Qt::AlignLeft, tr("Chiller and trub loss")); - painter.drawText(250, y+4, 200, 20, Qt::AlignLeft, QString("%1 L").arg(product->eq_trub_chiller_loss, 1, 'f', 1)); + painter.drawText(250, y+4, 200, 20, Qt::AlignLeft, QString("%1 L").arg(product->eq_trub_loss, 1, 'f', 1)); painter.drawText(450, y+4, 200, 20, Qt::AlignLeft, QString("%1 L").arg(product->brew_fermenter_tcloss, 1, 'f', 1)); - painter.drawText(650, y+4, 85, 20, Qt::AlignLeft, strDiff(product->eq_trub_chiller_loss, product->brew_fermenter_tcloss, 1, " L")); + painter.drawText(650, y+4, 85, 20, Qt::AlignLeft, strDiff(product->eq_trub_loss, product->brew_fermenter_tcloss, 1, " L")); y += 20; painter.fillRect( 20, y, 715, 20, c_line1); painter.drawText( 20, y+4, 230, 20, Qt::AlignLeft, tr("Top up water")); @@ -1281,9 +1281,9 @@ y += 20; painter.fillRect( 20, y, 715, 20, c_line1); painter.drawText( 20, y+4, 230, 20, Qt::AlignLeft, tr("Fermenter volume")); - painter.drawText(250, y+4, 200, 20, Qt::AlignLeft, QString("%1 L").arg(product->batch_size - product->eq_trub_chiller_loss - product->boil_absorb, 1, 'f', 1)); + painter.drawText(250, y+4, 200, 20, Qt::AlignLeft, QString("%1 L").arg(product->batch_size - product->eq_trub_loss - product->boil_absorb, 1, 'f', 1)); painter.drawText(450, y+4, 200, 20, Qt::AlignLeft, QString("%1 L").arg(product->brew_fermenter_volume, 1, 'f', 1)); - painter.drawText(650, y+4, 85, 20, Qt::AlignLeft, strDiff(product->batch_size - product->eq_trub_chiller_loss - product->boil_absorb, product->brew_fermenter_volume, 1, " L")); + painter.drawText(650, y+4, 85, 20, Qt::AlignLeft, strDiff(product->batch_size - product->eq_trub_loss - product->boil_absorb, product->brew_fermenter_volume, 1, " L")); y += 20; painter.fillRect( 20, y, 715, 20, c_line1); painter.drawText( 20, y+4, 230, 20, Qt::AlignLeft, tr("Fermenter density"));
--- a/src/database/db_product.cpp Fri Jan 13 15:08:57 2023 +0100 +++ b/src/database/db_product.cpp Sat Jan 14 11:34:51 2023 +0100 @@ -61,7 +61,7 @@ prod->eq_tun_material = query.value("eq_tun_material").toInt(); prod->eq_tun_height = query.value("eq_tun_height").toDouble(); prod->eq_top_up_water = query.value("eq_top_up_water").toDouble(); - prod->eq_trub_chiller_loss = query.value("eq_trub_chiller_loss").toDouble(); + prod->eq_trub_loss = query.value("eq_trub_loss").toDouble(); prod->eq_evap_rate = query.value("eq_evap_rate").toDouble(); prod->eq_boil_time = query.value("eq_boil_time").toDouble(); // prod->eq_calc_boil_volume = query.value("eq_calc_boil_volume").toInt() ? true:false; @@ -564,7 +564,7 @@ "eq_name=:eq_name, eq_boil_size=:eq_boil_size, eq_efficiency=:eq_efficiency, " "eq_batch_size=:eq_batch_size, eq_tun_volume=:eq_tun_volume, eq_tun_weight=:eq_tun_weight, " "eq_tun_specific_heat=:eq_tun_specific_heat, eq_tun_material=:eq_tun_material, eq_tun_height=:eq_tun_height, " - "eq_top_up_water=:eq_top_up_water, eq_trub_chiller_loss=:eq_chiller_loss, eq_evap_rate=:eq_evap_rate, " + "eq_top_up_water=:eq_top_up_water, eq_trub_loss=:eq_trub_loss, eq_evap_rate=:eq_evap_rate, " "eq_boil_time=:eq_boil_time, eq_top_up_kettle=:eq_top_up_kettle, eq_notes=:eq_notes, " "eq_lauter_deadspace=:eq_lauter_deadspace, eq_kettle_volume=:eq_kettle_volume, " "eq_kettle_height=:eq_kettle_height, eq_mash_volume=:eq_mash_volume, eq_mash_max=:eq_mash_max, " @@ -657,7 +657,7 @@ query.bindValue(":eq_tun_material", prod->eq_tun_material); query.bindValue(":eq_tun_height", round(prod->eq_tun_height * 1000) / 1000); query.bindValue(":eq_top_up_water", round(prod->eq_top_up_water * 10) / 10); - query.bindValue(":eq_chiller_loss", round(prod->eq_trub_chiller_loss * 10) / 10); + query.bindValue(":eq_trub_loss", round(prod->eq_trub_loss * 10) / 10); query.bindValue(":eq_evap_rate", round(prod->eq_evap_rate * 100) / 100); query.bindValue(":eq_boil_time", round(prod->eq_boil_time)); //query.bindValue(":eq_calcboil", prod->eq_calc_boil_volume ? 1:0);
--- a/src/global.h Fri Jan 13 15:08:57 2023 +0100 +++ b/src/global.h Sat Jan 14 11:34:51 2023 +0100 @@ -248,7 +248,7 @@ int tun_material; double tun_height; double top_up_water; - double trub_chiller_loss; + double trub_loss; double evap_rate; double boil_time; bool calc_boil_volume; @@ -447,7 +447,7 @@ int eq_tun_material; double eq_tun_height; double eq_top_up_water; - double eq_trub_chiller_loss; + double eq_trub_loss; double eq_evap_rate; double eq_boil_time; bool xeq_calc_boil_volume;
--- a/translations/bmsapp_en.ts Fri Jan 13 15:08:57 2023 +0100 +++ b/translations/bmsapp_en.ts Sat Jan 14 11:34:51 2023 +0100 @@ -4232,7 +4232,7 @@ <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="879"/> + <location filename="../src/EditProductTab6.cpp" line="880"/> <location filename="../src/EditProductTab7.cpp" line="306"/> <location filename="../src/EditProduct.cpp" line="869"/> <source>Delete %1</source> @@ -4267,7 +4267,7 @@ <message> <location filename="../src/EditProductTab3.cpp" line="1073"/> <location filename="../src/EditProductTab4.cpp" line="633"/> - <location filename="../src/EditProductTab6.cpp" line="1178"/> + <location filename="../src/EditProductTab6.cpp" line="1179"/> <source>Use at:</source> <translation type="unfinished"></translation> </message> @@ -4281,7 +4281,7 @@ <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="1163"/> + <location filename="../src/EditProductTab6.cpp" line="1164"/> <source>In stock:</source> <translation type="unfinished"></translation> </message> @@ -4423,8 +4423,8 @@ <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="1011"/> - <location filename="../src/EditProductTab6.cpp" line="1171"/> + <location filename="../src/EditProductTab6.cpp" line="1012"/> + <location filename="../src/EditProductTab6.cpp" line="1172"/> <source>Amount in gr:</source> <translation type="unfinished"></translation> </message> @@ -4463,8 +4463,8 @@ <message> <location filename="../src/EditProductTab5.cpp" line="528"/> <location filename="../src/EditProductTab5.cpp" line="652"/> - <location filename="../src/EditProductTab6.cpp" line="1018"/> - <location filename="../src/EditProductTab6.cpp" line="1173"/> + <location filename="../src/EditProductTab6.cpp" line="1019"/> + <location filename="../src/EditProductTab6.cpp" line="1174"/> <source>Amount in ml:</source> <translation type="unfinished"></translation> </message> @@ -4475,13 +4475,13 @@ </message> <message> <location filename="../src/EditProductTab5.cpp" line="720"/> - <location filename="../src/EditProductTab6.cpp" line="1227"/> + <location filename="../src/EditProductTab6.cpp" line="1228"/> <source>Primary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab5.cpp" line="721"/> - <location filename="../src/EditProductTab6.cpp" line="1228"/> + <location filename="../src/EditProductTab6.cpp" line="1229"/> <source>Secondary</source> <translation type="unfinished"></translation> </message> @@ -4572,99 +4572,99 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="711"/> + <location filename="../src/EditProductTab6.cpp" line="712"/> <source>0.075 Real Kveik</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="712"/> - <source>0.75 Ale, upto 1.060</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProductTab6.cpp" line="713"/> - <source>1.0 Ale, above 1.060</source> + <source>0.75 Ale, upto 1.060</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab6.cpp" line="714"/> - <source>1.5 Lager, upto 1.060</source> + <source>1.0 Ale, above 1.060</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab6.cpp" line="715"/> + <source>1.5 Lager, upto 1.060</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="716"/> <source>2.0 Lager, above 1.060</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="746"/> + <location filename="../src/EditProductTab6.cpp" line="747"/> <source>Retry starter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="746"/> + <location filename="../src/EditProductTab6.cpp" line="747"/> <source>Retry to automatic create starter steps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="780"/> + <location filename="../src/EditProductTab6.cpp" line="781"/> <source>Start step type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="785"/> + <location filename="../src/EditProductTab6.cpp" line="786"/> <source>Starter step volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="792"/> - <source>Stirred</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProductTab6.cpp" line="793"/> - <source>Shaken</source> + <source>Stirred</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab6.cpp" line="794"/> + <source>Shaken</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="795"/> <source>Simple</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="879"/> + <location filename="../src/EditProductTab6.cpp" line="880"/> <source>Delete yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1004"/> - <location filename="../src/EditProductTab6.cpp" line="1169"/> + <location filename="../src/EditProductTab6.cpp" line="1005"/> + <location filename="../src/EditProductTab6.cpp" line="1170"/> <source>Total packs:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1143"/> + <location filename="../src/EditProductTab6.cpp" line="1144"/> <source>Yeast name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1148"/> - <location filename="../src/EditProductTab6.cpp" line="1153"/> + <location filename="../src/EditProductTab6.cpp" line="1149"/> + <location filename="../src/EditProductTab6.cpp" line="1154"/> <source>Laboratory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1158"/> + <location filename="../src/EditProductTab6.cpp" line="1159"/> <source>Select yeast:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1229"/> - <source>Tertiary</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProductTab6.cpp" line="1230"/> + <source>Tertiary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="1231"/> <source>Bottle</source> <translation type="unfinished"></translation> </message>
--- a/translations/bmsapp_nl.ts Fri Jan 13 15:08:57 2023 +0100 +++ b/translations/bmsapp_nl.ts Sat Jan 14 11:34:51 2023 +0100 @@ -4640,7 +4640,7 @@ <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="879"/> + <location filename="../src/EditProductTab6.cpp" line="880"/> <location filename="../src/EditProductTab7.cpp" line="306"/> <location filename="../src/EditProduct.cpp" line="869"/> <source>Delete %1</source> @@ -4675,7 +4675,7 @@ <message> <location filename="../src/EditProductTab3.cpp" line="1073"/> <location filename="../src/EditProductTab4.cpp" line="633"/> - <location filename="../src/EditProductTab6.cpp" line="1178"/> + <location filename="../src/EditProductTab6.cpp" line="1179"/> <source>Use at:</source> <translation>Toevoegen bij:</translation> </message> @@ -4689,7 +4689,7 @@ <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="1163"/> + <location filename="../src/EditProductTab6.cpp" line="1164"/> <source>In stock:</source> <translation>In voorraad:</translation> </message> @@ -4831,8 +4831,8 @@ <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="1011"/> - <location filename="../src/EditProductTab6.cpp" line="1171"/> + <location filename="../src/EditProductTab6.cpp" line="1012"/> + <location filename="../src/EditProductTab6.cpp" line="1172"/> <source>Amount in gr:</source> <translation>Gewicht in gr:</translation> </message> @@ -4890,8 +4890,8 @@ <message> <location filename="../src/EditProductTab5.cpp" line="528"/> <location filename="../src/EditProductTab5.cpp" line="652"/> - <location filename="../src/EditProductTab6.cpp" line="1018"/> - <location filename="../src/EditProductTab6.cpp" line="1173"/> + <location filename="../src/EditProductTab6.cpp" line="1019"/> + <location filename="../src/EditProductTab6.cpp" line="1174"/> <source>Amount in ml:</source> <translation>Hoeveelheid in ml:</translation> </message> @@ -4902,13 +4902,13 @@ </message> <message> <location filename="../src/EditProductTab5.cpp" line="720"/> - <location filename="../src/EditProductTab6.cpp" line="1227"/> + <location filename="../src/EditProductTab6.cpp" line="1228"/> <source>Primary</source> <translation>Hoofdgisting</translation> </message> <message> <location filename="../src/EditProductTab5.cpp" line="721"/> - <location filename="../src/EditProductTab6.cpp" line="1228"/> + <location filename="../src/EditProductTab6.cpp" line="1229"/> <source>Secondary</source> <translation>Nagisting/lagering</translation> </message> @@ -4999,99 +4999,99 @@ <translation>Biergist nodig:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="711"/> + <location filename="../src/EditProductTab6.cpp" line="712"/> <source>0.075 Real Kveik</source> <translation>0,075 Echte Kveik</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="712"/> - <source>0.75 Ale, upto 1.060</source> - <translation>0,75 Bovengist tot 1.060</translation> - </message> - <message> <location filename="../src/EditProductTab6.cpp" line="713"/> - <source>1.0 Ale, above 1.060</source> - <translation>1,0 Bovengist hoger 1.060</translation> + <source>0.75 Ale, upto 1.060</source> + <translation>0,75 Bovengist tot 1.060</translation> </message> <message> <location filename="../src/EditProductTab6.cpp" line="714"/> - <source>1.5 Lager, upto 1.060</source> - <translation>1,5 Ondergist tot 1.060</translation> + <source>1.0 Ale, above 1.060</source> + <translation>1,0 Bovengist hoger 1.060</translation> </message> <message> <location filename="../src/EditProductTab6.cpp" line="715"/> + <source>1.5 Lager, upto 1.060</source> + <translation>1,5 Ondergist tot 1.060</translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="716"/> <source>2.0 Lager, above 1.060</source> <translation>2,0 Ondergist hoger 1.060</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="746"/> + <location filename="../src/EditProductTab6.cpp" line="747"/> <source>Retry starter</source> <translation>Ververs starter</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="746"/> + <location filename="../src/EditProductTab6.cpp" line="747"/> <source>Retry to automatic create starter steps</source> <translation>Ververs de starter stappen automatisch</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="780"/> + <location filename="../src/EditProductTab6.cpp" line="781"/> <source>Start step type:</source> <translation>Starter stap type:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="785"/> + <location filename="../src/EditProductTab6.cpp" line="786"/> <source>Starter step volume:</source> <translation>Starter stap volume:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="792"/> - <source>Stirred</source> - <translation>Geroerd</translation> - </message> - <message> <location filename="../src/EditProductTab6.cpp" line="793"/> - <source>Shaken</source> - <translation>Geschud</translation> + <source>Stirred</source> + <translation>Geroerd</translation> </message> <message> <location filename="../src/EditProductTab6.cpp" line="794"/> + <source>Shaken</source> + <translation>Geschud</translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="795"/> <source>Simple</source> <translation>Simpel</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="879"/> + <location filename="../src/EditProductTab6.cpp" line="880"/> <source>Delete yeast</source> <translation>Verwijder gist</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1004"/> - <location filename="../src/EditProductTab6.cpp" line="1169"/> + <location filename="../src/EditProductTab6.cpp" line="1005"/> + <location filename="../src/EditProductTab6.cpp" line="1170"/> <source>Total packs:</source> <translation>Aantal pakken:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1143"/> + <location filename="../src/EditProductTab6.cpp" line="1144"/> <source>Yeast name:</source> <translation>Gist naam:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1148"/> - <location filename="../src/EditProductTab6.cpp" line="1153"/> + <location filename="../src/EditProductTab6.cpp" line="1149"/> + <location filename="../src/EditProductTab6.cpp" line="1154"/> <source>Laboratory:</source> <translation>Laboratorium:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1158"/> + <location filename="../src/EditProductTab6.cpp" line="1159"/> <source>Select yeast:</source> <translation>Kies gist:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1229"/> - <source>Tertiary</source> - <translation>Lageren</translation> - </message> - <message> <location filename="../src/EditProductTab6.cpp" line="1230"/> + <source>Tertiary</source> + <translation>Lageren</translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="1231"/> <source>Bottle</source> <translation>Bottelen</translation> </message>
