--- a/translations/bmsapp_en.ts Thu Jun 23 16:50:23 2022 +0200 +++ b/translations/bmsapp_en.ts Thu Jun 23 16:56:07 2022 +0200 @@ -1285,15 +1285,15 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="75"/> - <location filename="../src/EditProductTab3.cpp" line="61"/> - <location filename="../src/EditProductTab3.cpp" line="131"/> - <location filename="../src/EditProductTab4.cpp" line="49"/> - <location filename="../src/EditProductTab4.cpp" line="128"/> - <location filename="../src/EditProductTab5.cpp" line="55"/> - <location filename="../src/EditProductTab5.cpp" line="131"/> - <location filename="../src/EditProductTab6.cpp" line="42"/> - <location filename="../src/EditProductTab6.cpp" line="115"/> - <location filename="../src/EditProductExport.cpp" line="868"/> + <location filename="../src/EditProductTab3.cpp" line="75"/> + <location filename="../src/EditProductTab3.cpp" line="163"/> + <location filename="../src/EditProductTab4.cpp" line="57"/> + <location filename="../src/EditProductTab4.cpp" line="148"/> + <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="159"/> + <location filename="../src/EditProductTab6.cpp" line="56"/> + <location filename="../src/EditProductTab6.cpp" line="143"/> + <location filename="../src/EditProductExport.cpp" line="853"/> <source>Delete</source> <translation type="unfinished"></translation> </message> @@ -1424,8 +1424,8 @@ <location filename="../ui/EditProduct.ui" line="9641"/> <location filename="../ui/EditProduct.ui" line="10001"/> <location filename="../ui/EditProduct.ui" line="10082"/> - <location filename="../src/EditProductExport.cpp" line="832"/> - <location filename="../src/EditProductExport.cpp" line="840"/> + <location filename="../src/EditProductExport.cpp" line="817"/> + <location filename="../src/EditProductExport.cpp" line="825"/> <source> L</source> <translation type="unfinished"></translation> </message> @@ -1482,7 +1482,7 @@ <message> <location filename="../ui/EditProduct.ui" line="843"/> <location filename="../ui/EditProduct.ui" line="2541"/> - <location filename="../src/EditProductTab4.cpp" line="596"/> + <location filename="../src/EditProductTab4.cpp" line="617"/> <source>Bitterness IBU:</source> <translation type="unfinished"></translation> </message> @@ -1702,7 +1702,7 @@ <location filename="../ui/EditProduct.ui" line="2713"/> <location filename="../ui/EditProduct.ui" line="3495"/> <location filename="../ui/EditProduct.ui" line="3650"/> - <location filename="../src/EditProductExport.cpp" line="860"/> + <location filename="../src/EditProductExport.cpp" line="845"/> <source>Add</source> <translation type="unfinished"></translation> </message> @@ -1873,9 +1873,9 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="3628"/> - <location filename="../src/EditProductTab3.cpp" line="1031"/> - <location filename="../src/EditProductTab4.cpp" line="641"/> - <location filename="../src/EditProductTab5.cpp" line="647"/> + <location filename="../src/EditProductTab3.cpp" line="1056"/> + <location filename="../src/EditProductTab4.cpp" line="662"/> + <location filename="../src/EditProductTab5.cpp" line="675"/> <source>Mash</source> <translation type="unfinished"></translation> </message> @@ -1952,7 +1952,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="4187"/> - <location filename="../src/EditProductTab6.cpp" line="267"/> + <location filename="../src/EditProductTab6.cpp" line="296"/> <location filename="../src/EditProductTab7.cpp" line="37"/> <source>Volume</source> <translation type="unfinished"></translation> @@ -2547,7 +2547,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="7554"/> - <location filename="../src/EditProductExport.cpp" line="799"/> + <location filename="../src/EditProductExport.cpp" line="784"/> <source>After boil</source> <translation type="unfinished"></translation> </message> @@ -2965,493 +2965,517 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="847"/> + <location filename="../src/EditProduct.cpp" line="848"/> <source>Delete product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="871"/> + <location filename="../src/EditProduct.cpp" line="872"/> <source>Product changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="871"/> + <location filename="../src/EditProduct.cpp" line="872"/> <source>The product has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="60"/> + <location filename="../src/EditProductTab3.cpp" line="74"/> <source>Supplier</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="60"/> + <location filename="../src/EditProductTab3.cpp" line="74"/> <source>Fermentable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="60"/> + <location filename="../src/EditProductTab3.cpp" line="74"/> <source>EBC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="60"/> - <location filename="../src/EditProductTab4.cpp" line="48"/> - <location filename="../src/EditProductTab5.cpp" line="55"/> - <location filename="../src/EditProductTab6.cpp" line="41"/> + <location filename="../src/EditProductTab3.cpp" line="74"/> + <location filename="../src/EditProductTab4.cpp" line="56"/> + <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <location filename="../src/EditProductTab7.cpp" line="36"/> <source>Type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="60"/> + <location filename="../src/EditProductTab3.cpp" line="74"/> <source>Graintype</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="60"/> + <location filename="../src/EditProductTab3.cpp" line="74"/> <source>When</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="60"/> + <location filename="../src/EditProductTab3.cpp" line="74"/> <source>Yield</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="61"/> - <location filename="../src/EditProductTab4.cpp" line="49"/> - <location filename="../src/EditProductTab5.cpp" line="55"/> - <location filename="../src/EditProductTab6.cpp" line="42"/> + <location filename="../src/EditProductTab3.cpp" line="75"/> + <location filename="../src/EditProductTab4.cpp" line="57"/> + <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab6.cpp" line="56"/> <source>Amount</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="61"/> - <location filename="../src/EditProductTab4.cpp" line="49"/> - <location filename="../src/EditProductTab5.cpp" line="55"/> - <location filename="../src/EditProductTab6.cpp" line="42"/> + <location filename="../src/EditProductTab3.cpp" line="75"/> + <location filename="../src/EditProductTab4.cpp" line="57"/> + <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab6.cpp" line="56"/> <source>Stock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="61"/> + <location filename="../src/EditProductTab3.cpp" line="75"/> <source>Procent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="61"/> + <location filename="../src/EditProductTab3.cpp" line="75"/> <source>100%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="61"/> - <location filename="../src/EditProductTab3.cpp" line="142"/> - <location filename="../src/EditProductTab4.cpp" line="49"/> - <location filename="../src/EditProductTab4.cpp" line="139"/> - <location filename="../src/EditProductTab5.cpp" line="55"/> - <location filename="../src/EditProductTab5.cpp" line="142"/> - <location filename="../src/EditProductTab6.cpp" line="42"/> - <location filename="../src/EditProductTab6.cpp" line="126"/> + <location filename="../src/EditProductTab3.cpp" line="75"/> + <location filename="../src/EditProductTab3.cpp" line="174"/> + <location filename="../src/EditProductTab4.cpp" line="57"/> + <location filename="../src/EditProductTab4.cpp" line="159"/> + <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="170"/> + <location filename="../src/EditProductTab6.cpp" line="56"/> + <location filename="../src/EditProductTab6.cpp" line="154"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="151"/> + <location filename="../src/EditProductTab3.cpp" line="147"/> + <location filename="../src/EditProductTab3.cpp" line="150"/> + <source>Edit this from the package tab</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab3.cpp" line="154"/> - <source>Edit this from the package tab</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="625"/> + <location filename="../src/EditProductTab3.cpp" line="157"/> + <source>Fermentable already used</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="650"/> <source>Delete fermentable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="625"/> - <location filename="../src/EditProductTab4.cpp" line="317"/> - <location filename="../src/EditProductTab5.cpp" line="328"/> - <location filename="../src/EditProductTab6.cpp" line="718"/> + <location filename="../src/EditProductTab3.cpp" line="650"/> + <location filename="../src/EditProductTab4.cpp" line="338"/> + <location filename="../src/EditProductTab5.cpp" line="356"/> + <location filename="../src/EditProductTab6.cpp" line="747"/> <location filename="../src/EditProductTab7.cpp" line="303"/> - <location filename="../src/EditProduct.cpp" line="847"/> + <location filename="../src/EditProduct.cpp" line="848"/> <source>Delete %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="941"/> - <location filename="../src/EditProductTab5.cpp" line="572"/> - <source>Current ingredient:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="946"/> - <source>Supplier:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="951"/> - <source>Amount in kg:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="956"/> - <source>Percentage in batch:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab3.cpp" line="961"/> - <source>Auto fill to 100%:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProductTab3.cpp" line="966"/> - <location filename="../src/EditProductTab4.cpp" line="581"/> - <location filename="../src/EditProductTab6.cpp" line="977"/> - <source>Use at:</source> + <location filename="../src/EditProductTab5.cpp" line="600"/> + <source>Current ingredient:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="971"/> - <location filename="../src/EditProductTab5.cpp" line="598"/> - <source>Select ingredient:</source> + <source>Supplier:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="976"/> - <location filename="../src/EditProductTab4.cpp" line="591"/> - <location filename="../src/EditProductTab5.cpp" line="603"/> - <location filename="../src/EditProductTab6.cpp" line="962"/> - <source>In stock:</source> + <source>Amount in kg:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="981"/> + <source>Percentage in batch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="986"/> + <source>Auto fill to 100%:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="991"/> + <location filename="../src/EditProductTab4.cpp" line="602"/> + <location filename="../src/EditProductTab6.cpp" line="1006"/> + <source>Use at:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="996"/> + <location filename="../src/EditProductTab5.cpp" line="626"/> + <source>Select ingredient:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="1001"/> + <location filename="../src/EditProductTab4.cpp" line="612"/> + <location filename="../src/EditProductTab5.cpp" line="631"/> + <location filename="../src/EditProductTab6.cpp" line="991"/> + <source>In stock:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab3.cpp" line="1006"/> <source>Max in batch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1032"/> - <location filename="../src/EditProductTab4.cpp" line="643"/> - <location filename="../src/EditProductTab5.cpp" line="648"/> + <location filename="../src/EditProductTab3.cpp" line="1057"/> + <location filename="../src/EditProductTab4.cpp" line="664"/> + <location filename="../src/EditProductTab5.cpp" line="676"/> <source>Boil</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1033"/> + <location filename="../src/EditProductTab3.cpp" line="1058"/> <source>Fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab3.cpp" line="1034"/> + <location filename="../src/EditProductTab3.cpp" line="1059"/> <source>Lagering</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="48"/> + <location filename="../src/EditProductTab4.cpp" line="56"/> <source>Origin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="48"/> + <location filename="../src/EditProductTab4.cpp" line="56"/> <source>Hop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="48"/> + <location filename="../src/EditProductTab4.cpp" line="56"/> <source>Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="48"/> + <location filename="../src/EditProductTab4.cpp" line="56"/> <source>Alpha</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="48"/> - <location filename="../src/EditProductTab5.cpp" line="55"/> + <location filename="../src/EditProductTab4.cpp" line="56"/> + <location filename="../src/EditProductTab5.cpp" line="69"/> <source>Use at</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="48"/> - <location filename="../src/EditProductTab5.cpp" line="55"/> + <location filename="../src/EditProductTab4.cpp" line="56"/> + <location filename="../src/EditProductTab5.cpp" line="69"/> <location filename="../src/EditProductTab9.cpp" line="514"/> <source>Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="49"/> + <location filename="../src/EditProductTab4.cpp" line="57"/> <source>IBU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="154"/> - <location filename="../src/EditProductTab4.cpp" line="194"/> - <source>Very low</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="160"/> - <location filename="../src/EditProductTab4.cpp" line="200"/> - <source>Low</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="167"/> - <location filename="../src/EditProductTab4.cpp" line="207"/> - <source>Moderate</source> + <location filename="../src/EditProductTab4.cpp" line="139"/> + <location filename="../src/EditProductTab4.cpp" line="142"/> + <source>Hop already used</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab4.cpp" line="175"/> <location filename="../src/EditProductTab4.cpp" line="215"/> + <source>Very low</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="181"/> + <location filename="../src/EditProductTab4.cpp" line="221"/> + <source>Low</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="188"/> + <location filename="../src/EditProductTab4.cpp" line="228"/> + <source>Moderate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="196"/> + <location filename="../src/EditProductTab4.cpp" line="236"/> <source>High</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="182"/> - <location filename="../src/EditProductTab4.cpp" line="222"/> + <location filename="../src/EditProductTab4.cpp" line="203"/> + <location filename="../src/EditProductTab4.cpp" line="243"/> <source>Very high</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="317"/> + <location filename="../src/EditProductTab4.cpp" line="338"/> <source>Delete hop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="514"/> - <location filename="../src/EditProductTab4.cpp" line="573"/> - <location filename="../src/EditProductTab5.cpp" line="443"/> - <location filename="../src/EditProductTab5.cpp" line="532"/> - <location filename="../src/EditProductTab5.cpp" line="590"/> + <location filename="../src/EditProductTab4.cpp" line="535"/> + <location filename="../src/EditProductTab4.cpp" line="594"/> + <location filename="../src/EditProductTab5.cpp" line="471"/> + <location filename="../src/EditProductTab5.cpp" line="560"/> + <location filename="../src/EditProductTab5.cpp" line="618"/> <source>Time in minutes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="518"/> - <location filename="../src/EditProductTab4.cpp" line="571"/> - <location filename="../src/EditProductTab5.cpp" line="438"/> - <location filename="../src/EditProductTab5.cpp" line="527"/> - <location filename="../src/EditProductTab5.cpp" line="588"/> + <location filename="../src/EditProductTab4.cpp" line="539"/> + <location filename="../src/EditProductTab4.cpp" line="592"/> + <location filename="../src/EditProductTab5.cpp" line="466"/> + <location filename="../src/EditProductTab5.cpp" line="555"/> + <location filename="../src/EditProductTab5.cpp" line="616"/> <source>Time in days:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="555"/> + <location filename="../src/EditProductTab4.cpp" line="576"/> <source>Current hop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="560"/> + <location filename="../src/EditProductTab4.cpp" line="581"/> <source>Origin:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="565"/> - <location filename="../src/EditProductTab5.cpp" line="454"/> - <location filename="../src/EditProductTab5.cpp" line="579"/> - <location filename="../src/EditProductTab6.cpp" line="832"/> - <location filename="../src/EditProductTab6.cpp" line="970"/> - <source>Amount in gr:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProductTab4.cpp" line="586"/> + <location filename="../src/EditProductTab5.cpp" line="482"/> + <location filename="../src/EditProductTab5.cpp" line="607"/> + <location filename="../src/EditProductTab6.cpp" line="861"/> + <location filename="../src/EditProductTab6.cpp" line="999"/> + <source>Amount in gr:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="607"/> <source>Select hop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="642"/> + <location filename="../src/EditProductTab4.cpp" line="663"/> <source>First wort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="644"/> + <location filename="../src/EditProductTab4.cpp" line="665"/> <source>Aroma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="645"/> + <location filename="../src/EditProductTab4.cpp" line="666"/> <source>Whirlpool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="646"/> + <location filename="../src/EditProductTab4.cpp" line="667"/> <source>Dry hop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="55"/> + <location filename="../src/EditProductTab5.cpp" line="69"/> <source>Ingredient</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="115"/> - <location filename="../src/EditProductTab5.cpp" line="119"/> + <location filename="../src/EditProductTab5.cpp" line="134"/> + <location filename="../src/EditProductTab5.cpp" line="138"/> <source>Edit this from the water tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="328"/> + <location filename="../src/EditProductTab5.cpp" line="143"/> + <location filename="../src/EditProductTab5.cpp" line="147"/> + <source>Misc already used</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab5.cpp" line="356"/> <source>Delete misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="457"/> - <location filename="../src/EditProductTab5.cpp" line="581"/> - <location filename="../src/EditProductTab6.cpp" line="839"/> - <location filename="../src/EditProductTab6.cpp" line="972"/> + <location filename="../src/EditProductTab5.cpp" line="485"/> + <location filename="../src/EditProductTab5.cpp" line="609"/> + <location filename="../src/EditProductTab6.cpp" line="868"/> + <location filename="../src/EditProductTab6.cpp" line="1001"/> <source>Amount in ml:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="646"/> + <location filename="../src/EditProductTab5.cpp" line="674"/> <source>Starter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="649"/> - <location filename="../src/EditProductTab6.cpp" line="1026"/> + <location filename="../src/EditProductTab5.cpp" line="677"/> + <location filename="../src/EditProductTab6.cpp" line="1055"/> <source>Primary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="650"/> - <location filename="../src/EditProductTab6.cpp" line="1027"/> + <location filename="../src/EditProductTab5.cpp" line="678"/> + <location filename="../src/EditProductTab6.cpp" line="1056"/> <source>Secondary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="647"/> - <location filename="../src/EditProductTab5.cpp" line="651"/> + <location filename="../src/EditProductTab4.cpp" line="668"/> + <location filename="../src/EditProductTab5.cpp" line="679"/> <source>Bottling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="41"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="41"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Laboratory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="41"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="41"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Use for</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="41"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Min.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="41"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Max.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="42"/> + <location filename="../src/EditProductTab6.cpp" line="56"/> <source>Tol.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="42"/> + <location filename="../src/EditProductTab6.cpp" line="56"/> <source>Attn.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="267"/> + <location filename="../src/EditProductTab6.cpp" line="133"/> + <location filename="../src/EditProductTab6.cpp" line="137"/> + <source>Yeast already used</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="296"/> <source>Method</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="267"/> + <location filename="../src/EditProductTab6.cpp" line="296"/> <source>Inj. factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="267"/> + <location filename="../src/EditProductTab6.cpp" line="296"/> <source>New cells</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="267"/> + <location filename="../src/EditProductTab6.cpp" line="296"/> <source>Total cells</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="267"/> + <location filename="../src/EditProductTab6.cpp" line="296"/> <source>Grow factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="620"/> + <location filename="../src/EditProductTab6.cpp" line="649"/> <source>Start step type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="625"/> + <location filename="../src/EditProductTab6.cpp" line="654"/> <source>Starter step volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="632"/> + <location filename="../src/EditProductTab6.cpp" line="661"/> <source>Stirred</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="633"/> + <location filename="../src/EditProductTab6.cpp" line="662"/> <source>Shaken</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="634"/> + <location filename="../src/EditProductTab6.cpp" line="663"/> <source>Simple</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="718"/> + <location filename="../src/EditProductTab6.cpp" line="747"/> <source>Delete yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="825"/> - <location filename="../src/EditProductTab6.cpp" line="968"/> + <location filename="../src/EditProductTab6.cpp" line="854"/> + <location filename="../src/EditProductTab6.cpp" line="997"/> <source>Total packs:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="942"/> + <location filename="../src/EditProductTab6.cpp" line="971"/> <source>Yeast name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="947"/> - <location filename="../src/EditProductTab6.cpp" line="952"/> + <location filename="../src/EditProductTab6.cpp" line="976"/> + <location filename="../src/EditProductTab6.cpp" line="981"/> <source>Laboratory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="957"/> + <location filename="../src/EditProductTab6.cpp" line="986"/> <source>Select yeast:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1028"/> + <location filename="../src/EditProductTab6.cpp" line="1057"/> <source>Tertiary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1029"/> + <location filename="../src/EditProductTab6.cpp" line="1058"/> <source>Bottle</source> <translation type="unfinished"></translation> </message> @@ -3637,215 +3661,215 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="44"/> - <location filename="../src/EditProductExport.cpp" line="47"/> - <location filename="../src/EditProductExport.cpp" line="268"/> + <location filename="../src/EditProductExport.cpp" line="38"/> + <location filename="../src/EditProductExport.cpp" line="41"/> + <location filename="../src/EditProductExport.cpp" line="262"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="45"/> + <location filename="../src/EditProductExport.cpp" line="39"/> <source>Files (*.xml)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="47"/> + <location filename="../src/EditProductExport.cpp" line="41"/> <source>No XML file selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="268"/> + <location filename="../src/EditProductExport.cpp" line="262"/> <source>XML export ready</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="320"/> - <location filename="../src/EditProductExport.cpp" line="322"/> - <location filename="../src/EditProductExport.cpp" line="418"/> - <location filename="../src/EditProductExport.cpp" line="420"/> + <location filename="../src/EditProductExport.cpp" line="314"/> + <location filename="../src/EditProductExport.cpp" line="316"/> + <location filename="../src/EditProductExport.cpp" line="412"/> + <location filename="../src/EditProductExport.cpp" line="414"/> <source>Copy Product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="320"/> + <location filename="../src/EditProductExport.cpp" line="314"/> <source>Copy Product export ready.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="322"/> + <location filename="../src/EditProductExport.cpp" line="316"/> <source>Copy Product error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="418"/> + <location filename="../src/EditProductExport.cpp" line="412"/> <source>Copy Product to Recipe ready.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="420"/> + <location filename="../src/EditProductExport.cpp" line="414"/> <source>Copy Product to Recipe error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="576"/> - <location filename="../src/EditProductExport.cpp" line="1043"/> + <location filename="../src/EditProductExport.cpp" line="561"/> + <location filename="../src/EditProductExport.cpp" line="1028"/> <source>Export to forum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="576"/> + <location filename="../src/EditProductExport.cpp" line="561"/> <source>The recipe and all data are copied to the clipboard. You can "paste" this data in the forum screen in your web browser.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="593"/> + <location filename="../src/EditProductExport.cpp" line="578"/> <source>Add a splitted batch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="598"/> + <location filename="../src/EditProductExport.cpp" line="583"/> <source>Choose split moment in the brew process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="605"/> + <location filename="../src/EditProductExport.cpp" line="590"/> <source>Delete the last splitted batch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="614"/> + <location filename="../src/EditProductExport.cpp" line="599"/> <source>The read-only `product code` of the batch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="618"/> + <location filename="../src/EditProductExport.cpp" line="603"/> <source>Batch name, click to change the name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="623"/> + <location filename="../src/EditProductExport.cpp" line="608"/> <source>Batch size, click to change the volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="728"/> - <location filename="../src/EditProductExport.cpp" line="742"/> + <location filename="../src/EditProductExport.cpp" line="713"/> + <location filename="../src/EditProductExport.cpp" line="727"/> <source>Split product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="754"/> + <location filename="../src/EditProductExport.cpp" line="739"/> <source>Product name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="765"/> + <location filename="../src/EditProductExport.cpp" line="750"/> <source>Product code:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="776"/> + <location filename="../src/EditProductExport.cpp" line="761"/> <source>Available volume:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductExport.cpp" line="767"/> + <source>Current brew stage:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductExport.cpp" line="778"/> + <source>Split at moment:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductExport.cpp" line="782"/> - <source>Current brew stage:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductExport.cpp" line="793"/> - <source>Split at moment:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductExport.cpp" line="797"/> <source>Not divided</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="798"/> + <location filename="../src/EditProductExport.cpp" line="783"/> <source>After mash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="800"/> + <location filename="../src/EditProductExport.cpp" line="785"/> <source>After cooling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="801"/> + <location filename="../src/EditProductExport.cpp" line="786"/> <source>After primary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="802"/> + <location filename="../src/EditProductExport.cpp" line="787"/> <source>After secondary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="803"/> + <location filename="../src/EditProductExport.cpp" line="788"/> <source>After tertiary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="824"/> + <location filename="../src/EditProductExport.cpp" line="809"/> <source>Volume remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="842"/> + <location filename="../src/EditProductExport.cpp" line="827"/> <source>Split code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="842"/> + <location filename="../src/EditProductExport.cpp" line="827"/> <source>Split name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="842"/> + <location filename="../src/EditProductExport.cpp" line="827"/> <source>Split volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1019"/> + <location filename="../src/EditProductExport.cpp" line="1004"/> <source>Export choices</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1031"/> + <location filename="../src/EditProductExport.cpp" line="1016"/> <source>Export to beerXML</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1035"/> + <location filename="../src/EditProductExport.cpp" line="1020"/> <source>Copy to product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1039"/> + <location filename="../src/EditProductExport.cpp" line="1024"/> <source>Copy to recipe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1047"/> + <location filename="../src/EditProductExport.cpp" line="1032"/> <source>Split this batch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1076"/> + <location filename="../src/EditProductExport.cpp" line="1061"/> <source>Printer report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1088"/> + <location filename="../src/EditProductExport.cpp" line="1073"/> <source>Print recipe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1092"/> + <location filename="../src/EditProductExport.cpp" line="1077"/> <source>Print checklist</source> <translation type="unfinished"></translation> </message> @@ -6054,84 +6078,84 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="42"/> - <location filename="../src/EditRecipeExport.cpp" line="44"/> - <location filename="../src/EditRecipeExport.cpp" line="258"/> + <location filename="../src/EditRecipeExport.cpp" line="36"/> + <location filename="../src/EditRecipeExport.cpp" line="38"/> + <location filename="../src/EditRecipeExport.cpp" line="252"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="42"/> + <location filename="../src/EditRecipeExport.cpp" line="36"/> <source>Files (*.xml)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="44"/> + <location filename="../src/EditRecipeExport.cpp" line="38"/> <source>No XML file selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="258"/> + <location filename="../src/EditRecipeExport.cpp" line="252"/> <source>XML export ready</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="274"/> - <location filename="../src/EditRecipeExport.cpp" line="276"/> - <location filename="../src/EditRecipeExport.cpp" line="435"/> - <location filename="../src/EditRecipeExport.cpp" line="437"/> + <location filename="../src/EditRecipeExport.cpp" line="268"/> + <location filename="../src/EditRecipeExport.cpp" line="270"/> + <location filename="../src/EditRecipeExport.cpp" line="429"/> + <location filename="../src/EditRecipeExport.cpp" line="431"/> <source>Copy Recipe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="274"/> + <location filename="../src/EditRecipeExport.cpp" line="268"/> <source>Copy Recipe export ready.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="276"/> + <location filename="../src/EditRecipeExport.cpp" line="270"/> <source>Copy Recipe error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="435"/> + <location filename="../src/EditRecipeExport.cpp" line="429"/> <source>Copy Recipe to Product ready.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="437"/> + <location filename="../src/EditRecipeExport.cpp" line="431"/> <source>Copy Recipe to Product error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="584"/> - <location filename="../src/EditRecipeExport.cpp" line="618"/> + <location filename="../src/EditRecipeExport.cpp" line="569"/> + <location filename="../src/EditRecipeExport.cpp" line="603"/> <source>Export to forum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="584"/> + <location filename="../src/EditRecipeExport.cpp" line="569"/> <source>The recipe and all data are copied to the clipboard. You can "paste" this data in the forum screen in your web browser.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="591"/> + <location filename="../src/EditRecipeExport.cpp" line="576"/> <source>Export choices</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="603"/> + <location filename="../src/EditRecipeExport.cpp" line="588"/> <source>Export to beerXML</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="608"/> + <location filename="../src/EditRecipeExport.cpp" line="593"/> <source>Copy to recipe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeExport.cpp" line="613"/> + <location filename="../src/EditRecipeExport.cpp" line="598"/> <source>Copy to product</source> <translation type="unfinished"></translation> </message>