# HG changeset patch # User Michiel Broek # Date 1667567876 -3600 # Node ID ef2638cfc1b78f28e02d661777c59ea2932c0811 # Parent 4aac0b672667eaacb54fcc94364530b76a2dbb61 Added five hop absorption fields to the profile_setup record to set the hop absorption rates. Added edit fields in the global setup. Load global these new variables during application startup. diff -r 4aac0b672667 -r ef2638cfc1b7 src/MainWindow.cpp --- a/src/MainWindow.cpp Sun Oct 30 16:43:22 2022 +0100 +++ b/src/MainWindow.cpp Fri Nov 04 14:17:56 2022 +0100 @@ -140,6 +140,11 @@ my_ut_wethop = query.value("ut_wethop").toDouble(); my_ut_t45 = query.value("ut_t45").toDouble(); my_ut_co2extract = query.value("ut_co2extract").toDouble(); + my_ha_pellet = query.value("ha_pellet").toDouble(); + my_ha_plug = query.value("ha_plug").toDouble(); + my_ha_leaf = query.value("ha_leaf").toDouble(); + my_ha_wethop = query.value("ha_wethop").toDouble(); + my_ha_t45 = query.value("ha_t45").toDouble(); my_ibu_method = query.value("ibu_method").toInt(); my_color_method = query.value("color_method").toInt(); my_brix_correction = query.value("brix_correction").toDouble(); diff -r 4aac0b672667 -r ef2638cfc1b7 src/Setup.cpp --- a/src/Setup.cpp Sun Oct 30 16:43:22 2022 +0100 +++ b/src/Setup.cpp Fri Nov 04 14:17:56 2022 +0100 @@ -65,40 +65,69 @@ pelletLabel = new QLabel(topWidget); pelletLabel->setObjectName(QString::fromUtf8("pelletLabel")); - pelletLabel->setGeometry(QRect(10, 210, 181, 20)); + pelletLabel->setGeometry(QRect(10, 240, 181, 20)); pelletLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); pelletLabel->setText(tr("Hop Pellets utilisation:")); hopplugLabel = new QLabel(topWidget); hopplugLabel->setObjectName(QString::fromUtf8("plugsLabel")); - hopplugLabel->setGeometry(QRect(10, 240, 181, 20)); + hopplugLabel->setGeometry(QRect(10, 270, 181, 20)); hopplugLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); hopplugLabel->setText(tr("Hop Plugs utilisation:")); leafLabel = new QLabel(topWidget); leafLabel->setObjectName(QString::fromUtf8("leafLabel")); - leafLabel->setGeometry(QRect(10, 270, 181, 20)); + leafLabel->setGeometry(QRect(10, 300, 181, 20)); leafLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); leafLabel->setText(tr("Hop Leafs utilisation:")); wethopLabel = new QLabel(topWidget); wethopLabel->setObjectName(QString::fromUtf8("wethopLabel")); - wethopLabel->setGeometry(QRect(10, 300, 181, 20)); + wethopLabel->setGeometry(QRect(10, 330, 181, 20)); wethopLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); wethopLabel->setText(tr("Wet Hop utilisation:")); cryohopLabel = new QLabel(topWidget); cryohopLabel->setObjectName(QString::fromUtf8("cryohopLabel")); - cryohopLabel->setGeometry(QRect(10, 330, 181, 20)); + cryohopLabel->setGeometry(QRect(10, 360, 181, 20)); cryohopLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); cryohopLabel->setText(tr("Cryo Hop\302\256 utilisation:")); extractLabel = new QLabel(topWidget); extractLabel->setObjectName(QString::fromUtf8("extractLabel")); - extractLabel->setGeometry(QRect(10, 360, 181, 20)); + extractLabel->setGeometry(QRect(10, 390, 181, 20)); extractLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); extractLabel->setText(tr("CO2 Hop Extract utilisation:")); + hapelletLabel = new QLabel(topWidget); + hapelletLabel->setObjectName(QString::fromUtf8("hapelletLabel")); + hapelletLabel->setGeometry(QRect(380, 240, 181, 20)); + hapelletLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + hapelletLabel->setText(tr("Hop Pellets water absorption:")); + + hahopplugLabel = new QLabel(topWidget); + hahopplugLabel->setObjectName(QString::fromUtf8("haplugsLabel")); + hahopplugLabel->setGeometry(QRect(380, 270, 181, 20)); + hahopplugLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + hahopplugLabel->setText(tr("Hop Plugs water absorption:")); + + haleafLabel = new QLabel(topWidget); + haleafLabel->setObjectName(QString::fromUtf8("haleafLabel")); + haleafLabel->setGeometry(QRect(380, 300, 181, 20)); + haleafLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + haleafLabel->setText(tr("Hop Leafs water absorption:")); + + hawethopLabel = new QLabel(topWidget); + hawethopLabel->setObjectName(QString::fromUtf8("hawethopLabel")); + hawethopLabel->setGeometry(QRect(380, 330, 181, 20)); + hawethopLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + hawethopLabel->setText(tr("Wet Hop water absorption:")); + + hacryohopLabel = new QLabel(topWidget); + hacryohopLabel->setObjectName(QString::fromUtf8("hacryohopLabel")); + hacryohopLabel->setGeometry(QRect(380, 360, 181, 20)); + hacryohopLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + hacryohopLabel->setText(tr("Cryo Hop\302\256 water absorption:")); fwhEdit = new QSpinBox(topWidget); fwhEdit->setObjectName(QString::fromUtf8("fwhEdit")); @@ -122,7 +151,7 @@ pelletEdit = new QDoubleSpinBox(topWidget); pelletEdit->setObjectName(QString::fromUtf8("pelletEdit")); - pelletEdit->setGeometry(QRect(210, 210, 81, 24)); + pelletEdit->setGeometry(QRect(210, 240, 81, 24)); pelletEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); pelletEdit->setAccelerated(true); pelletEdit->setMaximum(100); @@ -132,7 +161,7 @@ hopplugEdit = new QDoubleSpinBox(topWidget); hopplugEdit->setObjectName(QString::fromUtf8("hopplugEdit")); - hopplugEdit->setGeometry(QRect(210, 240, 81, 24)); + hopplugEdit->setGeometry(QRect(210, 270, 81, 24)); hopplugEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); hopplugEdit->setAccelerated(true); hopplugEdit->setMaximum(100); @@ -142,7 +171,7 @@ leafEdit = new QDoubleSpinBox(topWidget); leafEdit->setObjectName(QString::fromUtf8("leafEdit")); - leafEdit->setGeometry(QRect(210, 270, 81, 24)); + leafEdit->setGeometry(QRect(210, 300, 81, 24)); leafEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); leafEdit->setAccelerated(true); leafEdit->setMaximum(100); @@ -152,17 +181,17 @@ wethopEdit = new QDoubleSpinBox(topWidget); wethopEdit->setObjectName(QString::fromUtf8("wethopEdit")); - wethopEdit->setGeometry(QRect(210, 300, 81, 24)); + wethopEdit->setGeometry(QRect(210, 330, 81, 24)); wethopEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); wethopEdit->setAccelerated(true); wethopEdit->setMaximum(100); wethopEdit->setDecimals(1); - wethopEdit->setToolTip(tr("The uyilisation for fresh hops, default 3.6")); + wethopEdit->setToolTip(tr("The utilisation for fresh hops, default 3.6")); wethopEdit->setSuffix(tr("%")); cryohopEdit = new QDoubleSpinBox(topWidget); cryohopEdit->setObjectName(QString::fromUtf8("cryohopEdit")); - cryohopEdit->setGeometry(QRect(210, 330, 81, 24)); + cryohopEdit->setGeometry(QRect(210, 360, 81, 24)); cryohopEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); cryohopEdit->setAccelerated(true); cryohopEdit->setMaximum(100); @@ -172,7 +201,7 @@ extractEdit = new QDoubleSpinBox(topWidget); extractEdit->setObjectName(QString::fromUtf8("extractEdit")); - extractEdit->setGeometry(QRect(210, 360, 81, 24)); + extractEdit->setGeometry(QRect(210, 390, 81, 24)); extractEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); extractEdit->setAccelerated(true); extractEdit->setMaximum(100); @@ -270,6 +299,61 @@ heightEdit->setValue(0); heightEdit->setToolTip(tr("Height in meters above/below sealevel to calculate the exact boiling point and hop isomerizon.")); + hapelletEdit = new QDoubleSpinBox(topWidget); + hapelletEdit->setObjectName(QString::fromUtf8("hapelletEdit")); + hapelletEdit->setGeometry(QRect(580, 240, 101, 24)); + hapelletEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + hapelletEdit->setAccelerated(true); + hapelletEdit->setSingleStep(0.010000000000000); + hapelletEdit->setMaximum(20); + hapelletEdit->setDecimals(2); + hapelletEdit->setToolTip(tr("The water absorption by hop pellets, default 2.67")); + hapelletEdit->setSuffix(tr(" ml/gr")); + + hahopplugEdit = new QDoubleSpinBox(topWidget); + hahopplugEdit->setObjectName(QString::fromUtf8("hahopplugEdit")); + hahopplugEdit->setGeometry(QRect(580, 270, 101, 24)); + hahopplugEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + hahopplugEdit->setAccelerated(true); + hahopplugEdit->setSingleStep(0.010000000000000); + hahopplugEdit->setMaximum(20); + hahopplugEdit->setDecimals(2); + hahopplugEdit->setToolTip(tr("The water absorption by hop plugs, default 2.67")); + hahopplugEdit->setSuffix(tr(" ml/gr")); + + haleafEdit = new QDoubleSpinBox(topWidget); + haleafEdit->setObjectName(QString::fromUtf8("haleafEdit")); + haleafEdit->setGeometry(QRect(580, 300, 101, 24)); + haleafEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + haleafEdit->setAccelerated(true); + haleafEdit->setSingleStep(0.010000000000000); + haleafEdit->setMaximum(20); + haleafEdit->setDecimals(2); + haleafEdit->setToolTip(tr("The water absorption by hop leafs, default 6.01")); + haleafEdit->setSuffix(tr(" ml/gr")); + + hawethopEdit = new QDoubleSpinBox(topWidget); + hawethopEdit->setObjectName(QString::fromUtf8("hawethopEdit")); + hawethopEdit->setGeometry(QRect(580, 330, 101, 24)); + hawethopEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + hawethopEdit->setAccelerated(true); + hawethopEdit->setSingleStep(0.010000000000000); + hawethopEdit->setMaximum(20); + hawethopEdit->setDecimals(2); + hawethopEdit->setToolTip(tr("The water absorption by fresh hops, default 1.21")); + hawethopEdit->setSuffix(tr(" ml/gr")); + + hacryohopEdit = new QDoubleSpinBox(topWidget); + hacryohopEdit->setObjectName(QString::fromUtf8("hacryohopEdit")); + hacryohopEdit->setGeometry(QRect(580, 360, 101, 24)); + hacryohopEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + hacryohopEdit->setAccelerated(true); + hacryohopEdit->setSingleStep(0.010000000000000); + hacryohopEdit->setMaximum(20); + hacryohopEdit->setDecimals(2); + hacryohopEdit->setToolTip(tr("The water absorption by Cryo Hop\302\256, default 2.67")); + hacryohopEdit->setSuffix(tr(" ml/gr")); + colorEdit = new QComboBox(topWidget); colorEdit->setObjectName(QString::fromUtf8("colorEdit")); colorEdit->setGeometry(QRect(940, 120, 161, 23)); @@ -370,9 +454,19 @@ grainEdit->setValue(query.value("grain_absorption").toDouble()); brixEdit->setValue(query.value("brix_correction").toDouble()); heightEdit->setValue(query.value("brewery_height").toInt()); + hapelletEdit->setValue(query.value("ha_pellet").toDouble()); + hahopplugEdit->setValue(query.value("ha_plug").toDouble()); + haleafEdit->setValue(query.value("ha_leaf").toDouble()); + hawethopEdit->setValue(query.value("ha_wethop").toDouble()); + hacryohopEdit->setValue(query.value("ha_t45").toDouble()); connect(grainEdit, &QDoubleSpinBox::textChanged, this, &Setup::is_changed); connect(brixEdit, &QDoubleSpinBox::textChanged, this, &Setup::is_changed); connect(heightEdit, &QSpinBox::textChanged, this, &Setup::is_changed); + connect(hapelletEdit, &QDoubleSpinBox::textChanged, this, &Setup::is_changed); + connect(hahopplugEdit, &QDoubleSpinBox::textChanged, this, &Setup::is_changed); + connect(haleafEdit, &QDoubleSpinBox::textChanged, this, &Setup::is_changed); + connect(hawethopEdit, &QDoubleSpinBox::textChanged, this, &Setup::is_changed); + connect(hacryohopEdit, &QDoubleSpinBox::textChanged, this, &Setup::is_changed); colorEdit->addItem("Morey"); colorEdit->addItem("Mosher"); @@ -512,7 +606,9 @@ "ut_pellet=:pellet, ut_plug=:plug, ut_leaf=:leaf, ut_wethop=:wet, ut_t45=:cryo, ut_co2extract=:extract, " "color_method=:color, ibu_method=:ibu, " "brix_correction=:brix, grain_absorption=:grain, default_water=:water, my_yeastlab=:yeast, " - "brewery_height=:height WHERE record='1'"); + "brewery_height=:height, " + "ha_pellet=:hapellet, ha_plug=:haplug, ha_leaf=:haleaf, ha_wethop=:hawet, ha_t45=:hacryo " + "WHERE record='1'"); query.bindValue(":brewery", this->breweryEdit->text()); query.bindValue(":logo", logoByteArray); query.bindValue(":mashhop", this->mashhopEdit->value()); @@ -530,6 +626,11 @@ query.bindValue(":water", record); query.bindValue(":yeast", this->yeastEdit->currentText()); query.bindValue(":height", this->heightEdit->value()); + query.bindValue(":hapellet", this->hapelletEdit->value()); + query.bindValue(":haplug", this->hahopplugEdit->value()); + query.bindValue(":haleaf", this->haleafEdit->value()); + query.bindValue(":hawet", this->hawethopEdit->value()); + query.bindValue(":hacryo", this->hacryohopEdit->value()); query.exec(); if (query.lastError().isValid()) { qDebug() << "Setup Save error:" << query.lastError(); diff -r 4aac0b672667 -r ef2638cfc1b7 src/Setup.h --- a/src/Setup.h Sun Oct 30 16:43:22 2022 +0100 +++ b/src/Setup.h Fri Nov 04 14:17:56 2022 +0100 @@ -56,6 +56,11 @@ QLabel *wethopLabel; QLabel *cryohopLabel; QLabel *extractLabel; + QLabel *haleafLabel; + QLabel *hapelletLabel; + QLabel *hahopplugLabel; + QLabel *hawethopLabel; + QLabel *hacryohopLabel; QLabel *grainLabel; QLabel *brixLabel; QLabel *heightLabel; @@ -75,6 +80,11 @@ QDoubleSpinBox *wethopEdit; QDoubleSpinBox *cryohopEdit; QDoubleSpinBox *extractEdit; + QDoubleSpinBox *hapelletEdit; + QDoubleSpinBox *hahopplugEdit; + QDoubleSpinBox *haleafEdit; + QDoubleSpinBox *hawethopEdit; + QDoubleSpinBox *hacryohopEdit; QComboBox *waterEdit; QDoubleSpinBox *grainEdit; QDoubleSpinBox *brixEdit; diff -r 4aac0b672667 -r ef2638cfc1b7 src/global.cpp --- a/src/global.cpp Sun Oct 30 16:43:22 2022 +0100 +++ b/src/global.cpp Fri Nov 04 14:17:56 2022 +0100 @@ -22,6 +22,11 @@ double my_ut_wethop = 3.6; double my_ut_t45 = 50.0; double my_ut_co2extract = 35.0; +double my_ha_pellet = 2.67; +double my_ha_plug = 2.67; +double my_ha_leaf = 6.01; +double my_ha_wethop = 1.21; +double my_ha_t45 = 2.67; Recipe *recipe; diff -r 4aac0b672667 -r ef2638cfc1b7 src/global.h --- a/src/global.h Sun Oct 30 16:43:22 2022 +0100 +++ b/src/global.h Fri Nov 04 14:17:56 2022 +0100 @@ -701,6 +701,11 @@ extern double my_ut_wethop; extern double my_ut_t45; extern double my_ut_co2extract; +extern double my_ha_pellet; +extern double my_ha_plug; +extern double my_ha_leaf; +extern double my_ha_wethop; +extern double my_ha_t45; enum ProdStages { diff -r 4aac0b672667 -r ef2638cfc1b7 translations/bmsapp_en.ts --- a/translations/bmsapp_en.ts Sun Oct 30 16:43:22 2022 +0100 +++ b/translations/bmsapp_en.ts Fri Nov 04 14:17:56 2022 +0100 @@ -17,32 +17,32 @@ BeerType - + Lager - + Ale - + Mead - + Wheat - + Mixed - + Cider @@ -244,27 +244,27 @@ ChillerType - + - - + Immersion - + Counterflow - + Au bain marie - + No-chill @@ -8077,32 +8077,32 @@ FermentableAdded - + Mash - + Boil - + Fermentation - + Lagering - + Bottle - + Kegs @@ -8110,37 +8110,37 @@ FermentableGraintype - + Base - - Roast - - - - - Crystal - - - - - Kilned - - - - - Sour Malt - - - - - Special - - - + Roast + + + + + Crystal + + + + + Kilned + + + + + Sour Malt + + + + + Special + + + + No malt @@ -8148,27 +8148,27 @@ FermentableType - + Grain - + Sugar - + Extract - + Dry extract - + Adjunct @@ -8176,37 +8176,37 @@ HopForm - + Pellet - - Plug - - - - - Leaf - - - - - Leaf wet - - - - - Cryo - - - - - CO2 extract - - - + Plug + + + + + Leaf + + + + + Leaf wet + + + + + Cryo + + + + + CO2 extract + + + + Iso extract @@ -8214,17 +8214,17 @@ HopTypes - + Bittering - + Aroma - + Both @@ -8232,37 +8232,37 @@ HopUse - + Mash - - First wort - - - - - Boil - - - - - Aroma - - - - - Whirlpool - - - - - Dry hop - - - + First wort + + + + + Boil + + + + + Aroma + + + + + Whirlpool + + + + + Dry hop + + + + Bottling @@ -9226,37 +9226,37 @@ MiscType - + Spice - - Herb - - - - - Flavor - - - - - Fining - - - - - Water agent - - - - - Yeast nutrient - - - + Herb + + + + + Flavor + + + + + Fining + + + + + Water agent + + + + + Yeast nutrient + + + + Other @@ -9264,37 +9264,37 @@ MiscUse - + Starter - - Mash - - - - - Boil - - - - - Primary - - - - - Secondary - - - - - Bottling - - - + Mash + + + + + Boil + + + + + Primary + + + + + Secondary + + + + + Bottling + + + + Sparge @@ -11326,62 +11326,62 @@ ProdStages - + Plan - - Wait - - - - - Brew - - - - - Primary - - - - - Secondary - - - - - Tertiary - - - - Package + Wait - Carbonation + Brew - Mature + Primary - Taste + Secondary - Ready + Tertiary + Package + + + + + Carbonation + + + + + Mature + + + + + Taste + + + + + Ready + + + + Closed @@ -11714,17 +11714,17 @@ RecipeType - + Extract - + Partial Mash - + All Grain @@ -11907,191 +11907,250 @@ - + The efficiency for First Wort Hopping. - - - - - - - - - % - - - - - The efficiency for Mash hopping. - - - - - The utilisation for hop pellets, default 22 - - - - The utilisation for hop plugs, default 20.4 - - - - The utilisation for hop leafs, default 20 - - - - The uyilisation for fresh hops, default 3.6 - - - - The utilisation for using Cryo Hop®, default 50 - - - - The utilisation for using CO2 hop extract, default 35 - - - - - Grain Absorption: - - - - - Brix Correction factor: + + + + % + + + + + The efficiency for Mash hopping. + + + + + The utilisation for hop pellets, default 22 + + + + + The utilisation for hop plugs, default 20.4 + + + + + The utilisation for hop leafs, default 20 + + + + + The utilisation for fresh hops, default 3.6 + + + + + Hop Pellets water absorption: + + + + + Hop Plugs water absorption: + + + + + Hop Leafs water absorption: + + + + + Wet Hop water absorption: + + + + + Cryo Hop® water absorption: + The utilisation for using Cryo Hop®, default 50 + + + + + The utilisation for using CO2 hop extract, default 35 + + + + + Grain Absorption: + + + + + Brix Correction factor: + + + + Brewery height meters: - + Brew settings. - + Color Calculation: - + IBU Calculation: - + Default Water: - + Private Yeast bank: - + Absorption with water by the grain (L/Kg) - + L/Kg - + Plato to Brix conversion factor. - + Height in meters above/below sealevel to calculate the exact boiling point and hop isomerizon. - - - - + + The water absorption by hop pellets, default 2.67 + + + + + + + + + ml/gr + + + + + The water absorption by hop plugs, default 2.67 + + + + + The water absorption by hop leafs, default 6.01 + + + + + The water absorption by fresh hops, default 1.21 + + + + + The water absorption by Cryo Hop®, default 2.67 + + + + + + + Choose color - + Logo here - + Quit - + Save - + Load logo - - - + + + Setup - + Choose default water - + Choose laboratory - + Cannot load %1: %2 - + Open File - + Database error - + MySQL error: %1 %2 %3 - + Setup changed - + The global setup has been modified. Save changes? @@ -12099,37 +12158,37 @@ Splitter - + Not divided - - After mash - - - - - After boil - - - - - After cooling - - - - - After primary - - - - - After secondary - - - + After mash + + + + + After boil + + + + + After cooling + + + + + After primary + + + + + After secondary + + + + After tertiary @@ -12137,17 +12196,17 @@ StepType - + Infusion - + Temperature - + Decoction @@ -12163,22 +12222,22 @@ TunMaterial - + Stainless Steel - + Aluminium - + Plastics - + Copper @@ -12202,37 +12261,37 @@ YeastForm - + Liquid - - Dry - - - - - Slant - - - - - Culture - - - - - Frozen - - - - - Bottle - - - + Dry + + + + + Slant + + + + + Culture + + + + + Frozen + + + + + Bottle + + + + Dried @@ -12240,17 +12299,17 @@ YeastStarter - + Stirred - + Shaken - + Simple @@ -12258,42 +12317,42 @@ YeastType - + Lager - - Ale - - - - - Wheat - - - - - Wine - - - - - Champagne - - - - - Brett - - - - Kveik + Ale + Wheat + + + + + Wine + + + + + Champagne + + + + + Brett + + + + + Kveik + + + + Hybrid @@ -12301,22 +12360,22 @@ YeastUse - + Primary - + Secondary - + Tertiary - + Bottle diff -r 4aac0b672667 -r ef2638cfc1b7 translations/bmsapp_nl.ts --- a/translations/bmsapp_nl.ts Sun Oct 30 16:43:22 2022 +0100 +++ b/translations/bmsapp_nl.ts Fri Nov 04 14:17:56 2022 +0100 @@ -47,32 +47,32 @@ BeerType - + Lager Ondergist - + Ale Bovengist - + Mead Mede - + Wheat Tarwebier - + Mixed Gemengd - + Cider Cider @@ -281,22 +281,22 @@ ChillerType - + - - - + Immersion Dompel - + Counterflow Tegenstroom - + No-chill Niet-koelen @@ -309,7 +309,7 @@ Tegenstroom koeler - + Au bain marie Au bain marie @@ -8713,32 +8713,32 @@ FermentableAdded - + Mash Maischen - + Boil Koken - + Fermentation Hoofdvergisting - + Lagering Nagisting/lagering - + Bottle Bottelen - + Kegs Fusten @@ -8746,37 +8746,37 @@ FermentableGraintype - + Base Basismout - - Roast - Geroosterde mout - - - - Crystal - Cara/crystal mout - - - - Kilned - Geëeste mout - - - - Sour Malt - Zuurmout - - - - Special - Speciale mout - - + Roast + Geroosterde mout + + + + Crystal + Cara/crystal mout + + + + Kilned + Geëeste mout + + + + Sour Malt + Zuurmout + + + + Special + Speciale mout + + + No malt Geen mout @@ -8784,27 +8784,27 @@ FermentableType - + Grain Mout - + Sugar Suiker - + Extract - + Dry extract Droog extract - + Adjunct Ongemout graan @@ -8812,37 +8812,37 @@ HopForm - + Pellet Pellets - - Plug - Plugs - - - - Leaf - Bloemen - - - - Leaf wet - Nat, vers - - - - Cryo - Cryo hop - - - - CO2 extract - CO2 extract - - + Plug + Plugs + + + + Leaf + Bloemen + + + + Leaf wet + Nat, vers + + + + Cryo + Cryo hop + + + + CO2 extract + CO2 extract + + + Iso extract Iso extract @@ -8877,17 +8877,17 @@ HopTypes - + Bittering Bitterhop - + Aroma Aromahop - + Both Beide @@ -8895,37 +8895,37 @@ HopUse - + Mash Maischen - - First wort - Eerste wort - - - - Boil - Koken - - - - Aroma - Vlamuit - - - - Whirlpool - Hopstand - - - - Dry hop - Koudhop - - + First wort + Eerste wort + + + + Boil + Koken + + + + Aroma + Vlamuit + + + + Whirlpool + Hopstand + + + + Dry hop + Koudhop + + + Bottling Bottelen @@ -10113,37 +10113,37 @@ MiscType - + Spice Specerij - - Herb - Kruid - - - - Flavor - Smaakstof - - - - Fining - Klaringsmiddel - - - - Water agent - Brouwzout - - - - Yeast nutrient - Gistvoeding - - + Herb + Kruid + + + + Flavor + Smaakstof + + + + Fining + Klaringsmiddel + + + + Water agent + Brouwzout + + + + Yeast nutrient + Gistvoeding + + + Other Anders @@ -10151,37 +10151,37 @@ MiscUse - + Starter Starter - - Mash - Maischen - - - - Boil - Koken - - - - Primary - Hoofdgisting - - - - Secondary - Nagisting/lagering - - - - Bottling - Bottelen - - + Mash + Maischen + + + + Boil + Koken + + + + Primary + Hoofdgisting + + + + Secondary + Nagisting/lagering + + + + Bottling + Bottelen + + + Sparge Spoelen @@ -12373,62 +12373,62 @@ ProdStages - + Plan Plan - - Wait - Wacht - - - - Brew - Brouwen - - - - Primary - Hoofdgisting - - - - Secondary - Nagisting - - - - Tertiary - Lageren - - - Package - Verpakken + Wait + Wacht - Carbonation - Carbonatie + Brew + Brouwen - Mature - Rijpen + Primary + Hoofdgisting - Taste - Proeven + Secondary + Nagisting - Ready - Gereed + Tertiary + Lageren + Package + Verpakken + + + + Carbonation + Carbonatie + + + + Mature + Rijpen + + + + Taste + Proeven + + + + Ready + Gereed + + + Closed Gesloten @@ -13109,17 +13109,17 @@ RecipeType - + Extract Vloeibaar extract - + Partial Mash Deelmaisch - + All Grain Mout @@ -13283,44 +13283,43 @@ Cryo Hops® factor: - - - - - - - - + + + + + + + + % - + The utilisation for hop pellets, default 22 De efficientie van hop pellets, standaard 22 - + The utilisation for hop plugs, default 20.4 De efficientie van hop plugs, standaard 20,4 - + The utilisation for hop leafs, default 20 De efficientie van hop bloemen, standaard 20 - The uyilisation for fresh hops, default 3.6 - De efficientie van verse hop, standaard 3,6 - - - + De efficientie van verse hop, standaard 3,6 + + + The utilisation for using Cryo Hop®, default 50 De efficientie van Cryo Hop®, standaard 50 - + The utilisation for using CO2 hop extract, default 35 De efficientie van CO2 hop extract, standaard 35 @@ -13329,12 +13328,12 @@ Graan absorbtie: - + Brix Correction factor: Brix correctie factor: - + Brew settings. Brouw instellingen. @@ -13378,16 +13377,21 @@ CO2 hop extract efficientie: - + The efficiency for First Wort Hopping. De efficientie van First Wort Hopping. - + The efficiency for Mash hopping. De effecientie voor maisch hoppen. + + The utilisation for fresh hops, default 3.6 + De efficientie van verse hop, standaard 3,6 + + The efficiency for hop pellets. De efficientie van hop pellets. @@ -13404,27 +13408,27 @@ De efficientie van Cryo Hop®. - + Brewery height meters: Brouwerij hoogte in meters: - + Color Calculation: Kleur berekening: - + IBU Calculation: IBU berekening: - + Default Water: Standaard water: - + Private Yeast bank: Prive gistbank: @@ -13433,92 +13437,151 @@ Absorbtie met water door de mout (L/Kg) - + + Hop Pellets water absorption: + Hop pellets water absorptie: + + + + Hop Plugs water absorption: + Hop plugs water absorptie: + + + + Hop Leafs water absorption: + Hop bloemen water absorptie: + + + + Wet Hop water absorption: + Verse hop water absorptie: + + + + Cryo Hop® water absorption: + Cryo Hop® water absorptie: + + + Grain Absorption: Graan absorptie: - + Absorption with water by the grain (L/Kg) Absorptie met water door de mout (L/Kg) - + L/Kg L/Kg - + Plato to Brix conversion factor. Plato naar Brix correctie factor. - + Height in meters above/below sealevel to calculate the exact boiling point and hop isomerizon. Hoogte in meters boven/beneden de zeespiegel om het exacte kookpunt en hop isomersie te berekenen. - - - - + + The water absorption by hop pellets, default 2.67 + De water absorptie door hop pellets, standaard 2.67 ml/gr + + + + + + + + ml/gr + ml/gr + + + + The water absorption by hop plugs, default 2.67 + De water absorptie door hop plugs, standaard 2.67 ml/gr + + + + The water absorption by hop leafs, default 6.01 + De water absorptie door hop bloemen, standaard 6.01 ml/gr + + + + The water absorption by fresh hops, default 1.21 + De water absorptie door verse hop, standaard 1.21 ml/gr + + + + The water absorption by Cryo Hop®, default 2.67 + De water absorptie door Cryo Hop®, standaard 2.67 ml/gr + + + + + + Choose color Kies kleur - + Logo here Logo komt hier - + Quit Terug - + Save Bewaar - + Load logo Laad logo - - - + + + Setup Instellingen - + Choose default water Kies standaard water - + Choose laboratory Kies laboratorium - + Cannot load %1: %2 Kan niet laden %1: %2 - + Open File Open bestand - + Database error Database fout - + MySQL error: %1 %2 %3 @@ -13527,12 +13590,12 @@ %3 - + Setup changed Instellingen gewijzigd - + The global setup has been modified. Save changes? De globale setup is gewijzigd. Wijzigingen opslaan? @@ -13546,37 +13609,37 @@ Splitter - + Not divided Niet gesplitst - - After mash - Na maischen - - - - After boil - Na koken - - - - After cooling - Na koelen - - - - After primary - Na hoofdgisting - - - - After secondary - Na nagisting - - + After mash + Na maischen + + + + After boil + Na koken + + + + After cooling + Na koelen + + + + After primary + Na hoofdgisting + + + + After secondary + Na nagisting + + + After tertiary Na lageren @@ -13584,17 +13647,17 @@ StepType - + Infusion Infusie - + Temperature Verwarmen - + Decoction Decoctie @@ -13610,22 +13673,22 @@ TunMaterial - + Stainless Steel RVS - + Aluminium Aluminium - + Plastics Kunststof - + Copper Koper @@ -13649,37 +13712,37 @@ YeastForm - + Liquid Vloeibaar - - Dry - Droog - - - - Slant - Schuine buis - - - - Culture - Slurry - - - - Frozen - Ingevroren - - - - Bottle - Flesdepot - - + Dry + Droog + + + + Slant + Schuine buis + + + + Culture + Slurry + + + + Frozen + Ingevroren + + + + Bottle + Flesdepot + + + Dried Gedroogd @@ -13687,17 +13750,17 @@ YeastStarter - + Stirred Geroerd - + Shaken Geschud - + Simple Simpel @@ -13705,42 +13768,42 @@ YeastType - + Lager Ondergist - - Ale - Bovengist - - - - Wheat - Tarwegist - - - - Wine - Wijngist - - - - Champagne - Champagnegist - - - - Brett - Brett - - - Kveik - Kveik + Ale + Bovengist + Wheat + Tarwegist + + + + Wine + Wijngist + + + + Champagne + Champagnegist + + + + Brett + Brett + + + + Kveik + Kveik + + + Hybrid Hybride @@ -13748,22 +13811,22 @@ YeastUse - + Primary Hoofdgisting - + Secondary Nagisting - + Tertiary Lageren - + Bottle Bottelgist