changeset
Updated translations
Mon, 18 Jul 2022 19:28:21 +0200
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Mon, 18 Jul 2022 19:28:21 +0200
- changeset 360
- b70cfa20ac46
- parent 359
- dfbb012c631c
- child 361
- ec8de79f6ff6
Updated translations
--- a/translations/bmsapp_en.ts Mon Jul 18 17:04:02 2022 +0200 +++ b/translations/bmsapp_en.ts Mon Jul 18 19:28:21 2022 +0200 @@ -1249,7 +1249,7 @@ </message> <message> <location filename="../ui/EditFermentable.ui" line="590"/> - <location filename="../ui/EditFermentable.ui" line="1006"/> + <location filename="../ui/EditFermentable.ui" line="1012"/> <source> €</source> <translation type="unfinished"></translation> </message> @@ -1259,68 +1259,68 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="810"/> - <location filename="../ui/EditFermentable.ui" line="823"/> - <location filename="../ui/EditFermentable.ui" line="836"/> + <location filename="../ui/EditFermentable.ui" line="816"/> + <location filename="../ui/EditFermentable.ui" line="829"/> + <location filename="../ui/EditFermentable.ui" line="842"/> <source>Yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="885"/> - <location filename="../ui/EditFermentable.ui" line="918"/> + <location filename="../ui/EditFermentable.ui" line="891"/> + <location filename="../ui/EditFermentable.ui" line="924"/> <source>yyyy-MM-dd</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="940"/> + <location filename="../ui/EditFermentable.ui" line="946"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="960"/> + <location filename="../ui/EditFermentable.ui" line="966"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="980"/> + <location filename="../ui/EditFermentable.ui" line="986"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1022"/> + <location filename="../ui/EditFermentable.ui" line="1028"/> <source>Lintner:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1044"/> + <location filename="../ui/EditFermentable.ui" line="1050"/> <source> °L</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1066"/> + <location filename="../ui/EditFermentable.ui" line="1072"/> <source>Set the tht date to today.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1069"/> - <location filename="../ui/EditFermentable.ui" line="1089"/> - <location filename="../ui/EditFermentable.ui" line="1109"/> - <location filename="../ui/EditFermentable.ui" line="1129"/> + <location filename="../ui/EditFermentable.ui" line="1075"/> + <location filename="../ui/EditFermentable.ui" line="1095"/> + <location filename="../ui/EditFermentable.ui" line="1115"/> + <location filename="../ui/EditFermentable.ui" line="1135"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1086"/> + <location filename="../ui/EditFermentable.ui" line="1092"/> <source>Clear tht date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1106"/> + <location filename="../ui/EditFermentable.ui" line="1112"/> <source>Set the production date to today.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1126"/> + <location filename="../ui/EditFermentable.ui" line="1132"/> <source>Clear production date</source> <translation type="unfinished"></translation> </message> @@ -2052,8 +2052,8 @@ <location filename="../src/EditProductTab3.cpp" line="163"/> <location filename="../src/EditProductTab4.cpp" line="57"/> <location filename="../src/EditProductTab4.cpp" line="149"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> - <location filename="../src/EditProductTab5.cpp" line="159"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> + <location filename="../src/EditProductTab5.cpp" line="166"/> <location filename="../src/EditProductTab6.cpp" line="56"/> <location filename="../src/EditProductTab6.cpp" line="143"/> <location filename="../src/EditProductExport.cpp" line="852"/> @@ -2093,8 +2093,8 @@ <message> <location filename="../ui/EditProduct.ui" line="240"/> <location filename="../ui/EditProduct.ui" line="2143"/> - <location filename="../ui/EditProduct.ui" line="6979"/> - <location filename="../ui/EditProduct.ui" line="7951"/> + <location filename="../ui/EditProduct.ui" line="7388"/> + <location filename="../ui/EditProduct.ui" line="8360"/> <source>Efficiency:</source> <translation type="unfinished"></translation> </message> @@ -2125,34 +2125,34 @@ <location filename="../ui/EditProduct.ui" line="2861"/> <location filename="../ui/EditProduct.ui" line="2914"/> <location filename="../ui/EditProduct.ui" line="3576"/> - <location filename="../ui/EditProduct.ui" line="6678"/> - <location filename="../ui/EditProduct.ui" line="7073"/> - <location filename="../ui/EditProduct.ui" line="8067"/> - <location filename="../ui/EditProduct.ui" line="8648"/> - <location filename="../ui/EditProduct.ui" line="8882"/> - <location filename="../ui/EditProduct.ui" line="9100"/> - <location filename="../ui/EditProduct.ui" line="9202"/> - <location filename="../ui/EditProduct.ui" line="9347"/> - <location filename="../ui/EditProduct.ui" line="9400"/> - <location filename="../ui/EditProduct.ui" line="9604"/> - <location filename="../ui/EditProduct.ui" line="9638"/> - <location filename="../ui/EditProduct.ui" line="9726"/> - <location filename="../ui/EditProduct.ui" line="9904"/> - <location filename="../ui/EditProduct.ui" line="10089"/> - <location filename="../ui/EditProduct.ui" line="10317"/> - <location filename="../ui/EditProduct.ui" line="10480"/> + <location filename="../ui/EditProduct.ui" line="7081"/> + <location filename="../ui/EditProduct.ui" line="7482"/> + <location filename="../ui/EditProduct.ui" line="8476"/> + <location filename="../ui/EditProduct.ui" line="9057"/> + <location filename="../ui/EditProduct.ui" line="9291"/> + <location filename="../ui/EditProduct.ui" line="9509"/> + <location filename="../ui/EditProduct.ui" line="9611"/> + <location filename="../ui/EditProduct.ui" line="9756"/> + <location filename="../ui/EditProduct.ui" line="9809"/> + <location filename="../ui/EditProduct.ui" line="10013"/> + <location filename="../ui/EditProduct.ui" line="10047"/> + <location filename="../ui/EditProduct.ui" line="10135"/> + <location filename="../ui/EditProduct.ui" line="10313"/> + <location filename="../ui/EditProduct.ui" line="10498"/> + <location filename="../ui/EditProduct.ui" line="10726"/> + <location filename="../ui/EditProduct.ui" line="10889"/> <source> %</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="335"/> <location filename="../ui/EditProduct.ui" line="1971"/> - <location filename="../ui/EditProduct.ui" line="7270"/> - <location filename="../ui/EditProduct.ui" line="7298"/> - <location filename="../ui/EditProduct.ui" line="7326"/> - <location filename="../ui/EditProduct.ui" line="7354"/> - <location filename="../ui/EditProduct.ui" line="7741"/> - <location filename="../ui/EditProduct.ui" line="7862"/> + <location filename="../ui/EditProduct.ui" line="7679"/> + <location filename="../ui/EditProduct.ui" line="7707"/> + <location filename="../ui/EditProduct.ui" line="7735"/> + <location filename="../ui/EditProduct.ui" line="7763"/> + <location filename="../ui/EditProduct.ui" line="8150"/> + <location filename="../ui/EditProduct.ui" line="8271"/> <source> min</source> <translation type="unfinished"></translation> </message> @@ -2171,22 +2171,25 @@ <location filename="../ui/EditProduct.ui" line="2021"/> <location filename="../ui/EditProduct.ui" line="2121"/> <location filename="../ui/EditProduct.ui" line="3779"/> - <location filename="../ui/EditProduct.ui" line="6121"/> - <location filename="../ui/EditProduct.ui" line="6786"/> - <location filename="../ui/EditProduct.ui" line="6852"/> - <location filename="../ui/EditProduct.ui" line="7098"/> - <location filename="../ui/EditProduct.ui" line="7129"/> - <location filename="../ui/EditProduct.ui" line="7443"/> - <location filename="../ui/EditProduct.ui" line="7471"/> - <location filename="../ui/EditProduct.ui" line="7505"/> - <location filename="../ui/EditProduct.ui" line="7932"/> - <location filename="../ui/EditProduct.ui" line="8017"/> - <location filename="../ui/EditProduct.ui" line="9539"/> - <location filename="../ui/EditProduct.ui" line="9570"/> - <location filename="../ui/EditProduct.ui" line="9876"/> - <location filename="../ui/EditProduct.ui" line="9998"/> - <location filename="../ui/EditProduct.ui" line="10358"/> - <location filename="../ui/EditProduct.ui" line="10439"/> + <location filename="../ui/EditProduct.ui" line="5115"/> + <location filename="../ui/EditProduct.ui" line="5851"/> + <location filename="../ui/EditProduct.ui" line="6188"/> + <location filename="../ui/EditProduct.ui" line="6514"/> + <location filename="../ui/EditProduct.ui" line="7189"/> + <location filename="../ui/EditProduct.ui" line="7255"/> + <location filename="../ui/EditProduct.ui" line="7507"/> + <location filename="../ui/EditProduct.ui" line="7538"/> + <location filename="../ui/EditProduct.ui" line="7852"/> + <location filename="../ui/EditProduct.ui" line="7880"/> + <location filename="../ui/EditProduct.ui" line="7914"/> + <location filename="../ui/EditProduct.ui" line="8341"/> + <location filename="../ui/EditProduct.ui" line="8426"/> + <location filename="../ui/EditProduct.ui" line="9948"/> + <location filename="../ui/EditProduct.ui" line="9979"/> + <location filename="../ui/EditProduct.ui" line="10285"/> + <location filename="../ui/EditProduct.ui" line="10407"/> + <location filename="../ui/EditProduct.ui" line="10767"/> + <location filename="../ui/EditProduct.ui" line="10848"/> <location filename="../src/EditProductExport.cpp" line="816"/> <location filename="../src/EditProductExport.cpp" line="824"/> <source> L</source> @@ -2391,7 +2394,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="1730"/> - <location filename="../ui/EditProduct.ui" line="7421"/> + <location filename="../ui/EditProduct.ui" line="7830"/> <source>Top up water:</source> <translation type="unfinished"></translation> </message> @@ -2521,10 +2524,10 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="3080"/> - <location filename="../ui/EditProduct.ui" line="9315"/> - <location filename="../ui/EditProduct.ui" line="10576"/> - <location filename="../ui/EditProduct.ui" line="10653"/> - <location filename="../ui/EditProduct.ui" line="10962"/> + <location filename="../ui/EditProduct.ui" line="9724"/> + <location filename="../ui/EditProduct.ui" line="10985"/> + <location filename="../ui/EditProduct.ui" line="11062"/> + <location filename="../ui/EditProduct.ui" line="11371"/> <source>Set or clear date</source> <translation type="unfinished"></translation> </message> @@ -2532,27 +2535,27 @@ <location filename="../ui/EditProduct.ui" line="3083"/> <location filename="../ui/EditProduct.ui" line="3547"/> <location filename="../ui/EditProduct.ui" line="3614"/> - <location filename="../ui/EditProduct.ui" line="7151"/> - <location filename="../ui/EditProduct.ui" line="7767"/> - <location filename="../ui/EditProduct.ui" line="8089"/> - <location filename="../ui/EditProduct.ui" line="8164"/> - <location filename="../ui/EditProduct.ui" line="8203"/> - <location filename="../ui/EditProduct.ui" line="8274"/> - <location filename="../ui/EditProduct.ui" line="8361"/> - <location filename="../ui/EditProduct.ui" line="8670"/> - <location filename="../ui/EditProduct.ui" line="8690"/> - <location filename="../ui/EditProduct.ui" line="8729"/> - <location filename="../ui/EditProduct.ui" line="8904"/> - <location filename="../ui/EditProduct.ui" line="8924"/> - <location filename="../ui/EditProduct.ui" line="8963"/> - <location filename="../ui/EditProduct.ui" line="9122"/> - <location filename="../ui/EditProduct.ui" line="9257"/> - <location filename="../ui/EditProduct.ui" line="9277"/> - <location filename="../ui/EditProduct.ui" line="9318"/> - <location filename="../ui/EditProduct.ui" line="10579"/> - <location filename="../ui/EditProduct.ui" line="10599"/> - <location filename="../ui/EditProduct.ui" line="10656"/> - <location filename="../ui/EditProduct.ui" line="10965"/> + <location filename="../ui/EditProduct.ui" line="7560"/> + <location filename="../ui/EditProduct.ui" line="8176"/> + <location filename="../ui/EditProduct.ui" line="8498"/> + <location filename="../ui/EditProduct.ui" line="8573"/> + <location filename="../ui/EditProduct.ui" line="8612"/> + <location filename="../ui/EditProduct.ui" line="8683"/> + <location filename="../ui/EditProduct.ui" line="8770"/> + <location filename="../ui/EditProduct.ui" line="9079"/> + <location filename="../ui/EditProduct.ui" line="9099"/> + <location filename="../ui/EditProduct.ui" line="9138"/> + <location filename="../ui/EditProduct.ui" line="9313"/> + <location filename="../ui/EditProduct.ui" line="9333"/> + <location filename="../ui/EditProduct.ui" line="9372"/> + <location filename="../ui/EditProduct.ui" line="9531"/> + <location filename="../ui/EditProduct.ui" line="9666"/> + <location filename="../ui/EditProduct.ui" line="9686"/> + <location filename="../ui/EditProduct.ui" line="9727"/> + <location filename="../ui/EditProduct.ui" line="10988"/> + <location filename="../ui/EditProduct.ui" line="11008"/> + <location filename="../ui/EditProduct.ui" line="11065"/> + <location filename="../ui/EditProduct.ui" line="11374"/> <source>...</source> <translation type="unfinished"></translation> </message> @@ -2609,7 +2612,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="3544"/> - <location filename="../ui/EditProduct.ui" line="8161"/> + <location filename="../ui/EditProduct.ui" line="8570"/> <source>Set the date to today.</source> <translation type="unfinished"></translation> </message> @@ -2620,12 +2623,12 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="3595"/> - <location filename="../ui/EditProduct.ui" line="8184"/> - <location filename="../ui/EditProduct.ui" line="8239"/> - <location filename="../ui/EditProduct.ui" line="8710"/> - <location filename="../ui/EditProduct.ui" line="8944"/> - <location filename="../ui/EditProduct.ui" line="10560"/> - <location filename="../ui/EditProduct.ui" line="10946"/> + <location filename="../ui/EditProduct.ui" line="8593"/> + <location filename="../ui/EditProduct.ui" line="8648"/> + <location filename="../ui/EditProduct.ui" line="9119"/> + <location filename="../ui/EditProduct.ui" line="9353"/> + <location filename="../ui/EditProduct.ui" line="10969"/> + <location filename="../ui/EditProduct.ui" line="11355"/> <source>dd-MM-yyyy</source> <translation type="unfinished"></translation> </message> @@ -2638,7 +2641,7 @@ <location filename="../ui/EditProduct.ui" line="3628"/> <location filename="../src/EditProductTab3.cpp" line="1056"/> <location filename="../src/EditProductTab4.cpp" line="668"/> - <location filename="../src/EditProductTab5.cpp" line="675"/> + <location filename="../src/EditProductTab5.cpp" line="719"/> <source>Mash</source> <translation type="unfinished"></translation> </message> @@ -2668,620 +2671,578 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3810"/> - <source>Water overview</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4031"/> + <location filename="../ui/EditProduct.ui" line="6678"/> <source>Ca</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4047"/> + <location filename="../ui/EditProduct.ui" line="6417"/> <source>Mg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4063"/> + <location filename="../ui/EditProduct.ui" line="6726"/> <source>HCO3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4079"/> + <location filename="../ui/EditProduct.ui" line="6558"/> <source>CaCO3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4095"/> + <location filename="../ui/EditProduct.ui" line="6662"/> <source>Na</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4111"/> + <location filename="../ui/EditProduct.ui" line="6646"/> <source>Cl</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4127"/> + <location filename="../ui/EditProduct.ui" line="6694"/> <source>SO4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4143"/> + <location filename="../ui/EditProduct.ui" line="6433"/> <location filename="../src/EditProductTab7.cpp" line="37"/> <source>pH</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4187"/> + <location filename="../ui/EditProduct.ui" line="6710"/> <location filename="../src/EditProductTab6.cpp" line="296"/> <location filename="../src/EditProductTab7.cpp" line="37"/> <source>Volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4378"/> + <location filename="../ui/EditProduct.ui" line="6173"/> <source>The division between the main and dilution water. The total volume does not change.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4687"/> - <location filename="../ui/EditProduct.ui" line="5890"/> + <location filename="../ui/EditProduct.ui" line="4401"/> + <location filename="../ui/EditProduct.ui" line="5500"/> <source>Mash pH should be between 5.2 and 5.6. Use 5.2 for light and 5.5 for dark beers.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4865"/> + <location filename="../ui/EditProduct.ui" line="5666"/> <source>The ideal amount of Magnesium is between 5 and 40.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4893"/> + <location filename="../ui/EditProduct.ui" line="5431"/> <source>0 to 50 for light beers, 50 to 150 for amber beers, 150 to 250 for dark beers.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4921"/> - <source>The ideal Sulfate amount should be between 50 and 400. -Together with Chloride it must be below 500.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4950"/> - <source>The ideal amount of Calcium is between 40 and 150.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4978"/> - <source>The ideal Chloride amount is between 50 and 150. -Together with Sulfate it must be below 500.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5032"/> - <source>The ideal amount of Natrium should be below 150.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5060"/> - <source>Water profile</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5076"/> - <source>The main brewing water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5082"/> - <source>Choose water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5095"/> - <source>Optional dilution water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5098"/> - <source>Choose dilution</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5111"/> - <source>If needed, choose a target water profile.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5124"/> - <source>Mixed water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5140"/> - <source>Treated water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5184"/> - <source>RA</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5359"/> - <source>Hardness</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5454"/> - <source>Water agents</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5466"/> - <source>Calcium Chloride</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5469"/> - <source>CaCl2:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5485"/> - <source>Gypsym</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5488"/> - <source>CaSO4:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5504"/> - <source>Epsom</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5507"/> - <source>MgSO4:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5523"/> - <source>Table salt</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5526"/> - <source>NaCl:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5542"/> - <location filename="../ui/EditProduct.ui" line="5726"/> - <source>Magnesium Chloride</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5545"/> - <source>MgCl2:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5561"/> - <location filename="../ui/EditProduct.ui" line="5757"/> - <source>Baking soda</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5564"/> - <source>NaHCO3:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5580"/> - <location filename="../ui/EditProduct.ui" line="5788"/> - <source>Chalk undissolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5583"/> - <source>CaCO3:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5599"/> - <source>To change the water profile. This adds Calcium and Chloride. -To improve sweet style beers.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5609"/> - <location filename="../ui/EditProduct.ui" line="5641"/> - <location filename="../ui/EditProduct.ui" line="5672"/> - <location filename="../ui/EditProduct.ui" line="5704"/> - <location filename="../ui/EditProduct.ui" line="5735"/> - <location filename="../ui/EditProduct.ui" line="5766"/> - <location filename="../ui/EditProduct.ui" line="5797"/> - <location filename="../ui/EditProduct.ui" line="9945"/> - <location filename="../ui/EditProduct.ui" line="10289"/> - <source> gr</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5631"/> - <source>Gypsum to change the water profile. This adds Calcium and Sulfate. -To improve bitter beers.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5663"/> - <source>Epsom salt to change the water profile. Use with caution!</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ui/EditProduct.ui" line="5694"/> + <source>The ideal Sulfate amount should be between 50 and 400. +Together with Chloride it must be below 500.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5610"/> + <source>The ideal amount of Calcium is between 40 and 150.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5581"/> + <source>The ideal Chloride amount is between 50 and 150. +Together with Sulfate it must be below 500.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5528"/> + <source>The ideal amount of Natrium should be below 150.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6742"/> + <source>Water profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6627"/> + <source>The main brewing water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6633"/> + <source>Choose water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6260"/> + <source>Optional dilution water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6263"/> + <source>Choose dilution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5187"/> + <source>If needed, choose a target water profile.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5776"/> + <source>Mixed water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6461"/> + <source>RA</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6376"/> + <source>Hardness</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3807"/> + <source>Water agents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3819"/> + <source>Calcium Chloride</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3822"/> + <source>CaCl2:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3838"/> + <source>Gypsym</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3841"/> + <source>CaSO4:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3857"/> + <source>Epsom</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3860"/> + <source>MgSO4:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3876"/> + <source>Table salt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3879"/> + <source>NaCl:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3895"/> + <location filename="../ui/EditProduct.ui" line="4079"/> + <location filename="../ui/EditProduct.ui" line="4299"/> + <source>Magnesium Chloride</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3898"/> + <source>MgCl2:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3914"/> + <location filename="../ui/EditProduct.ui" line="4110"/> + <source>Baking soda</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3917"/> + <source>NaHCO3:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3933"/> + <location filename="../ui/EditProduct.ui" line="4141"/> + <source>Chalk undissolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3936"/> + <source>CaCO3:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3952"/> + <location filename="../ui/EditProduct.ui" line="4267"/> + <source>To change the water profile. This adds Calcium and Chloride. +To improve sweet style beers.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3962"/> + <location filename="../ui/EditProduct.ui" line="3994"/> + <location filename="../ui/EditProduct.ui" line="4025"/> + <location filename="../ui/EditProduct.ui" line="4057"/> + <location filename="../ui/EditProduct.ui" line="4088"/> + <location filename="../ui/EditProduct.ui" line="4119"/> + <location filename="../ui/EditProduct.ui" line="4150"/> + <location filename="../ui/EditProduct.ui" line="4182"/> + <location filename="../ui/EditProduct.ui" line="4213"/> + <location filename="../ui/EditProduct.ui" line="4245"/> + <location filename="../ui/EditProduct.ui" line="4277"/> + <location filename="../ui/EditProduct.ui" line="4308"/> + <location filename="../ui/EditProduct.ui" line="10354"/> + <location filename="../ui/EditProduct.ui" line="10698"/> + <source> gr</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="3984"/> + <location filename="../ui/EditProduct.ui" line="4172"/> + <source>Gypsum to change the water profile. This adds Calcium and Sulfate. +To improve bitter beers.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4016"/> + <location filename="../ui/EditProduct.ui" line="4204"/> + <source>Epsom salt to change the water profile. Use with caution!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4047"/> + <location filename="../ui/EditProduct.ui" line="4235"/> <source>Table salt to change the water profile. This adds Sodium and Chloride. Improves the sweetness of the beer. The beer will become salty at high doses.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5820"/> - <source>Mash water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5832"/> - <location filename="../ui/EditProduct.ui" line="6051"/> - <source>Desired pH:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5848"/> + <location filename="../ui/EditProduct.ui" line="4359"/> <source>Auto calculate:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5864"/> + <location filename="../ui/EditProduct.ui" line="4375"/> <source>Acid to use:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5930"/> - <location filename="../ui/EditProduct.ui" line="6208"/> + <location filename="../ui/EditProduct.ui" line="4441"/> + <location filename="../ui/EditProduct.ui" line="4580"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5958"/> - <location filename="../ui/EditProduct.ui" line="6242"/> + <location filename="../ui/EditProduct.ui" line="4469"/> + <location filename="../ui/EditProduct.ui" line="4614"/> <source> ml</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5991"/> - <source>Sparge water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6003"/> - <source>Sparge water supply:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6019"/> - <source>Sparge temperature:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6035"/> - <source>Water source:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6067"/> + <location filename="../ui/EditProduct.ui" line="4542"/> <source>Acid type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6083"/> - <source>Acid strength:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6099"/> - <source>Acid needed:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6285"/> + <location filename="../ui/EditProduct.ui" line="4669"/> <source>Bitterness index:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6337"/> - <location filename="../ui/EditProduct.ui" line="6405"/> + <location filename="../ui/EditProduct.ui" line="4721"/> + <location filename="../ui/EditProduct.ui" line="4789"/> <source>N/A</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6353"/> + <location filename="../ui/EditProduct.ui" line="4737"/> <source>Preffered SO4:Cl ratio:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6421"/> + <location filename="../ui/EditProduct.ui" line="4805"/> <source>Current SO4:Cl ratio:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6478"/> + <location filename="../ui/EditProduct.ui" line="4862"/> <source>Estimate pre boil pH:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6512"/> + <location filename="../ui/EditProduct.ui" line="6915"/> <source>Brewday</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6540"/> + <location filename="../ui/EditProduct.ui" line="6943"/> <source>Brewday end:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6556"/> + <location filename="../ui/EditProduct.ui" line="6959"/> <source>Mashing and Sparge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6568"/> + <location filename="../ui/EditProduct.ui" line="6971"/> <source>Mash pH:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6697"/> + <location filename="../ui/EditProduct.ui" line="7100"/> <source>Mash SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6713"/> + <location filename="../ui/EditProduct.ui" line="7116"/> <source>Mash efficiency:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6729"/> + <location filename="../ui/EditProduct.ui" line="7132"/> <source>Sparge water pH:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7148"/> - <location filename="../ui/EditProduct.ui" line="8086"/> + <location filename="../ui/EditProduct.ui" line="7557"/> + <location filename="../ui/EditProduct.ui" line="8495"/> <source>Edit volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7232"/> + <location filename="../ui/EditProduct.ui" line="7641"/> <source>Whirlpool cold:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7665"/> + <location filename="../ui/EditProduct.ui" line="8074"/> <source>Aeration time & speed:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7796"/> + <location filename="../ui/EditProduct.ui" line="8205"/> <source>Cooling method:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7894"/> + <location filename="../ui/EditProduct.ui" line="8303"/> <source>Cooling time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8399"/> + <location filename="../ui/EditProduct.ui" line="8808"/> <source>Start density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8415"/> + <location filename="../ui/EditProduct.ui" line="8824"/> <source>Start temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8431"/> + <location filename="../ui/EditProduct.ui" line="8840"/> <source>Peak temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8447"/> - <location filename="../ui/EditProduct.ui" line="8759"/> + <location filename="../ui/EditProduct.ui" line="8856"/> + <location filename="../ui/EditProduct.ui" line="9168"/> <source>End temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8463"/> - <location filename="../ui/EditProduct.ui" line="8775"/> + <location filename="../ui/EditProduct.ui" line="8872"/> + <location filename="../ui/EditProduct.ui" line="9184"/> <source>End density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8479"/> - <location filename="../ui/EditProduct.ui" line="8791"/> + <location filename="../ui/EditProduct.ui" line="8888"/> + <location filename="../ui/EditProduct.ui" line="9200"/> <source>End date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8623"/> - <location filename="../ui/EditProduct.ui" line="8857"/> - <location filename="../ui/EditProduct.ui" line="9075"/> + <location filename="../ui/EditProduct.ui" line="9032"/> + <location filename="../ui/EditProduct.ui" line="9266"/> + <location filename="../ui/EditProduct.ui" line="9484"/> <source>Apparent attenuation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8941"/> + <location filename="../ui/EditProduct.ui" line="9350"/> <source>Edit the date the secondary fermentation was done.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8993"/> + <location filename="../ui/EditProduct.ui" line="9402"/> <source>Average temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9009"/> + <location filename="../ui/EditProduct.ui" line="9418"/> <source>Final density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9139"/> + <location filename="../ui/EditProduct.ui" line="9548"/> <source>Expected end density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9453"/> + <location filename="../ui/EditProduct.ui" line="9862"/> <source>Extra added volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9469"/> + <location filename="../ui/EditProduct.ui" line="9878"/> <source>Extra remarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9485"/> + <location filename="../ui/EditProduct.ui" line="9894"/> <source>Final ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9501"/> + <location filename="../ui/EditProduct.ui" line="9910"/> <source>Extra added ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9758"/> - <location filename="../ui/EditProduct.ui" line="10336"/> + <location filename="../ui/EditProduct.ui" line="10167"/> + <location filename="../ui/EditProduct.ui" line="10745"/> <source>Volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9822"/> - <location filename="../ui/EditProduct.ui" line="10226"/> + <location filename="../ui/EditProduct.ui" line="10231"/> + <location filename="../ui/EditProduct.ui" line="10635"/> <source>Priming:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9854"/> + <location filename="../ui/EditProduct.ui" line="10263"/> <source>Bottle fermentation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9973"/> - <location filename="../ui/EditProduct.ui" line="10389"/> + <location filename="../ui/EditProduct.ui" line="10382"/> + <location filename="../ui/EditProduct.ui" line="10798"/> <source> gr/L</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10242"/> + <location filename="../ui/EditProduct.ui" line="10651"/> <source>Kegs temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7377"/> + <location filename="../ui/EditProduct.ui" line="7786"/> <source>Transfer to fermenter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6524"/> + <location filename="../ui/EditProduct.ui" line="6927"/> <source>Brewday plan:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6149"/> - <location filename="../ui/EditProduct.ui" line="6880"/> - <location filename="../ui/EditProduct.ui" line="7834"/> - <location filename="../ui/EditProduct.ui" line="8523"/> - <location filename="../ui/EditProduct.ui" line="8551"/> - <location filename="../ui/EditProduct.ui" line="8579"/> - <location filename="../ui/EditProduct.ui" line="8813"/> - <location filename="../ui/EditProduct.ui" line="9031"/> - <location filename="../ui/EditProduct.ui" line="10058"/> - <location filename="../ui/EditProduct.ui" line="10508"/> + <location filename="../ui/EditProduct.ui" line="7286"/> + <location filename="../ui/EditProduct.ui" line="8243"/> + <location filename="../ui/EditProduct.ui" line="8932"/> + <location filename="../ui/EditProduct.ui" line="8960"/> + <location filename="../ui/EditProduct.ui" line="8988"/> + <location filename="../ui/EditProduct.ui" line="9222"/> + <location filename="../ui/EditProduct.ui" line="9440"/> + <location filename="../ui/EditProduct.ui" line="10467"/> + <location filename="../ui/EditProduct.ui" line="10917"/> <source> °C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6919"/> + <location filename="../ui/EditProduct.ui" line="7328"/> <source>Pre boil</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6963"/> - <location filename="../ui/EditProduct.ui" line="8122"/> + <location filename="../ui/EditProduct.ui" line="7372"/> + <location filename="../ui/EditProduct.ui" line="8531"/> <source>Volume @100°C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7061"/> + <location filename="../ui/EditProduct.ui" line="7470"/> <source>Mash, sparge and lauter efficiency.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7188"/> + <location filename="../ui/EditProduct.ui" line="7597"/> <source>Whirlpools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7200"/> + <location filename="../ui/EditProduct.ui" line="7609"/> <source>Whirlpool 72..79°C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7216"/> + <location filename="../ui/EditProduct.ui" line="7625"/> <source>Whirlpool 60..66°C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7248"/> + <location filename="../ui/EditProduct.ui" line="7657"/> <source>Whirlpool 85..100°C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7389"/> + <location filename="../ui/EditProduct.ui" line="7798"/> <source>Volume to fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7405"/> + <location filename="../ui/EditProduct.ui" line="7814"/> <source>Trub and chiller loss:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7527"/> + <location filename="../ui/EditProduct.ui" line="7936"/> <source>SG in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7543"/> + <location filename="../ui/EditProduct.ui" line="7952"/> <source>EBC color in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7559"/> + <location filename="../ui/EditProduct.ui" line="7968"/> <source>IBU in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7719"/> + <location filename="../ui/EditProduct.ui" line="8128"/> <source>Aeration with:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7687"/> + <location filename="../ui/EditProduct.ui" line="8096"/> <source> L/m</source> <translation type="unfinished"></translation> </message> @@ -3291,357 +3252,419 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6745"/> + <location filename="../ui/EditProduct.ui" line="4331"/> + <source>Acid Additions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4343"/> + <source>Desired mash pH:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4501"/> + <source>Desired sparge pH:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4636"/> + <location filename="../ui/EditProduct.ui" line="4652"/> + <source>Acid amount:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5106"/> + <source>The total prepared amount of sparge water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5190"/> + <source>Choose example water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5484"/> + <source>Treated mash water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6833"/> + <source>Sparge water source 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6855"/> + <source>Sparge water source 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6874"/> + <source>Sparge water mixed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6890"/> + <location filename="../src/EditProductTab5.cpp" line="724"/> + <source>Sparge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6906"/> + <source>Treated sparge water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7148"/> <source>Sparge supply:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6761"/> + <location filename="../ui/EditProduct.ui" line="7164"/> <source>Sparge estimate:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6805"/> + <location filename="../ui/EditProduct.ui" line="7208"/> <source>Sparge temp:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7764"/> - <location filename="../ui/EditProduct.ui" line="9254"/> - <location filename="../ui/EditProduct.ui" line="9274"/> - <location filename="../ui/EditProduct.ui" line="10596"/> + <location filename="../ui/EditProduct.ui" line="8173"/> + <location filename="../ui/EditProduct.ui" line="9663"/> + <location filename="../ui/EditProduct.ui" line="9683"/> + <location filename="../ui/EditProduct.ui" line="11005"/> <source>Brew log chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7784"/> + <location filename="../ui/EditProduct.ui" line="8193"/> <source>Cooling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7812"/> + <location filename="../ui/EditProduct.ui" line="8221"/> <source>Cooling to:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7911"/> + <location filename="../ui/EditProduct.ui" line="8320"/> <location filename="../src/EditProductExport.cpp" line="783"/> <source>After boil</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8055"/> + <location filename="../ui/EditProduct.ui" line="8464"/> <source>The overall efficiency.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8181"/> + <location filename="../ui/EditProduct.ui" line="8590"/> <source>Edit the brewdate plan or start.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8200"/> + <location filename="../ui/EditProduct.ui" line="8609"/> <source>Clear planned brewdate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8220"/> + <location filename="../ui/EditProduct.ui" line="8629"/> <source>Edit the brewdate start time.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8223"/> - <location filename="../ui/EditProduct.ui" line="8258"/> + <location filename="../ui/EditProduct.ui" line="8632"/> + <location filename="../ui/EditProduct.ui" line="8667"/> <source>hh:mm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8236"/> + <location filename="../ui/EditProduct.ui" line="8645"/> <source>Edit the brewdate end.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8255"/> + <location filename="../ui/EditProduct.ui" line="8664"/> <source>Edit the brewdate end time.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8271"/> + <location filename="../ui/EditProduct.ui" line="8680"/> <source>Set the brewdate end date.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8291"/> + <location filename="../ui/EditProduct.ui" line="8700"/> <source>End time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8307"/> + <location filename="../ui/EditProduct.ui" line="8716"/> <source>Start time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8323"/> + <location filename="../ui/EditProduct.ui" line="8732"/> <source>Show brewlog:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8342"/> + <location filename="../ui/EditProduct.ui" line="8751"/> <source>Confirm brew done:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8358"/> - <location filename="../ui/EditProduct.ui" line="8726"/> - <location filename="../ui/EditProduct.ui" line="8960"/> + <location filename="../ui/EditProduct.ui" line="8767"/> + <location filename="../ui/EditProduct.ui" line="9135"/> + <location filename="../ui/EditProduct.ui" line="9369"/> <source>Confirm the brew dates and times.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8375"/> + <location filename="../ui/EditProduct.ui" line="8784"/> <source>Fermenting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8387"/> + <location filename="../ui/EditProduct.ui" line="8796"/> <source>Primary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8667"/> - <location filename="../ui/EditProduct.ui" line="8901"/> - <location filename="../ui/EditProduct.ui" line="9119"/> + <location filename="../ui/EditProduct.ui" line="9076"/> + <location filename="../ui/EditProduct.ui" line="9310"/> + <location filename="../ui/EditProduct.ui" line="9528"/> <source>Edit SG in Plato, Brix or SG</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8687"/> - <location filename="../ui/EditProduct.ui" line="8921"/> + <location filename="../ui/EditProduct.ui" line="9096"/> + <location filename="../ui/EditProduct.ui" line="9330"/> <source>Set the date to today</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8707"/> + <location filename="../ui/EditProduct.ui" line="9116"/> <source>Edit the date the primary fermentation was done.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8747"/> + <location filename="../ui/EditProduct.ui" line="9156"/> <source>Secondary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8981"/> + <location filename="../ui/EditProduct.ui" line="9390"/> <source>Tertiary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9177"/> + <location filename="../ui/EditProduct.ui" line="9586"/> <source>Alcohol volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9222"/> + <location filename="../ui/EditProduct.ui" line="9631"/> <source>Show fermenter unit log:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9238"/> + <location filename="../ui/EditProduct.ui" line="9647"/> <source>Show fermentation log:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9287"/> + <location filename="../ui/EditProduct.ui" line="9696"/> <source>Package</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9299"/> + <location filename="../ui/EditProduct.ui" line="9708"/> <source>Package date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9372"/> + <location filename="../ui/EditProduct.ui" line="9781"/> <source>Carbonation range:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9425"/> + <location filename="../ui/EditProduct.ui" line="9834"/> <source>Infusion or Dilution</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9437"/> + <location filename="../ui/EditProduct.ui" line="9846"/> <source>Package volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9698"/> + <location filename="../ui/EditProduct.ui" line="10107"/> <source>Package ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9517"/> + <location filename="../ui/EditProduct.ui" line="9926"/> <source>pH from fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9561"/> + <location filename="../ui/EditProduct.ui" line="9970"/> <source>Extra dilution or infusion added to this batch.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9592"/> - <location filename="../ui/EditProduct.ui" line="9714"/> + <location filename="../ui/EditProduct.ui" line="10001"/> + <location filename="../ui/EditProduct.ui" line="10123"/> <source>The ABV including the infusion.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9623"/> + <location filename="../ui/EditProduct.ui" line="10032"/> <source>If there is alcohol in the infusion, give the percentage.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9682"/> + <location filename="../ui/EditProduct.ui" line="10091"/> <source>Could be the description of the infusion.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9746"/> + <location filename="../ui/EditProduct.ui" line="10155"/> <source>Bottles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9774"/> - <location filename="../ui/EditProduct.ui" line="10194"/> + <location filename="../ui/EditProduct.ui" line="10183"/> + <location filename="../ui/EditProduct.ui" line="10603"/> <source>Desired volume CO2:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9790"/> - <location filename="../ui/EditProduct.ui" line="10261"/> + <location filename="../ui/EditProduct.ui" line="10199"/> + <location filename="../ui/EditProduct.ui" line="10670"/> <source>Priming sugar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9806"/> - <location filename="../ui/EditProduct.ui" line="10178"/> + <location filename="../ui/EditProduct.ui" line="10215"/> + <location filename="../ui/EditProduct.ui" line="10587"/> <source>Sugar amount:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9838"/> - <location filename="../ui/EditProduct.ui" line="10210"/> + <location filename="../ui/EditProduct.ui" line="10247"/> + <location filename="../ui/EditProduct.ui" line="10619"/> <source>Water amount:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10020"/> + <location filename="../ui/EditProduct.ui" line="10429"/> <source>Expected pressure in bar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10036"/> + <location filename="../ui/EditProduct.ui" line="10445"/> <source>Bottles ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10134"/> + <location filename="../ui/EditProduct.ui" line="10543"/> <source>Kegs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10146"/> + <location filename="../ui/EditProduct.ui" line="10555"/> <source>Kegs ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10162"/> + <location filename="../ui/EditProduct.ui" line="10571"/> <source>Kegs pressure in bar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10530"/> + <location filename="../ui/EditProduct.ui" line="10939"/> <source>Forced carbonation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10557"/> + <location filename="../ui/EditProduct.ui" line="10966"/> <source>Edit the package date.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10616"/> + <location filename="../ui/EditProduct.ui" line="11025"/> <source>Show carbonation log:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10625"/> + <location filename="../ui/EditProduct.ui" line="11034"/> <source>Tasting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10637"/> + <location filename="../ui/EditProduct.ui" line="11046"/> <source>Taste date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10673"/> + <location filename="../ui/EditProduct.ui" line="11082"/> <source>Taste rate:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10714"/> + <location filename="../ui/EditProduct.ui" line="11123"/> <source>Color:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10730"/> + <location filename="../ui/EditProduct.ui" line="11139"/> <source>Transparency:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10746"/> + <location filename="../ui/EditProduct.ui" line="11155"/> <source>Head:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10801"/> + <location filename="../ui/EditProduct.ui" line="11210"/> <source>Aroma:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10830"/> + <location filename="../ui/EditProduct.ui" line="11239"/> <source>Taste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10859"/> + <location filename="../ui/EditProduct.ui" line="11268"/> <source>Aftertaste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10888"/> + <location filename="../ui/EditProduct.ui" line="11297"/> <source>Mouthfeel:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10917"/> + <location filename="../ui/EditProduct.ui" line="11326"/> <source>Notes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10943"/> + <location filename="../ui/EditProduct.ui" line="11352"/> <source>Edit the tasting date.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10984"/> + <location filename="../ui/EditProduct.ui" line="11393"/> <source>Export</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11001"/> + <location filename="../ui/EditProduct.ui" line="11410"/> <source>Print</source> <translation type="unfinished"></translation> </message> @@ -3661,32 +3684,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="62"/> - <source>Source 1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProduct.cpp" line="63"/> - <source>Source 2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProduct.cpp" line="64"/> - <source>Mixed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProduct.cpp" line="99"/> + <location filename="../src/EditProduct.cpp" line="95"/> <source>None</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="100"/> + <location filename="../src/EditProduct.cpp" line="96"/> <source>Air</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="101"/> + <location filename="../src/EditProduct.cpp" line="97"/> <source>Oxygen</source> <translation type="unfinished"></translation> </message> @@ -3696,43 +3704,43 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="791"/> + <location filename="../src/EditProduct.cpp" line="798"/> <source>BMSapp - Add new product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="793"/> + <location filename="../src/EditProduct.cpp" line="800"/> <source>BMSapp - Edit product %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="809"/> - <location filename="../src/EditProduct.cpp" line="813"/> + <location filename="../src/EditProduct.cpp" line="816"/> + <location filename="../src/EditProduct.cpp" line="820"/> <source>Edit Product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="809"/> + <location filename="../src/EditProduct.cpp" line="816"/> <source>Name empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="813"/> + <location filename="../src/EditProduct.cpp" line="820"/> <source>No beerstyle selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="851"/> + <location filename="../src/EditProduct.cpp" line="858"/> <source>Delete product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="875"/> + <location filename="../src/EditProduct.cpp" line="882"/> <source>Product changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="875"/> + <location filename="../src/EditProduct.cpp" line="882"/> <source>The product has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -3754,7 +3762,7 @@ <message> <location filename="../src/EditProductTab3.cpp" line="74"/> <location filename="../src/EditProductTab4.cpp" line="56"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> <location filename="../src/EditProductTab6.cpp" line="55"/> <location filename="../src/EditProductTab7.cpp" line="36"/> <source>Type</source> @@ -3778,7 +3786,7 @@ <message> <location filename="../src/EditProductTab3.cpp" line="75"/> <location filename="../src/EditProductTab4.cpp" line="57"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> <location filename="../src/EditProductTab6.cpp" line="56"/> <source>Amount</source> <translation type="unfinished"></translation> @@ -3786,7 +3794,7 @@ <message> <location filename="../src/EditProductTab3.cpp" line="75"/> <location filename="../src/EditProductTab4.cpp" line="57"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> <location filename="../src/EditProductTab6.cpp" line="56"/> <source>Stock</source> <translation type="unfinished"></translation> @@ -3806,8 +3814,8 @@ <location filename="../src/EditProductTab3.cpp" line="174"/> <location filename="../src/EditProductTab4.cpp" line="57"/> <location filename="../src/EditProductTab4.cpp" line="160"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> - <location filename="../src/EditProductTab5.cpp" line="170"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> + <location filename="../src/EditProductTab5.cpp" line="177"/> <location filename="../src/EditProductTab6.cpp" line="56"/> <location filename="../src/EditProductTab6.cpp" line="154"/> <source>Edit</source> @@ -3833,16 +3841,16 @@ <message> <location filename="../src/EditProductTab3.cpp" line="650"/> <location filename="../src/EditProductTab4.cpp" line="341"/> - <location filename="../src/EditProductTab5.cpp" line="356"/> + <location filename="../src/EditProductTab5.cpp" line="400"/> <location filename="../src/EditProductTab6.cpp" line="747"/> <location filename="../src/EditProductTab7.cpp" line="303"/> - <location filename="../src/EditProduct.cpp" line="851"/> + <location filename="../src/EditProduct.cpp" line="858"/> <source>Delete %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="966"/> - <location filename="../src/EditProductTab5.cpp" line="600"/> + <location filename="../src/EditProductTab5.cpp" line="644"/> <source>Current ingredient:</source> <translation type="unfinished"></translation> </message> @@ -3875,14 +3883,14 @@ </message> <message> <location filename="../src/EditProductTab3.cpp" line="996"/> - <location filename="../src/EditProductTab5.cpp" line="626"/> + <location filename="../src/EditProductTab5.cpp" line="670"/> <source>Select ingredient:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="1001"/> <location filename="../src/EditProductTab4.cpp" line="618"/> - <location filename="../src/EditProductTab5.cpp" line="631"/> + <location filename="../src/EditProductTab5.cpp" line="675"/> <location filename="../src/EditProductTab6.cpp" line="991"/> <source>In stock:</source> <translation type="unfinished"></translation> @@ -3895,7 +3903,7 @@ <message> <location filename="../src/EditProductTab3.cpp" line="1057"/> <location filename="../src/EditProductTab4.cpp" line="670"/> - <location filename="../src/EditProductTab5.cpp" line="676"/> + <location filename="../src/EditProductTab5.cpp" line="720"/> <source>Boil</source> <translation type="unfinished"></translation> </message> @@ -3931,13 +3939,13 @@ </message> <message> <location filename="../src/EditProductTab4.cpp" line="56"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> <source>Use at</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab4.cpp" line="56"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> <location filename="../src/EditProductTab9.cpp" line="514"/> <source>Time</source> <translation type="unfinished"></translation> @@ -3991,18 +3999,18 @@ <message> <location filename="../src/EditProductTab4.cpp" line="541"/> <location filename="../src/EditProductTab4.cpp" line="600"/> - <location filename="../src/EditProductTab5.cpp" line="471"/> - <location filename="../src/EditProductTab5.cpp" line="560"/> - <location filename="../src/EditProductTab5.cpp" line="618"/> + <location filename="../src/EditProductTab5.cpp" line="515"/> + <location filename="../src/EditProductTab5.cpp" line="604"/> + <location filename="../src/EditProductTab5.cpp" line="662"/> <source>Time in minutes:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab4.cpp" line="545"/> <location filename="../src/EditProductTab4.cpp" line="598"/> - <location filename="../src/EditProductTab5.cpp" line="466"/> - <location filename="../src/EditProductTab5.cpp" line="555"/> - <location filename="../src/EditProductTab5.cpp" line="616"/> + <location filename="../src/EditProductTab5.cpp" line="510"/> + <location filename="../src/EditProductTab5.cpp" line="599"/> + <location filename="../src/EditProductTab5.cpp" line="660"/> <source>Time in days:</source> <translation type="unfinished"></translation> </message> @@ -4018,8 +4026,8 @@ </message> <message> <location filename="../src/EditProductTab4.cpp" line="592"/> - <location filename="../src/EditProductTab5.cpp" line="482"/> - <location filename="../src/EditProductTab5.cpp" line="607"/> + <location filename="../src/EditProductTab5.cpp" line="526"/> + <location filename="../src/EditProductTab5.cpp" line="651"/> <location filename="../src/EditProductTab6.cpp" line="861"/> <location filename="../src/EditProductTab6.cpp" line="999"/> <source>Amount in gr:</source> @@ -4051,55 +4059,55 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> <source>Ingredient</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="134"/> - <location filename="../src/EditProductTab5.cpp" line="138"/> + <location filename="../src/EditProductTab5.cpp" line="141"/> + <location filename="../src/EditProductTab5.cpp" line="145"/> <source>Edit this from the water tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="143"/> - <location filename="../src/EditProductTab5.cpp" line="147"/> + <location filename="../src/EditProductTab5.cpp" line="150"/> + <location filename="../src/EditProductTab5.cpp" line="154"/> <source>Misc already used</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="356"/> + <location filename="../src/EditProductTab5.cpp" line="400"/> <source>Delete misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="485"/> - <location filename="../src/EditProductTab5.cpp" line="609"/> + <location filename="../src/EditProductTab5.cpp" line="529"/> + <location filename="../src/EditProductTab5.cpp" line="653"/> <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="674"/> + <location filename="../src/EditProductTab5.cpp" line="718"/> <source>Starter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="677"/> + <location filename="../src/EditProductTab5.cpp" line="721"/> <location filename="../src/EditProductTab6.cpp" line="1055"/> <source>Primary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="678"/> + <location filename="../src/EditProductTab5.cpp" line="722"/> <location filename="../src/EditProductTab6.cpp" line="1056"/> <source>Secondary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab4.cpp" line="674"/> - <location filename="../src/EditProductTab5.cpp" line="679"/> + <location filename="../src/EditProductTab5.cpp" line="723"/> <source>Bottling</source> <translation type="unfinished"></translation> </message> @@ -4327,8 +4335,8 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6931"/> - <location filename="../ui/EditProduct.ui" line="8039"/> + <location filename="../ui/EditProduct.ui" line="7340"/> + <location filename="../ui/EditProduct.ui" line="8448"/> <location filename="../src/EditProductTab7.cpp" line="624"/> <source>Measured pH:</source> <translation type="unfinished"></translation> @@ -4339,8 +4347,8 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6947"/> - <location filename="../ui/EditProduct.ui" line="8106"/> + <location filename="../ui/EditProduct.ui" line="7356"/> + <location filename="../ui/EditProduct.ui" line="8515"/> <location filename="../src/EditProductTab7.cpp" line="656"/> <source>Measured SG:</source> <translation type="unfinished"></translation> @@ -4356,63 +4364,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="334"/> + <location filename="../src/EditProductTab8.cpp" line="343"/> <source>Very malty and sweet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="336"/> + <location filename="../src/EditProductTab8.cpp" line="345"/> <source>Malty, sweet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="338"/> - <location filename="../src/EditProductTab8.cpp" line="354"/> + <location filename="../src/EditProductTab8.cpp" line="347"/> + <location filename="../src/EditProductTab8.cpp" line="363"/> <source>Balanced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="340"/> + <location filename="../src/EditProductTab8.cpp" line="349"/> <source>Hoppy, bitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="342"/> + <location filename="../src/EditProductTab8.cpp" line="351"/> <source>Very hoppy, very bitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="348"/> + <location filename="../src/EditProductTab8.cpp" line="357"/> <source>Too malty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="350"/> + <location filename="../src/EditProductTab8.cpp" line="359"/> <source>Very malty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="352"/> + <location filename="../src/EditProductTab8.cpp" line="361"/> <source>Malty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="356"/> + <location filename="../src/EditProductTab8.cpp" line="365"/> <source>Little bitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="358"/> + <location filename="../src/EditProductTab8.cpp" line="367"/> <source>Bitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="360"/> + <location filename="../src/EditProductTab8.cpp" line="369"/> <source>Very bitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="362"/> + <location filename="../src/EditProductTab8.cpp" line="371"/> <source>Too bitter</source> <translation type="unfinished"></translation> </message> @@ -5297,75 +5305,90 @@ </message> <message> <location filename="../ui/EditProfileWater.ui" line="201"/> - <source>Acid pH:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProfileWater.ui" line="472"/> + <source>pH:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProfileWater.ui" line="526"/> + <source>Total Alkalinity (CaCO3) mg/L:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProfileWater.ui" line="571"/> + <source>Residual Alkalinity as CaCO3:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProfileWater.ui" line="655"/> + <source>Hardness as CaCO3:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProfileWater.ui" line="705"/> + <source>Carbonate (CO3) mg/L:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProfileWater.ui" line="478"/> <source>Sulfate (SO4) mg/L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProfileWater.ui" line="488"/> + <location filename="../ui/EditProfileWater.ui" line="494"/> <source>Chloride (Cl) mg/L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProfileWater.ui" line="504"/> + <location filename="../ui/EditProfileWater.ui" line="510"/> <source>Bicarbonate (HCO3) mg/L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProfileWater.ui" line="520"/> - <source>Alkalinity (CaCO3) mg/L:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProfileWater.ui" line="536"/> + <location filename="../ui/EditProfileWater.ui" line="542"/> <source>Ion balance meq/L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="85"/> + <location filename="../src/EditProfileWater.cpp" line="96"/> <source>BMSapp - Add new brewing water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="87"/> + <location filename="../src/EditProfileWater.cpp" line="98"/> <source>BMSapp - Edit brewing water %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="103"/> + <location filename="../src/EditProfileWater.cpp" line="114"/> <source>Edit Water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="103"/> + <location filename="../src/EditProfileWater.cpp" line="114"/> <source>Name empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="135"/> - <location filename="../src/EditProfileWater.cpp" line="160"/> + <location filename="../src/EditProfileWater.cpp" line="146"/> + <location filename="../src/EditProfileWater.cpp" line="171"/> <source>Database error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="136"/> - <location filename="../src/EditProfileWater.cpp" line="161"/> + <location filename="../src/EditProfileWater.cpp" line="147"/> + <location filename="../src/EditProfileWater.cpp" line="172"/> <source>MySQL error: %1 %2 %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="226"/> + <location filename="../src/EditProfileWater.cpp" line="281"/> <source>Water changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="226"/> + <location filename="../src/EditProfileWater.cpp" line="281"/> <source>This water profile has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -5393,8 +5416,8 @@ <location filename="../src/EditRecipeTab2.cpp" line="123"/> <location filename="../src/EditRecipeTab3.cpp" line="49"/> <location filename="../src/EditRecipeTab3.cpp" line="117"/> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> - <location filename="../src/EditRecipeTab4.cpp" line="121"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> + <location filename="../src/EditRecipeTab4.cpp" line="128"/> <location filename="../src/EditRecipeTab5.cpp" line="42"/> <location filename="../src/EditRecipeTab5.cpp" line="103"/> <location filename="../src/EditRecipeTab6.cpp" line="35"/> @@ -5469,6 +5492,7 @@ <message> <location filename="../ui/EditRecipe.ui" line="357"/> <location filename="../ui/EditRecipe.ui" line="391"/> + <location filename="../ui/EditRecipe.ui" line="5362"/> <source> L</source> <translation type="unfinished"></translation> </message> @@ -5712,7 +5736,7 @@ <location filename="../ui/EditRecipe.ui" line="2309"/> <location filename="../src/EditRecipeTab2.cpp" line="922"/> <location filename="../src/EditRecipeTab3.cpp" line="659"/> - <location filename="../src/EditRecipeTab4.cpp" line="610"/> + <location filename="../src/EditRecipeTab4.cpp" line="653"/> <source>Mash</source> <translation type="unfinished"></translation> </message> @@ -5737,362 +5761,383 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2441"/> - <source>Water overview</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="2662"/> + <location filename="../ui/EditRecipe.ui" line="4759"/> <source>Ca</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2678"/> + <location filename="../ui/EditRecipe.ui" line="5118"/> <source>Mg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2694"/> + <location filename="../ui/EditRecipe.ui" line="4775"/> <source>HCO3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2710"/> + <location filename="../ui/EditRecipe.ui" line="4743"/> <source>CaCO3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2726"/> + <location filename="../ui/EditRecipe.ui" line="5070"/> <source>Na</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2742"/> + <location filename="../ui/EditRecipe.ui" line="5102"/> <source>Cl</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2758"/> + <location filename="../ui/EditRecipe.ui" line="4667"/> <source>SO4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2774"/> + <location filename="../ui/EditRecipe.ui" line="4869"/> <source>pH</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2818"/> + <location filename="../ui/EditRecipe.ui" line="4954"/> <location filename="../src/EditRecipeTab6.cpp" line="35"/> <source>Volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3009"/> + <location filename="../ui/EditRecipe.ui" line="4211"/> <source>The division between the main and dilution water. The total volume does not change.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3318"/> - <location filename="../ui/EditRecipe.ui" line="4521"/> + <location filename="../ui/EditRecipe.ui" line="3229"/> + <location filename="../ui/EditRecipe.ui" line="3942"/> <source>Mash pH should be between 5.2 and 5.6. Use 5.2 for light and 5.5 for dark beers.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3496"/> + <location filename="../ui/EditRecipe.ui" line="3998"/> <source>The ideal amount of Magnesium is between 5 and 40.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3524"/> + <location filename="../ui/EditRecipe.ui" line="3860"/> <source>0 to 50 for light beers, 50 to 150 for amber beers, 150 to 250 for dark beers.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3552"/> + <location filename="../ui/EditRecipe.ui" line="2962"/> + <source>Acid Additions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="2974"/> + <source>Desired sparge pH:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="3006"/> + <location filename="../ui/EditRecipe.ui" line="3153"/> + <source>Acid amount:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="3257"/> + <source>Desired mash pH:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="3612"/> + <source>Choose example water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="3803"/> <source>The ideal Sulfate amount should be between 50 and 400. Together with Chloride it must be below 500.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3581"/> + <location filename="../ui/EditRecipe.ui" line="3832"/> <source>The ideal amount of Calcium is between 40 and 150.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../ui/EditRecipe.ui" line="3913"/> + <source>The ideal Chloride amount is between 50 and 150. +Together with Sulfate it must be below 500.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="4026"/> + <source>Treated mash water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="4042"/> + <source>The ideal amount of Natrium should be below 150.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="4885"/> + <source>Water profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="4683"/> + <source>The main brewing water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="4689"/> + <source>Choose water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="4651"/> + <source>Optional dilution water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="4654"/> + <source>Choose dilution</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../ui/EditRecipe.ui" line="3609"/> - <source>The ideal Chloride amount is between 50 and 150. -Together with Sulfate it must be below 500.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="3663"/> - <source>The ideal amount of Natrium should be below 150.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="3691"/> - <source>Water profile</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="3707"/> - <source>The main brewing water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="3713"/> - <source>Choose water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="3726"/> - <source>Optional dilution water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="3729"/> - <source>Choose dilution</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="3742"/> <source>If needed, choose a target water profile.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3755"/> + <location filename="../ui/EditRecipe.ui" line="4070"/> <source>Mixed water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3771"/> - <source>Treated water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="3999"/> + <location filename="../ui/EditRecipe.ui" line="5086"/> <source>RA</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4068"/> + <location filename="../ui/EditRecipe.ui" line="4727"/> <source>Hardness</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4085"/> + <location filename="../ui/EditRecipe.ui" line="2438"/> <source>Water agents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4097"/> + <location filename="../ui/EditRecipe.ui" line="2450"/> <source>Calcium Chloride</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4100"/> + <location filename="../ui/EditRecipe.ui" line="2453"/> <source>CaCl2:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4116"/> + <location filename="../ui/EditRecipe.ui" line="2469"/> <source>Gypsym</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4119"/> + <location filename="../ui/EditRecipe.ui" line="2472"/> <source>CaSO4:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4135"/> + <location filename="../ui/EditRecipe.ui" line="2488"/> <source>Epsom</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4138"/> + <location filename="../ui/EditRecipe.ui" line="2491"/> <source>MgSO4:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4154"/> + <location filename="../ui/EditRecipe.ui" line="2507"/> <source>Table salt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4157"/> + <location filename="../ui/EditRecipe.ui" line="2510"/> <source>NaCl:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4173"/> - <location filename="../ui/EditRecipe.ui" line="4357"/> + <location filename="../ui/EditRecipe.ui" line="2526"/> + <location filename="../ui/EditRecipe.ui" line="2710"/> + <location filename="../ui/EditRecipe.ui" line="2930"/> <source>Magnesium Chloride</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4176"/> + <location filename="../ui/EditRecipe.ui" line="2529"/> <source>MgCl2:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4192"/> - <location filename="../ui/EditRecipe.ui" line="4388"/> + <location filename="../ui/EditRecipe.ui" line="2545"/> + <location filename="../ui/EditRecipe.ui" line="2741"/> <source>Baking soda</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4195"/> + <location filename="../ui/EditRecipe.ui" line="2548"/> <source>NaHCO3:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4211"/> - <location filename="../ui/EditRecipe.ui" line="4419"/> + <location filename="../ui/EditRecipe.ui" line="2564"/> + <location filename="../ui/EditRecipe.ui" line="2772"/> <source>Chalk undissolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4214"/> + <location filename="../ui/EditRecipe.ui" line="2567"/> <source>CaCO3:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4230"/> + <location filename="../ui/EditRecipe.ui" line="2583"/> + <location filename="../ui/EditRecipe.ui" line="2803"/> <source>To change the water profile. This adds Calcium and Chloride. To improve sweet style beers.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4240"/> - <location filename="../ui/EditRecipe.ui" line="4272"/> - <location filename="../ui/EditRecipe.ui" line="4303"/> - <location filename="../ui/EditRecipe.ui" line="4335"/> - <location filename="../ui/EditRecipe.ui" line="4366"/> - <location filename="../ui/EditRecipe.ui" line="4397"/> - <location filename="../ui/EditRecipe.ui" line="4428"/> + <location filename="../ui/EditRecipe.ui" line="2593"/> + <location filename="../ui/EditRecipe.ui" line="2625"/> + <location filename="../ui/EditRecipe.ui" line="2656"/> + <location filename="../ui/EditRecipe.ui" line="2688"/> + <location filename="../ui/EditRecipe.ui" line="2719"/> + <location filename="../ui/EditRecipe.ui" line="2750"/> + <location filename="../ui/EditRecipe.ui" line="2781"/> + <location filename="../ui/EditRecipe.ui" line="2813"/> + <location filename="../ui/EditRecipe.ui" line="2844"/> + <location filename="../ui/EditRecipe.ui" line="2876"/> + <location filename="../ui/EditRecipe.ui" line="2908"/> + <location filename="../ui/EditRecipe.ui" line="2939"/> <source> gr</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4262"/> + <location filename="../ui/EditRecipe.ui" line="2615"/> + <location filename="../ui/EditRecipe.ui" line="2898"/> <source>Gypsum to change the water profile. This adds Calcium and Sulfate. To improve bitter beers.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4294"/> + <location filename="../ui/EditRecipe.ui" line="2647"/> + <location filename="../ui/EditRecipe.ui" line="2835"/> <source>Epsom salt to change the water profile. Use with caution!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4325"/> + <location filename="../ui/EditRecipe.ui" line="2678"/> + <location filename="../ui/EditRecipe.ui" line="2866"/> <source>Table salt to change the water profile. This adds Sodium and Chloride. Improves the sweetness of the beer. The beer will become salty at high doses.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4451"/> - <source>Mash water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4463"/> - <location filename="../ui/EditRecipe.ui" line="4682"/> - <source>Desired pH:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4479"/> + <location filename="../ui/EditRecipe.ui" line="3273"/> <source>Auto calculate:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4495"/> + <location filename="../ui/EditRecipe.ui" line="3213"/> <source>Acid to use:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4561"/> - <location filename="../ui/EditRecipe.ui" line="4833"/> + <location filename="../ui/EditRecipe.ui" line="3059"/> + <location filename="../ui/EditRecipe.ui" line="3181"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4589"/> - <location filename="../ui/EditRecipe.ui" line="4867"/> + <location filename="../ui/EditRecipe.ui" line="3093"/> + <location filename="../ui/EditRecipe.ui" line="3131"/> <source> ml</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4622"/> - <source>Sparge water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4634"/> - <source>Sparge water supply:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4650"/> - <source>Sparge temperature:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4666"/> - <source>Water source:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4698"/> + <location filename="../ui/EditRecipe.ui" line="2990"/> <source>Acid type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4714"/> - <source>Acid strength:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4730"/> - <source>Acid needed:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4910"/> + <location filename="../ui/EditRecipe.ui" line="3300"/> <source>Bitterness index:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4962"/> - <location filename="../ui/EditRecipe.ui" line="5030"/> + <location filename="../ui/EditRecipe.ui" line="3352"/> + <location filename="../ui/EditRecipe.ui" line="3420"/> <source>N/A</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4978"/> + <location filename="../ui/EditRecipe.ui" line="3368"/> <source>Preffered SO4:Cl ratio:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="5046"/> + <location filename="../ui/EditRecipe.ui" line="3436"/> <source>Current SO4:Cl ratio:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="5103"/> + <location filename="../ui/EditRecipe.ui" line="3493"/> <source>Estimate pre boil pH:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="5146"/> + <location filename="../ui/EditRecipe.ui" line="5212"/> + <source>Treated sparge water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="5353"/> + <source>The total prepared amount of sparge water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="5459"/> + <location filename="../src/EditRecipeTab4.cpp" line="658"/> + <source>Sparge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="5478"/> + <source>Sparge water mixed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="5494"/> + <source>Sparge water source 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="5516"/> + <source>Sparge water source 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="5534"/> <source>Export</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="5163"/> + <location filename="../ui/EditRecipe.ui" line="5551"/> <source>Print</source> <translation type="unfinished"></translation> </message> @@ -6113,58 +6158,43 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="59"/> - <source>Source 1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipe.cpp" line="60"/> - <source>Source 2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipe.cpp" line="61"/> - <source>Mixed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipe.cpp" line="449"/> + <location filename="../src/EditRecipe.cpp" line="456"/> <source>BMSapp - Add new recipe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="451"/> + <location filename="../src/EditRecipe.cpp" line="458"/> <source>BMSapp - Edit recipe %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="467"/> - <location filename="../src/EditRecipe.cpp" line="471"/> + <location filename="../src/EditRecipe.cpp" line="474"/> + <location filename="../src/EditRecipe.cpp" line="478"/> <source>Edit Recipe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="467"/> + <location filename="../src/EditRecipe.cpp" line="474"/> <source>Name empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="471"/> + <location filename="../src/EditRecipe.cpp" line="478"/> <source>No beerstyle selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="503"/> + <location filename="../src/EditRecipe.cpp" line="510"/> <source>Delete recipe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="527"/> + <location filename="../src/EditRecipe.cpp" line="534"/> <source>Recipe changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="527"/> + <location filename="../src/EditRecipe.cpp" line="534"/> <source>The recipe has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -6186,7 +6216,7 @@ <message> <location filename="../src/EditRecipeTab2.cpp" line="60"/> <location filename="../src/EditRecipeTab3.cpp" line="48"/> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> <location filename="../src/EditRecipeTab5.cpp" line="41"/> <location filename="../src/EditRecipeTab6.cpp" line="34"/> <source>Type</source> @@ -6210,7 +6240,7 @@ <message> <location filename="../src/EditRecipeTab2.cpp" line="61"/> <location filename="../src/EditRecipeTab3.cpp" line="49"/> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> <location filename="../src/EditRecipeTab5.cpp" line="42"/> <source>Amount</source> <translation type="unfinished"></translation> @@ -6230,8 +6260,8 @@ <location filename="../src/EditRecipeTab2.cpp" line="134"/> <location filename="../src/EditRecipeTab3.cpp" line="49"/> <location filename="../src/EditRecipeTab3.cpp" line="128"/> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> - <location filename="../src/EditRecipeTab4.cpp" line="132"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> + <location filename="../src/EditRecipeTab4.cpp" line="139"/> <location filename="../src/EditRecipeTab5.cpp" line="42"/> <location filename="../src/EditRecipeTab5.cpp" line="114"/> <location filename="../src/EditRecipeTab6.cpp" line="35"/> @@ -6247,16 +6277,16 @@ <message> <location filename="../src/EditRecipeTab2.cpp" line="522"/> <location filename="../src/EditRecipeTab3.cpp" line="291"/> - <location filename="../src/EditRecipeTab4.cpp" line="301"/> + <location filename="../src/EditRecipeTab4.cpp" line="344"/> <location filename="../src/EditRecipeTab5.cpp" line="261"/> <location filename="../src/EditRecipeTab6.cpp" line="285"/> - <location filename="../src/EditRecipe.cpp" line="503"/> + <location filename="../src/EditRecipe.cpp" line="510"/> <source>Delete %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="832"/> - <location filename="../src/EditRecipeTab4.cpp" line="535"/> + <location filename="../src/EditRecipeTab4.cpp" line="578"/> <source>Current ingredient:</source> <translation type="unfinished"></translation> </message> @@ -6289,14 +6319,14 @@ </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="862"/> - <location filename="../src/EditRecipeTab4.cpp" line="561"/> + <location filename="../src/EditRecipeTab4.cpp" line="604"/> <source>Select ingredient:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="867"/> <location filename="../src/EditRecipeTab3.cpp" line="600"/> - <location filename="../src/EditRecipeTab4.cpp" line="566"/> + <location filename="../src/EditRecipeTab4.cpp" line="609"/> <location filename="../src/EditRecipeTab5.cpp" line="482"/> <source>In stock:</source> <translation type="unfinished"></translation> @@ -6309,7 +6339,7 @@ <message> <location filename="../src/EditRecipeTab2.cpp" line="923"/> <location filename="../src/EditRecipeTab3.cpp" line="661"/> - <location filename="../src/EditRecipeTab4.cpp" line="611"/> + <location filename="../src/EditRecipeTab4.cpp" line="654"/> <source>Boil</source> <translation type="unfinished"></translation> </message> @@ -6356,13 +6386,13 @@ </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="48"/> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> <source>Use at</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="48"/> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> <source>Time</source> <translation type="unfinished"></translation> </message> @@ -6409,18 +6439,18 @@ <message> <location filename="../src/EditRecipeTab3.cpp" line="491"/> <location filename="../src/EditRecipeTab3.cpp" line="577"/> - <location filename="../src/EditRecipeTab4.cpp" line="415"/> - <location filename="../src/EditRecipeTab4.cpp" line="495"/> - <location filename="../src/EditRecipeTab4.cpp" line="553"/> + <location filename="../src/EditRecipeTab4.cpp" line="458"/> + <location filename="../src/EditRecipeTab4.cpp" line="538"/> + <location filename="../src/EditRecipeTab4.cpp" line="596"/> <source>Time in minutes:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="495"/> <location filename="../src/EditRecipeTab3.cpp" line="575"/> - <location filename="../src/EditRecipeTab4.cpp" line="410"/> - <location filename="../src/EditRecipeTab4.cpp" line="490"/> - <location filename="../src/EditRecipeTab4.cpp" line="551"/> + <location filename="../src/EditRecipeTab4.cpp" line="453"/> + <location filename="../src/EditRecipeTab4.cpp" line="533"/> + <location filename="../src/EditRecipeTab4.cpp" line="594"/> <source>Time in days:</source> <translation type="unfinished"></translation> </message> @@ -6436,8 +6466,8 @@ </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="564"/> - <location filename="../src/EditRecipeTab4.cpp" line="426"/> - <location filename="../src/EditRecipeTab4.cpp" line="542"/> + <location filename="../src/EditRecipeTab4.cpp" line="469"/> + <location filename="../src/EditRecipeTab4.cpp" line="585"/> <location filename="../src/EditRecipeTab5.cpp" line="365"/> <location filename="../src/EditRecipeTab5.cpp" line="490"/> <source>Amount in gr:</source> @@ -6504,49 +6534,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> <source>Ingredient</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="106"/> - <location filename="../src/EditRecipeTab4.cpp" line="109"/> + <location filename="../src/EditRecipeTab4.cpp" line="113"/> + <location filename="../src/EditRecipeTab4.cpp" line="116"/> <source>Edit this from the water tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="301"/> + <location filename="../src/EditRecipeTab4.cpp" line="344"/> <source>Delete misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="429"/> - <location filename="../src/EditRecipeTab4.cpp" line="544"/> + <location filename="../src/EditRecipeTab4.cpp" line="472"/> + <location filename="../src/EditRecipeTab4.cpp" line="587"/> <location filename="../src/EditRecipeTab5.cpp" line="369"/> <location filename="../src/EditRecipeTab5.cpp" line="492"/> <source>Amount in ml:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="609"/> + <location filename="../src/EditRecipeTab4.cpp" line="652"/> <source>Starter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="612"/> + <location filename="../src/EditRecipeTab4.cpp" line="655"/> <location filename="../src/EditRecipeTab5.cpp" line="545"/> <source>Primary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="613"/> + <location filename="../src/EditRecipeTab4.cpp" line="656"/> <location filename="../src/EditRecipeTab5.cpp" line="546"/> <source>Secondary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="665"/> - <location filename="../src/EditRecipeTab4.cpp" line="614"/> + <location filename="../src/EditRecipeTab4.cpp" line="657"/> <source>Bottling</source> <translation type="unfinished"></translation> </message> @@ -6718,63 +6748,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="334"/> + <location filename="../src/EditRecipeTab7.cpp" line="343"/> <source>Very malty and sweet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="336"/> + <location filename="../src/EditRecipeTab7.cpp" line="345"/> <source>Malty, sweet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="338"/> - <location filename="../src/EditRecipeTab7.cpp" line="354"/> + <location filename="../src/EditRecipeTab7.cpp" line="347"/> + <location filename="../src/EditRecipeTab7.cpp" line="363"/> <source>Balanced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="340"/> + <location filename="../src/EditRecipeTab7.cpp" line="349"/> <source>Hoppy, bitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="342"/> + <location filename="../src/EditRecipeTab7.cpp" line="351"/> <source>Very hoppy, very bitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="348"/> + <location filename="../src/EditRecipeTab7.cpp" line="357"/> <source>Too malty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="350"/> + <location filename="../src/EditRecipeTab7.cpp" line="359"/> <source>Very malty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="352"/> + <location filename="../src/EditRecipeTab7.cpp" line="361"/> <source>Malty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="356"/> + <location filename="../src/EditRecipeTab7.cpp" line="365"/> <source>Little bitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="358"/> + <location filename="../src/EditRecipeTab7.cpp" line="367"/> <source>Bitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="360"/> + <location filename="../src/EditRecipeTab7.cpp" line="369"/> <source>Very bitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="362"/> + <location filename="../src/EditRecipeTab7.cpp" line="371"/> <source>Too bitter</source> <translation type="unfinished"></translation> </message> @@ -7092,7 +7122,27 @@ </message> <message> <location filename="../ui/EditWater.ui" line="295"/> - <source>Acid pH:</source> + <source>pH:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditWater.ui" line="646"/> + <source>Total Alkalinity (CaCO3) mg/L:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditWater.ui" line="662"/> + <source>Ion balance mEq/L:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditWater.ui" line="785"/> + <source>Hardness as CaCO3:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditWater.ui" line="801"/> + <source>Residual Alkalinity as CaCO3:</source> <translation type="unfinished"></translation> </message> <message> @@ -7106,81 +7156,71 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditWater.ui" line="595"/> + <location filename="../ui/EditWater.ui" line="598"/> <source>Sulfate (SO4) mg/L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditWater.ui" line="611"/> + <location filename="../ui/EditWater.ui" line="614"/> <source>Chloride (Cl) mg/L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditWater.ui" line="627"/> + <location filename="../ui/EditWater.ui" line="630"/> <source>Bicarbonate (HCO3) mg/L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditWater.ui" line="643"/> - <source>or (CaCO3) mg/L:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditWater.ui" line="688"/> + <location filename="../ui/EditWater.ui" line="691"/> <source>Nitrate (NO3) mg/L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditWater.ui" line="732"/> + <location filename="../ui/EditWater.ui" line="735"/> <source>Carbonate (CO3) mg/L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditWater.ui" line="659"/> - <source>Ion balance meq/L:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditWater.cpp" line="93"/> + <location filename="../src/EditWater.cpp" line="105"/> <source>BMSapp - Add new brewing water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditWater.cpp" line="95"/> + <location filename="../src/EditWater.cpp" line="107"/> <source>BMSapp - Edit brewing water %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditWater.cpp" line="111"/> + <location filename="../src/EditWater.cpp" line="123"/> <source>Edit Water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditWater.cpp" line="111"/> + <location filename="../src/EditWater.cpp" line="123"/> <source>Name empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditWater.cpp" line="147"/> - <location filename="../src/EditWater.cpp" line="172"/> + <location filename="../src/EditWater.cpp" line="159"/> + <location filename="../src/EditWater.cpp" line="184"/> <source>Database error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditWater.cpp" line="148"/> - <location filename="../src/EditWater.cpp" line="173"/> + <location filename="../src/EditWater.cpp" line="160"/> + <location filename="../src/EditWater.cpp" line="185"/> <source>MySQL error: %1 %2 %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditWater.cpp" line="244"/> + <location filename="../src/EditWater.cpp" line="301"/> <source>Water changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditWater.cpp" line="244"/> + <location filename="../src/EditWater.cpp" line="301"/> <source>The brewing water has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -8731,6 +8771,11 @@ <source>Bottling</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/global.cpp" line="150"/> + <source>Sparge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MonCO2meters</name> @@ -11423,17 +11468,17 @@ <context> <name>StepType</name> <message> - <location filename="../src/global.cpp" line="187"/> + <location filename="../src/global.cpp" line="188"/> <source>Infusion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="188"/> - <source>Temperature</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="189"/> + <source>Temperature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="190"/> <source>Decoction</source> <translation type="unfinished"></translation> </message> @@ -11449,22 +11494,22 @@ <context> <name>TunMaterial</name> <message> - <location filename="../src/global.cpp" line="193"/> + <location filename="../src/global.cpp" line="194"/> <source>Stainless Steel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="194"/> - <source>Aluminium</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="195"/> - <source>Plastics</source> + <source>Aluminium</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="196"/> + <source>Plastics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="197"/> <source>Copper</source> <translation type="unfinished"></translation> </message> @@ -11480,37 +11525,37 @@ <context> <name>YeastForm</name> <message> - <location filename="../src/global.cpp" line="164"/> + <location filename="../src/global.cpp" line="165"/> <source>Liquid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="165"/> - <source>Dry</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="166"/> - <source>Slant</source> + <source>Dry</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="167"/> - <source>Culture</source> + <source>Slant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="168"/> - <source>Frozen</source> + <source>Culture</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="169"/> - <source>Bottle</source> + <source>Frozen</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="170"/> + <source>Bottle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="171"/> <source>Dried</source> <translation type="unfinished"></translation> </message> @@ -11518,17 +11563,17 @@ <context> <name>YeastStarter</name> <message> - <location filename="../src/global.cpp" line="181"/> + <location filename="../src/global.cpp" line="182"/> <source>Stirred</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="182"/> - <source>Shaken</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="183"/> + <source>Shaken</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="184"/> <source>Simple</source> <translation type="unfinished"></translation> </message> @@ -11536,42 +11581,42 @@ <context> <name>YeastType</name> <message> - <location filename="../src/global.cpp" line="153"/> + <location filename="../src/global.cpp" line="154"/> <source>Lager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="154"/> - <source>Ale</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="155"/> - <source>Wheat</source> + <source>Ale</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="156"/> - <source>Wine</source> + <source>Wheat</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="157"/> - <source>Champagne</source> + <source>Wine</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="158"/> - <source>Brett</source> + <source>Champagne</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="159"/> - <source>Kveik</source> + <source>Brett</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="160"/> + <source>Kveik</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="161"/> <source>Hybrid</source> <translation type="unfinished"></translation> </message> @@ -11579,22 +11624,22 @@ <context> <name>YeastUse</name> <message> - <location filename="../src/global.cpp" line="174"/> + <location filename="../src/global.cpp" line="175"/> <source>Primary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="175"/> - <source>Secondary</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="176"/> - <source>Tertiary</source> + <source>Secondary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="177"/> + <source>Tertiary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="178"/> <source>Bottle</source> <translation type="unfinished"></translation> </message>
--- a/translations/bmsapp_nl.ts Mon Jul 18 17:04:02 2022 +0200 +++ b/translations/bmsapp_nl.ts Mon Jul 18 19:28:21 2022 +0200 @@ -1311,7 +1311,7 @@ </message> <message> <location filename="../ui/EditFermentable.ui" line="590"/> - <location filename="../ui/EditFermentable.ui" line="1006"/> + <location filename="../ui/EditFermentable.ui" line="1012"/> <source> €</source> <translation> €</translation> </message> @@ -1321,68 +1321,68 @@ <translation> °WK</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="810"/> - <location filename="../ui/EditFermentable.ui" line="823"/> - <location filename="../ui/EditFermentable.ui" line="836"/> + <location filename="../ui/EditFermentable.ui" line="816"/> + <location filename="../ui/EditFermentable.ui" line="829"/> + <location filename="../ui/EditFermentable.ui" line="842"/> <source>Yes</source> <translation>Ja</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="885"/> - <location filename="../ui/EditFermentable.ui" line="918"/> + <location filename="../ui/EditFermentable.ui" line="891"/> + <location filename="../ui/EditFermentable.ui" line="924"/> <source>yyyy-MM-dd</source> <translation>yyyy-MM-dd</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="940"/> + <location filename="../ui/EditFermentable.ui" line="946"/> <source>Quit</source> <translation>Terug</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="960"/> + <location filename="../ui/EditFermentable.ui" line="966"/> <source>Save</source> <translation>Bewaar</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="980"/> + <location filename="../ui/EditFermentable.ui" line="986"/> <source>Delete</source> <translation>Verwijder</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1022"/> + <location filename="../ui/EditFermentable.ui" line="1028"/> <source>Lintner:</source> <translation>Lintner:</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1044"/> + <location filename="../ui/EditFermentable.ui" line="1050"/> <source> °L</source> <translation> °L</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1066"/> + <location filename="../ui/EditFermentable.ui" line="1072"/> <source>Set the tht date to today.</source> <translation>Zet de tht datum op vandaag.</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1069"/> - <location filename="../ui/EditFermentable.ui" line="1089"/> - <location filename="../ui/EditFermentable.ui" line="1109"/> - <location filename="../ui/EditFermentable.ui" line="1129"/> + <location filename="../ui/EditFermentable.ui" line="1075"/> + <location filename="../ui/EditFermentable.ui" line="1095"/> + <location filename="../ui/EditFermentable.ui" line="1115"/> + <location filename="../ui/EditFermentable.ui" line="1135"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1086"/> + <location filename="../ui/EditFermentable.ui" line="1092"/> <source>Clear tht date</source> <translation>Verwijder de tht datum</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1106"/> + <location filename="../ui/EditFermentable.ui" line="1112"/> <source>Set the production date to today.</source> <translation>Zet de productie datum op vandaag.</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1126"/> + <location filename="../ui/EditFermentable.ui" line="1132"/> <source>Clear production date</source> <translation>Verwijder de productie datum</translation> </message> @@ -2138,8 +2138,8 @@ <location filename="../src/EditProductTab3.cpp" line="163"/> <location filename="../src/EditProductTab4.cpp" line="57"/> <location filename="../src/EditProductTab4.cpp" line="149"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> - <location filename="../src/EditProductTab5.cpp" line="159"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> + <location filename="../src/EditProductTab5.cpp" line="166"/> <location filename="../src/EditProductTab6.cpp" line="56"/> <location filename="../src/EditProductTab6.cpp" line="143"/> <location filename="../src/EditProductExport.cpp" line="852"/> @@ -2179,8 +2179,8 @@ <message> <location filename="../ui/EditProduct.ui" line="240"/> <location filename="../ui/EditProduct.ui" line="2143"/> - <location filename="../ui/EditProduct.ui" line="6979"/> - <location filename="../ui/EditProduct.ui" line="7951"/> + <location filename="../ui/EditProduct.ui" line="7388"/> + <location filename="../ui/EditProduct.ui" line="8360"/> <source>Efficiency:</source> <translation>Rendement:</translation> </message> @@ -2211,34 +2211,34 @@ <location filename="../ui/EditProduct.ui" line="2861"/> <location filename="../ui/EditProduct.ui" line="2914"/> <location filename="../ui/EditProduct.ui" line="3576"/> - <location filename="../ui/EditProduct.ui" line="6678"/> - <location filename="../ui/EditProduct.ui" line="7073"/> - <location filename="../ui/EditProduct.ui" line="8067"/> - <location filename="../ui/EditProduct.ui" line="8648"/> - <location filename="../ui/EditProduct.ui" line="8882"/> - <location filename="../ui/EditProduct.ui" line="9100"/> - <location filename="../ui/EditProduct.ui" line="9202"/> - <location filename="../ui/EditProduct.ui" line="9347"/> - <location filename="../ui/EditProduct.ui" line="9400"/> - <location filename="../ui/EditProduct.ui" line="9604"/> - <location filename="../ui/EditProduct.ui" line="9638"/> - <location filename="../ui/EditProduct.ui" line="9726"/> - <location filename="../ui/EditProduct.ui" line="9904"/> - <location filename="../ui/EditProduct.ui" line="10089"/> - <location filename="../ui/EditProduct.ui" line="10317"/> - <location filename="../ui/EditProduct.ui" line="10480"/> + <location filename="../ui/EditProduct.ui" line="7081"/> + <location filename="../ui/EditProduct.ui" line="7482"/> + <location filename="../ui/EditProduct.ui" line="8476"/> + <location filename="../ui/EditProduct.ui" line="9057"/> + <location filename="../ui/EditProduct.ui" line="9291"/> + <location filename="../ui/EditProduct.ui" line="9509"/> + <location filename="../ui/EditProduct.ui" line="9611"/> + <location filename="../ui/EditProduct.ui" line="9756"/> + <location filename="../ui/EditProduct.ui" line="9809"/> + <location filename="../ui/EditProduct.ui" line="10013"/> + <location filename="../ui/EditProduct.ui" line="10047"/> + <location filename="../ui/EditProduct.ui" line="10135"/> + <location filename="../ui/EditProduct.ui" line="10313"/> + <location filename="../ui/EditProduct.ui" line="10498"/> + <location filename="../ui/EditProduct.ui" line="10726"/> + <location filename="../ui/EditProduct.ui" line="10889"/> <source> %</source> <translation> %</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="335"/> <location filename="../ui/EditProduct.ui" line="1971"/> - <location filename="../ui/EditProduct.ui" line="7270"/> - <location filename="../ui/EditProduct.ui" line="7298"/> - <location filename="../ui/EditProduct.ui" line="7326"/> - <location filename="../ui/EditProduct.ui" line="7354"/> - <location filename="../ui/EditProduct.ui" line="7741"/> - <location filename="../ui/EditProduct.ui" line="7862"/> + <location filename="../ui/EditProduct.ui" line="7679"/> + <location filename="../ui/EditProduct.ui" line="7707"/> + <location filename="../ui/EditProduct.ui" line="7735"/> + <location filename="../ui/EditProduct.ui" line="7763"/> + <location filename="../ui/EditProduct.ui" line="8150"/> + <location filename="../ui/EditProduct.ui" line="8271"/> <source> min</source> <translation> min</translation> </message> @@ -2257,22 +2257,25 @@ <location filename="../ui/EditProduct.ui" line="2021"/> <location filename="../ui/EditProduct.ui" line="2121"/> <location filename="../ui/EditProduct.ui" line="3779"/> - <location filename="../ui/EditProduct.ui" line="6121"/> - <location filename="../ui/EditProduct.ui" line="6786"/> - <location filename="../ui/EditProduct.ui" line="6852"/> - <location filename="../ui/EditProduct.ui" line="7098"/> - <location filename="../ui/EditProduct.ui" line="7129"/> - <location filename="../ui/EditProduct.ui" line="7443"/> - <location filename="../ui/EditProduct.ui" line="7471"/> - <location filename="../ui/EditProduct.ui" line="7505"/> - <location filename="../ui/EditProduct.ui" line="7932"/> - <location filename="../ui/EditProduct.ui" line="8017"/> - <location filename="../ui/EditProduct.ui" line="9539"/> - <location filename="../ui/EditProduct.ui" line="9570"/> - <location filename="../ui/EditProduct.ui" line="9876"/> - <location filename="../ui/EditProduct.ui" line="9998"/> - <location filename="../ui/EditProduct.ui" line="10358"/> - <location filename="../ui/EditProduct.ui" line="10439"/> + <location filename="../ui/EditProduct.ui" line="5115"/> + <location filename="../ui/EditProduct.ui" line="5851"/> + <location filename="../ui/EditProduct.ui" line="6188"/> + <location filename="../ui/EditProduct.ui" line="6514"/> + <location filename="../ui/EditProduct.ui" line="7189"/> + <location filename="../ui/EditProduct.ui" line="7255"/> + <location filename="../ui/EditProduct.ui" line="7507"/> + <location filename="../ui/EditProduct.ui" line="7538"/> + <location filename="../ui/EditProduct.ui" line="7852"/> + <location filename="../ui/EditProduct.ui" line="7880"/> + <location filename="../ui/EditProduct.ui" line="7914"/> + <location filename="../ui/EditProduct.ui" line="8341"/> + <location filename="../ui/EditProduct.ui" line="8426"/> + <location filename="../ui/EditProduct.ui" line="9948"/> + <location filename="../ui/EditProduct.ui" line="9979"/> + <location filename="../ui/EditProduct.ui" line="10285"/> + <location filename="../ui/EditProduct.ui" line="10407"/> + <location filename="../ui/EditProduct.ui" line="10767"/> + <location filename="../ui/EditProduct.ui" line="10848"/> <location filename="../src/EditProductExport.cpp" line="816"/> <location filename="../src/EditProductExport.cpp" line="824"/> <source> L</source> @@ -2477,7 +2480,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="1730"/> - <location filename="../ui/EditProduct.ui" line="7421"/> + <location filename="../ui/EditProduct.ui" line="7830"/> <source>Top up water:</source> <translation>Extra water in gistvat:</translation> </message> @@ -2611,10 +2614,10 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="3080"/> - <location filename="../ui/EditProduct.ui" line="9315"/> - <location filename="../ui/EditProduct.ui" line="10576"/> - <location filename="../ui/EditProduct.ui" line="10653"/> - <location filename="../ui/EditProduct.ui" line="10962"/> + <location filename="../ui/EditProduct.ui" line="9724"/> + <location filename="../ui/EditProduct.ui" line="10985"/> + <location filename="../ui/EditProduct.ui" line="11062"/> + <location filename="../ui/EditProduct.ui" line="11371"/> <source>Set or clear date</source> <translation>Zet of wis datum</translation> </message> @@ -2622,27 +2625,27 @@ <location filename="../ui/EditProduct.ui" line="3083"/> <location filename="../ui/EditProduct.ui" line="3547"/> <location filename="../ui/EditProduct.ui" line="3614"/> - <location filename="../ui/EditProduct.ui" line="7151"/> - <location filename="../ui/EditProduct.ui" line="7767"/> - <location filename="../ui/EditProduct.ui" line="8089"/> - <location filename="../ui/EditProduct.ui" line="8164"/> - <location filename="../ui/EditProduct.ui" line="8203"/> - <location filename="../ui/EditProduct.ui" line="8274"/> - <location filename="../ui/EditProduct.ui" line="8361"/> - <location filename="../ui/EditProduct.ui" line="8670"/> - <location filename="../ui/EditProduct.ui" line="8690"/> - <location filename="../ui/EditProduct.ui" line="8729"/> - <location filename="../ui/EditProduct.ui" line="8904"/> - <location filename="../ui/EditProduct.ui" line="8924"/> - <location filename="../ui/EditProduct.ui" line="8963"/> - <location filename="../ui/EditProduct.ui" line="9122"/> - <location filename="../ui/EditProduct.ui" line="9257"/> - <location filename="../ui/EditProduct.ui" line="9277"/> - <location filename="../ui/EditProduct.ui" line="9318"/> - <location filename="../ui/EditProduct.ui" line="10579"/> - <location filename="../ui/EditProduct.ui" line="10599"/> - <location filename="../ui/EditProduct.ui" line="10656"/> - <location filename="../ui/EditProduct.ui" line="10965"/> + <location filename="../ui/EditProduct.ui" line="7560"/> + <location filename="../ui/EditProduct.ui" line="8176"/> + <location filename="../ui/EditProduct.ui" line="8498"/> + <location filename="../ui/EditProduct.ui" line="8573"/> + <location filename="../ui/EditProduct.ui" line="8612"/> + <location filename="../ui/EditProduct.ui" line="8683"/> + <location filename="../ui/EditProduct.ui" line="8770"/> + <location filename="../ui/EditProduct.ui" line="9079"/> + <location filename="../ui/EditProduct.ui" line="9099"/> + <location filename="../ui/EditProduct.ui" line="9138"/> + <location filename="../ui/EditProduct.ui" line="9313"/> + <location filename="../ui/EditProduct.ui" line="9333"/> + <location filename="../ui/EditProduct.ui" line="9372"/> + <location filename="../ui/EditProduct.ui" line="9531"/> + <location filename="../ui/EditProduct.ui" line="9666"/> + <location filename="../ui/EditProduct.ui" line="9686"/> + <location filename="../ui/EditProduct.ui" line="9727"/> + <location filename="../ui/EditProduct.ui" line="10988"/> + <location filename="../ui/EditProduct.ui" line="11008"/> + <location filename="../ui/EditProduct.ui" line="11065"/> + <location filename="../ui/EditProduct.ui" line="11374"/> <source>...</source> <translation>...</translation> </message> @@ -2699,7 +2702,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="3544"/> - <location filename="../ui/EditProduct.ui" line="8161"/> + <location filename="../ui/EditProduct.ui" line="8570"/> <source>Set the date to today.</source> <translation>Zet de datum op vandaag.</translation> </message> @@ -2710,12 +2713,12 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="3595"/> - <location filename="../ui/EditProduct.ui" line="8184"/> - <location filename="../ui/EditProduct.ui" line="8239"/> - <location filename="../ui/EditProduct.ui" line="8710"/> - <location filename="../ui/EditProduct.ui" line="8944"/> - <location filename="../ui/EditProduct.ui" line="10560"/> - <location filename="../ui/EditProduct.ui" line="10946"/> + <location filename="../ui/EditProduct.ui" line="8593"/> + <location filename="../ui/EditProduct.ui" line="8648"/> + <location filename="../ui/EditProduct.ui" line="9119"/> + <location filename="../ui/EditProduct.ui" line="9353"/> + <location filename="../ui/EditProduct.ui" line="10969"/> + <location filename="../ui/EditProduct.ui" line="11355"/> <source>dd-MM-yyyy</source> <translation>dd-MM-yyyy</translation> </message> @@ -2728,7 +2731,7 @@ <location filename="../ui/EditProduct.ui" line="3628"/> <location filename="../src/EditProductTab3.cpp" line="1056"/> <location filename="../src/EditProductTab4.cpp" line="668"/> - <location filename="../src/EditProductTab5.cpp" line="675"/> + <location filename="../src/EditProductTab5.cpp" line="719"/> <source>Mash</source> <translation>Maischen</translation> </message> @@ -2758,489 +2761,488 @@ <translation>Water</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="3810"/> <source>Water overview</source> - <translation>Water overzicht</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="4031"/> + <translation type="vanished">Water overzicht</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6678"/> <source>Ca</source> <translation>Ca</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4047"/> + <location filename="../ui/EditProduct.ui" line="6417"/> <source>Mg</source> <translation>Mg</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4063"/> + <location filename="../ui/EditProduct.ui" line="6726"/> <source>HCO3</source> <translation>HCO3</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4079"/> + <location filename="../ui/EditProduct.ui" line="6558"/> <source>CaCO3</source> <translation>CaCO3</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4095"/> + <location filename="../ui/EditProduct.ui" line="6662"/> <source>Na</source> <translation>Na</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4111"/> + <location filename="../ui/EditProduct.ui" line="6646"/> <source>Cl</source> <translation>Cl</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4127"/> + <location filename="../ui/EditProduct.ui" line="6694"/> <source>SO4</source> <translation>SO4</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4143"/> + <location filename="../ui/EditProduct.ui" line="6433"/> <location filename="../src/EditProductTab7.cpp" line="37"/> <source>pH</source> <translation>pH</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4187"/> + <location filename="../ui/EditProduct.ui" line="6710"/> <location filename="../src/EditProductTab6.cpp" line="296"/> <location filename="../src/EditProductTab7.cpp" line="37"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4378"/> + <location filename="../ui/EditProduct.ui" line="6173"/> <source>The division between the main and dilution water. The total volume does not change.</source> <translation>De verdeling tussen het hoofd en verdunnings water. Het totale volume blijft gelijk.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4687"/> - <location filename="../ui/EditProduct.ui" line="5890"/> + <location filename="../ui/EditProduct.ui" line="4401"/> + <location filename="../ui/EditProduct.ui" line="5500"/> <source>Mash pH should be between 5.2 and 5.6. Use 5.2 for light and 5.5 for dark beers.</source> <translation>De maisch pH moet tussen 5.2 en 5.6 zijn. Gebruik 5.2 voor lichte en 5.5 voor donkere bieren.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4865"/> + <location filename="../ui/EditProduct.ui" line="5666"/> <source>The ideal amount of Magnesium is between 5 and 40.</source> <translation>De ideale hoeveelheid magnesium is tussen 5 en 40.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4893"/> + <location filename="../ui/EditProduct.ui" line="5431"/> <source>0 to 50 for light beers, 50 to 150 for amber beers, 150 to 250 for dark beers.</source> <translation>0 tot 50 voor licht bier, 50 tot 150 voor amber bier, 150 tot 250 voor donker bier.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4921"/> + <location filename="../ui/EditProduct.ui" line="5694"/> <source>The ideal Sulfate amount should be between 50 and 400. Together with Chloride it must be below 500.</source> <translation>De ideale sulfaat hoeveelheid is tussen 50 en 400. Samen met Chloride moet het minder dan 500 zijn.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4950"/> + <location filename="../ui/EditProduct.ui" line="5610"/> <source>The ideal amount of Calcium is between 40 and 150.</source> <translation>De ideale hoeveelheid Calcium is tussen 40 en 150.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="4978"/> + <location filename="../ui/EditProduct.ui" line="5581"/> <source>The ideal Chloride amount is between 50 and 150. Together with Sulfate it must be below 500.</source> <translation>De ideale hoeveelheid Chloride is tussen 50 en 150. Samen met Sulfaat moet dit minder dan 500 zijn.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5032"/> + <location filename="../ui/EditProduct.ui" line="5528"/> <source>The ideal amount of Natrium should be below 150.</source> <translation>De ideale hoeveelheid Zout moet minder dan 150 zijn.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5060"/> + <location filename="../ui/EditProduct.ui" line="6742"/> <source>Water profile</source> <translation>Water profiel</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5076"/> + <location filename="../ui/EditProduct.ui" line="6627"/> <source>The main brewing water</source> <translation>Het hoofd brouwwater</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5082"/> + <location filename="../ui/EditProduct.ui" line="6633"/> <source>Choose water</source> <translation>Kies water</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5095"/> + <location filename="../ui/EditProduct.ui" line="6260"/> <source>Optional dilution water</source> <translation>Optioneel meng water</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5098"/> + <location filename="../ui/EditProduct.ui" line="6263"/> <source>Choose dilution</source> <translation>Kies mengwater</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5111"/> + <location filename="../ui/EditProduct.ui" line="5187"/> <source>If needed, choose a target water profile.</source> <translation>Indien nodig, kies een doel water profiel.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5124"/> + <location filename="../ui/EditProduct.ui" line="5776"/> <source>Mixed water</source> <translation>Gemengd water</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5140"/> <source>Treated water</source> - <translation>Behandeld water</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5184"/> + <translation type="vanished">Behandeld water</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6461"/> <source>RA</source> <translation></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5359"/> + <location filename="../ui/EditProduct.ui" line="6376"/> <source>Hardness</source> <translation>Hardheid</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5454"/> + <location filename="../ui/EditProduct.ui" line="3807"/> <source>Water agents</source> <translation>Brouwzouten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5466"/> + <location filename="../ui/EditProduct.ui" line="3819"/> <source>Calcium Chloride</source> <translation>Calcium Chloride</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5469"/> + <location filename="../ui/EditProduct.ui" line="3822"/> <source>CaCl2:</source> <translation>CaCl2:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5485"/> + <location filename="../ui/EditProduct.ui" line="3838"/> <source>Gypsym</source> <translation>Gips</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5488"/> + <location filename="../ui/EditProduct.ui" line="3841"/> <source>CaSO4:</source> <translation>CaSO4:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5504"/> + <location filename="../ui/EditProduct.ui" line="3857"/> <source>Epsom</source> <translation>Magmesium sulfaat</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5507"/> + <location filename="../ui/EditProduct.ui" line="3860"/> <source>MgSO4:</source> <translation>MgSO4:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5523"/> + <location filename="../ui/EditProduct.ui" line="3876"/> <source>Table salt</source> <translation>Keukenzout</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5526"/> + <location filename="../ui/EditProduct.ui" line="3879"/> <source>NaCl:</source> <translation>NaCl:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5542"/> - <location filename="../ui/EditProduct.ui" line="5726"/> + <location filename="../ui/EditProduct.ui" line="3895"/> + <location filename="../ui/EditProduct.ui" line="4079"/> + <location filename="../ui/EditProduct.ui" line="4299"/> <source>Magnesium Chloride</source> <translation>Magnesium Chloride</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5545"/> + <location filename="../ui/EditProduct.ui" line="3898"/> <source>MgCl2:</source> <translation>MgCl2:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5561"/> - <location filename="../ui/EditProduct.ui" line="5757"/> + <location filename="../ui/EditProduct.ui" line="3914"/> + <location filename="../ui/EditProduct.ui" line="4110"/> <source>Baking soda</source> <translation>Baksoda</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5564"/> + <location filename="../ui/EditProduct.ui" line="3917"/> <source>NaHCO3:</source> <translation>NaHCO3:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5580"/> - <location filename="../ui/EditProduct.ui" line="5788"/> + <location filename="../ui/EditProduct.ui" line="3933"/> + <location filename="../ui/EditProduct.ui" line="4141"/> <source>Chalk undissolved</source> <translation>Ongebluste kalk</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5583"/> + <location filename="../ui/EditProduct.ui" line="3936"/> <source>CaCO3:</source> <translation>CaCO3:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5599"/> + <location filename="../ui/EditProduct.ui" line="3952"/> + <location filename="../ui/EditProduct.ui" line="4267"/> <source>To change the water profile. This adds Calcium and Chloride. To improve sweet style beers.</source> <translation>Verbeterd het water profiel. Voegt Calcium en Chloride toe. Om de zoetheid van bier te verbeteren.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5609"/> - <location filename="../ui/EditProduct.ui" line="5641"/> - <location filename="../ui/EditProduct.ui" line="5672"/> - <location filename="../ui/EditProduct.ui" line="5704"/> - <location filename="../ui/EditProduct.ui" line="5735"/> - <location filename="../ui/EditProduct.ui" line="5766"/> - <location filename="../ui/EditProduct.ui" line="5797"/> - <location filename="../ui/EditProduct.ui" line="9945"/> - <location filename="../ui/EditProduct.ui" line="10289"/> + <location filename="../ui/EditProduct.ui" line="3962"/> + <location filename="../ui/EditProduct.ui" line="3994"/> + <location filename="../ui/EditProduct.ui" line="4025"/> + <location filename="../ui/EditProduct.ui" line="4057"/> + <location filename="../ui/EditProduct.ui" line="4088"/> + <location filename="../ui/EditProduct.ui" line="4119"/> + <location filename="../ui/EditProduct.ui" line="4150"/> + <location filename="../ui/EditProduct.ui" line="4182"/> + <location filename="../ui/EditProduct.ui" line="4213"/> + <location filename="../ui/EditProduct.ui" line="4245"/> + <location filename="../ui/EditProduct.ui" line="4277"/> + <location filename="../ui/EditProduct.ui" line="4308"/> + <location filename="../ui/EditProduct.ui" line="10354"/> + <location filename="../ui/EditProduct.ui" line="10698"/> <source> gr</source> <translation> gr</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5631"/> + <location filename="../ui/EditProduct.ui" line="3984"/> + <location filename="../ui/EditProduct.ui" line="4172"/> <source>Gypsum to change the water profile. This adds Calcium and Sulfate. To improve bitter beers.</source> <translation>Gips om het waterprofiel te veranderen. Dit voegt Calcium en Sulfaat toe. Verbeterd de beleving van bittere bieren.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5663"/> + <location filename="../ui/EditProduct.ui" line="4016"/> + <location filename="../ui/EditProduct.ui" line="4204"/> <source>Epsom salt to change the water profile. Use with caution!</source> <translation>Epsom zout om water aan te passen. Gebruik spaarzaam!</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5694"/> + <location filename="../ui/EditProduct.ui" line="4047"/> + <location filename="../ui/EditProduct.ui" line="4235"/> <source>Table salt to change the water profile. This adds Sodium and Chloride. Improves the sweetness of the beer. The beer will become salty at high doses.</source> <translation>Keukenzout om water aan te passen. Voegt Zout en Chloride toe. Versterkt de zoetheid van het bier. Het bier wordt ziltig bij hoge dosering.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5820"/> <source>Mash water</source> - <translation>Maischwater</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5832"/> - <location filename="../ui/EditProduct.ui" line="6051"/> + <translation type="vanished">Maischwater</translation> + </message> + <message> <source>Desired pH:</source> - <translation>Gewenste pH:</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="5848"/> + <translation type="vanished">Gewenste pH:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4359"/> <source>Auto calculate:</source> <translation>Automatisch rekenen:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5864"/> + <location filename="../ui/EditProduct.ui" line="4375"/> <source>Acid to use:</source> <translation>Aanzuren met:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5930"/> - <location filename="../ui/EditProduct.ui" line="6208"/> + <location filename="../ui/EditProduct.ui" line="4441"/> + <location filename="../ui/EditProduct.ui" line="4580"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5958"/> - <location filename="../ui/EditProduct.ui" line="6242"/> + <location filename="../ui/EditProduct.ui" line="4469"/> + <location filename="../ui/EditProduct.ui" line="4614"/> <source> ml</source> <translation> ml</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="5991"/> <source>Sparge water</source> - <translation>Spoelwater</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6003"/> + <translation type="vanished">Spoelwater</translation> + </message> + <message> <source>Sparge water supply:</source> - <translation>Spoelwater voorraad:</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6019"/> + <translation type="vanished">Spoelwater voorraad:</translation> + </message> + <message> <source>Sparge temperature:</source> - <translation>Spoelwater temperatuur:</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6035"/> + <translation type="vanished">Spoelwater temperatuur:</translation> + </message> + <message> <source>Water source:</source> - <translation>Water bron:</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6067"/> + <translation type="vanished">Water bron:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4542"/> <source>Acid type:</source> <translation>Aanzuren met:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6083"/> <source>Acid strength:</source> - <translation>Sterkte %:</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6099"/> + <translation type="vanished">Sterkte %:</translation> + </message> + <message> <source>Acid needed:</source> - <translation>Benodigd:</translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6285"/> + <translation type="vanished">Benodigd:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4669"/> <source>Bitterness index:</source> <translation>Bitterheidsindex:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6337"/> - <location filename="../ui/EditProduct.ui" line="6405"/> + <location filename="../ui/EditProduct.ui" line="4721"/> + <location filename="../ui/EditProduct.ui" line="4789"/> <source>N/A</source> <translation>N.v.t</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6353"/> + <location filename="../ui/EditProduct.ui" line="4737"/> <source>Preffered SO4:Cl ratio:</source> <translation>Gewenste SO4:Cl verh:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6421"/> + <location filename="../ui/EditProduct.ui" line="4805"/> <source>Current SO4:Cl ratio:</source> <translation>Huidige SO4:Cl verhouding:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6478"/> + <location filename="../ui/EditProduct.ui" line="4862"/> <source>Estimate pre boil pH:</source> <translation>Geschat voor kook pH:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6512"/> + <location filename="../ui/EditProduct.ui" line="6915"/> <source>Brewday</source> <translation>Brouwdag</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6745"/> + <location filename="../ui/EditProduct.ui" line="7148"/> <source>Sparge supply:</source> <translation>Spoelwater voorraad:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6761"/> + <location filename="../ui/EditProduct.ui" line="7164"/> <source>Sparge estimate:</source> <translation>Spoelwater geschat:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6805"/> + <location filename="../ui/EditProduct.ui" line="7208"/> <source>Sparge temp:</source> <translation>Spoelwater temp:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8399"/> + <location filename="../ui/EditProduct.ui" line="8808"/> <source>Start density:</source> <translation>Begin densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8415"/> + <location filename="../ui/EditProduct.ui" line="8824"/> <source>Start temperature:</source> <translation>Start temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8431"/> + <location filename="../ui/EditProduct.ui" line="8840"/> <source>Peak temperature:</source> <translation>Piek temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8447"/> - <location filename="../ui/EditProduct.ui" line="8759"/> + <location filename="../ui/EditProduct.ui" line="8856"/> + <location filename="../ui/EditProduct.ui" line="9168"/> <source>End temperature:</source> <translation>Eind temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8463"/> - <location filename="../ui/EditProduct.ui" line="8775"/> + <location filename="../ui/EditProduct.ui" line="8872"/> + <location filename="../ui/EditProduct.ui" line="9184"/> <source>End density:</source> <translation>Eind densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8479"/> - <location filename="../ui/EditProduct.ui" line="8791"/> + <location filename="../ui/EditProduct.ui" line="8888"/> + <location filename="../ui/EditProduct.ui" line="9200"/> <source>End date:</source> <translation>Eind datum:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8623"/> - <location filename="../ui/EditProduct.ui" line="8857"/> - <location filename="../ui/EditProduct.ui" line="9075"/> + <location filename="../ui/EditProduct.ui" line="9032"/> + <location filename="../ui/EditProduct.ui" line="9266"/> + <location filename="../ui/EditProduct.ui" line="9484"/> <source>Apparent attenuation:</source> <translation>Schijnbare vergisting:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8941"/> + <location filename="../ui/EditProduct.ui" line="9350"/> <source>Edit the date the secondary fermentation was done.</source> <translation>Wijzig de datum dat de nagisting gereed was.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8993"/> + <location filename="../ui/EditProduct.ui" line="9402"/> <source>Average temperature:</source> <translation>Gemiddelde temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9009"/> + <location filename="../ui/EditProduct.ui" line="9418"/> <source>Final density:</source> <translation>Finale densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9139"/> + <location filename="../ui/EditProduct.ui" line="9548"/> <source>Expected end density:</source> <translation>Verwachte eind densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9453"/> + <location filename="../ui/EditProduct.ui" line="9862"/> <source>Extra added volume:</source> <translation>Toevoeging volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9469"/> + <location filename="../ui/EditProduct.ui" line="9878"/> <source>Extra remarks:</source> <translation>Toevoeging opmerking:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9485"/> + <location filename="../ui/EditProduct.ui" line="9894"/> <source>Final ABV %:</source> <translation>Finale ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9501"/> + <location filename="../ui/EditProduct.ui" line="9910"/> <source>Extra added ABV %:</source> <translation>Toevoeging extra ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9758"/> - <location filename="../ui/EditProduct.ui" line="10336"/> + <location filename="../ui/EditProduct.ui" line="10167"/> + <location filename="../ui/EditProduct.ui" line="10745"/> <source>Volume:</source> <translation>Volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9822"/> - <location filename="../ui/EditProduct.ui" line="10226"/> + <location filename="../ui/EditProduct.ui" line="10231"/> + <location filename="../ui/EditProduct.ui" line="10635"/> <source>Priming:</source> <translation>Carbonatie:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9854"/> + <location filename="../ui/EditProduct.ui" line="10263"/> <source>Bottle fermentation:</source> <translation>Flessen hergisting:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9973"/> - <location filename="../ui/EditProduct.ui" line="10389"/> + <location filename="../ui/EditProduct.ui" line="10382"/> + <location filename="../ui/EditProduct.ui" line="10798"/> <source> gr/L</source> <translation> gr/L</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10242"/> + <location filename="../ui/EditProduct.ui" line="10651"/> <source>Kegs temperature:</source> <translation>Fusten temperatuur:</translation> </message> @@ -3249,32 +3251,32 @@ <translation type="vanished">Brouwdag start:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6540"/> + <location filename="../ui/EditProduct.ui" line="6943"/> <source>Brewday end:</source> <translation>Brouwdag eind:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6556"/> + <location filename="../ui/EditProduct.ui" line="6959"/> <source>Mashing and Sparge</source> <translation>Maischen en Spoelen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6568"/> + <location filename="../ui/EditProduct.ui" line="6971"/> <source>Mash pH:</source> <translation>Maisch pH:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6697"/> + <location filename="../ui/EditProduct.ui" line="7100"/> <source>Mash SG:</source> <translation>Maisch SG:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6713"/> + <location filename="../ui/EditProduct.ui" line="7116"/> <source>Mash efficiency:</source> <translation>Maisch rendement:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6729"/> + <location filename="../ui/EditProduct.ui" line="7132"/> <source>Sparge water pH:</source> <translation>Spoelwater pH:</translation> </message> @@ -3307,113 +3309,112 @@ <translation type="vanished">Voor koken rendement:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7148"/> - <location filename="../ui/EditProduct.ui" line="8086"/> + <location filename="../ui/EditProduct.ui" line="7557"/> + <location filename="../ui/EditProduct.ui" line="8495"/> <source>Edit volume</source> <translation>Wijzig volume</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7232"/> + <location filename="../ui/EditProduct.ui" line="7641"/> <source>Whirlpool cold:</source> <translation>Whirlpool koud:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7665"/> + <location filename="../ui/EditProduct.ui" line="8074"/> <source>Aeration time & speed:</source> <translation>Beluchten tijd snelheid:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7796"/> + <location filename="../ui/EditProduct.ui" line="8205"/> <source>Cooling method:</source> <translation>Koelen methode:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7894"/> + <location filename="../ui/EditProduct.ui" line="8303"/> <source>Cooling time:</source> <translation>Koelen tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7377"/> + <location filename="../ui/EditProduct.ui" line="7786"/> <source>Transfer to fermenter</source> <translation>Naar gistvat</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6524"/> + <location filename="../ui/EditProduct.ui" line="6927"/> <source>Brewday plan:</source> <translation>Brouwdag plan:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6149"/> - <location filename="../ui/EditProduct.ui" line="6880"/> - <location filename="../ui/EditProduct.ui" line="7834"/> - <location filename="../ui/EditProduct.ui" line="8523"/> - <location filename="../ui/EditProduct.ui" line="8551"/> - <location filename="../ui/EditProduct.ui" line="8579"/> - <location filename="../ui/EditProduct.ui" line="8813"/> - <location filename="../ui/EditProduct.ui" line="9031"/> - <location filename="../ui/EditProduct.ui" line="10058"/> - <location filename="../ui/EditProduct.ui" line="10508"/> + <location filename="../ui/EditProduct.ui" line="7286"/> + <location filename="../ui/EditProduct.ui" line="8243"/> + <location filename="../ui/EditProduct.ui" line="8932"/> + <location filename="../ui/EditProduct.ui" line="8960"/> + <location filename="../ui/EditProduct.ui" line="8988"/> + <location filename="../ui/EditProduct.ui" line="9222"/> + <location filename="../ui/EditProduct.ui" line="9440"/> + <location filename="../ui/EditProduct.ui" line="10467"/> + <location filename="../ui/EditProduct.ui" line="10917"/> <source> °C</source> <translation> °C</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6919"/> + <location filename="../ui/EditProduct.ui" line="7328"/> <source>Pre boil</source> <translation>Begin koken</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6963"/> - <location filename="../ui/EditProduct.ui" line="8122"/> + <location filename="../ui/EditProduct.ui" line="7372"/> + <location filename="../ui/EditProduct.ui" line="8531"/> <source>Volume @100°C:</source> <translation>Volume @100°C:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7061"/> + <location filename="../ui/EditProduct.ui" line="7470"/> <source>Mash, sparge and lauter efficiency.</source> <translation>Maischen, spoelen en filteren rendement.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7188"/> + <location filename="../ui/EditProduct.ui" line="7597"/> <source>Whirlpools</source> <translation>Whirlpoolen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7200"/> + <location filename="../ui/EditProduct.ui" line="7609"/> <source>Whirlpool 72..79°C:</source> <translation>Whirlpool 72..79°C:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7216"/> + <location filename="../ui/EditProduct.ui" line="7625"/> <source>Whirlpool 60..66°C:</source> <translation>Whirlpool 60..66°C:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7248"/> + <location filename="../ui/EditProduct.ui" line="7657"/> <source>Whirlpool 85..100°C:</source> <translation>Whirlpool 85..100°C:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7389"/> + <location filename="../ui/EditProduct.ui" line="7798"/> <source>Volume to fermenter:</source> <translation>Volume naar gistvat:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7405"/> + <location filename="../ui/EditProduct.ui" line="7814"/> <source>Trub and chiller loss:</source> <translation>Trub en koeler verlies:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7527"/> + <location filename="../ui/EditProduct.ui" line="7936"/> <source>SG in fermenter:</source> <translation>SG in gistvat:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7543"/> + <location filename="../ui/EditProduct.ui" line="7952"/> <source>EBC color in fermenter:</source> <translation>EBC kleur in gistvat:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7559"/> + <location filename="../ui/EditProduct.ui" line="7968"/> <source>IBU in fermenter:</source> <translation>IBU in het gistvat:</translation> </message> @@ -3422,7 +3423,7 @@ <translation type="vanished">Beluchten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7719"/> + <location filename="../ui/EditProduct.ui" line="8128"/> <source>Aeration with:</source> <translation>Beluchten met:</translation> </message> @@ -3435,187 +3436,187 @@ <translation type="vanished">Beluchten snelheid:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7687"/> + <location filename="../ui/EditProduct.ui" line="8096"/> <source> L/m</source> <translation> L/m</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7764"/> - <location filename="../ui/EditProduct.ui" line="9254"/> - <location filename="../ui/EditProduct.ui" line="9274"/> - <location filename="../ui/EditProduct.ui" line="10596"/> + <location filename="../ui/EditProduct.ui" line="8173"/> + <location filename="../ui/EditProduct.ui" line="9663"/> + <location filename="../ui/EditProduct.ui" line="9683"/> + <location filename="../ui/EditProduct.ui" line="11005"/> <source>Brew log chart</source> <translation>Brouw log grafiek</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7784"/> + <location filename="../ui/EditProduct.ui" line="8193"/> <source>Cooling</source> <translation>Koelen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7812"/> + <location filename="../ui/EditProduct.ui" line="8221"/> <source>Cooling to:</source> <translation>Koelen tot:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7911"/> + <location filename="../ui/EditProduct.ui" line="8320"/> <location filename="../src/EditProductExport.cpp" line="783"/> <source>After boil</source> <translation>Einde koken</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8055"/> + <location filename="../ui/EditProduct.ui" line="8464"/> <source>The overall efficiency.</source> <translation>Het totale brouwzaal rendement.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8181"/> + <location filename="../ui/EditProduct.ui" line="8590"/> <source>Edit the brewdate plan or start.</source> <translation>Wijzig de brouwdag plan of start datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8200"/> + <location filename="../ui/EditProduct.ui" line="8609"/> <source>Clear planned brewdate</source> <translation>Wis geplande brouwdag</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8220"/> + <location filename="../ui/EditProduct.ui" line="8629"/> <source>Edit the brewdate start time.</source> <translation>Wijzig de brouwdag start tijd.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8223"/> - <location filename="../ui/EditProduct.ui" line="8258"/> + <location filename="../ui/EditProduct.ui" line="8632"/> + <location filename="../ui/EditProduct.ui" line="8667"/> <source>hh:mm</source> <translation>hh:mm</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8236"/> + <location filename="../ui/EditProduct.ui" line="8645"/> <source>Edit the brewdate end.</source> <translation>Wijzig de brouwdag eind datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8255"/> + <location filename="../ui/EditProduct.ui" line="8664"/> <source>Edit the brewdate end time.</source> <translation>Wijzig de brouwdag eind tijd.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8271"/> + <location filename="../ui/EditProduct.ui" line="8680"/> <source>Set the brewdate end date.</source> <translation>Zet de brouwdag eind datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8291"/> + <location filename="../ui/EditProduct.ui" line="8700"/> <source>End time:</source> <translation>Eind tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8307"/> + <location filename="../ui/EditProduct.ui" line="8716"/> <source>Start time:</source> <translation>Start tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8323"/> + <location filename="../ui/EditProduct.ui" line="8732"/> <source>Show brewlog:</source> <translation>Toon brouwlog:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8342"/> + <location filename="../ui/EditProduct.ui" line="8751"/> <source>Confirm brew done:</source> <translation>Bevestig brouwdag:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8358"/> - <location filename="../ui/EditProduct.ui" line="8726"/> - <location filename="../ui/EditProduct.ui" line="8960"/> + <location filename="../ui/EditProduct.ui" line="8767"/> + <location filename="../ui/EditProduct.ui" line="9135"/> + <location filename="../ui/EditProduct.ui" line="9369"/> <source>Confirm the brew dates and times.</source> <translation>Bevestig de brouw datums en tijden.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8375"/> + <location filename="../ui/EditProduct.ui" line="8784"/> <source>Fermenting</source> <translation>Vergisten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8387"/> + <location filename="../ui/EditProduct.ui" line="8796"/> <source>Primary fermentation</source> <translation>Hoofdvergisting</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8667"/> - <location filename="../ui/EditProduct.ui" line="8901"/> - <location filename="../ui/EditProduct.ui" line="9119"/> + <location filename="../ui/EditProduct.ui" line="9076"/> + <location filename="../ui/EditProduct.ui" line="9310"/> + <location filename="../ui/EditProduct.ui" line="9528"/> <source>Edit SG in Plato, Brix or SG</source> <translation>Wijzig SG in Plato, Brix of SG</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8687"/> - <location filename="../ui/EditProduct.ui" line="8921"/> + <location filename="../ui/EditProduct.ui" line="9096"/> + <location filename="../ui/EditProduct.ui" line="9330"/> <source>Set the date to today</source> <translation>Zet de datum op vandaag</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8707"/> + <location filename="../ui/EditProduct.ui" line="9116"/> <source>Edit the date the primary fermentation was done.</source> <translation>Wijzig de datum dat de hoofdgisting gereed was.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8747"/> + <location filename="../ui/EditProduct.ui" line="9156"/> <source>Secondary fermentation</source> <translation>Nagisting</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8981"/> + <location filename="../ui/EditProduct.ui" line="9390"/> <source>Tertiary fermentation</source> <translation>Lageren</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9177"/> + <location filename="../ui/EditProduct.ui" line="9586"/> <source>Alcohol volume:</source> <translation>Alcohol vol%:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9222"/> + <location filename="../ui/EditProduct.ui" line="9631"/> <source>Show fermenter unit log:</source> <translation>Toon gistkast log:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9238"/> + <location filename="../ui/EditProduct.ui" line="9647"/> <source>Show fermentation log:</source> <translation>Toon vergisting log:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9287"/> + <location filename="../ui/EditProduct.ui" line="9696"/> <source>Package</source> <translation>Verpakken</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9299"/> + <location filename="../ui/EditProduct.ui" line="9708"/> <source>Package date:</source> <translation>Verpakken datum:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9372"/> + <location filename="../ui/EditProduct.ui" line="9781"/> <source>Carbonation range:</source> <translation>Koolzuur volumes:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9425"/> + <location filename="../ui/EditProduct.ui" line="9834"/> <source>Infusion or Dilution</source> <translation>Infusie of verdunnen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9437"/> + <location filename="../ui/EditProduct.ui" line="9846"/> <source>Package volume:</source> <translation>Verpakken volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9698"/> + <location filename="../ui/EditProduct.ui" line="10107"/> <source>Package ABV %:</source> <translation>Verpakken ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9517"/> + <location filename="../ui/EditProduct.ui" line="9926"/> <source>pH from fermenter:</source> <translation>pH vanuit gistvat:</translation> </message> @@ -3625,162 +3626,224 @@ <translation>Schijnbare vergisting:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9561"/> + <location filename="../ui/EditProduct.ui" line="4331"/> + <source>Acid Additions</source> + <translation>Zuur toevoegingen</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4343"/> + <source>Desired mash pH:</source> + <translation>Gewenst maisch pH:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4501"/> + <source>Desired sparge pH:</source> + <translation>Gewenst spoelwater pH:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="4636"/> + <location filename="../ui/EditProduct.ui" line="4652"/> + <source>Acid amount:</source> + <translation>Zuur hoeveelheid:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5106"/> + <source>The total prepared amount of sparge water</source> + <translation>De totale voorraad spoelwater</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5190"/> + <source>Choose example water</source> + <translation>Kies voorbeeld water</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="5484"/> + <source>Treated mash water</source> + <translation>Behandeld maisch water</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6833"/> + <source>Sparge water source 1</source> + <translation>Spoelwater bron 1</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6855"/> + <source>Sparge water source 2</source> + <translation>Spoelwater bron 2</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6874"/> + <source>Sparge water mixed</source> + <translation>Gemengd spoelwater</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6890"/> + <location filename="../src/EditProductTab5.cpp" line="724"/> + <source>Sparge</source> + <translation>Spoel</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6906"/> + <source>Treated sparge water</source> + <translation>Behandeld spoelwater</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="9970"/> <source>Extra dilution or infusion added to this batch.</source> <translation>Toegevoegde verdunning of infusie aan deze batch.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9592"/> - <location filename="../ui/EditProduct.ui" line="9714"/> + <location filename="../ui/EditProduct.ui" line="10001"/> + <location filename="../ui/EditProduct.ui" line="10123"/> <source>The ABV including the infusion.</source> <translation>Het ABV inclusief infusie.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9623"/> + <location filename="../ui/EditProduct.ui" line="10032"/> <source>If there is alcohol in the infusion, give the percentage.</source> <translation>Als er alcohol in de infusie zit, geef hier het percentage.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9682"/> + <location filename="../ui/EditProduct.ui" line="10091"/> <source>Could be the description of the infusion.</source> <translation>Hier kun je de toevoeging beschrijven.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9746"/> + <location filename="../ui/EditProduct.ui" line="10155"/> <source>Bottles</source> <translation>Flessen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9774"/> - <location filename="../ui/EditProduct.ui" line="10194"/> + <location filename="../ui/EditProduct.ui" line="10183"/> + <location filename="../ui/EditProduct.ui" line="10603"/> <source>Desired volume CO2:</source> <translation>Gewenst volume CO2:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9790"/> - <location filename="../ui/EditProduct.ui" line="10261"/> + <location filename="../ui/EditProduct.ui" line="10199"/> + <location filename="../ui/EditProduct.ui" line="10670"/> <source>Priming sugar:</source> <translation>Carbonatie suiker:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9806"/> - <location filename="../ui/EditProduct.ui" line="10178"/> + <location filename="../ui/EditProduct.ui" line="10215"/> + <location filename="../ui/EditProduct.ui" line="10587"/> <source>Sugar amount:</source> <translation>Suiker gewicht:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9838"/> - <location filename="../ui/EditProduct.ui" line="10210"/> + <location filename="../ui/EditProduct.ui" line="10247"/> + <location filename="../ui/EditProduct.ui" line="10619"/> <source>Water amount:</source> <translation>Water volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10020"/> + <location filename="../ui/EditProduct.ui" line="10429"/> <source>Expected pressure in bar:</source> <translation>Verwachte druk in bar:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10036"/> + <location filename="../ui/EditProduct.ui" line="10445"/> <source>Bottles ABV %:</source> <translation>Flessen ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10134"/> + <location filename="../ui/EditProduct.ui" line="10543"/> <source>Kegs</source> <translation>Fusten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10146"/> + <location filename="../ui/EditProduct.ui" line="10555"/> <source>Kegs ABV %:</source> <translation>Fusten ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10162"/> + <location filename="../ui/EditProduct.ui" line="10571"/> <source>Kegs pressure in bar:</source> <translation>Fusten druk in bar:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10530"/> + <location filename="../ui/EditProduct.ui" line="10939"/> <source>Forced carbonation:</source> <translation>Geforceerde carbonatie:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10557"/> + <location filename="../ui/EditProduct.ui" line="10966"/> <source>Edit the package date.</source> <translation>Wijzig de verpakkings datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10616"/> + <location filename="../ui/EditProduct.ui" line="11025"/> <source>Show carbonation log:</source> <translation>Toon carbonatie log:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10625"/> + <location filename="../ui/EditProduct.ui" line="11034"/> <source>Tasting</source> <translation>Proeven</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10637"/> + <location filename="../ui/EditProduct.ui" line="11046"/> <source>Taste date:</source> <translation>Proeven datum:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10673"/> + <location filename="../ui/EditProduct.ui" line="11082"/> <source>Taste rate:</source> <translation>Beoordeling cijfer:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10714"/> + <location filename="../ui/EditProduct.ui" line="11123"/> <source>Color:</source> <translation>Kleur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10730"/> + <location filename="../ui/EditProduct.ui" line="11139"/> <source>Transparency:</source> <translation>Helderheid:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10746"/> + <location filename="../ui/EditProduct.ui" line="11155"/> <source>Head:</source> <translation>Schuim:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10801"/> + <location filename="../ui/EditProduct.ui" line="11210"/> <source>Aroma:</source> <translation>Geur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10830"/> + <location filename="../ui/EditProduct.ui" line="11239"/> <source>Taste:</source> <translation>Smaak:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10859"/> + <location filename="../ui/EditProduct.ui" line="11268"/> <source>Aftertaste:</source> <translation>Nasmaak:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10888"/> + <location filename="../ui/EditProduct.ui" line="11297"/> <source>Mouthfeel:</source> <translation>Mondgevoel:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10917"/> + <location filename="../ui/EditProduct.ui" line="11326"/> <source>Notes:</source> <translation>Opmerkingen:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10943"/> + <location filename="../ui/EditProduct.ui" line="11352"/> <source>Edit the tasting date.</source> <translation>Wijzig de datum van proeven.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10984"/> + <location filename="../ui/EditProduct.ui" line="11393"/> <source>Export</source> <translation>Exporteer</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11001"/> + <location filename="../ui/EditProduct.ui" line="11410"/> <source>Print</source> <translation>Print</translation> </message> @@ -3800,19 +3863,16 @@ <translation>Mout</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="62"/> <source>Source 1</source> - <translation>Bron 1</translation> - </message> - <message> - <location filename="../src/EditProduct.cpp" line="63"/> + <translation type="vanished">Bron 1</translation> + </message> + <message> <source>Source 2</source> - <translation>Bron 2</translation> - </message> - <message> - <location filename="../src/EditProduct.cpp" line="64"/> + <translation type="vanished">Bron 2</translation> + </message> + <message> <source>Mixed</source> - <translation>Gemengd</translation> + <translation type="vanished">Gemengd</translation> </message> <message> <source>Emersion chiller</source> @@ -3831,17 +3891,17 @@ <translation type="vanished">Afkoelen</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="99"/> + <location filename="../src/EditProduct.cpp" line="95"/> <source>None</source> <translation>Geen</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="100"/> + <location filename="../src/EditProduct.cpp" line="96"/> <source>Air</source> <translation>Lucht</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="101"/> + <location filename="../src/EditProduct.cpp" line="97"/> <source>Oxygen</source> <translation>Zuurstof</translation> </message> @@ -3863,28 +3923,28 @@ <translation type="vanished">Koken %1 minuten</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="791"/> + <location filename="../src/EditProduct.cpp" line="798"/> <source>BMSapp - Add new product</source> <translation>BMSapp - Nieuw product</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="793"/> + <location filename="../src/EditProduct.cpp" line="800"/> <source>BMSapp - Edit product %1</source> <translation>BMSapp - Wijzig product %1</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="809"/> - <location filename="../src/EditProduct.cpp" line="813"/> + <location filename="../src/EditProduct.cpp" line="816"/> + <location filename="../src/EditProduct.cpp" line="820"/> <source>Edit Product</source> <translation>Wijzig Product</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="809"/> + <location filename="../src/EditProduct.cpp" line="816"/> <source>Name empty or too short.</source> <translation>De naam is leeg of te kort.</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="813"/> + <location filename="../src/EditProduct.cpp" line="820"/> <source>No beerstyle selected.</source> <translation>Geen bierstijl gekozen.</translation> </message> @@ -3897,17 +3957,17 @@ %3</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="851"/> + <location filename="../src/EditProduct.cpp" line="858"/> <source>Delete product</source> <translation>Verwijder product</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="875"/> + <location filename="../src/EditProduct.cpp" line="882"/> <source>Product changed</source> <translation>Product gewijzigd</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="875"/> + <location filename="../src/EditProduct.cpp" line="882"/> <source>The product has been modified. Save changes?</source> <translation>Het product is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -3929,7 +3989,7 @@ <message> <location filename="../src/EditProductTab3.cpp" line="74"/> <location filename="../src/EditProductTab4.cpp" line="56"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> <location filename="../src/EditProductTab6.cpp" line="55"/> <location filename="../src/EditProductTab7.cpp" line="36"/> <source>Type</source> @@ -3953,7 +4013,7 @@ <message> <location filename="../src/EditProductTab3.cpp" line="75"/> <location filename="../src/EditProductTab4.cpp" line="57"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> <location filename="../src/EditProductTab6.cpp" line="56"/> <source>Amount</source> <translation>Hoeveel</translation> @@ -3961,7 +4021,7 @@ <message> <location filename="../src/EditProductTab3.cpp" line="75"/> <location filename="../src/EditProductTab4.cpp" line="57"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> <location filename="../src/EditProductTab6.cpp" line="56"/> <source>Stock</source> <translation>Voorraad</translation> @@ -3981,8 +4041,8 @@ <location filename="../src/EditProductTab3.cpp" line="174"/> <location filename="../src/EditProductTab4.cpp" line="57"/> <location filename="../src/EditProductTab4.cpp" line="160"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> - <location filename="../src/EditProductTab5.cpp" line="170"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> + <location filename="../src/EditProductTab5.cpp" line="177"/> <location filename="../src/EditProductTab6.cpp" line="56"/> <location filename="../src/EditProductTab6.cpp" line="154"/> <source>Edit</source> @@ -4008,16 +4068,16 @@ <message> <location filename="../src/EditProductTab3.cpp" line="650"/> <location filename="../src/EditProductTab4.cpp" line="341"/> - <location filename="../src/EditProductTab5.cpp" line="356"/> + <location filename="../src/EditProductTab5.cpp" line="400"/> <location filename="../src/EditProductTab6.cpp" line="747"/> <location filename="../src/EditProductTab7.cpp" line="303"/> - <location filename="../src/EditProduct.cpp" line="851"/> + <location filename="../src/EditProduct.cpp" line="858"/> <source>Delete %1</source> <translation>Verwijder %1</translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="966"/> - <location filename="../src/EditProductTab5.cpp" line="600"/> + <location filename="../src/EditProductTab5.cpp" line="644"/> <source>Current ingredient:</source> <translation>Huidig ingredient:</translation> </message> @@ -4050,14 +4110,14 @@ </message> <message> <location filename="../src/EditProductTab3.cpp" line="996"/> - <location filename="../src/EditProductTab5.cpp" line="626"/> + <location filename="../src/EditProductTab5.cpp" line="670"/> <source>Select ingredient:</source> <translation>Kies ingredient:</translation> </message> <message> <location filename="../src/EditProductTab3.cpp" line="1001"/> <location filename="../src/EditProductTab4.cpp" line="618"/> - <location filename="../src/EditProductTab5.cpp" line="631"/> + <location filename="../src/EditProductTab5.cpp" line="675"/> <location filename="../src/EditProductTab6.cpp" line="991"/> <source>In stock:</source> <translation>In voorraad:</translation> @@ -4070,7 +4130,7 @@ <message> <location filename="../src/EditProductTab3.cpp" line="1057"/> <location filename="../src/EditProductTab4.cpp" line="670"/> - <location filename="../src/EditProductTab5.cpp" line="676"/> + <location filename="../src/EditProductTab5.cpp" line="720"/> <source>Boil</source> <translation>Koken</translation> </message> @@ -4106,13 +4166,13 @@ </message> <message> <location filename="../src/EditProductTab4.cpp" line="56"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> <source>Use at</source> <translation>Toepassing</translation> </message> <message> <location filename="../src/EditProductTab4.cpp" line="56"/> - <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> <location filename="../src/EditProductTab9.cpp" line="514"/> <source>Time</source> <translation>Tijd</translation> @@ -4166,18 +4226,18 @@ <message> <location filename="../src/EditProductTab4.cpp" line="541"/> <location filename="../src/EditProductTab4.cpp" line="600"/> - <location filename="../src/EditProductTab5.cpp" line="471"/> - <location filename="../src/EditProductTab5.cpp" line="560"/> - <location filename="../src/EditProductTab5.cpp" line="618"/> + <location filename="../src/EditProductTab5.cpp" line="515"/> + <location filename="../src/EditProductTab5.cpp" line="604"/> + <location filename="../src/EditProductTab5.cpp" line="662"/> <source>Time in minutes:</source> <translation>Tijd in minuten:</translation> </message> <message> <location filename="../src/EditProductTab4.cpp" line="545"/> <location filename="../src/EditProductTab4.cpp" line="598"/> - <location filename="../src/EditProductTab5.cpp" line="466"/> - <location filename="../src/EditProductTab5.cpp" line="555"/> - <location filename="../src/EditProductTab5.cpp" line="616"/> + <location filename="../src/EditProductTab5.cpp" line="510"/> + <location filename="../src/EditProductTab5.cpp" line="599"/> + <location filename="../src/EditProductTab5.cpp" line="660"/> <source>Time in days:</source> <translation>Tijd in dagen:</translation> </message> @@ -4193,8 +4253,8 @@ </message> <message> <location filename="../src/EditProductTab4.cpp" line="592"/> - <location filename="../src/EditProductTab5.cpp" line="482"/> - <location filename="../src/EditProductTab5.cpp" line="607"/> + <location filename="../src/EditProductTab5.cpp" line="526"/> + <location filename="../src/EditProductTab5.cpp" line="651"/> <location filename="../src/EditProductTab6.cpp" line="861"/> <location filename="../src/EditProductTab6.cpp" line="999"/> <source>Amount in gr:</source> @@ -4234,55 +4294,55 @@ <translation>Koudhop</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="69"/> + <location filename="../src/EditProductTab5.cpp" line="76"/> <source>Ingredient</source> <translation>Ingredient</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="134"/> - <location filename="../src/EditProductTab5.cpp" line="138"/> + <location filename="../src/EditProductTab5.cpp" line="141"/> + <location filename="../src/EditProductTab5.cpp" line="145"/> <source>Edit this from the water tab</source> <translation>Wijzig dit vanaf het water tabblad</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="143"/> - <location filename="../src/EditProductTab5.cpp" line="147"/> + <location filename="../src/EditProductTab5.cpp" line="150"/> + <location filename="../src/EditProductTab5.cpp" line="154"/> <source>Misc already used</source> <translation>Divers ingredient is al verwerkt</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="356"/> + <location filename="../src/EditProductTab5.cpp" line="400"/> <source>Delete misc</source> <translation>Verwijder divers ingredient</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="485"/> - <location filename="../src/EditProductTab5.cpp" line="609"/> + <location filename="../src/EditProductTab5.cpp" line="529"/> + <location filename="../src/EditProductTab5.cpp" line="653"/> <location filename="../src/EditProductTab6.cpp" line="868"/> <location filename="../src/EditProductTab6.cpp" line="1001"/> <source>Amount in ml:</source> <translation>Hoeveelheid in ml:</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="674"/> + <location filename="../src/EditProductTab5.cpp" line="718"/> <source>Starter</source> <translation>Starter</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="677"/> + <location filename="../src/EditProductTab5.cpp" line="721"/> <location filename="../src/EditProductTab6.cpp" line="1055"/> <source>Primary</source> <translation>Hoofdgisting</translation> </message> <message> - <location filename="../src/EditProductTab5.cpp" line="678"/> + <location filename="../src/EditProductTab5.cpp" line="722"/> <location filename="../src/EditProductTab6.cpp" line="1056"/> <source>Secondary</source> <translation>Nagisting/lagering</translation> </message> <message> <location filename="../src/EditProductTab4.cpp" line="674"/> - <location filename="../src/EditProductTab5.cpp" line="679"/> + <location filename="../src/EditProductTab5.cpp" line="723"/> <source>Bottling</source> <translation>Bottelen</translation> </message> @@ -4510,8 +4570,8 @@ <translation>Verwarm tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6931"/> - <location filename="../ui/EditProduct.ui" line="8039"/> + <location filename="../ui/EditProduct.ui" line="7340"/> + <location filename="../ui/EditProduct.ui" line="8448"/> <location filename="../src/EditProductTab7.cpp" line="624"/> <source>Measured pH:</source> <translation>Gemeten pH:</translation> @@ -4522,8 +4582,8 @@ <translation>Gemeten Brix:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6947"/> - <location filename="../ui/EditProduct.ui" line="8106"/> + <location filename="../ui/EditProduct.ui" line="7356"/> + <location filename="../ui/EditProduct.ui" line="8515"/> <location filename="../src/EditProductTab7.cpp" line="656"/> <source>Measured SG:</source> <translation>Gemeten SG:</translation> @@ -4539,63 +4599,63 @@ <translation>Infusie temperatuur:</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="334"/> + <location filename="../src/EditProductTab8.cpp" line="343"/> <source>Very malty and sweet</source> <translation>Zeer moutig en zoet</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="336"/> + <location filename="../src/EditProductTab8.cpp" line="345"/> <source>Malty, sweet</source> <translation>Moutig, zoet</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="338"/> - <location filename="../src/EditProductTab8.cpp" line="354"/> + <location filename="../src/EditProductTab8.cpp" line="347"/> + <location filename="../src/EditProductTab8.cpp" line="363"/> <source>Balanced</source> <translation>Gebalanceerd</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="340"/> + <location filename="../src/EditProductTab8.cpp" line="349"/> <source>Hoppy, bitter</source> <translation>Hoppig, bitter</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="342"/> + <location filename="../src/EditProductTab8.cpp" line="351"/> <source>Very hoppy, very bitter</source> <translation>Erg hoppig, erg bitter</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="348"/> + <location filename="../src/EditProductTab8.cpp" line="357"/> <source>Too malty</source> <translation>Te moutig</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="350"/> + <location filename="../src/EditProductTab8.cpp" line="359"/> <source>Very malty</source> <translation>Erg moutig</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="352"/> + <location filename="../src/EditProductTab8.cpp" line="361"/> <source>Malty</source> <translation>Moutig</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="356"/> + <location filename="../src/EditProductTab8.cpp" line="365"/> <source>Little bitter</source> <translation>Iets bitter</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="358"/> + <location filename="../src/EditProductTab8.cpp" line="367"/> <source>Bitter</source> <translation>Bitter</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="360"/> + <location filename="../src/EditProductTab8.cpp" line="369"/> <source>Very bitter</source> <translation>Erg bitter</translation> </message> <message> - <location filename="../src/EditProductTab8.cpp" line="362"/> + <location filename="../src/EditProductTab8.cpp" line="371"/> <source>Too bitter</source> <translation>Veel te bitter</translation> </message> @@ -5567,63 +5627,86 @@ </message> <message> <location filename="../ui/EditProfileWater.ui" line="201"/> + <source>pH:</source> + <translation>pH:</translation> + </message> + <message> + <location filename="../ui/EditProfileWater.ui" line="526"/> + <source>Total Alkalinity (CaCO3) mg/L:</source> + <translation>Totale alkaliteit (CaCO3) mg/L:</translation> + </message> + <message> + <location filename="../ui/EditProfileWater.ui" line="571"/> + <source>Residual Alkalinity as CaCO3:</source> + <translation>Rest alkaliteit als CaCO3:</translation> + </message> + <message> + <location filename="../ui/EditProfileWater.ui" line="655"/> + <source>Hardness as CaCO3:</source> + <translation>Hardheid als CaCO3:</translation> + </message> + <message> + <location filename="../ui/EditProfileWater.ui" line="705"/> + <source>Carbonate (CO3) mg/L:</source> + <translation>Carbonaat (CO3) mg/L:</translation> + </message> + <message> <source>Acid pH:</source> - <translation>Zuurgraad pH:</translation> - </message> - <message> - <location filename="../ui/EditProfileWater.ui" line="472"/> + <translation type="vanished">Zuurgraad pH:</translation> + </message> + <message> + <location filename="../ui/EditProfileWater.ui" line="478"/> <source>Sulfate (SO4) mg/L:</source> <translation>Sulfaat (SO4) mg/L:</translation> </message> <message> - <location filename="../ui/EditProfileWater.ui" line="488"/> + <location filename="../ui/EditProfileWater.ui" line="494"/> <source>Chloride (Cl) mg/L:</source> <translation>Chloride (Cl) mg/L:</translation> </message> <message> - <location filename="../ui/EditProfileWater.ui" line="504"/> + <location filename="../ui/EditProfileWater.ui" line="510"/> <source>Bicarbonate (HCO3) mg/L:</source> <translation>Bicarbonaat (HCO3) mg/L:</translation> </message> <message> - <location filename="../ui/EditProfileWater.ui" line="520"/> <source>Alkalinity (CaCO3) mg/L:</source> - <translation>Totale alkaliteit (CaCO3) mg/L:</translation> - </message> - <message> - <location filename="../ui/EditProfileWater.ui" line="536"/> + <translation type="vanished">Totale alkaliteit (CaCO3) mg/L:</translation> + </message> + <message> + <location filename="../ui/EditProfileWater.ui" line="542"/> <source>Ion balance meq/L:</source> <translation>Ionen balans meq/L:</translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="85"/> + <location filename="../src/EditProfileWater.cpp" line="96"/> <source>BMSapp - Add new brewing water</source> <translation>BMSapp - Nieuw brouwwater</translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="87"/> + <location filename="../src/EditProfileWater.cpp" line="98"/> <source>BMSapp - Edit brewing water %1</source> <translation>BMSapp - Wijzig brouwwater %1</translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="103"/> + <location filename="../src/EditProfileWater.cpp" line="114"/> <source>Edit Water</source> <translation>Wijzig water</translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="103"/> + <location filename="../src/EditProfileWater.cpp" line="114"/> <source>Name empty or too short.</source> <translation>De naam is leeg of te kort.</translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="135"/> - <location filename="../src/EditProfileWater.cpp" line="160"/> + <location filename="../src/EditProfileWater.cpp" line="146"/> + <location filename="../src/EditProfileWater.cpp" line="171"/> <source>Database error</source> <translation>Database fout</translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="136"/> - <location filename="../src/EditProfileWater.cpp" line="161"/> + <location filename="../src/EditProfileWater.cpp" line="147"/> + <location filename="../src/EditProfileWater.cpp" line="172"/> <source>MySQL error: %1 %2 %3</source> @@ -5632,12 +5715,12 @@ %3</translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="226"/> + <location filename="../src/EditProfileWater.cpp" line="281"/> <source>Water changed</source> <translation>Water gewijzigd</translation> </message> <message> - <location filename="../src/EditProfileWater.cpp" line="226"/> + <location filename="../src/EditProfileWater.cpp" line="281"/> <source>This water profile has been modified. Save changes?</source> <translation>Dit water profiel is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -5671,8 +5754,8 @@ <location filename="../src/EditRecipeTab2.cpp" line="123"/> <location filename="../src/EditRecipeTab3.cpp" line="49"/> <location filename="../src/EditRecipeTab3.cpp" line="117"/> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> - <location filename="../src/EditRecipeTab4.cpp" line="121"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> + <location filename="../src/EditRecipeTab4.cpp" line="128"/> <location filename="../src/EditRecipeTab5.cpp" line="42"/> <location filename="../src/EditRecipeTab5.cpp" line="103"/> <location filename="../src/EditRecipeTab6.cpp" line="35"/> @@ -5747,6 +5830,7 @@ <message> <location filename="../ui/EditRecipe.ui" line="357"/> <location filename="../ui/EditRecipe.ui" line="391"/> + <location filename="../ui/EditRecipe.ui" line="5362"/> <source> L</source> <translation> L</translation> </message> @@ -5994,7 +6078,7 @@ <location filename="../ui/EditRecipe.ui" line="2309"/> <location filename="../src/EditRecipeTab2.cpp" line="922"/> <location filename="../src/EditRecipeTab3.cpp" line="659"/> - <location filename="../src/EditRecipeTab4.cpp" line="610"/> + <location filename="../src/EditRecipeTab4.cpp" line="653"/> <source>Mash</source> <translation>Maischen</translation> </message> @@ -6019,367 +6103,428 @@ <translation>Water</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2441"/> <source>Water overview</source> - <translation>Water overzicht</translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="2662"/> + <translation type="vanished">Water overzicht</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="4759"/> <source>Ca</source> <translation>Ca</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2678"/> + <location filename="../ui/EditRecipe.ui" line="5118"/> <source>Mg</source> <translation>Mg</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2694"/> + <location filename="../ui/EditRecipe.ui" line="4775"/> <source>HCO3</source> <translation></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2710"/> + <location filename="../ui/EditRecipe.ui" line="4743"/> <source>CaCO3</source> <translation>CaCO3</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2726"/> + <location filename="../ui/EditRecipe.ui" line="5070"/> <source>Na</source> <translation>Na</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2742"/> + <location filename="../ui/EditRecipe.ui" line="5102"/> <source>Cl</source> <translation>Cl</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2758"/> + <location filename="../ui/EditRecipe.ui" line="4667"/> <source>SO4</source> <translation>SO4</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2774"/> + <location filename="../ui/EditRecipe.ui" line="4869"/> <source>pH</source> <translation>pH</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="2818"/> + <location filename="../ui/EditRecipe.ui" line="4954"/> <location filename="../src/EditRecipeTab6.cpp" line="35"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3009"/> + <location filename="../ui/EditRecipe.ui" line="4211"/> <source>The division between the main and dilution water. The total volume does not change.</source> <translation>De verdeling tussen het hoofd en verdunnings water. Het totale volume blijft gelijk.</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3318"/> - <location filename="../ui/EditRecipe.ui" line="4521"/> + <location filename="../ui/EditRecipe.ui" line="3229"/> + <location filename="../ui/EditRecipe.ui" line="3942"/> <source>Mash pH should be between 5.2 and 5.6. Use 5.2 for light and 5.5 for dark beers.</source> <translation>De maisch pH moet tussen 5.2 en 5.6 zijn. Gebruik 5.2 voor lichte en 5.5 voor donkere bieren.</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3496"/> + <location filename="../ui/EditRecipe.ui" line="3998"/> <source>The ideal amount of Magnesium is between 5 and 40.</source> <translation>De ideale hoeveelheid magnesium is tussen 5 en 40.</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3524"/> + <location filename="../ui/EditRecipe.ui" line="3860"/> <source>0 to 50 for light beers, 50 to 150 for amber beers, 150 to 250 for dark beers.</source> <translation>0 tot 50 voor licht bier, 50 tot 150 voor amber bier, 150 tot 250 voor donker bier.</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3552"/> + <location filename="../ui/EditRecipe.ui" line="2962"/> + <source>Acid Additions</source> + <translation>Zuur toevoegingen</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="2974"/> + <source>Desired sparge pH:</source> + <translation>Gewenst spoelwater pH:</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="3006"/> + <location filename="../ui/EditRecipe.ui" line="3153"/> + <source>Acid amount:</source> + <translation>Zuur hoeveelheid:</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="3257"/> + <source>Desired mash pH:</source> + <translation>Gewenst maisch pH:</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="3612"/> + <source>Choose example water</source> + <translation>Kies voorbeeld water</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="3803"/> <source>The ideal Sulfate amount should be between 50 and 400. Together with Chloride it must be below 500.</source> <translation>De ideale sulfaat hoeveelheid is tussen 50 en 400. Samen met Chloride moet het minder dan 500 zijn.</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3581"/> + <location filename="../ui/EditRecipe.ui" line="3832"/> <source>The ideal amount of Calcium is between 40 and 150.</source> <translation>De ideale hoeveelheid Calcium is tussen 40 en 150.</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3609"/> + <location filename="../ui/EditRecipe.ui" line="3913"/> <source>The ideal Chloride amount is between 50 and 150. Together with Sulfate it must be below 500.</source> <translation>De ideale hoeveelheid Chloride is tussen 50 en 150. Samen met Sulfaat moet dit minder dan 500 zijn.</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3663"/> + <location filename="../ui/EditRecipe.ui" line="4026"/> + <source>Treated mash water</source> + <translation>Behandeld maisch water</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="4042"/> <source>The ideal amount of Natrium should be below 150.</source> <translation>De ideale hoeveelheid Zout moet minder dan 150 zijn.</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3691"/> + <location filename="../ui/EditRecipe.ui" line="4885"/> <source>Water profile</source> <translation>Water profiel</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3707"/> + <location filename="../ui/EditRecipe.ui" line="4683"/> <source>The main brewing water</source> <translation>Het hoofd brouwwater</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3713"/> + <location filename="../ui/EditRecipe.ui" line="4689"/> <source>Choose water</source> <translation>Kies water</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3726"/> + <location filename="../ui/EditRecipe.ui" line="4651"/> <source>Optional dilution water</source> <translation>Optioneel meng water</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3729"/> + <location filename="../ui/EditRecipe.ui" line="4654"/> <source>Choose dilution</source> <translation>Kies mengwater</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3742"/> + <location filename="../ui/EditRecipe.ui" line="3609"/> <source>If needed, choose a target water profile.</source> <translation>Indien nodig, kies een doel water profiel.</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3755"/> + <location filename="../ui/EditRecipe.ui" line="4070"/> <source>Mixed water</source> <translation>Gemengd water</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="3771"/> <source>Treated water</source> - <translation>Behandeld water</translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="3999"/> + <translation type="vanished">Behandeld water</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="5086"/> <source>RA</source> <translation></translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4068"/> + <location filename="../ui/EditRecipe.ui" line="4727"/> <source>Hardness</source> <translation>Hardheid</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4085"/> + <location filename="../ui/EditRecipe.ui" line="2438"/> <source>Water agents</source> <translation>Brouwzouten</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4097"/> + <location filename="../ui/EditRecipe.ui" line="2450"/> <source>Calcium Chloride</source> <translation>Calcium Chloride</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4100"/> + <location filename="../ui/EditRecipe.ui" line="2453"/> <source>CaCl2:</source> <translation>CaCl2:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4116"/> + <location filename="../ui/EditRecipe.ui" line="2469"/> <source>Gypsym</source> <translation>Gips</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4119"/> + <location filename="../ui/EditRecipe.ui" line="2472"/> <source>CaSO4:</source> <translation>CaSO4:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4135"/> + <location filename="../ui/EditRecipe.ui" line="2488"/> <source>Epsom</source> <translation>Magmesium sulfaat</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4138"/> + <location filename="../ui/EditRecipe.ui" line="2491"/> <source>MgSO4:</source> <translation>MgSO4:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4154"/> + <location filename="../ui/EditRecipe.ui" line="2507"/> <source>Table salt</source> <translation>Keukenzout</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4157"/> + <location filename="../ui/EditRecipe.ui" line="2510"/> <source>NaCl:</source> <translation>NaCl:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4173"/> - <location filename="../ui/EditRecipe.ui" line="4357"/> + <location filename="../ui/EditRecipe.ui" line="2526"/> + <location filename="../ui/EditRecipe.ui" line="2710"/> + <location filename="../ui/EditRecipe.ui" line="2930"/> <source>Magnesium Chloride</source> <translation>Magnesium Chloride</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4176"/> + <location filename="../ui/EditRecipe.ui" line="2529"/> <source>MgCl2:</source> <translation>MgCl2:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4192"/> - <location filename="../ui/EditRecipe.ui" line="4388"/> + <location filename="../ui/EditRecipe.ui" line="2545"/> + <location filename="../ui/EditRecipe.ui" line="2741"/> <source>Baking soda</source> <translation>Baksoda</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4195"/> + <location filename="../ui/EditRecipe.ui" line="2548"/> <source>NaHCO3:</source> <translation>NaHCO3:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4211"/> - <location filename="../ui/EditRecipe.ui" line="4419"/> + <location filename="../ui/EditRecipe.ui" line="2564"/> + <location filename="../ui/EditRecipe.ui" line="2772"/> <source>Chalk undissolved</source> <translation>Ongebluste kalk</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4214"/> + <location filename="../ui/EditRecipe.ui" line="2567"/> <source>CaCO3:</source> <translation>CaCO3:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4230"/> + <location filename="../ui/EditRecipe.ui" line="2583"/> + <location filename="../ui/EditRecipe.ui" line="2803"/> <source>To change the water profile. This adds Calcium and Chloride. To improve sweet style beers.</source> <translation>Verbeterd het water profiel. Voegt Calcium en Chloride toe. Om de zoetheid van bier te verbeteren.</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4240"/> - <location filename="../ui/EditRecipe.ui" line="4272"/> - <location filename="../ui/EditRecipe.ui" line="4303"/> - <location filename="../ui/EditRecipe.ui" line="4335"/> - <location filename="../ui/EditRecipe.ui" line="4366"/> - <location filename="../ui/EditRecipe.ui" line="4397"/> - <location filename="../ui/EditRecipe.ui" line="4428"/> + <location filename="../ui/EditRecipe.ui" line="2593"/> + <location filename="../ui/EditRecipe.ui" line="2625"/> + <location filename="../ui/EditRecipe.ui" line="2656"/> + <location filename="../ui/EditRecipe.ui" line="2688"/> + <location filename="../ui/EditRecipe.ui" line="2719"/> + <location filename="../ui/EditRecipe.ui" line="2750"/> + <location filename="../ui/EditRecipe.ui" line="2781"/> + <location filename="../ui/EditRecipe.ui" line="2813"/> + <location filename="../ui/EditRecipe.ui" line="2844"/> + <location filename="../ui/EditRecipe.ui" line="2876"/> + <location filename="../ui/EditRecipe.ui" line="2908"/> + <location filename="../ui/EditRecipe.ui" line="2939"/> <source> gr</source> <translation> gr</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4262"/> + <location filename="../ui/EditRecipe.ui" line="2615"/> + <location filename="../ui/EditRecipe.ui" line="2898"/> <source>Gypsum to change the water profile. This adds Calcium and Sulfate. To improve bitter beers.</source> <translation>Gips om het waterprofiel te veranderen. Dit voegt Calcium en Sulfaat toe. Verbeterd de beleving van bittere bieren.</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4294"/> + <location filename="../ui/EditRecipe.ui" line="2647"/> + <location filename="../ui/EditRecipe.ui" line="2835"/> <source>Epsom salt to change the water profile. Use with caution!</source> <translation>Epsom zout om water aan te passen. Gebruik spaarzaam!</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4325"/> + <location filename="../ui/EditRecipe.ui" line="2678"/> + <location filename="../ui/EditRecipe.ui" line="2866"/> <source>Table salt to change the water profile. This adds Sodium and Chloride. Improves the sweetness of the beer. The beer will become salty at high doses.</source> <translation>Keukenzout om water aan te passen. Voegt Zout en Chloride toe. Versterkt de zoetheid van het bier. Het bier wordt ziltig bij hoge dosering.</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4451"/> <source>Mash water</source> - <translation>Maischwater</translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4463"/> - <location filename="../ui/EditRecipe.ui" line="4682"/> + <translation type="vanished">Maischwater</translation> + </message> + <message> <source>Desired pH:</source> - <translation>Gewenste pH:</translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4479"/> + <translation type="vanished">Gewenste pH:</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="3273"/> <source>Auto calculate:</source> <translation>Automatisch rekenen:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4495"/> + <location filename="../ui/EditRecipe.ui" line="3213"/> <source>Acid to use:</source> <translation>Aanzuren met:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4561"/> - <location filename="../ui/EditRecipe.ui" line="4833"/> + <location filename="../ui/EditRecipe.ui" line="3059"/> + <location filename="../ui/EditRecipe.ui" line="3181"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4589"/> - <location filename="../ui/EditRecipe.ui" line="4867"/> + <location filename="../ui/EditRecipe.ui" line="3093"/> + <location filename="../ui/EditRecipe.ui" line="3131"/> <source> ml</source> <translation> ml</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4622"/> <source>Sparge water</source> - <translation>Spoelwater</translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4634"/> + <translation type="vanished">Spoelwater</translation> + </message> + <message> <source>Sparge water supply:</source> - <translation>Spoelwater voorraad:</translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4650"/> + <translation type="vanished">Spoelwater voorraad:</translation> + </message> + <message> <source>Sparge temperature:</source> - <translation>Spoelwater temperatuur:</translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4666"/> + <translation type="vanished">Spoelwater temperatuur:</translation> + </message> + <message> <source>Water source:</source> - <translation>Water bron:</translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4698"/> + <translation type="vanished">Water bron:</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="2990"/> <source>Acid type:</source> <translation>Aanzuren met:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4714"/> <source>Acid strength:</source> - <translation>Sterkte %:</translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4730"/> + <translation type="vanished">Sterkte %:</translation> + </message> + <message> <source>Acid needed:</source> - <translation>Benodigd:</translation> - </message> - <message> - <location filename="../ui/EditRecipe.ui" line="4910"/> + <translation type="vanished">Benodigd:</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="3300"/> <source>Bitterness index:</source> <translation>Bitterheidsindex:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4962"/> - <location filename="../ui/EditRecipe.ui" line="5030"/> + <location filename="../ui/EditRecipe.ui" line="3352"/> + <location filename="../ui/EditRecipe.ui" line="3420"/> <source>N/A</source> <translation>N.v.t</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="4978"/> + <location filename="../ui/EditRecipe.ui" line="3368"/> <source>Preffered SO4:Cl ratio:</source> <translation>Gewenste SO4:Cl verh:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="5046"/> + <location filename="../ui/EditRecipe.ui" line="3436"/> <source>Current SO4:Cl ratio:</source> <translation>Huidige SO4:Cl verhouding:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="5103"/> + <location filename="../ui/EditRecipe.ui" line="3493"/> <source>Estimate pre boil pH:</source> <translation>Geschat voor kook pH:</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="5146"/> + <location filename="../ui/EditRecipe.ui" line="5212"/> + <source>Treated sparge water</source> + <translation>Behandeld spoelwater</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="5353"/> + <source>The total prepared amount of sparge water</source> + <translation>De totale voorraad spoelwater</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="5459"/> + <location filename="../src/EditRecipeTab4.cpp" line="658"/> + <source>Sparge</source> + <translation>Spoel</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="5478"/> + <source>Sparge water mixed</source> + <translation>Gemengd spoelwater</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="5494"/> + <source>Sparge water source 1</source> + <translation>Spoelwater bron 1</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="5516"/> + <source>Sparge water source 2</source> + <translation>Spoelwater bron 2</translation> + </message> + <message> + <location filename="../ui/EditRecipe.ui" line="5534"/> <source>Export</source> <translation>Exporteer</translation> </message> <message> - <location filename="../ui/EditRecipe.ui" line="5163"/> + <location filename="../ui/EditRecipe.ui" line="5551"/> <source>Print</source> <translation>Print</translation> </message> @@ -6400,19 +6545,16 @@ <translation>Mout</translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="59"/> <source>Source 1</source> - <translation>Bron 1</translation> - </message> - <message> - <location filename="../src/EditRecipe.cpp" line="60"/> + <translation type="vanished">Bron 1</translation> + </message> + <message> <source>Source 2</source> - <translation>Bron 2</translation> - </message> - <message> - <location filename="../src/EditRecipe.cpp" line="61"/> + <translation type="vanished">Bron 2</translation> + </message> + <message> <source>Mixed</source> - <translation>Gemengd</translation> + <translation type="vanished">Gemengd</translation> </message> <message> <source>Database error</source> @@ -6423,28 +6565,28 @@ <translation type="vanished">MySQL fout: record %1 niet gevonden</translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="449"/> + <location filename="../src/EditRecipe.cpp" line="456"/> <source>BMSapp - Add new recipe</source> <translation>BMSapp - Nieuw recept</translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="451"/> + <location filename="../src/EditRecipe.cpp" line="458"/> <source>BMSapp - Edit recipe %1</source> <translation>BMSapp - Wijzig recept %1</translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="467"/> - <location filename="../src/EditRecipe.cpp" line="471"/> + <location filename="../src/EditRecipe.cpp" line="474"/> + <location filename="../src/EditRecipe.cpp" line="478"/> <source>Edit Recipe</source> <translation>Wijzig recept</translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="467"/> + <location filename="../src/EditRecipe.cpp" line="474"/> <source>Name empty or too short.</source> <translation>De naam is leeg of te kort.</translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="471"/> + <location filename="../src/EditRecipe.cpp" line="478"/> <source>No beerstyle selected.</source> <translation>Geen bierstijl gekozen.</translation> </message> @@ -6457,17 +6599,17 @@ %3</translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="503"/> + <location filename="../src/EditRecipe.cpp" line="510"/> <source>Delete recipe</source> <translation>Verwijder recept</translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="527"/> + <location filename="../src/EditRecipe.cpp" line="534"/> <source>Recipe changed</source> <translation>Recept gewijzigd</translation> </message> <message> - <location filename="../src/EditRecipe.cpp" line="527"/> + <location filename="../src/EditRecipe.cpp" line="534"/> <source>The recipe has been modified. Save changes?</source> <translation>Het recept is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -6489,7 +6631,7 @@ <message> <location filename="../src/EditRecipeTab2.cpp" line="60"/> <location filename="../src/EditRecipeTab3.cpp" line="48"/> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> <location filename="../src/EditRecipeTab5.cpp" line="41"/> <location filename="../src/EditRecipeTab6.cpp" line="34"/> <source>Type</source> @@ -6513,7 +6655,7 @@ <message> <location filename="../src/EditRecipeTab2.cpp" line="61"/> <location filename="../src/EditRecipeTab3.cpp" line="49"/> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> <location filename="../src/EditRecipeTab5.cpp" line="42"/> <source>Amount</source> <translation>Hoeveel</translation> @@ -6533,8 +6675,8 @@ <location filename="../src/EditRecipeTab2.cpp" line="134"/> <location filename="../src/EditRecipeTab3.cpp" line="49"/> <location filename="../src/EditRecipeTab3.cpp" line="128"/> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> - <location filename="../src/EditRecipeTab4.cpp" line="132"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> + <location filename="../src/EditRecipeTab4.cpp" line="139"/> <location filename="../src/EditRecipeTab5.cpp" line="42"/> <location filename="../src/EditRecipeTab5.cpp" line="114"/> <location filename="../src/EditRecipeTab6.cpp" line="35"/> @@ -6550,16 +6692,16 @@ <message> <location filename="../src/EditRecipeTab2.cpp" line="522"/> <location filename="../src/EditRecipeTab3.cpp" line="291"/> - <location filename="../src/EditRecipeTab4.cpp" line="301"/> + <location filename="../src/EditRecipeTab4.cpp" line="344"/> <location filename="../src/EditRecipeTab5.cpp" line="261"/> <location filename="../src/EditRecipeTab6.cpp" line="285"/> - <location filename="../src/EditRecipe.cpp" line="503"/> + <location filename="../src/EditRecipe.cpp" line="510"/> <source>Delete %1</source> <translation>Verwijder %1</translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="832"/> - <location filename="../src/EditRecipeTab4.cpp" line="535"/> + <location filename="../src/EditRecipeTab4.cpp" line="578"/> <source>Current ingredient:</source> <translation>Huidig ingredient:</translation> </message> @@ -6592,14 +6734,14 @@ </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="862"/> - <location filename="../src/EditRecipeTab4.cpp" line="561"/> + <location filename="../src/EditRecipeTab4.cpp" line="604"/> <source>Select ingredient:</source> <translation>Kies ingredient:</translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="867"/> <location filename="../src/EditRecipeTab3.cpp" line="600"/> - <location filename="../src/EditRecipeTab4.cpp" line="566"/> + <location filename="../src/EditRecipeTab4.cpp" line="609"/> <location filename="../src/EditRecipeTab5.cpp" line="482"/> <source>In stock:</source> <translation>In voorraad:</translation> @@ -6612,7 +6754,7 @@ <message> <location filename="../src/EditRecipeTab2.cpp" line="923"/> <location filename="../src/EditRecipeTab3.cpp" line="661"/> - <location filename="../src/EditRecipeTab4.cpp" line="611"/> + <location filename="../src/EditRecipeTab4.cpp" line="654"/> <source>Boil</source> <translation>Koken</translation> </message> @@ -6659,13 +6801,13 @@ </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="48"/> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> <source>Use at</source> <translation>Toepassing</translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="48"/> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> <source>Time</source> <translation>Tijd</translation> </message> @@ -6712,18 +6854,18 @@ <message> <location filename="../src/EditRecipeTab3.cpp" line="491"/> <location filename="../src/EditRecipeTab3.cpp" line="577"/> - <location filename="../src/EditRecipeTab4.cpp" line="415"/> - <location filename="../src/EditRecipeTab4.cpp" line="495"/> - <location filename="../src/EditRecipeTab4.cpp" line="553"/> + <location filename="../src/EditRecipeTab4.cpp" line="458"/> + <location filename="../src/EditRecipeTab4.cpp" line="538"/> + <location filename="../src/EditRecipeTab4.cpp" line="596"/> <source>Time in minutes:</source> <translation>Tijd in minuten:</translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="495"/> <location filename="../src/EditRecipeTab3.cpp" line="575"/> - <location filename="../src/EditRecipeTab4.cpp" line="410"/> - <location filename="../src/EditRecipeTab4.cpp" line="490"/> - <location filename="../src/EditRecipeTab4.cpp" line="551"/> + <location filename="../src/EditRecipeTab4.cpp" line="453"/> + <location filename="../src/EditRecipeTab4.cpp" line="533"/> + <location filename="../src/EditRecipeTab4.cpp" line="594"/> <source>Time in days:</source> <translation>Tijd in dagen:</translation> </message> @@ -6739,8 +6881,8 @@ </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="564"/> - <location filename="../src/EditRecipeTab4.cpp" line="426"/> - <location filename="../src/EditRecipeTab4.cpp" line="542"/> + <location filename="../src/EditRecipeTab4.cpp" line="469"/> + <location filename="../src/EditRecipeTab4.cpp" line="585"/> <location filename="../src/EditRecipeTab5.cpp" line="365"/> <location filename="../src/EditRecipeTab5.cpp" line="490"/> <source>Amount in gr:</source> @@ -6811,49 +6953,49 @@ <translation>Cryo hop</translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="55"/> + <location filename="../src/EditRecipeTab4.cpp" line="62"/> <source>Ingredient</source> <translation>Ingredient</translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="106"/> - <location filename="../src/EditRecipeTab4.cpp" line="109"/> + <location filename="../src/EditRecipeTab4.cpp" line="113"/> + <location filename="../src/EditRecipeTab4.cpp" line="116"/> <source>Edit this from the water tab</source> <translation>Wijzig dit vanaf het water tabblad</translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="301"/> + <location filename="../src/EditRecipeTab4.cpp" line="344"/> <source>Delete misc</source> <translation>Verwijder divers ingredient</translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="429"/> - <location filename="../src/EditRecipeTab4.cpp" line="544"/> + <location filename="../src/EditRecipeTab4.cpp" line="472"/> + <location filename="../src/EditRecipeTab4.cpp" line="587"/> <location filename="../src/EditRecipeTab5.cpp" line="369"/> <location filename="../src/EditRecipeTab5.cpp" line="492"/> <source>Amount in ml:</source> <translation>Hoeveelheid in ml:</translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="609"/> + <location filename="../src/EditRecipeTab4.cpp" line="652"/> <source>Starter</source> <translation>Starter</translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="612"/> + <location filename="../src/EditRecipeTab4.cpp" line="655"/> <location filename="../src/EditRecipeTab5.cpp" line="545"/> <source>Primary</source> <translation>Hoofdgisting</translation> </message> <message> - <location filename="../src/EditRecipeTab4.cpp" line="613"/> + <location filename="../src/EditRecipeTab4.cpp" line="656"/> <location filename="../src/EditRecipeTab5.cpp" line="546"/> <source>Secondary</source> <translation>Nagisting/lagering</translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="665"/> - <location filename="../src/EditRecipeTab4.cpp" line="614"/> + <location filename="../src/EditRecipeTab4.cpp" line="657"/> <source>Bottling</source> <translation>Bottelen</translation> </message> @@ -7025,63 +7167,63 @@ <translation>Infusie temperatuur:</translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="334"/> + <location filename="../src/EditRecipeTab7.cpp" line="343"/> <source>Very malty and sweet</source> <translation>Zeer moutig en zoet</translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="336"/> + <location filename="../src/EditRecipeTab7.cpp" line="345"/> <source>Malty, sweet</source> <translation>Moutig, zoet</translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="338"/> - <location filename="../src/EditRecipeTab7.cpp" line="354"/> + <location filename="../src/EditRecipeTab7.cpp" line="347"/> + <location filename="../src/EditRecipeTab7.cpp" line="363"/> <source>Balanced</source> <translation>Gebalanceerd</translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="340"/> + <location filename="../src/EditRecipeTab7.cpp" line="349"/> <source>Hoppy, bitter</source> <translation>Hoppig, bitter</translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="342"/> + <location filename="../src/EditRecipeTab7.cpp" line="351"/> <source>Very hoppy, very bitter</source> <translation>Erg hoppig, erg bitter</translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="348"/> + <location filename="../src/EditRecipeTab7.cpp" line="357"/> <source>Too malty</source> <translation>Te moutig</translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="350"/> + <location filename="../src/EditRecipeTab7.cpp" line="359"/> <source>Very malty</source> <translation>Erg moutig</translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="352"/> + <location filename="../src/EditRecipeTab7.cpp" line="361"/> <source>Malty</source> <translation>Moutig</translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="356"/> + <location filename="../src/EditRecipeTab7.cpp" line="365"/> <source>Little bitter</source> <translation>Iets bitter</translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="358"/> + <location filename="../src/EditRecipeTab7.cpp" line="367"/> <source>Bitter</source> <translation>Bitter</translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="360"/> + <location filename="../src/EditRecipeTab7.cpp" line="369"/> <source>Very bitter</source> <translation>Erg bitter</translation> </message> <message> - <location filename="../src/EditRecipeTab7.cpp" line="362"/> + <location filename="../src/EditRecipeTab7.cpp" line="371"/> <source>Too bitter</source> <translation>Veel te bitter</translation> </message> @@ -7408,8 +7550,32 @@ </message> <message> <location filename="../ui/EditWater.ui" line="295"/> + <source>pH:</source> + <translation></translation> + </message> + <message> + <location filename="../ui/EditWater.ui" line="646"/> + <source>Total Alkalinity (CaCO3) mg/L:</source> + <translation>Totale alkaliteit (CaCO3) mg/L:</translation> + </message> + <message> + <location filename="../ui/EditWater.ui" line="662"/> + <source>Ion balance mEq/L:</source> + <translation>Ionen balans mEq/L:</translation> + </message> + <message> + <location filename="../ui/EditWater.ui" line="785"/> + <source>Hardness as CaCO3:</source> + <translation>Hardheid als CaCO3:</translation> + </message> + <message> + <location filename="../ui/EditWater.ui" line="801"/> + <source>Residual Alkalinity as CaCO3:</source> + <translation>Rest alkaliteit als CaCO3:</translation> + </message> + <message> <source>Acid pH:</source> - <translation>Zuurgraad pH:</translation> + <translation type="vanished">Zuurgraad pH:</translation> </message> <message> <location filename="../ui/EditWater.ui" line="311"/> @@ -7422,32 +7588,31 @@ <translation>Ja</translation> </message> <message> - <location filename="../ui/EditWater.ui" line="595"/> + <location filename="../ui/EditWater.ui" line="598"/> <source>Sulfate (SO4) mg/L:</source> <translation>Sulfaat (SO4) mg/L:</translation> </message> <message> - <location filename="../ui/EditWater.ui" line="611"/> + <location filename="../ui/EditWater.ui" line="614"/> <source>Chloride (Cl) mg/L:</source> <translation>Chloride (Cl) mg/L:</translation> </message> <message> - <location filename="../ui/EditWater.ui" line="627"/> + <location filename="../ui/EditWater.ui" line="630"/> <source>Bicarbonate (HCO3) mg/L:</source> <translation>Bicarbonaat (HCO3) mg/L:</translation> </message> <message> - <location filename="../ui/EditWater.ui" line="643"/> <source>or (CaCO3) mg/L:</source> - <translation>of (CaCO3) mg/L:</translation> - </message> - <message> - <location filename="../ui/EditWater.ui" line="688"/> + <translation type="vanished">of (CaCO3) mg/L:</translation> + </message> + <message> + <location filename="../ui/EditWater.ui" line="691"/> <source>Nitrate (NO3) mg/L:</source> <translation>Nitraat (NO3 mg/L:</translation> </message> <message> - <location filename="../ui/EditWater.ui" line="732"/> + <location filename="../ui/EditWater.ui" line="735"/> <source>Carbonate (CO3) mg/L:</source> <translation>Carbonaat (CO3) mg/L:</translation> </message> @@ -7456,39 +7621,38 @@ <translation type="vanished">Totale alkaliteit (CaCO3) mg/L:</translation> </message> <message> - <location filename="../ui/EditWater.ui" line="659"/> <source>Ion balance meq/L:</source> - <translation>Ionen balans meq/L:</translation> - </message> - <message> - <location filename="../src/EditWater.cpp" line="93"/> + <translation type="vanished">Ionen balans meq/L:</translation> + </message> + <message> + <location filename="../src/EditWater.cpp" line="105"/> <source>BMSapp - Add new brewing water</source> <translation>BMSapp - Nieuw brouwwater</translation> </message> <message> - <location filename="../src/EditWater.cpp" line="95"/> + <location filename="../src/EditWater.cpp" line="107"/> <source>BMSapp - Edit brewing water %1</source> <translation>BMSapp - Wijzig brouwwater %1</translation> </message> <message> - <location filename="../src/EditWater.cpp" line="111"/> + <location filename="../src/EditWater.cpp" line="123"/> <source>Edit Water</source> <translation>Wijzig water</translation> </message> <message> - <location filename="../src/EditWater.cpp" line="111"/> + <location filename="../src/EditWater.cpp" line="123"/> <source>Name empty or too short.</source> <translation>De naam is leeg of te kort.</translation> </message> <message> - <location filename="../src/EditWater.cpp" line="147"/> - <location filename="../src/EditWater.cpp" line="172"/> + <location filename="../src/EditWater.cpp" line="159"/> + <location filename="../src/EditWater.cpp" line="184"/> <source>Database error</source> <translation>Database fout</translation> </message> <message> - <location filename="../src/EditWater.cpp" line="148"/> - <location filename="../src/EditWater.cpp" line="173"/> + <location filename="../src/EditWater.cpp" line="160"/> + <location filename="../src/EditWater.cpp" line="185"/> <source>MySQL error: %1 %2 %3</source> @@ -7497,12 +7661,12 @@ %3</translation> </message> <message> - <location filename="../src/EditWater.cpp" line="244"/> + <location filename="../src/EditWater.cpp" line="301"/> <source>Water changed</source> <translation>Water gewijzigd</translation> </message> <message> - <location filename="../src/EditWater.cpp" line="244"/> + <location filename="../src/EditWater.cpp" line="301"/> <source>The brewing water has been modified. Save changes?</source> <translation>Dit brouwwater is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -9310,6 +9474,11 @@ <source>Bottling</source> <translation>Bottelen</translation> </message> + <message> + <location filename="../src/global.cpp" line="150"/> + <source>Sparge</source> + <translation>Spoelen</translation> + </message> </context> <context> <name>MonCO2meters</name> @@ -12502,17 +12671,17 @@ <context> <name>StepType</name> <message> - <location filename="../src/global.cpp" line="187"/> + <location filename="../src/global.cpp" line="188"/> <source>Infusion</source> <translation>Infusie</translation> </message> <message> - <location filename="../src/global.cpp" line="188"/> - <source>Temperature</source> - <translation>Verwarmen</translation> - </message> - <message> <location filename="../src/global.cpp" line="189"/> + <source>Temperature</source> + <translation>Verwarmen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="190"/> <source>Decoction</source> <translation>Decoctie</translation> </message> @@ -12528,22 +12697,22 @@ <context> <name>TunMaterial</name> <message> - <location filename="../src/global.cpp" line="193"/> + <location filename="../src/global.cpp" line="194"/> <source>Stainless Steel</source> <translation>RVS</translation> </message> <message> - <location filename="../src/global.cpp" line="194"/> - <source>Aluminium</source> - <translation>Aluminium</translation> - </message> - <message> <location filename="../src/global.cpp" line="195"/> - <source>Plastics</source> - <translation>Kunststof</translation> + <source>Aluminium</source> + <translation>Aluminium</translation> </message> <message> <location filename="../src/global.cpp" line="196"/> + <source>Plastics</source> + <translation>Kunststof</translation> + </message> + <message> + <location filename="../src/global.cpp" line="197"/> <source>Copper</source> <translation>Koper</translation> </message> @@ -12559,37 +12728,37 @@ <context> <name>YeastForm</name> <message> - <location filename="../src/global.cpp" line="164"/> + <location filename="../src/global.cpp" line="165"/> <source>Liquid</source> <translation>Vloeibaar</translation> </message> <message> - <location filename="../src/global.cpp" line="165"/> - <source>Dry</source> - <translation>Droog</translation> - </message> - <message> <location filename="../src/global.cpp" line="166"/> - <source>Slant</source> - <translation>Schuine buis</translation> + <source>Dry</source> + <translation>Droog</translation> </message> <message> <location filename="../src/global.cpp" line="167"/> - <source>Culture</source> - <translation>Slurry</translation> + <source>Slant</source> + <translation>Schuine buis</translation> </message> <message> <location filename="../src/global.cpp" line="168"/> - <source>Frozen</source> - <translation>Ingevroren</translation> + <source>Culture</source> + <translation>Slurry</translation> </message> <message> <location filename="../src/global.cpp" line="169"/> - <source>Bottle</source> - <translation>Flesdepot</translation> + <source>Frozen</source> + <translation>Ingevroren</translation> </message> <message> <location filename="../src/global.cpp" line="170"/> + <source>Bottle</source> + <translation>Flesdepot</translation> + </message> + <message> + <location filename="../src/global.cpp" line="171"/> <source>Dried</source> <translation>Gedroogd</translation> </message> @@ -12597,17 +12766,17 @@ <context> <name>YeastStarter</name> <message> - <location filename="../src/global.cpp" line="181"/> + <location filename="../src/global.cpp" line="182"/> <source>Stirred</source> <translation>Geroerd</translation> </message> <message> - <location filename="../src/global.cpp" line="182"/> - <source>Shaken</source> - <translation>Geschud</translation> - </message> - <message> <location filename="../src/global.cpp" line="183"/> + <source>Shaken</source> + <translation>Geschud</translation> + </message> + <message> + <location filename="../src/global.cpp" line="184"/> <source>Simple</source> <translation>Simpel</translation> </message> @@ -12615,42 +12784,42 @@ <context> <name>YeastType</name> <message> - <location filename="../src/global.cpp" line="153"/> + <location filename="../src/global.cpp" line="154"/> <source>Lager</source> <translation>Ondergist</translation> </message> <message> - <location filename="../src/global.cpp" line="154"/> - <source>Ale</source> - <translation>Bovengist</translation> - </message> - <message> <location filename="../src/global.cpp" line="155"/> - <source>Wheat</source> - <translation>Tarwegist</translation> + <source>Ale</source> + <translation>Bovengist</translation> </message> <message> <location filename="../src/global.cpp" line="156"/> - <source>Wine</source> - <translation>Wijngist</translation> + <source>Wheat</source> + <translation>Tarwegist</translation> </message> <message> <location filename="../src/global.cpp" line="157"/> - <source>Champagne</source> - <translation>Champagnegist</translation> + <source>Wine</source> + <translation>Wijngist</translation> </message> <message> <location filename="../src/global.cpp" line="158"/> - <source>Brett</source> - <translation>Brett</translation> + <source>Champagne</source> + <translation>Champagnegist</translation> </message> <message> <location filename="../src/global.cpp" line="159"/> - <source>Kveik</source> - <translation>Kveik</translation> + <source>Brett</source> + <translation>Brett</translation> </message> <message> <location filename="../src/global.cpp" line="160"/> + <source>Kveik</source> + <translation>Kveik</translation> + </message> + <message> + <location filename="../src/global.cpp" line="161"/> <source>Hybrid</source> <translation>Hybride</translation> </message> @@ -12658,22 +12827,22 @@ <context> <name>YeastUse</name> <message> - <location filename="../src/global.cpp" line="174"/> + <location filename="../src/global.cpp" line="175"/> <source>Primary</source> <translation>Hoofdgisting</translation> </message> <message> - <location filename="../src/global.cpp" line="175"/> - <source>Secondary</source> - <translation>Nagisting</translation> - </message> - <message> <location filename="../src/global.cpp" line="176"/> - <source>Tertiary</source> - <translation>Lageren</translation> + <source>Secondary</source> + <translation>Nagisting</translation> </message> <message> <location filename="../src/global.cpp" line="177"/> + <source>Tertiary</source> + <translation>Lageren</translation> + </message> + <message> + <location filename="../src/global.cpp" line="178"/> <source>Bottle</source> <translation>Bottelgist</translation> </message>
--- a/ui/EditProduct.ui Mon Jul 18 17:04:02 2022 +0200 +++ b/ui/EditProduct.ui Mon Jul 18 19:28:21 2022 +0200 @@ -95,7 +95,7 @@ <enum>QTabWidget::Rounded</enum> </property> <property name="currentIndex"> - <number>7</number> + <number>0</number> </property> <property name="elideMode"> <enum>Qt::ElideNone</enum>
--- a/ui/EditRecipe.ui Mon Jul 18 17:04:02 2022 +0200 +++ b/ui/EditRecipe.ui Mon Jul 18 19:28:21 2022 +0200 @@ -95,7 +95,7 @@ <enum>QTabWidget::Rounded</enum> </property> <property name="currentIndex"> - <number>6</number> + <number>0</number> </property> <property name="elideMode"> <enum>Qt::ElideNone</enum>
