Sat, 14 Jan 2023 14:14:59 +0100
In print checklist show volume after boil inclusive immersion chiller volume. Improved some prompts in equipment edit.
--- a/src/PrinterDialog.cpp Sat Jan 14 11:34:51 2023 +0100 +++ b/src/PrinterDialog.cpp Sat Jan 14 14:14:59 2023 +0100 @@ -1859,11 +1859,16 @@ } } checkInput(&painter, &y, QString(tr("Target volume at end of boil: %1 liter (%2 cm below kettle top)")) - .arg(product->batch_size * 1.04 * factor, 1, 'f', 1) - .arg(Utils::kettle_cm(product->batch_size * 1.04 * factor, product->eq_kettle_volume, product->eq_kettle_height)), + .arg(((product->batch_size * 1.04) + product->eq_chiller_volume) * factor, 1, 'f', 1) + .arg(Utils::kettle_cm(((product->batch_size * 1.04) + product->eq_chiller_volume) * factor, product->eq_kettle_volume, product->eq_kettle_height)), QString(tr("cm"))); checkInput(&painter, &y, QString(tr("Target SG at end of boil: ")) + strDensity(product->est_og3), QString(tr("SG"))); - checkInput(&painter, &y, "", QString(tr("pH"))); + if (product->brew_cooling_method == CHILLER_TYPE_IMMERSION) { + messageInput(&painter, &y, QString(tr("Note: target volume includes chiller %1 liter")) + .arg(product->eq_chiller_volume, 1, 'f', 1), QString(tr("pH"))); + } else { + checkInput(&painter, &y, "", QString(tr("pH"))); + } if (checkSplit(&painter, &y, 2)) factor = 1; } else { @@ -2439,6 +2444,17 @@ } +void PrinterDialog::messageInput(QPainter *painter, qreal *y, QString text, QString prompt) +{ + if (text != "") { + painter->drawText(50, *y,480, 20, Qt::AlignLeft, text); + } + painter->drawText(515, *y, 150, 20, Qt::AlignRight, QString(tr("Measured:")) + QString(" _________")); + painter->drawText(675, *y, 60, 20, Qt::AlignLeft, prompt); + *y += 20; +} + + bool PrinterDialog::checkSplit(QPainter *painter, qreal *y, int moment) { if (product->divide_type && product->divide_type == moment) {
--- a/src/PrinterDialog.h Sat Jan 14 11:34:51 2023 +0100 +++ b/src/PrinterDialog.h Sat Jan 14 14:14:59 2023 +0100 @@ -42,6 +42,7 @@ void checkHeader(QPainter *painter, qreal *y, QString text); void checkLine(QPainter *painter, qreal *y, QString text); void checkInput(QPainter *painter, qreal *y, QString text, QString prompt); + void messageInput(QPainter *painter, qreal *y, QString text, QString prompt); bool checkSplit(QPainter *painter, qreal *y, int moment); };
--- a/translations/bmsapp_en.ts Sat Jan 14 11:34:51 2023 +0100 +++ b/translations/bmsapp_en.ts Sat Jan 14 14:14:59 2023 +0100 @@ -1129,104 +1129,109 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="704"/> - <source>Boil size L:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditEquipment.ui" line="748"/> + <location filename="../ui/EditEquipment.ui" line="676"/> + <source>Measured inside the kettle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditEquipment.ui" line="707"/> + <source>Boil size at 100 °C L:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditEquipment.ui" line="799"/> + <source>Batch size at 100 °C L:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditEquipment.ui" line="751"/> <source>Evaporation L/hour:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="764"/> + <location filename="../ui/EditEquipment.ui" line="767"/> <source>Boil time minutes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="780"/> + <location filename="../ui/EditEquipment.ui" line="783"/> <source>Top up kettle L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="796"/> - <source>Batch size L:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditEquipment.ui" line="930"/> + <location filename="../ui/EditEquipment.ui" line="933"/> <source>Kettle trub loss L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="975"/> + <location filename="../ui/EditEquipment.ui" line="978"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="990"/> + <location filename="../ui/EditEquipment.ui" line="993"/> <source>Extra water in fermenter L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1006"/> + <location filename="../ui/EditEquipment.ui" line="1009"/> <source>Volume in fermenter L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1085"/> + <location filename="../ui/EditEquipment.ui" line="1088"/> <source>Clone</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1102"/> + <location filename="../ui/EditEquipment.ui" line="1105"/> <source>Chilling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1114"/> + <location filename="../ui/EditEquipment.ui" line="1117"/> <source>Wort chiller type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1140"/> + <location filename="../ui/EditEquipment.ui" line="1143"/> <source>Minutes elapsed to cool to 79 °C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1171"/> + <location filename="../ui/EditEquipment.ui" line="1174"/> <source>Minutes to cool to 79 °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1187"/> + <location filename="../ui/EditEquipment.ui" line="1190"/> <source>Volume lost in hoses, pump ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1227"/> + <location filename="../ui/EditEquipment.ui" line="1230"/> <source>Transfer loss L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1243"/> + <location filename="../ui/EditEquipment.ui" line="1246"/> <source>Immersion chiller L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1259"/> + <location filename="../ui/EditEquipment.ui" line="1262"/> <source>Temporary extra volume of the immersion chiller in the kettle. Used to correct the after boil volume.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1291"/> + <location filename="../ui/EditEquipment.ui" line="1294"/> <source>Liters per minute to pump trough the chiller. Used to calculate the time needed to transfer the wort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1323"/> + <location filename="../ui/EditEquipment.ui" line="1326"/> <source>Transfer liters/minute:</source> <translation type="unfinished"></translation> </message> @@ -9752,7 +9757,7 @@ <location filename="../src/PrinterDialog.cpp" line="285"/> <location filename="../src/PrinterDialog.cpp" line="472"/> <location filename="../src/PrinterDialog.cpp" line="885"/> - <location filename="../src/PrinterDialog.cpp" line="2365"/> + <location filename="../src/PrinterDialog.cpp" line="2370"/> <source>Yeast</source> <translation type="unfinished"></translation> </message> @@ -10025,7 +10030,8 @@ <location filename="../src/PrinterDialog.cpp" line="1750"/> <location filename="../src/PrinterDialog.cpp" line="1778"/> <location filename="../src/PrinterDialog.cpp" line="1786"/> - <location filename="../src/PrinterDialog.cpp" line="1866"/> + <location filename="../src/PrinterDialog.cpp" line="1868"/> + <location filename="../src/PrinterDialog.cpp" line="1870"/> <source>pH</source> <translation type="unfinished"></translation> </message> @@ -10060,9 +10066,9 @@ </message> <message> <location filename="../src/PrinterDialog.cpp" line="766"/> - <location filename="../src/PrinterDialog.cpp" line="2256"/> - <location filename="../src/PrinterDialog.cpp" line="2508"/> - <location filename="../src/PrinterDialog.cpp" line="2512"/> + <location filename="../src/PrinterDialog.cpp" line="2261"/> + <location filename="../src/PrinterDialog.cpp" line="2524"/> + <location filename="../src/PrinterDialog.cpp" line="2528"/> <source>Beer style</source> <translation type="unfinished"></translation> </message> @@ -10700,362 +10706,368 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1870"/> + <location filename="../src/PrinterDialog.cpp" line="1867"/> + <source>Note: target volume includes chiller %1 liter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1875"/> <source>This is a `no-boil` recipe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1895"/> + <location filename="../src/PrinterDialog.cpp" line="1900"/> <source>Whirlpool(s) and cooling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1897"/> + <location filename="../src/PrinterDialog.cpp" line="1902"/> <source>Wirlpool for %1 minutes. Keep temp above 85°C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1899"/> - <source>Wirlpool for %1 minutes. Keep temp between 72 and 79°C</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="1901"/> - <source>Wirlpool for %1 minutes. Keep temp between 60 and 66°C</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="1904"/> + <source>Wirlpool for %1 minutes. Keep temp between 72 and 79°C</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1906"/> + <source>Wirlpool for %1 minutes. Keep temp between 60 and 66°C</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1909"/> <source>%1 gr `%2` for %3 minutes in the whirlpool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1908"/> <location filename="../src/PrinterDialog.cpp" line="1913"/> + <location filename="../src/PrinterDialog.cpp" line="1918"/> <source>Cool to %1°C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1910"/> - <source>Wirlpool for %1 minutes.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="1912"/> - <source>Cooling</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="1915"/> - <source>Desinfect fermenter and pump and hoses if needed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="1916"/> - <source>Transfer about %1 liter wort to the fermenter</source> + <source>Wirlpool for %1 minutes.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="1917"/> + <source>Cooling</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1920"/> + <source>Desinfect fermenter and pump and hoses if needed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1921"/> + <source>Transfer about %1 liter wort to the fermenter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1922"/> <source>Liter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1942"/> + <location filename="../src/PrinterDialog.cpp" line="1947"/> <source>Yeast pitching and fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1946"/> + <location filename="../src/PrinterDialog.cpp" line="1951"/> <source>%1 pack %2, `%3` yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1950"/> + <location filename="../src/PrinterDialog.cpp" line="1955"/> <source>%1 gram %2, `%3` yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1954"/> + <location filename="../src/PrinterDialog.cpp" line="1959"/> <source>%1 ml %2, `%3` yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1960"/> + <location filename="../src/PrinterDialog.cpp" line="1965"/> <source>Pitch yeast at %1°C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1966"/> - <source>Pitch yeast dry into the wort</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="1969"/> - <source>Add decanted yeast starter</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="1971"/> - <source>Add the yeast</source> + <source>Pitch yeast dry into the wort</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="1974"/> - <source>Add %1 liter water in the fermenter</source> + <source>Add decanted yeast starter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="1976"/> - <source>Aerate %1 minutes with %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="1978"/> - <source>Set fermentation start temperature to %1°C</source> + <source>Add the yeast</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="1979"/> + <source>Add %1 liter water in the fermenter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1981"/> + <source>Aerate %1 minutes with %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1983"/> + <source>Set fermentation start temperature to %1°C</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1984"/> <source>Start fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1997"/> + <location filename="../src/PrinterDialog.cpp" line="2002"/> <source>Primary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2000"/> + <location filename="../src/PrinterDialog.cpp" line="2005"/> <source>Add %1 kg `%2` on day 3 or 4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2006"/> + <location filename="../src/PrinterDialog.cpp" line="2011"/> <source>Add %1 %2 `%3` on day 3 or 4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2030"/> + <location filename="../src/PrinterDialog.cpp" line="2035"/> <source>Secondary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2034"/> - <location filename="../src/PrinterDialog.cpp" line="2092"/> + <location filename="../src/PrinterDialog.cpp" line="2039"/> + <location filename="../src/PrinterDialog.cpp" line="2097"/> <source>Add %1 pack %2, `%3` yeast (with starter if needed)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2037"/> - <location filename="../src/PrinterDialog.cpp" line="2095"/> + <location filename="../src/PrinterDialog.cpp" line="2042"/> + <location filename="../src/PrinterDialog.cpp" line="2100"/> <source>Add %1 gram %2, `%3`</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2040"/> + <location filename="../src/PrinterDialog.cpp" line="2045"/> <source>Add %1 gram %2, `%3` yeast (with starter if needed)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2046"/> + <location filename="../src/PrinterDialog.cpp" line="2051"/> <source>After %1 hours harvest yeast from the %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2077"/> + <location filename="../src/PrinterDialog.cpp" line="2082"/> <source>Tertiary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2080"/> - <source>Add %1 kg `%2`</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2085"/> + <source>Add %1 kg `%2`</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2090"/> <source>Add %1 gram `%2` for %3 days</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2098"/> + <location filename="../src/PrinterDialog.cpp" line="2103"/> <source>Add %1 ml %2, `%3` yeast (with starter if needed)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2107"/> + <location filename="../src/PrinterDialog.cpp" line="2112"/> <source>Add %1 %2 `%3` for %4 days</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2137"/> + <location filename="../src/PrinterDialog.cpp" line="2142"/> <source>Packaging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2140"/> + <location filename="../src/PrinterDialog.cpp" line="2145"/> <source>Bottling add %1 kg `%2` with %3 liter water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2144"/> + <location filename="../src/PrinterDialog.cpp" line="2149"/> <source>Kegging add %1 kg `%2` with %3 liter water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2151"/> + <location filename="../src/PrinterDialog.cpp" line="2156"/> <source>Add %1, `%2` as bottle yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2154"/> + <location filename="../src/PrinterDialog.cpp" line="2159"/> <source>Add %1 gram %2, `%3` as bottle yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2158"/> + <location filename="../src/PrinterDialog.cpp" line="2163"/> <source>Add %1 ml %2, `%3` as bottle yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2167"/> + <location filename="../src/PrinterDialog.cpp" line="2172"/> <source>Add %1 %2 `%3` during bottling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2173"/> + <location filename="../src/PrinterDialog.cpp" line="2178"/> <source>Add %1 gr `%2`</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2188"/> + <location filename="../src/PrinterDialog.cpp" line="2193"/> <source>Number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2189"/> + <location filename="../src/PrinterDialog.cpp" line="2194"/> <source>Year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2190"/> + <location filename="../src/PrinterDialog.cpp" line="2195"/> <source>Brew sessions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2191"/> + <location filename="../src/PrinterDialog.cpp" line="2196"/> <source>Brew volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2192"/> + <location filename="../src/PrinterDialog.cpp" line="2197"/> <source>Average volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2254"/> - <location filename="../src/PrinterDialog.cpp" line="2363"/> - <source>Code</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2255"/> - <location filename="../src/PrinterDialog.cpp" line="2364"/> - <source>Name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2257"/> - <source>Max extract</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2258"/> - <source>Mash eff.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2259"/> - <source>Sparge eff</source> + <location filename="../src/PrinterDialog.cpp" line="2368"/> + <source>Code</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2260"/> + <location filename="../src/PrinterDialog.cpp" line="2369"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2262"/> + <source>Max extract</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2263"/> + <source>Mash eff.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2264"/> + <source>Sparge eff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2265"/> <source>Boil eff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2366"/> - <source>Primary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2367"/> - <source>Secondary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2368"/> - <source>Tertiary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2369"/> - <source>Days</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2370"/> - <source>OG</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2371"/> - <source>FG</source> + <source>Primary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2372"/> + <source>Secondary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2373"/> + <source>Tertiary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2374"/> + <source>Days</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2375"/> + <source>OG</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2376"/> + <source>FG</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2377"/> <source>AA</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2436"/> + <location filename="../src/PrinterDialog.cpp" line="2441"/> + <location filename="../src/PrinterDialog.cpp" line="2452"/> <source>Measured:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2448"/> + <location filename="../src/PrinterDialog.cpp" line="2464"/> <source>%1 split the batch here!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2487"/> + <location filename="../src/PrinterDialog.cpp" line="2503"/> <source>Inventory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2489"/> - <source>Yeastbank</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2495"/> - <source>Year production</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2497"/> - <source>Brew efficiency</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2499"/> - <source>Fermentations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2505"/> + <source>Yeastbank</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2511"/> + <source>Year production</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2513"/> + <source>Brew efficiency</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2515"/> + <source>Fermentations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2521"/> <source>Date and time</source> <translation type="unfinished"></translation> </message>
--- a/translations/bmsapp_nl.ts Sat Jan 14 11:34:51 2023 +0100 +++ b/translations/bmsapp_nl.ts Sat Jan 14 14:14:59 2023 +0100 @@ -1186,61 +1186,76 @@ <translation>Kookketel hoogte cm:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="930"/> + <location filename="../ui/EditEquipment.ui" line="676"/> + <source>Measured inside the kettle</source> + <translation>Gemeten binnen in de ketel</translation> + </message> + <message> + <location filename="../ui/EditEquipment.ui" line="707"/> + <source>Boil size at 100 °C L:</source> + <translation>Kook volume bij 100 °C L:</translation> + </message> + <message> + <location filename="../ui/EditEquipment.ui" line="799"/> + <source>Batch size at 100 °C L:</source> + <translation>Eind volume bij 100 °C L:</translation> + </message> + <message> + <location filename="../ui/EditEquipment.ui" line="933"/> <source>Kettle trub loss L:</source> <translation>Kookketel trub verlies L:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="975"/> + <location filename="../ui/EditEquipment.ui" line="978"/> <source>Transfer</source> <translation>Overbrengen</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1114"/> + <location filename="../ui/EditEquipment.ui" line="1117"/> <source>Wort chiller type:</source> <translation>Wort koeler type:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1140"/> + <location filename="../ui/EditEquipment.ui" line="1143"/> <source>Minutes elapsed to cool to 79 °C</source> <translation>Nodige minuten om tot 79 °C te koelen</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1171"/> + <location filename="../ui/EditEquipment.ui" line="1174"/> <source>Minutes to cool to 79 °C:</source> <translation>Minuten koelen tot 79 °C:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1187"/> + <location filename="../ui/EditEquipment.ui" line="1190"/> <source>Volume lost in hoses, pump ...</source> <translation>Verlies in slangen, pomp ...</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1227"/> + <location filename="../ui/EditEquipment.ui" line="1230"/> <source>Transfer loss L:</source> <translation>Overbrengen verlies L:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1243"/> + <location filename="../ui/EditEquipment.ui" line="1246"/> <source>Immersion chiller L:</source> <translation>Dompelkoeler L:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1259"/> + <location filename="../ui/EditEquipment.ui" line="1262"/> <source>Temporary extra volume of the immersion chiller in the kettle. Used to correct the after boil volume.</source> <translation>Tijdelijk extra volume in de kookketel. Wordt gebruikt als correctie voor na koken volume.</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1291"/> + <location filename="../ui/EditEquipment.ui" line="1294"/> <source>Liters per minute to pump trough the chiller. Used to calculate the time needed to transfer the wort.</source> <translation>Liters per minuut pompen door de koeler. Gebruikt om de tijd te berekenen om het wort weg te pompen.</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1323"/> + <location filename="../ui/EditEquipment.ui" line="1326"/> <source>Transfer liters/minute:</source> <translation>Overbrengen liters/minuut:</translation> </message> @@ -1277,22 +1292,21 @@ <translation type="vanished">Kookketel hoogte cm:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="704"/> <source>Boil size L:</source> - <translation>Kook volume L:</translation> - </message> - <message> - <location filename="../ui/EditEquipment.ui" line="748"/> + <translation type="vanished">Kook volume L:</translation> + </message> + <message> + <location filename="../ui/EditEquipment.ui" line="751"/> <source>Evaporation L/hour:</source> <translation>Verdamping per uur L:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="764"/> + <location filename="../ui/EditEquipment.ui" line="767"/> <source>Boil time minutes:</source> <translation>Kooktijd minuten:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="780"/> + <location filename="../ui/EditEquipment.ui" line="783"/> <source>Top up kettle L:</source> <translation>Extra water bij koken L:</translation> </message> @@ -1301,16 +1315,15 @@ <translation type="vanished">Hop efficientie %:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="796"/> <source>Batch size L:</source> - <translation>Volume einde kook L:</translation> + <translation type="vanished">Volume einde kook L:</translation> </message> <message> <source>100% for small breweries, higher for large breweries.</source> <translation type="vanished">100% voor kleine brouwerijen, hoger voor grote.</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1102"/> + <location filename="../ui/EditEquipment.ui" line="1105"/> <source>Chilling</source> <translation>Koelen</translation> </message> @@ -1319,17 +1332,17 @@ <translation type="vanished">Trub en koeler verlies L:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="990"/> + <location filename="../ui/EditEquipment.ui" line="993"/> <source>Extra water in fermenter L:</source> <translation>Extra water in gistvat L:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1006"/> + <location filename="../ui/EditEquipment.ui" line="1009"/> <source>Volume in fermenter L:</source> <translation>Volume naar het gistvat L:</translation> </message> <message> - <location filename="../ui/EditEquipment.ui" line="1085"/> + <location filename="../ui/EditEquipment.ui" line="1088"/> <source>Clone</source> <translation>Kloon</translation> </message> @@ -10821,7 +10834,7 @@ <location filename="../src/PrinterDialog.cpp" line="285"/> <location filename="../src/PrinterDialog.cpp" line="472"/> <location filename="../src/PrinterDialog.cpp" line="885"/> - <location filename="../src/PrinterDialog.cpp" line="2365"/> + <location filename="../src/PrinterDialog.cpp" line="2370"/> <source>Yeast</source> <translation>Gist</translation> </message> @@ -11094,7 +11107,8 @@ <location filename="../src/PrinterDialog.cpp" line="1750"/> <location filename="../src/PrinterDialog.cpp" line="1778"/> <location filename="../src/PrinterDialog.cpp" line="1786"/> - <location filename="../src/PrinterDialog.cpp" line="1866"/> + <location filename="../src/PrinterDialog.cpp" line="1868"/> + <location filename="../src/PrinterDialog.cpp" line="1870"/> <source>pH</source> <translation>pH</translation> </message> @@ -11688,7 +11702,12 @@ <translation>Plaats spiraalkoeler 10 minuten voor het eind van de kook</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1916"/> + <location filename="../src/PrinterDialog.cpp" line="1867"/> + <source>Note: target volume includes chiller %1 liter</source> + <translation>Noot: doel volume inclusief koeler %1 liter</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1921"/> <source>Transfer about %1 liter wort to the fermenter</source> <translation>Breng ongeveer %1 liter wort over naar het gistvat</translation> </message> @@ -11776,53 +11795,53 @@ <translation>Doel SG einde koken: </translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1870"/> + <location filename="../src/PrinterDialog.cpp" line="1875"/> <source>This is a `no-boil` recipe</source> <translation>Dit is een `no-boil` recept</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1895"/> + <location filename="../src/PrinterDialog.cpp" line="1900"/> <source>Whirlpool(s) and cooling</source> <translation>Whirlpools en koelen</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1897"/> + <location filename="../src/PrinterDialog.cpp" line="1902"/> <source>Wirlpool for %1 minutes. Keep temp above 85°C</source> <translation>Whirlpool voor %1 minuten. Houd temp boven 85°C</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1899"/> - <source>Wirlpool for %1 minutes. Keep temp between 72 and 79°C</source> - <translation>Whirlpool voor %1 minuten. Houd temp tussen 72 en 79°C</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="1901"/> - <source>Wirlpool for %1 minutes. Keep temp between 60 and 66°C</source> - <translation>Whirlpool voor %1 minuten. Houd temp tussen 60 en 66°C</translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="1904"/> + <source>Wirlpool for %1 minutes. Keep temp between 72 and 79°C</source> + <translation>Whirlpool voor %1 minuten. Houd temp tussen 72 en 79°C</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1906"/> + <source>Wirlpool for %1 minutes. Keep temp between 60 and 66°C</source> + <translation>Whirlpool voor %1 minuten. Houd temp tussen 60 en 66°C</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1909"/> <source>%1 gr `%2` for %3 minutes in the whirlpool</source> <translation>%1 gr `%2` voor %3 minuten in de whirlpool</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1908"/> <location filename="../src/PrinterDialog.cpp" line="1913"/> + <location filename="../src/PrinterDialog.cpp" line="1918"/> <source>Cool to %1°C</source> <translation>Koel tot %1°C</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1910"/> - <source>Wirlpool for %1 minutes.</source> - <translation>Whirlpool voor %1 minuten.</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="1912"/> - <source>Cooling</source> - <translation>Koelen</translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="1915"/> + <source>Wirlpool for %1 minutes.</source> + <translation>Whirlpool voor %1 minuten.</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1917"/> + <source>Cooling</source> + <translation>Koelen</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1920"/> <source>Desinfect fermenter and pump and hoses if needed</source> <translation>Ontsmet het gistvat en eventueel de pomp en slangen</translation> </message> @@ -11831,314 +11850,315 @@ <translation type="vanished">Breng het wort over naar het gistvat</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1917"/> + <location filename="../src/PrinterDialog.cpp" line="1922"/> <source>Liter</source> <translation>Liter</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1942"/> + <location filename="../src/PrinterDialog.cpp" line="1947"/> <source>Yeast pitching and fermentation</source> <translation>Gist enten en vergisten</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1946"/> + <location filename="../src/PrinterDialog.cpp" line="1951"/> <source>%1 pack %2, `%3` yeast</source> <translation>%1 pak %2, `%3` gist</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1950"/> + <location filename="../src/PrinterDialog.cpp" line="1955"/> <source>%1 gram %2, `%3` yeast</source> <translation>%1 gram %2, `%3` gist</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1954"/> + <location filename="../src/PrinterDialog.cpp" line="1959"/> <source>%1 ml %2, `%3` yeast</source> <translation>%1 ml %2, `%3` gist</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1960"/> + <location filename="../src/PrinterDialog.cpp" line="1965"/> <source>Pitch yeast at %1°C</source> <translation>Ent gist bij %1°C</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1966"/> - <source>Pitch yeast dry into the wort</source> - <translation>Strooi de gist over het wort</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="1969"/> - <source>Add decanted yeast starter</source> - <translation>Toevoegen afgegoten giststarter</translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="1971"/> - <source>Add the yeast</source> - <translation>Gist toevoegen</translation> + <source>Pitch yeast dry into the wort</source> + <translation>Strooi de gist over het wort</translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="1974"/> - <source>Add %1 liter water in the fermenter</source> - <translation>Voeg %1 liter water toe in het gistvat</translation> + <source>Add decanted yeast starter</source> + <translation>Toevoegen afgegoten giststarter</translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="1976"/> - <source>Aerate %1 minutes with %2</source> - <translation>Belucht %1 minuten met %2</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="1978"/> - <source>Set fermentation start temperature to %1°C</source> - <translation>Zet de vergisting start temperatuur op %1°C</translation> + <source>Add the yeast</source> + <translation>Gist toevoegen</translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="1979"/> + <source>Add %1 liter water in the fermenter</source> + <translation>Voeg %1 liter water toe in het gistvat</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1981"/> + <source>Aerate %1 minutes with %2</source> + <translation>Belucht %1 minuten met %2</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1983"/> + <source>Set fermentation start temperature to %1°C</source> + <translation>Zet de vergisting start temperatuur op %1°C</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1984"/> <source>Start fermentation</source> <translation>Start vergisten</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1997"/> + <location filename="../src/PrinterDialog.cpp" line="2002"/> <source>Primary fermentation</source> <translation>Hoofdvergisting</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2000"/> + <location filename="../src/PrinterDialog.cpp" line="2005"/> <source>Add %1 kg `%2` on day 3 or 4</source> <translation>Voeg %1 kg `%2` toe op dag 3 of 4</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2006"/> + <location filename="../src/PrinterDialog.cpp" line="2011"/> <source>Add %1 %2 `%3` on day 3 or 4</source> <translation>Voeg %1 %2 `%3` toe op dag 3 of 4</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2030"/> + <location filename="../src/PrinterDialog.cpp" line="2035"/> <source>Secondary fermentation</source> <translation>Nagisting</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2034"/> - <location filename="../src/PrinterDialog.cpp" line="2092"/> + <location filename="../src/PrinterDialog.cpp" line="2039"/> + <location filename="../src/PrinterDialog.cpp" line="2097"/> <source>Add %1 pack %2, `%3` yeast (with starter if needed)</source> <translation>Voeg %1 pak(ken) %2, `%3` gist toe (eventueel met starter)</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2037"/> - <location filename="../src/PrinterDialog.cpp" line="2095"/> + <location filename="../src/PrinterDialog.cpp" line="2042"/> + <location filename="../src/PrinterDialog.cpp" line="2100"/> <source>Add %1 gram %2, `%3`</source> <translation>Toevoegen %1 gram %2, `%3`</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2040"/> + <location filename="../src/PrinterDialog.cpp" line="2045"/> <source>Add %1 gram %2, `%3` yeast (with starter if needed)</source> <translation>Voeg %1 gram %2, `%3` gist toe (eventueel met starter)</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2046"/> + <location filename="../src/PrinterDialog.cpp" line="2051"/> <source>After %1 hours harvest yeast from the %2</source> <translation>Na %1 uur oogst de gist vanaf de %2</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2077"/> + <location filename="../src/PrinterDialog.cpp" line="2082"/> <source>Tertiary fermentation</source> <translation>Lageren</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2080"/> - <source>Add %1 kg `%2`</source> - <translation>Toevoegen %1 kg `%2`</translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2085"/> + <source>Add %1 kg `%2`</source> + <translation>Toevoegen %1 kg `%2`</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2090"/> <source>Add %1 gram `%2` for %3 days</source> <translation>Toevoegen %1 gram `%2` voor %3 dagen</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2098"/> + <location filename="../src/PrinterDialog.cpp" line="2103"/> <source>Add %1 ml %2, `%3` yeast (with starter if needed)</source> <translation>Voeg %1 ml %2, `%3` gist toe (eventueel met starter)</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2107"/> + <location filename="../src/PrinterDialog.cpp" line="2112"/> <source>Add %1 %2 `%3` for %4 days</source> <translation>Toevoegen %1 %2 `%3` voor %4 dagen</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2137"/> + <location filename="../src/PrinterDialog.cpp" line="2142"/> <source>Packaging</source> <translation>Verpakken</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2140"/> + <location filename="../src/PrinterDialog.cpp" line="2145"/> <source>Bottling add %1 kg `%2` with %3 liter water</source> <translation>Bottelen met %1 kg `%2` en %3 liter water</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2144"/> + <location filename="../src/PrinterDialog.cpp" line="2149"/> <source>Kegging add %1 kg `%2` with %3 liter water</source> <translation>Keggen met %1 kg `%2` en %3 liter water</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2151"/> + <location filename="../src/PrinterDialog.cpp" line="2156"/> <source>Add %1, `%2` as bottle yeast</source> <translation>Toevoegen %1, `%%2` als bottelgist</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2154"/> + <location filename="../src/PrinterDialog.cpp" line="2159"/> <source>Add %1 gram %2, `%3` as bottle yeast</source> <translation>Toevoegen %1 gram %2, `%3` als bottelgist</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2158"/> + <location filename="../src/PrinterDialog.cpp" line="2163"/> <source>Add %1 ml %2, `%3` as bottle yeast</source> <translation>Toevoegen %1 ml %2, `%3` als bottelgist</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2167"/> + <location filename="../src/PrinterDialog.cpp" line="2172"/> <source>Add %1 %2 `%3` during bottling</source> <translation>Toevoegen %1 %2 `%3` tijdens bottelen</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2173"/> + <location filename="../src/PrinterDialog.cpp" line="2178"/> <source>Add %1 gr `%2`</source> <translation>Toevoegen %1 gr `%2`</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2188"/> + <location filename="../src/PrinterDialog.cpp" line="2193"/> <source>Number</source> <translation>Nummer</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2189"/> + <location filename="../src/PrinterDialog.cpp" line="2194"/> <source>Year</source> <translation>Jaar</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2190"/> + <location filename="../src/PrinterDialog.cpp" line="2195"/> <source>Brew sessions</source> <translation>Brouw sessies</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2191"/> + <location filename="../src/PrinterDialog.cpp" line="2196"/> <source>Brew volume</source> <translation>Brouw volume</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2192"/> + <location filename="../src/PrinterDialog.cpp" line="2197"/> <source>Average volume</source> <translation>Gemiddeld volume</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2254"/> - <location filename="../src/PrinterDialog.cpp" line="2363"/> - <source>Code</source> - <translation>Code</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2255"/> - <location filename="../src/PrinterDialog.cpp" line="2364"/> - <source>Name</source> - <translation>Naam</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2257"/> - <source>Max extract</source> - <translation>Max extract</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2258"/> - <source>Mash eff.</source> - <translation>Maisch %</translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2259"/> - <source>Sparge eff</source> - <translation>Spoelen %</translation> + <location filename="../src/PrinterDialog.cpp" line="2368"/> + <source>Code</source> + <translation>Code</translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2260"/> + <location filename="../src/PrinterDialog.cpp" line="2369"/> + <source>Name</source> + <translation>Naam</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2262"/> + <source>Max extract</source> + <translation>Max extract</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2263"/> + <source>Mash eff.</source> + <translation>Maisch %</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2264"/> + <source>Sparge eff</source> + <translation>Spoelen %</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2265"/> <source>Boil eff</source> <translation>Koken %</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2366"/> - <source>Primary</source> - <translation>Hoofdgisting</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2367"/> - <source>Secondary</source> - <translation>Nagisten</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2368"/> - <source>Tertiary</source> - <translation>Lageren</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2369"/> - <source>Days</source> - <translation>Dagen</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2370"/> - <source>OG</source> - <translation>OG</translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2371"/> - <source>FG</source> - <translation>FG</translation> + <source>Primary</source> + <translation>Hoofdgisting</translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2372"/> + <source>Secondary</source> + <translation>Nagisten</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2373"/> + <source>Tertiary</source> + <translation>Lageren</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2374"/> + <source>Days</source> + <translation>Dagen</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2375"/> + <source>OG</source> + <translation>OG</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2376"/> + <source>FG</source> + <translation>FG</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2377"/> <source>AA</source> <translation>SVG</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2436"/> + <location filename="../src/PrinterDialog.cpp" line="2441"/> + <location filename="../src/PrinterDialog.cpp" line="2452"/> <source>Measured:</source> <translation>Gemeten:</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2448"/> + <location filename="../src/PrinterDialog.cpp" line="2464"/> <source>%1 split the batch here!</source> <translation>%1 splits de batch hier!</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2487"/> + <location filename="../src/PrinterDialog.cpp" line="2503"/> <source>Inventory</source> <translation>Inventaris</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2489"/> - <source>Yeastbank</source> - <translation>Gistbank</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2495"/> - <source>Year production</source> - <translation>Jaar productie</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2497"/> - <source>Brew efficiency</source> - <translation>Brouw rendement</translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="2499"/> - <source>Fermentations</source> - <translation>Vergistingen</translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2505"/> + <source>Yeastbank</source> + <translation>Gistbank</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2511"/> + <source>Year production</source> + <translation>Jaar productie</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2513"/> + <source>Brew efficiency</source> + <translation>Brouw rendement</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2515"/> + <source>Fermentations</source> + <translation>Vergistingen</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2521"/> <source>Date and time</source> <translation>Datum en tijd</translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="766"/> - <location filename="../src/PrinterDialog.cpp" line="2256"/> - <location filename="../src/PrinterDialog.cpp" line="2508"/> - <location filename="../src/PrinterDialog.cpp" line="2512"/> + <location filename="../src/PrinterDialog.cpp" line="2261"/> + <location filename="../src/PrinterDialog.cpp" line="2524"/> + <location filename="../src/PrinterDialog.cpp" line="2528"/> <source>Beer style</source> <translation>Bierstijl</translation> </message>
--- a/ui/EditEquipment.ui Sat Jan 14 11:34:51 2023 +0100 +++ b/ui/EditEquipment.ui Sat Jan 14 14:14:59 2023 +0100 @@ -672,6 +672,9 @@ <height>24</height> </rect> </property> + <property name="toolTip"> + <string>Measured inside the kettle</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -701,7 +704,7 @@ </rect> </property> <property name="text"> - <string>Boil size L:</string> + <string>Boil size at 100 °C L:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -793,7 +796,7 @@ </rect> </property> <property name="text"> - <string>Batch size L:</string> + <string>Batch size at 100 °C L:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>