--- a/translations/bmsapp_en.ts Sun Oct 09 15:26:42 2022 +0200 +++ b/translations/bmsapp_en.ts Mon Oct 10 12:55:05 2022 +0200 @@ -2828,7 +2828,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="3913"/> - <location filename="../src/EditProductTab3.cpp" line="1088"/> + <location filename="../src/EditProductTab3.cpp" line="1106"/> <location filename="../src/EditProductTab5.cpp" line="719"/> <source>Mash</source> <translation type="unfinished"></translation> @@ -3866,78 +3866,78 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="45"/> + <location filename="../src/EditProduct.cpp" line="46"/> <source>Extract</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="46"/> - <source>Partial Mash</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProduct.cpp" line="47"/> + <source>Partial Mash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProduct.cpp" line="48"/> <source>All Grain</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="96"/> - <source>None</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProduct.cpp" line="97"/> - <source>Air</source> + <source>None</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProduct.cpp" line="98"/> + <source>Air</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProduct.cpp" line="99"/> <source>Oxygen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="304"/> + <location filename="../src/EditProduct.cpp" line="305"/> <source>%1, part %2 of %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="808"/> + <location filename="../src/EditProduct.cpp" line="809"/> <source>BMSapp - Add new product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="810"/> + <location filename="../src/EditProduct.cpp" line="811"/> <source>BMSapp - Edit product %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="826"/> - <location filename="../src/EditProduct.cpp" line="830"/> + <location filename="../src/EditProduct.cpp" line="827"/> + <location filename="../src/EditProduct.cpp" line="831"/> <source>Edit Product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="826"/> + <location filename="../src/EditProduct.cpp" line="827"/> <source>Name empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="830"/> + <location filename="../src/EditProduct.cpp" line="831"/> <source>No beerstyle selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="868"/> + <location filename="../src/EditProduct.cpp" line="869"/> <source>Delete product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="892"/> + <location filename="../src/EditProduct.cpp" line="893"/> <source>Product changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="892"/> + <location filename="../src/EditProduct.cpp" line="893"/> <source>The product has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -4036,76 +4036,76 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="435"/> + <location filename="../src/EditProductTab3.cpp" line="453"/> <source>Final EBC:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="500"/> + <location filename="../src/EditProductTab3.cpp" line="518"/> <source>Final FG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="503"/> + <location filename="../src/EditProductTab3.cpp" line="521"/> <source>Final ABV:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="682"/> + <location filename="../src/EditProductTab3.cpp" line="700"/> <source>Delete fermentable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="682"/> + <location filename="../src/EditProductTab3.cpp" line="700"/> <location filename="../src/EditProductTab4.cpp" line="358"/> <location filename="../src/EditProductTab5.cpp" line="400"/> <location filename="../src/EditProductTab6.cpp" line="748"/> <location filename="../src/EditProductTab7.cpp" line="303"/> - <location filename="../src/EditProduct.cpp" line="868"/> + <location filename="../src/EditProduct.cpp" line="869"/> <source>Delete %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="998"/> + <location filename="../src/EditProductTab3.cpp" line="1016"/> <location filename="../src/EditProductTab5.cpp" line="644"/> <source>Current ingredient:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1003"/> + <location filename="../src/EditProductTab3.cpp" line="1021"/> <source>Supplier:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1008"/> + <location filename="../src/EditProductTab3.cpp" line="1026"/> <source>Amount in kg:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1013"/> + <location filename="../src/EditProductTab3.cpp" line="1031"/> <source>Percentage in batch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1018"/> + <location filename="../src/EditProductTab3.cpp" line="1036"/> <source>Auto fill to 100%:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1023"/> + <location filename="../src/EditProductTab3.cpp" line="1041"/> <location filename="../src/EditProductTab4.cpp" line="630"/> <location filename="../src/EditProductTab6.cpp" line="1007"/> <source>Use at:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1028"/> + <location filename="../src/EditProductTab3.cpp" line="1046"/> <location filename="../src/EditProductTab5.cpp" line="670"/> <source>Select ingredient:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1033"/> + <location filename="../src/EditProductTab3.cpp" line="1051"/> <location filename="../src/EditProductTab4.cpp" line="640"/> <location filename="../src/EditProductTab5.cpp" line="675"/> <location filename="../src/EditProductTab6.cpp" line="992"/> @@ -4113,23 +4113,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1038"/> + <location filename="../src/EditProductTab3.cpp" line="1056"/> <source>Max in batch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1089"/> + <location filename="../src/EditProductTab3.cpp" line="1107"/> <location filename="../src/EditProductTab5.cpp" line="720"/> <source>Boil</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1090"/> + <location filename="../src/EditProductTab3.cpp" line="1108"/> <source>Fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1091"/> + <location filename="../src/EditProductTab3.cpp" line="1109"/> <source>Lagering</source> <translation type="unfinished"></translation> </message> @@ -9513,7 +9513,7 @@ <location filename="../src/PrinterDialog.cpp" line="285"/> <location filename="../src/PrinterDialog.cpp" line="472"/> <location filename="../src/PrinterDialog.cpp" line="884"/> - <location filename="../src/PrinterDialog.cpp" line="2363"/> + <location filename="../src/PrinterDialog.cpp" line="2364"/> <source>Yeast</source> <translation type="unfinished"></translation> </message> @@ -9821,9 +9821,9 @@ </message> <message> <location filename="../src/PrinterDialog.cpp" line="766"/> - <location filename="../src/PrinterDialog.cpp" line="2254"/> - <location filename="../src/PrinterDialog.cpp" line="2506"/> - <location filename="../src/PrinterDialog.cpp" line="2510"/> + <location filename="../src/PrinterDialog.cpp" line="2255"/> + <location filename="../src/PrinterDialog.cpp" line="2507"/> + <location filename="../src/PrinterDialog.cpp" line="2511"/> <source>Beer style</source> <translation type="unfinished"></translation> </message> @@ -10513,310 +10513,310 @@ </message> <message> <location filename="../src/PrinterDialog.cpp" line="1915"/> - <source>Transfer wort to fermenter</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/PrinterDialog.cpp" line="1915"/> + <source>Transfer about %1 liter wort to the fermenter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1916"/> <source>Liter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1940"/> + <location filename="../src/PrinterDialog.cpp" line="1941"/> <source>Yeast pitching and fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1944"/> + <location filename="../src/PrinterDialog.cpp" line="1945"/> <source>%1 pack %2, `%3` yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1948"/> + <location filename="../src/PrinterDialog.cpp" line="1949"/> <source>%1 gram %2, `%3` yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1952"/> + <location filename="../src/PrinterDialog.cpp" line="1953"/> <source>%1 ml %2, `%3` yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1958"/> + <location filename="../src/PrinterDialog.cpp" line="1959"/> <source>Pitch yeast at %1°C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1964"/> + <location filename="../src/PrinterDialog.cpp" line="1965"/> <source>Pitch yeast dry into the wort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1967"/> + <location filename="../src/PrinterDialog.cpp" line="1968"/> <source>Add decanted yeast starter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1969"/> + <location filename="../src/PrinterDialog.cpp" line="1970"/> <source>Add the yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1972"/> + <location filename="../src/PrinterDialog.cpp" line="1973"/> <source>Add %1 liter water in the fermenter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1974"/> + <location filename="../src/PrinterDialog.cpp" line="1975"/> <source>Aerate %1 minutes with %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1976"/> - <source>Set fermentation start temperature to %1°C</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="1977"/> + <source>Set fermentation start temperature to %1°C</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="1978"/> <source>Start fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1995"/> + <location filename="../src/PrinterDialog.cpp" line="1996"/> <source>Primary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="1998"/> + <location filename="../src/PrinterDialog.cpp" line="1999"/> <source>Add %1 kg `%2` on day 3 or 4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2004"/> + <location filename="../src/PrinterDialog.cpp" line="2005"/> <source>Add %1 %2 `%3` on day 3 or 4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2028"/> + <location filename="../src/PrinterDialog.cpp" line="2029"/> <source>Secondary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2032"/> - <location filename="../src/PrinterDialog.cpp" line="2090"/> + <location filename="../src/PrinterDialog.cpp" line="2033"/> + <location filename="../src/PrinterDialog.cpp" line="2091"/> <source>Add %1 pack %2, `%3` yeast (with starter if needed)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2035"/> - <location filename="../src/PrinterDialog.cpp" line="2093"/> + <location filename="../src/PrinterDialog.cpp" line="2036"/> + <location filename="../src/PrinterDialog.cpp" line="2094"/> <source>Add %1 gram %2, `%3`</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2038"/> + <location filename="../src/PrinterDialog.cpp" line="2039"/> <source>Add %1 gram %2, `%3` yeast (with starter if needed)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2044"/> + <location filename="../src/PrinterDialog.cpp" line="2045"/> <source>After %1 hours harvest yeast from the %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2075"/> + <location filename="../src/PrinterDialog.cpp" line="2076"/> <source>Tertiary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2078"/> + <location filename="../src/PrinterDialog.cpp" line="2079"/> <source>Add %1 kg `%2`</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2083"/> + <location filename="../src/PrinterDialog.cpp" line="2084"/> <source>Add %1 gram `%2` for %3 days</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2096"/> + <location filename="../src/PrinterDialog.cpp" line="2097"/> <source>Add %1 ml %2, `%3` yeast (with starter if needed)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2105"/> + <location filename="../src/PrinterDialog.cpp" line="2106"/> <source>Add %1 %2 `%3` for %4 days</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2135"/> + <location filename="../src/PrinterDialog.cpp" line="2136"/> <source>Packaging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2138"/> + <location filename="../src/PrinterDialog.cpp" line="2139"/> <source>Bottling add %1 kg `%2` with %3 liter water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2142"/> + <location filename="../src/PrinterDialog.cpp" line="2143"/> <source>Kegging add %1 kg `%2` with %3 liter water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2149"/> + <location filename="../src/PrinterDialog.cpp" line="2150"/> <source>Add %1, `%2` as bottle yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2152"/> + <location filename="../src/PrinterDialog.cpp" line="2153"/> <source>Add %1 gram %2, `%3` as bottle yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2156"/> + <location filename="../src/PrinterDialog.cpp" line="2157"/> <source>Add %1 ml %2, `%3` as bottle yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2165"/> + <location filename="../src/PrinterDialog.cpp" line="2166"/> <source>Add %1 %2 `%3` during bottling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2171"/> + <location filename="../src/PrinterDialog.cpp" line="2172"/> <source>Add %1 gr `%2`</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2186"/> - <source>Number</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2187"/> - <source>Year</source> + <source>Number</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2188"/> - <source>Brew sessions</source> + <source>Year</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2189"/> - <source>Brew volume</source> + <source>Brew sessions</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2190"/> + <source>Brew volume</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2191"/> <source>Average volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2252"/> - <location filename="../src/PrinterDialog.cpp" line="2361"/> - <source>Code</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2253"/> <location filename="../src/PrinterDialog.cpp" line="2362"/> + <source>Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2254"/> + <location filename="../src/PrinterDialog.cpp" line="2363"/> <source>Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2255"/> - <source>Max extract</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2256"/> - <source>Mash eff.</source> + <source>Max extract</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2257"/> - <source>Sparge eff</source> + <source>Mash eff.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2258"/> + <source>Sparge eff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2259"/> <source>Boil eff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2364"/> - <source>Primary</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2365"/> - <source>Secondary</source> + <source>Primary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2366"/> - <source>Tertiary</source> + <source>Secondary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2367"/> - <source>Days</source> + <source>Tertiary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2368"/> - <source>OG</source> + <source>Days</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2369"/> - <source>FG</source> + <source>OG</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="2370"/> + <source>FG</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2371"/> <source>AA</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2434"/> + <location filename="../src/PrinterDialog.cpp" line="2435"/> <source>Measured:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2446"/> + <location filename="../src/PrinterDialog.cpp" line="2447"/> <source>%1 split the batch here!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2485"/> + <location filename="../src/PrinterDialog.cpp" line="2486"/> <source>Inventory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2487"/> + <location filename="../src/PrinterDialog.cpp" line="2488"/> <source>Yeastbank</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2493"/> + <location filename="../src/PrinterDialog.cpp" line="2494"/> <source>Year production</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2495"/> + <location filename="../src/PrinterDialog.cpp" line="2496"/> <source>Brew efficiency</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2497"/> + <location filename="../src/PrinterDialog.cpp" line="2498"/> <source>Fermentations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2503"/> + <location filename="../src/PrinterDialog.cpp" line="2504"/> <source>Date and time</source> <translation type="unfinished"></translation> </message>