Sat, 30 Jul 2022 19:21:55 +0200
Version 0.2.23
--- a/CMakeLists.txt Sat Jul 30 16:30:02 2022 +0200 +++ b/CMakeLists.txt Sat Jul 30 19:21:55 2022 +0200 @@ -9,7 +9,7 @@ SET( bmsapp_VERSION_MAJOR 0 ) SET( bmsapp_VERSION_MINOR 2 ) -SET( bmsapp_VERSION_PATCH 22 ) +SET( bmsapp_VERSION_PATCH 23 ) # Compile flags
--- a/translations/bmsapp_en.ts Sat Jul 30 16:30:02 2022 +0200 +++ b/translations/bmsapp_en.ts Sat Jul 30 19:21:55 2022 +0200 @@ -17,32 +17,32 @@ <context> <name>BeerType</name> <message> - <location filename="../src/global.cpp" line="59"/> + <location filename="../src/global.cpp" line="62"/> <source>Lager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="60"/> - <source>Ale</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="61"/> - <source>Mead</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="62"/> - <source>Wheat</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="63"/> - <source>Mixed</source> + <source>Ale</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="64"/> + <source>Mead</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="65"/> + <source>Wheat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="66"/> + <source>Mixed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="67"/> <source>Cider</source> <translation type="unfinished"></translation> </message> @@ -244,27 +244,27 @@ <context> <name>ChillerType</name> <message> - <location filename="../src/global.cpp" line="74"/> + <location filename="../src/global.cpp" line="77"/> <source>-</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="75"/> - <source>Emersion chiller</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="76"/> - <source>Counterflow chiller</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="77"/> - <source>Au bain marie</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="78"/> + <source>Emersion chiller</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="79"/> + <source>Counterflow chiller</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="80"/> + <source>Au bain marie</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="81"/> <source>Natural</source> <translation type="unfinished"></translation> </message> @@ -1618,7 +1618,6 @@ </message> <message> <location filename="../ui/EditHop.ui" line="182"/> - <location filename="../src/EditHop.cpp" line="141"/> <source> Kg</source> <translation type="unfinished"></translation> </message> @@ -1800,49 +1799,44 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="143"/> - <source> L</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditHop.cpp" line="155"/> - <location filename="../src/EditHop.cpp" line="159"/> + <location filename="../src/EditHop.cpp" line="149"/> + <location filename="../src/EditHop.cpp" line="153"/> <source>Edit Hop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="155"/> + <location filename="../src/EditHop.cpp" line="149"/> <source>Name empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="159"/> + <location filename="../src/EditHop.cpp" line="153"/> <source>Origin empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="211"/> - <location filename="../src/EditHop.cpp" line="264"/> - <location filename="../src/EditHop.cpp" line="285"/> + <location filename="../src/EditHop.cpp" line="205"/> + <location filename="../src/EditHop.cpp" line="258"/> + <location filename="../src/EditHop.cpp" line="279"/> <source>Database error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="212"/> - <location filename="../src/EditHop.cpp" line="265"/> - <location filename="../src/EditHop.cpp" line="286"/> + <location filename="../src/EditHop.cpp" line="206"/> + <location filename="../src/EditHop.cpp" line="259"/> + <location filename="../src/EditHop.cpp" line="280"/> <source>MySQL error: %1 %2 %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="312"/> + <location filename="../src/EditHop.cpp" line="320"/> <source>Hop changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="312"/> + <location filename="../src/EditHop.cpp" line="320"/> <source>This hop has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -2723,7 +2717,6 @@ <message> <location filename="../ui/EditProduct.ui" line="3628"/> <location filename="../src/EditProductTab3.cpp" line="1058"/> - <location filename="../src/EditProductTab4.cpp" line="677"/> <location filename="../src/EditProductTab5.cpp" line="719"/> <source>Mash</source> <translation type="unfinished"></translation> @@ -3985,7 +3978,6 @@ </message> <message> <location filename="../src/EditProductTab3.cpp" line="1059"/> - <location filename="../src/EditProductTab4.cpp" line="679"/> <location filename="../src/EditProductTab5.cpp" line="720"/> <source>Boil</source> <translation type="unfinished"></translation> @@ -4081,7 +4073,7 @@ </message> <message> <location filename="../src/EditProductTab4.cpp" line="550"/> - <location filename="../src/EditProductTab4.cpp" line="609"/> + <location filename="../src/EditProductTab4.cpp" line="611"/> <location filename="../src/EditProductTab5.cpp" line="515"/> <location filename="../src/EditProductTab5.cpp" line="604"/> <location filename="../src/EditProductTab5.cpp" line="662"/> @@ -4089,8 +4081,8 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="554"/> - <location filename="../src/EditProductTab4.cpp" line="607"/> + <location filename="../src/EditProductTab4.cpp" line="555"/> + <location filename="../src/EditProductTab4.cpp" line="609"/> <location filename="../src/EditProductTab5.cpp" line="510"/> <location filename="../src/EditProductTab5.cpp" line="599"/> <location filename="../src/EditProductTab5.cpp" line="660"/> @@ -4098,17 +4090,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="591"/> + <location filename="../src/EditProductTab4.cpp" line="593"/> <source>Current hop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="596"/> + <location filename="../src/EditProductTab4.cpp" line="598"/> <source>Origin:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="601"/> + <location filename="../src/EditProductTab4.cpp" line="603"/> <location filename="../src/EditProductTab5.cpp" line="526"/> <location filename="../src/EditProductTab5.cpp" line="651"/> <location filename="../src/EditProductTab6.cpp" line="861"/> @@ -4122,26 +4114,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="678"/> - <source>First wort</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="680"/> - <source>Aroma</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="681"/> - <source>Whirlpool</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="682"/> - <source>Dry hop</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProductTab5.cpp" line="76"/> <source>Ingredient</source> <translation type="unfinished"></translation> @@ -4189,7 +4161,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="683"/> <location filename="../src/EditProductTab5.cpp" line="723"/> <source>Bottling</source> <translation type="unfinished"></translation> @@ -7772,32 +7743,32 @@ <context> <name>FermentableAdded</name> <message> - <location filename="../src/global.cpp" line="100"/> + <location filename="../src/global.cpp" line="103"/> <source>Mash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="101"/> - <source>Boil</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="102"/> - <source>Fermentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="103"/> - <source>Lagering</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="104"/> - <source>Bottle</source> + <source>Boil</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="105"/> + <source>Fermentation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="106"/> + <source>Lagering</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="107"/> + <source>Bottle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="108"/> <source>Kegs</source> <translation type="unfinished"></translation> </message> @@ -7805,37 +7776,37 @@ <context> <name>FermentableGraintype</name> <message> - <location filename="../src/global.cpp" line="90"/> + <location filename="../src/global.cpp" line="93"/> <source>Base</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="91"/> - <source>Roast</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="92"/> - <source>Crystal</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="93"/> - <source>Kilned</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="94"/> - <source>Sour Malt</source> + <source>Roast</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="95"/> - <source>Special</source> + <source>Crystal</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="96"/> + <source>Kilned</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="97"/> + <source>Sour Malt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="98"/> + <source>Special</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="99"/> <source>No malt</source> <translation type="unfinished"></translation> </message> @@ -7843,27 +7814,27 @@ <context> <name>FermentableType</name> <message> - <location filename="../src/global.cpp" line="82"/> + <location filename="../src/global.cpp" line="85"/> <source>Grain</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="83"/> - <source>Sugar</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="84"/> - <source>Extract</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="85"/> - <source>Dry extract</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="86"/> + <source>Sugar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="87"/> + <source>Extract</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="88"/> + <source>Dry extract</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="89"/> <source>Adjunct</source> <translation type="unfinished"></translation> </message> @@ -7871,37 +7842,37 @@ <context> <name>HopForm</name> <message> - <location filename="../src/global.cpp" line="115"/> + <location filename="../src/global.cpp" line="118"/> <source>Pellet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="116"/> - <source>Plug</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="117"/> - <source>Leaf</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="118"/> - <source>Leaf wet</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="119"/> - <source>Cryo</source> + <source>Plug</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="120"/> - <source>CO2 extract</source> + <source>Leaf</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="121"/> + <source>Leaf wet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="122"/> + <source>Cryo</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="123"/> + <source>CO2 extract</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="124"/> <source>Iso extract</source> <translation type="unfinished"></translation> </message> @@ -7909,17 +7880,17 @@ <context> <name>HopTypes</name> <message> - <location filename="../src/global.cpp" line="109"/> + <location filename="../src/global.cpp" line="112"/> <source>Bittering</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="110"/> + <location filename="../src/global.cpp" line="113"/> <source>Aroma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="111"/> + <location filename="../src/global.cpp" line="114"/> <source>Both</source> <translation type="unfinished"></translation> </message> @@ -7927,37 +7898,37 @@ <context> <name>HopUse</name> <message> - <location filename="../src/global.cpp" line="125"/> + <location filename="../src/global.cpp" line="128"/> <source>Mash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="126"/> - <source>First wort</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="127"/> - <source>Boil</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="128"/> - <source>Aroma</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="129"/> - <source>Whirlpool</source> + <source>First wort</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="130"/> - <source>Dry hop</source> + <source>Boil</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="131"/> + <source>Aroma</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="132"/> + <source>Whirlpool</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="133"/> + <source>Dry hop</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="134"/> <source>Bottling</source> <translation type="unfinished"></translation> </message> @@ -8242,34 +8213,34 @@ </message> <message> <location filename="../src/InventoryHops.cpp" line="92"/> - <location filename="../src/InventoryHops.cpp" line="168"/> + <location filename="../src/InventoryHops.cpp" line="160"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/InventoryHops.cpp" line="177"/> + <location filename="../src/InventoryHops.cpp" line="169"/> <source>Total items: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/InventoryHops.cpp" line="219"/> - <location filename="../src/InventoryHops.cpp" line="221"/> - <location filename="../src/InventoryHops.cpp" line="263"/> + <location filename="../src/InventoryHops.cpp" line="211"/> + <location filename="../src/InventoryHops.cpp" line="213"/> + <location filename="../src/InventoryHops.cpp" line="255"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/InventoryHops.cpp" line="219"/> + <location filename="../src/InventoryHops.cpp" line="211"/> <source>Files (*.xml)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/InventoryHops.cpp" line="221"/> + <location filename="../src/InventoryHops.cpp" line="213"/> <source>No XML file selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/InventoryHops.cpp" line="263"/> + <location filename="../src/InventoryHops.cpp" line="255"/> <source>XML export ready</source> <translation type="unfinished"></translation> </message> @@ -8808,37 +8779,37 @@ <context> <name>MiscType</name> <message> - <location filename="../src/global.cpp" line="135"/> + <location filename="../src/global.cpp" line="138"/> <source>Spice</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="136"/> - <source>Herb</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="137"/> - <source>Flavor</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="138"/> - <source>Fining</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="139"/> - <source>Water agent</source> + <source>Herb</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="140"/> - <source>Yeast nutrient</source> + <source>Flavor</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="141"/> + <source>Fining</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="142"/> + <source>Water agent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="143"/> + <source>Yeast nutrient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="144"/> <source>Other</source> <translation type="unfinished"></translation> </message> @@ -8846,37 +8817,37 @@ <context> <name>MiscUse</name> <message> - <location filename="../src/global.cpp" line="145"/> + <location filename="../src/global.cpp" line="148"/> <source>Starter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="146"/> - <source>Mash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="147"/> - <source>Boil</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="148"/> - <source>Primary</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="149"/> - <source>Secondary</source> + <source>Mash</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="150"/> - <source>Bottling</source> + <source>Boil</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="151"/> + <source>Primary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="152"/> + <source>Secondary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="153"/> + <source>Bottling</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="154"/> <source>Sparge</source> <translation type="unfinished"></translation> </message> @@ -10317,69 +10288,74 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2100"/> + <location filename="../src/PrinterDialog.cpp" line="2103"/> <source>Packaging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2103"/> + <location filename="../src/PrinterDialog.cpp" line="2106"/> <source>Bottling add %1 kg `%2` with %3 liter water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2107"/> + <location filename="../src/PrinterDialog.cpp" line="2110"/> <source>Kegging add %1 kg `%2` with %3 liter water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2114"/> - <source>Add %1, `%2` as bottle yeast</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2117"/> + <source>Add %1, `%2` as bottle yeast</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2120"/> <source>Add %1 gram %2, `%3` as bottle yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2121"/> + <location filename="../src/PrinterDialog.cpp" line="2124"/> <source>Add %1 ml %2, `%3` as bottle yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2130"/> + <location filename="../src/PrinterDialog.cpp" line="2133"/> <source>Add %1 %2 `%3` during bottling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2168"/> + <location filename="../src/PrinterDialog.cpp" line="2139"/> + <source>Add %1 gr `%2`</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2177"/> <source>Measured:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2180"/> + <location filename="../src/PrinterDialog.cpp" line="2189"/> <source>%1 split the batch here!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2219"/> + <location filename="../src/PrinterDialog.cpp" line="2228"/> <source>Inventory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2221"/> + <location filename="../src/PrinterDialog.cpp" line="2230"/> <source>Yeastbank</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2231"/> + <location filename="../src/PrinterDialog.cpp" line="2240"/> <source>Date and time</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="766"/> - <location filename="../src/PrinterDialog.cpp" line="2234"/> - <location filename="../src/PrinterDialog.cpp" line="2238"/> + <location filename="../src/PrinterDialog.cpp" line="2243"/> + <location filename="../src/PrinterDialog.cpp" line="2247"/> <source>Beer style</source> <translation type="unfinished"></translation> </message> @@ -10794,62 +10770,62 @@ <context> <name>ProdStages</name> <message> - <location filename="../src/global.cpp" line="28"/> + <location filename="../src/global.cpp" line="31"/> <source>Plan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="29"/> - <source>Wait</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="30"/> - <source>Brew</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="31"/> - <source>Primary</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="32"/> - <source>Secondary</source> + <source>Wait</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="33"/> - <source>Tertiary</source> + <source>Brew</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="34"/> - <source>Package</source> + <source>Primary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="35"/> - <source>Carbonation</source> + <source>Secondary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="36"/> - <source>Mature</source> + <source>Tertiary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="37"/> - <source>Taste</source> + <source>Package</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="38"/> - <source>Ready</source> + <source>Carbonation</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="39"/> + <source>Mature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="40"/> + <source>Taste</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="41"/> + <source>Ready</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="42"/> <source>Closed</source> <translation type="unfinished"></translation> </message> @@ -11182,17 +11158,17 @@ <context> <name>RecipeType</name> <message> - <location filename="../src/global.cpp" line="53"/> + <location filename="../src/global.cpp" line="56"/> <source>Extract</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="54"/> + <location filename="../src/global.cpp" line="57"/> <source>Partial Mash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="55"/> + <location filename="../src/global.cpp" line="58"/> <source>All Grain</source> <translation type="unfinished"></translation> </message> @@ -11340,47 +11316,59 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="70"/> - <source>Pellet Hop factor:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="76"/> - <source>Hop Plugs factor:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="82"/> - <source>Wet Hop factor:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="88"/> - <source>Cryo Hop® factor:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="98"/> - <location filename="../src/Setup.cpp" line="108"/> - <location filename="../src/Setup.cpp" line="118"/> - <location filename="../src/Setup.cpp" line="127"/> - <location filename="../src/Setup.cpp" line="137"/> - <location filename="../src/Setup.cpp" line="147"/> + <location filename="../src/Setup.cpp" line="111"/> + <location filename="../src/Setup.cpp" line="121"/> + <location filename="../src/Setup.cpp" line="131"/> + <location filename="../src/Setup.cpp" line="141"/> + <location filename="../src/Setup.cpp" line="151"/> + <location filename="../src/Setup.cpp" line="161"/> + <location filename="../src/Setup.cpp" line="171"/> + <location filename="../src/Setup.cpp" line="181"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="153"/> + <location filename="../src/Setup.cpp" line="130"/> + <source>The utilisation for hop pellets, default 22</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="140"/> + <source>The utilisation for hop plugs, default 20.4</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="150"/> + <source>The utilisation for hop leafs, default 20</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="160"/> + <source>The uyilisation for fresh hops, default 3.6</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="170"/> + <source>The utilisation for using Cryo Hop®, default 50</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="180"/> + <source>The utilisation for using CO2 hop extract, default 35</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="187"/> <source>Grain Absorbtion:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="159"/> + <location filename="../src/Setup.cpp" line="193"/> <source>Brix Correction factor:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="177"/> + <location filename="../src/Setup.cpp" line="211"/> <source>Brew settings.</source> <translation type="unfinished"></translation> </message> @@ -11390,154 +11378,164 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="97"/> + <location filename="../src/Setup.cpp" line="70"/> + <source>Hop Pellets utilisation:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="76"/> + <source>Hop Plugs utilisation:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="82"/> + <source>Hop Leafs utilisation:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="88"/> + <source>Wet Hop utilisation:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="94"/> + <source>Cryo Hop® utilisation:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="100"/> + <source>CO2 Hop Extract utilisation:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="110"/> <source>The efficiency for First Wort Hopping.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="107"/> + <location filename="../src/Setup.cpp" line="120"/> <source>The efficiency for Mash hopping.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="117"/> - <source>The efficiency for hop pellets.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="126"/> - <source>The efficiency for hop plugs.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="136"/> - <source>The efficiency for fresh hops.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="146"/> - <source>The efficiency for using Cryo Hop®.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="165"/> + <location filename="../src/Setup.cpp" line="199"/> <source>Brewery height meters:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="183"/> + <location filename="../src/Setup.cpp" line="217"/> <source>Color Calculation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="189"/> + <location filename="../src/Setup.cpp" line="223"/> <source>IBU Calculation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="195"/> + <location filename="../src/Setup.cpp" line="229"/> <source>Default Water:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="201"/> + <location filename="../src/Setup.cpp" line="235"/> <source>Private Yeast bank:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="213"/> + <location filename="../src/Setup.cpp" line="247"/> <source>Absorbtion with water by the grain (L/Kg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="214"/> + <location filename="../src/Setup.cpp" line="248"/> <source> L/Kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="226"/> + <location filename="../src/Setup.cpp" line="260"/> <source>Plato to Brix conversion factor.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="237"/> + <location filename="../src/Setup.cpp" line="271"/> <source>Height in meters above/below sealevel to calculate the exact boiling point and hop isomerizon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="245"/> - <location filename="../src/Setup.cpp" line="253"/> - <location filename="../src/Setup.cpp" line="261"/> - <location filename="../src/Setup.cpp" line="269"/> + <location filename="../src/Setup.cpp" line="279"/> + <location filename="../src/Setup.cpp" line="287"/> + <location filename="../src/Setup.cpp" line="295"/> + <location filename="../src/Setup.cpp" line="303"/> <source>Choose color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="275"/> + <location filename="../src/Setup.cpp" line="309"/> <source>Logo here</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="283"/> + <location filename="../src/Setup.cpp" line="317"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="291"/> + <location filename="../src/Setup.cpp" line="325"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="300"/> + <location filename="../src/Setup.cpp" line="334"/> <source>Load logo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="310"/> - <location filename="../src/Setup.cpp" line="506"/> - <location filename="../src/Setup.cpp" line="533"/> + <location filename="../src/Setup.cpp" line="344"/> + <location filename="../src/Setup.cpp" line="547"/> + <location filename="../src/Setup.cpp" line="574"/> <source>Setup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="356"/> + <location filename="../src/Setup.cpp" line="394"/> <source>Choose default water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="372"/> + <location filename="../src/Setup.cpp" line="410"/> <source>Choose laboratory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="401"/> + <location filename="../src/Setup.cpp" line="439"/> <source>Cannot load %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="436"/> + <location filename="../src/Setup.cpp" line="474"/> <source>Open File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="495"/> + <location filename="../src/Setup.cpp" line="536"/> <source>Database error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="496"/> + <location filename="../src/Setup.cpp" line="537"/> <source>MySQL error: %1 %2 %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="513"/> + <location filename="../src/Setup.cpp" line="554"/> <source>Setup changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/Setup.cpp" line="513"/> + <location filename="../src/Setup.cpp" line="554"/> <source>The global setup has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -11545,37 +11543,37 @@ <context> <name>Splitter</name> <message> - <location filename="../src/global.cpp" line="43"/> + <location filename="../src/global.cpp" line="46"/> <source>Not divided</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="44"/> - <source>After mash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="45"/> - <source>After boil</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="46"/> - <source>After cooling</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="47"/> - <source>After primary</source> + <source>After mash</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="48"/> - <source>After secondary</source> + <source>After boil</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="49"/> + <source>After cooling</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="50"/> + <source>After primary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="51"/> + <source>After secondary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="52"/> <source>After tertiary</source> <translation type="unfinished"></translation> </message> @@ -11583,17 +11581,17 @@ <context> <name>StepType</name> <message> - <location filename="../src/global.cpp" line="189"/> + <location filename="../src/global.cpp" line="192"/> <source>Infusion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="190"/> + <location filename="../src/global.cpp" line="193"/> <source>Temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="191"/> + <location filename="../src/global.cpp" line="194"/> <source>Decoction</source> <translation type="unfinished"></translation> </message> @@ -11609,22 +11607,22 @@ <context> <name>TunMaterial</name> <message> - <location filename="../src/global.cpp" line="195"/> + <location filename="../src/global.cpp" line="198"/> <source>Stainless Steel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="196"/> + <location filename="../src/global.cpp" line="199"/> <source>Aluminium</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="197"/> + <location filename="../src/global.cpp" line="200"/> <source>Plastics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="198"/> + <location filename="../src/global.cpp" line="201"/> <source>Copper</source> <translation type="unfinished"></translation> </message> @@ -11640,37 +11638,37 @@ <context> <name>YeastForm</name> <message> - <location filename="../src/global.cpp" line="166"/> + <location filename="../src/global.cpp" line="169"/> <source>Liquid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="167"/> - <source>Dry</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="168"/> - <source>Slant</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="169"/> - <source>Culture</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="170"/> - <source>Frozen</source> + <source>Dry</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="171"/> - <source>Bottle</source> + <source>Slant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="172"/> + <source>Culture</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="173"/> + <source>Frozen</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="174"/> + <source>Bottle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="175"/> <source>Dried</source> <translation type="unfinished"></translation> </message> @@ -11678,17 +11676,17 @@ <context> <name>YeastStarter</name> <message> - <location filename="../src/global.cpp" line="183"/> + <location filename="../src/global.cpp" line="186"/> <source>Stirred</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="184"/> + <location filename="../src/global.cpp" line="187"/> <source>Shaken</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="185"/> + <location filename="../src/global.cpp" line="188"/> <source>Simple</source> <translation type="unfinished"></translation> </message> @@ -11696,42 +11694,42 @@ <context> <name>YeastType</name> <message> - <location filename="../src/global.cpp" line="155"/> + <location filename="../src/global.cpp" line="158"/> <source>Lager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="156"/> - <source>Ale</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="157"/> - <source>Wheat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="158"/> - <source>Wine</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/global.cpp" line="159"/> - <source>Champagne</source> + <source>Ale</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="160"/> - <source>Brett</source> + <source>Wheat</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="161"/> - <source>Kveik</source> + <source>Wine</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/global.cpp" line="162"/> + <source>Champagne</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="163"/> + <source>Brett</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="164"/> + <source>Kveik</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="165"/> <source>Hybrid</source> <translation type="unfinished"></translation> </message> @@ -11739,22 +11737,22 @@ <context> <name>YeastUse</name> <message> - <location filename="../src/global.cpp" line="176"/> + <location filename="../src/global.cpp" line="179"/> <source>Primary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="177"/> + <location filename="../src/global.cpp" line="180"/> <source>Secondary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="178"/> + <location filename="../src/global.cpp" line="181"/> <source>Tertiary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="179"/> + <location filename="../src/global.cpp" line="182"/> <source>Bottle</source> <translation type="unfinished"></translation> </message>
--- a/translations/bmsapp_nl.ts Sat Jul 30 16:30:02 2022 +0200 +++ b/translations/bmsapp_nl.ts Sat Jul 30 19:21:55 2022 +0200 @@ -47,32 +47,32 @@ <context> <name>BeerType</name> <message> - <location filename="../src/global.cpp" line="59"/> + <location filename="../src/global.cpp" line="62"/> <source>Lager</source> <translation>Ondergist</translation> </message> <message> - <location filename="../src/global.cpp" line="60"/> - <source>Ale</source> - <translation>Bovengist</translation> - </message> - <message> - <location filename="../src/global.cpp" line="61"/> - <source>Mead</source> - <translation>Mede</translation> - </message> - <message> - <location filename="../src/global.cpp" line="62"/> - <source>Wheat</source> - <translation>Tarwebier</translation> - </message> - <message> <location filename="../src/global.cpp" line="63"/> - <source>Mixed</source> - <translation>Gemengd</translation> + <source>Ale</source> + <translation>Bovengist</translation> </message> <message> <location filename="../src/global.cpp" line="64"/> + <source>Mead</source> + <translation>Mede</translation> + </message> + <message> + <location filename="../src/global.cpp" line="65"/> + <source>Wheat</source> + <translation>Tarwebier</translation> + </message> + <message> + <location filename="../src/global.cpp" line="66"/> + <source>Mixed</source> + <translation>Gemengd</translation> + </message> + <message> + <location filename="../src/global.cpp" line="67"/> <source>Cider</source> <translation>Cider</translation> </message> @@ -281,27 +281,27 @@ <context> <name>ChillerType</name> <message> - <location filename="../src/global.cpp" line="74"/> + <location filename="../src/global.cpp" line="77"/> <source>-</source> <translation>-</translation> </message> <message> - <location filename="../src/global.cpp" line="75"/> - <source>Emersion chiller</source> - <translation>Spiraal koeler</translation> - </message> - <message> - <location filename="../src/global.cpp" line="76"/> - <source>Counterflow chiller</source> - <translation>Tegenstroom koeler</translation> - </message> - <message> - <location filename="../src/global.cpp" line="77"/> - <source>Au bain marie</source> - <translation>Au bain marie</translation> - </message> - <message> <location filename="../src/global.cpp" line="78"/> + <source>Emersion chiller</source> + <translation>Spiraal koeler</translation> + </message> + <message> + <location filename="../src/global.cpp" line="79"/> + <source>Counterflow chiller</source> + <translation>Tegenstroom koeler</translation> + </message> + <message> + <location filename="../src/global.cpp" line="80"/> + <source>Au bain marie</source> + <translation>Au bain marie</translation> + </message> + <message> + <location filename="../src/global.cpp" line="81"/> <source>Natural</source> <translation>Afkoelen</translation> </message> @@ -1695,7 +1695,6 @@ </message> <message> <location filename="../ui/EditHop.ui" line="182"/> - <location filename="../src/EditHop.cpp" line="141"/> <source> Kg</source> <translation> Kg</translation> </message> @@ -1918,37 +1917,36 @@ <translation>BMSapp - Wijzig hop %1</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="143"/> <source> L</source> - <translation> L</translation> - </message> - <message> - <location filename="../src/EditHop.cpp" line="155"/> - <location filename="../src/EditHop.cpp" line="159"/> + <translation type="vanished"> L</translation> + </message> + <message> + <location filename="../src/EditHop.cpp" line="149"/> + <location filename="../src/EditHop.cpp" line="153"/> <source>Edit Hop</source> <translation>Wijzig hop</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="155"/> + <location filename="../src/EditHop.cpp" line="149"/> <source>Name empty or too short.</source> <translation>De naam is leeg of te kort.</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="159"/> + <location filename="../src/EditHop.cpp" line="153"/> <source>Origin empty or too short.</source> <translation>Herkomst leeg of te kort.</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="211"/> - <location filename="../src/EditHop.cpp" line="264"/> - <location filename="../src/EditHop.cpp" line="285"/> + <location filename="../src/EditHop.cpp" line="205"/> + <location filename="../src/EditHop.cpp" line="258"/> + <location filename="../src/EditHop.cpp" line="279"/> <source>Database error</source> <translation>Database fout</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="212"/> - <location filename="../src/EditHop.cpp" line="265"/> - <location filename="../src/EditHop.cpp" line="286"/> + <location filename="../src/EditHop.cpp" line="206"/> + <location filename="../src/EditHop.cpp" line="259"/> + <location filename="../src/EditHop.cpp" line="280"/> <source>MySQL error: %1 %2 %3</source> @@ -1957,12 +1955,12 @@ %3</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="312"/> + <location filename="../src/EditHop.cpp" line="320"/> <source>Hop changed</source> <translation>Hop gewijzigd</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="312"/> + <location filename="../src/EditHop.cpp" line="320"/> <source>This hop has been modified. Save changes?</source> <translation>Deze hop is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -2861,7 +2859,6 @@ <message> <location filename="../ui/EditProduct.ui" line="3628"/> <location filename="../src/EditProductTab3.cpp" line="1058"/> - <location filename="../src/EditProductTab4.cpp" line="677"/> <location filename="../src/EditProductTab5.cpp" line="719"/> <source>Mash</source> <translation>Maischen</translation> @@ -4260,7 +4257,6 @@ </message> <message> <location filename="../src/EditProductTab3.cpp" line="1059"/> - <location filename="../src/EditProductTab4.cpp" line="679"/> <location filename="../src/EditProductTab5.cpp" line="720"/> <source>Boil</source> <translation>Koken</translation> @@ -4356,7 +4352,7 @@ </message> <message> <location filename="../src/EditProductTab4.cpp" line="550"/> - <location filename="../src/EditProductTab4.cpp" line="609"/> + <location filename="../src/EditProductTab4.cpp" line="611"/> <location filename="../src/EditProductTab5.cpp" line="515"/> <location filename="../src/EditProductTab5.cpp" line="604"/> <location filename="../src/EditProductTab5.cpp" line="662"/> @@ -4364,8 +4360,8 @@ <translation>Tijd in minuten:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="554"/> - <location filename="../src/EditProductTab4.cpp" line="607"/> + <location filename="../src/EditProductTab4.cpp" line="555"/> + <location filename="../src/EditProductTab4.cpp" line="609"/> <location filename="../src/EditProductTab5.cpp" line="510"/> <location filename="../src/EditProductTab5.cpp" line="599"/> <location filename="../src/EditProductTab5.cpp" line="660"/> @@ -4373,17 +4369,17 @@ <translation>Tijd in dagen:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="591"/> + <location filename="../src/EditProductTab4.cpp" line="593"/> <source>Current hop:</source> <translation>Huidige hop:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="596"/> + <location filename="../src/EditProductTab4.cpp" line="598"/> <source>Origin:</source> <translation>Herkomst:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="601"/> + <location filename="../src/EditProductTab4.cpp" line="603"/> <location filename="../src/EditProductTab5.cpp" line="526"/> <location filename="../src/EditProductTab5.cpp" line="651"/> <location filename="../src/EditProductTab6.cpp" line="861"/> @@ -4397,14 +4393,12 @@ <translation>Kies hop:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="678"/> <source>First wort</source> - <translation>Maischhop</translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="680"/> + <translation type="vanished">Maischhop</translation> + </message> + <message> <source>Aroma</source> - <translation>Aromahop</translation> + <translation type="vanished">Aromahop</translation> </message> <message> <source>Bittering</source> @@ -4415,14 +4409,12 @@ <translation type="obsolete">Beide</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="681"/> <source>Whirlpool</source> - <translation>Hopstand</translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="682"/> + <translation type="vanished">Hopstand</translation> + </message> + <message> <source>Dry hop</source> - <translation>Koudhop</translation> + <translation type="vanished">Koudhop</translation> </message> <message> <location filename="../src/EditProductTab5.cpp" line="76"/> @@ -4472,7 +4464,6 @@ <translation>Nagisting/lagering</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="683"/> <location filename="../src/EditProductTab5.cpp" line="723"/> <source>Bottling</source> <translation>Bottelen</translation> @@ -8280,32 +8271,32 @@ <context> <name>FermentableAdded</name> <message> - <location filename="../src/global.cpp" line="100"/> + <location filename="../src/global.cpp" line="103"/> <source>Mash</source> <translation>Maischen</translation> </message> <message> - <location filename="../src/global.cpp" line="101"/> - <source>Boil</source> - <translation>Koken</translation> - </message> - <message> - <location filename="../src/global.cpp" line="102"/> - <source>Fermentation</source> - <translation>Hoofdvergisting</translation> - </message> - <message> - <location filename="../src/global.cpp" line="103"/> - <source>Lagering</source> - <translation>Nagisting/lagering</translation> - </message> - <message> <location filename="../src/global.cpp" line="104"/> - <source>Bottle</source> - <translation>Bottelen</translation> + <source>Boil</source> + <translation>Koken</translation> </message> <message> <location filename="../src/global.cpp" line="105"/> + <source>Fermentation</source> + <translation>Hoofdvergisting</translation> + </message> + <message> + <location filename="../src/global.cpp" line="106"/> + <source>Lagering</source> + <translation>Nagisting/lagering</translation> + </message> + <message> + <location filename="../src/global.cpp" line="107"/> + <source>Bottle</source> + <translation>Bottelen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="108"/> <source>Kegs</source> <translation>Fusten</translation> </message> @@ -8313,37 +8304,37 @@ <context> <name>FermentableGraintype</name> <message> - <location filename="../src/global.cpp" line="90"/> + <location filename="../src/global.cpp" line="93"/> <source>Base</source> <translation>Basismout</translation> </message> <message> - <location filename="../src/global.cpp" line="91"/> - <source>Roast</source> - <translation>Geroosterde mout</translation> - </message> - <message> - <location filename="../src/global.cpp" line="92"/> - <source>Crystal</source> - <translation>Cara/crystal mout</translation> - </message> - <message> - <location filename="../src/global.cpp" line="93"/> - <source>Kilned</source> - <translation>Geëeste mout</translation> - </message> - <message> <location filename="../src/global.cpp" line="94"/> - <source>Sour Malt</source> - <translation>Zuurmout</translation> + <source>Roast</source> + <translation>Geroosterde mout</translation> </message> <message> <location filename="../src/global.cpp" line="95"/> - <source>Special</source> - <translation>Speciale mout</translation> + <source>Crystal</source> + <translation>Cara/crystal mout</translation> </message> <message> <location filename="../src/global.cpp" line="96"/> + <source>Kilned</source> + <translation>Geëeste mout</translation> + </message> + <message> + <location filename="../src/global.cpp" line="97"/> + <source>Sour Malt</source> + <translation>Zuurmout</translation> + </message> + <message> + <location filename="../src/global.cpp" line="98"/> + <source>Special</source> + <translation>Speciale mout</translation> + </message> + <message> + <location filename="../src/global.cpp" line="99"/> <source>No malt</source> <translation>Geen mout</translation> </message> @@ -8351,27 +8342,27 @@ <context> <name>FermentableType</name> <message> - <location filename="../src/global.cpp" line="82"/> + <location filename="../src/global.cpp" line="85"/> <source>Grain</source> <translation>Mout</translation> </message> <message> - <location filename="../src/global.cpp" line="83"/> - <source>Sugar</source> - <translation>Suiker</translation> - </message> - <message> - <location filename="../src/global.cpp" line="84"/> - <source>Extract</source> - <translation></translation> - </message> - <message> - <location filename="../src/global.cpp" line="85"/> - <source>Dry extract</source> - <translation>Droog extract</translation> - </message> - <message> <location filename="../src/global.cpp" line="86"/> + <source>Sugar</source> + <translation>Suiker</translation> + </message> + <message> + <location filename="../src/global.cpp" line="87"/> + <source>Extract</source> + <translation></translation> + </message> + <message> + <location filename="../src/global.cpp" line="88"/> + <source>Dry extract</source> + <translation>Droog extract</translation> + </message> + <message> + <location filename="../src/global.cpp" line="89"/> <source>Adjunct</source> <translation>Ongemout graan</translation> </message> @@ -8379,37 +8370,37 @@ <context> <name>HopForm</name> <message> - <location filename="../src/global.cpp" line="115"/> + <location filename="../src/global.cpp" line="118"/> <source>Pellet</source> <translation>Pellets</translation> </message> <message> - <location filename="../src/global.cpp" line="116"/> - <source>Plug</source> - <translation>Plugs</translation> - </message> - <message> - <location filename="../src/global.cpp" line="117"/> - <source>Leaf</source> - <translation>Bloemen</translation> - </message> - <message> - <location filename="../src/global.cpp" line="118"/> - <source>Leaf wet</source> - <translation>Nat, vers</translation> - </message> - <message> <location filename="../src/global.cpp" line="119"/> - <source>Cryo</source> - <translation>Cryo hop</translation> + <source>Plug</source> + <translation>Plugs</translation> </message> <message> <location filename="../src/global.cpp" line="120"/> - <source>CO2 extract</source> - <translation>CO2 extract</translation> + <source>Leaf</source> + <translation>Bloemen</translation> </message> <message> <location filename="../src/global.cpp" line="121"/> + <source>Leaf wet</source> + <translation>Nat, vers</translation> + </message> + <message> + <location filename="../src/global.cpp" line="122"/> + <source>Cryo</source> + <translation>Cryo hop</translation> + </message> + <message> + <location filename="../src/global.cpp" line="123"/> + <source>CO2 extract</source> + <translation>CO2 extract</translation> + </message> + <message> + <location filename="../src/global.cpp" line="124"/> <source>Iso extract</source> <translation>Iso extract</translation> </message> @@ -8444,17 +8435,17 @@ <context> <name>HopTypes</name> <message> - <location filename="../src/global.cpp" line="109"/> + <location filename="../src/global.cpp" line="112"/> <source>Bittering</source> <translation>Bitterhop</translation> </message> <message> - <location filename="../src/global.cpp" line="110"/> + <location filename="../src/global.cpp" line="113"/> <source>Aroma</source> <translation>Aromahop</translation> </message> <message> - <location filename="../src/global.cpp" line="111"/> + <location filename="../src/global.cpp" line="114"/> <source>Both</source> <translation>Beide</translation> </message> @@ -8462,37 +8453,37 @@ <context> <name>HopUse</name> <message> - <location filename="../src/global.cpp" line="125"/> + <location filename="../src/global.cpp" line="128"/> <source>Mash</source> <translation>Maischen</translation> </message> <message> - <location filename="../src/global.cpp" line="126"/> - <source>First wort</source> - <translation>Eerste wort</translation> - </message> - <message> - <location filename="../src/global.cpp" line="127"/> - <source>Boil</source> - <translation>Koken</translation> - </message> - <message> - <location filename="../src/global.cpp" line="128"/> - <source>Aroma</source> - <translation>Vlamuit</translation> - </message> - <message> <location filename="../src/global.cpp" line="129"/> - <source>Whirlpool</source> - <translation>Hopstand</translation> + <source>First wort</source> + <translation>Eerste wort</translation> </message> <message> <location filename="../src/global.cpp" line="130"/> - <source>Dry hop</source> - <translation>Koudhop</translation> + <source>Boil</source> + <translation>Koken</translation> </message> <message> <location filename="../src/global.cpp" line="131"/> + <source>Aroma</source> + <translation>Vlamuit</translation> + </message> + <message> + <location filename="../src/global.cpp" line="132"/> + <source>Whirlpool</source> + <translation>Hopstand</translation> + </message> + <message> + <location filename="../src/global.cpp" line="133"/> + <source>Dry hop</source> + <translation>Koudhop</translation> + </message> + <message> + <location filename="../src/global.cpp" line="134"/> <source>Bottling</source> <translation>Bottelen</translation> </message> @@ -8833,7 +8824,7 @@ </message> <message> <location filename="../src/InventoryHops.cpp" line="92"/> - <location filename="../src/InventoryHops.cpp" line="168"/> + <location filename="../src/InventoryHops.cpp" line="160"/> <source>Edit</source> <translation>Wijzig</translation> </message> @@ -8870,29 +8861,29 @@ <translation type="vanished">Cryo hop</translation> </message> <message> - <location filename="../src/InventoryHops.cpp" line="177"/> + <location filename="../src/InventoryHops.cpp" line="169"/> <source>Total items: %1</source> <translation>Totaal items: %1</translation> </message> <message> - <location filename="../src/InventoryHops.cpp" line="219"/> - <location filename="../src/InventoryHops.cpp" line="221"/> - <location filename="../src/InventoryHops.cpp" line="263"/> + <location filename="../src/InventoryHops.cpp" line="211"/> + <location filename="../src/InventoryHops.cpp" line="213"/> + <location filename="../src/InventoryHops.cpp" line="255"/> <source>Save File</source> <translation>Bestand opslaan</translation> </message> <message> - <location filename="../src/InventoryHops.cpp" line="219"/> + <location filename="../src/InventoryHops.cpp" line="211"/> <source>Files (*.xml)</source> <translation>Bestanden (*.xml)</translation> </message> <message> - <location filename="../src/InventoryHops.cpp" line="221"/> + <location filename="../src/InventoryHops.cpp" line="213"/> <source>No XML file selected.</source> <translation>Geen XML bestand gekozen.</translation> </message> <message> - <location filename="../src/InventoryHops.cpp" line="263"/> + <location filename="../src/InventoryHops.cpp" line="255"/> <source>XML export ready</source> <translation>XML uitvoer gereed</translation> </message> @@ -9563,37 +9554,37 @@ <context> <name>MiscType</name> <message> - <location filename="../src/global.cpp" line="135"/> + <location filename="../src/global.cpp" line="138"/> <source>Spice</source> <translation>Specerij</translation> </message> <message> - <location filename="../src/global.cpp" line="136"/> - <source>Herb</source> - <translation>Kruid</translation> - </message> - <message> - <location filename="../src/global.cpp" line="137"/> - <source>Flavor</source> - <translation>Smaakstof</translation> - </message> - <message> - <location filename="../src/global.cpp" line="138"/> - <source>Fining</source> - <translation>Klaringsmiddel</translation> - </message> - <message> <location filename="../src/global.cpp" line="139"/> - <source>Water agent</source> - <translation>Brouwzout</translation> + <source>Herb</source> + <translation>Kruid</translation> </message> <message> <location filename="../src/global.cpp" line="140"/> - <source>Yeast nutrient</source> - <translation>Gistvoeding</translation> + <source>Flavor</source> + <translation>Smaakstof</translation> </message> <message> <location filename="../src/global.cpp" line="141"/> + <source>Fining</source> + <translation>Klaringsmiddel</translation> + </message> + <message> + <location filename="../src/global.cpp" line="142"/> + <source>Water agent</source> + <translation>Brouwzout</translation> + </message> + <message> + <location filename="../src/global.cpp" line="143"/> + <source>Yeast nutrient</source> + <translation>Gistvoeding</translation> + </message> + <message> + <location filename="../src/global.cpp" line="144"/> <source>Other</source> <translation>Anders</translation> </message> @@ -9601,37 +9592,37 @@ <context> <name>MiscUse</name> <message> - <location filename="../src/global.cpp" line="145"/> + <location filename="../src/global.cpp" line="148"/> <source>Starter</source> <translation>Starter</translation> </message> <message> - <location filename="../src/global.cpp" line="146"/> - <source>Mash</source> - <translation>Maischen</translation> - </message> - <message> - <location filename="../src/global.cpp" line="147"/> - <source>Boil</source> - <translation>Koken</translation> - </message> - <message> - <location filename="../src/global.cpp" line="148"/> - <source>Primary</source> - <translation>Hoofdgisting</translation> - </message> - <message> <location filename="../src/global.cpp" line="149"/> - <source>Secondary</source> - <translation>Nagisting/lagering</translation> + <source>Mash</source> + <translation>Maischen</translation> </message> <message> <location filename="../src/global.cpp" line="150"/> - <source>Bottling</source> - <translation>Bottelen</translation> + <source>Boil</source> + <translation>Koken</translation> </message> <message> <location filename="../src/global.cpp" line="151"/> + <source>Primary</source> + <translation>Hoofdgisting</translation> + </message> + <message> + <location filename="../src/global.cpp" line="152"/> + <source>Secondary</source> + <translation>Nagisting/lagering</translation> + </message> + <message> + <location filename="../src/global.cpp" line="153"/> + <source>Bottling</source> + <translation>Bottelen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="154"/> <source>Sparge</source> <translation>Spoelen</translation> </message> @@ -11224,69 +11215,74 @@ <translation>Toevoegen %1 %2 `%3` voor %4 dagen</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2100"/> + <location filename="../src/PrinterDialog.cpp" line="2103"/> <source>Packaging</source> <translation>Verpakken</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2103"/> + <location filename="../src/PrinterDialog.cpp" line="2106"/> <source>Bottling add %1 kg `%2` with %3 liter water</source> <translation>Bottelen met %1 kg `%2` en %3 liter water</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2107"/> + <location filename="../src/PrinterDialog.cpp" line="2110"/> <source>Kegging add %1 kg `%2` with %3 liter water</source> <translation>Keggen met %1 kg `%2` en %3 liter water</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2114"/> - <source>Add %1, `%2` as bottle yeast</source> - <translation>Toevoegen %1, `%%2` als bottelgist</translation> - </message> - <message> <location filename="../src/PrinterDialog.cpp" line="2117"/> + <source>Add %1, `%2` as bottle yeast</source> + <translation>Toevoegen %1, `%%2` als bottelgist</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2120"/> <source>Add %1 gram %2, `%3` as bottle yeast</source> <translation>Toevoegen %1 gram %2, `%3` als bottelgist</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2121"/> + <location filename="../src/PrinterDialog.cpp" line="2124"/> <source>Add %1 ml %2, `%3` as bottle yeast</source> <translation>Toevoegen %1 ml %2, `%3` als bottelgist</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2130"/> + <location filename="../src/PrinterDialog.cpp" line="2133"/> <source>Add %1 %2 `%3` during bottling</source> <translation>Toevoegen %1 %2 `%3` tijdens bottelen</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2168"/> + <location filename="../src/PrinterDialog.cpp" line="2139"/> + <source>Add %1 gr `%2`</source> + <translation>Toevoegen %1 gr `%2`</translation> + </message> + <message> + <location filename="../src/PrinterDialog.cpp" line="2177"/> <source>Measured:</source> <translation>Gemeten:</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2180"/> + <location filename="../src/PrinterDialog.cpp" line="2189"/> <source>%1 split the batch here!</source> <translation>%1 splits de batch hier!</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2219"/> + <location filename="../src/PrinterDialog.cpp" line="2228"/> <source>Inventory</source> <translation>Inventaris</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2221"/> + <location filename="../src/PrinterDialog.cpp" line="2230"/> <source>Yeastbank</source> <translation>Gistbank</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2231"/> + <location filename="../src/PrinterDialog.cpp" line="2240"/> <source>Date and time</source> <translation>Datum en tijd</translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="766"/> - <location filename="../src/PrinterDialog.cpp" line="2234"/> - <location filename="../src/PrinterDialog.cpp" line="2238"/> + <location filename="../src/PrinterDialog.cpp" line="2243"/> + <location filename="../src/PrinterDialog.cpp" line="2247"/> <source>Beer style</source> <translation>Bierstijl</translation> </message> @@ -11701,62 +11697,62 @@ <context> <name>ProdStages</name> <message> - <location filename="../src/global.cpp" line="28"/> + <location filename="../src/global.cpp" line="31"/> <source>Plan</source> <translation>Plan</translation> </message> <message> - <location filename="../src/global.cpp" line="29"/> - <source>Wait</source> - <translation>Wacht</translation> - </message> - <message> - <location filename="../src/global.cpp" line="30"/> - <source>Brew</source> - <translation>Brouwen</translation> - </message> - <message> - <location filename="../src/global.cpp" line="31"/> - <source>Primary</source> - <translation>Hoofdgisting</translation> - </message> - <message> <location filename="../src/global.cpp" line="32"/> - <source>Secondary</source> - <translation>Nagisting</translation> + <source>Wait</source> + <translation>Wacht</translation> </message> <message> <location filename="../src/global.cpp" line="33"/> - <source>Tertiary</source> - <translation>Lageren</translation> + <source>Brew</source> + <translation>Brouwen</translation> </message> <message> <location filename="../src/global.cpp" line="34"/> - <source>Package</source> - <translation>Verpakken</translation> + <source>Primary</source> + <translation>Hoofdgisting</translation> </message> <message> <location filename="../src/global.cpp" line="35"/> - <source>Carbonation</source> - <translation>Carbonatie</translation> + <source>Secondary</source> + <translation>Nagisting</translation> </message> <message> <location filename="../src/global.cpp" line="36"/> - <source>Mature</source> - <translation>Rijpen</translation> + <source>Tertiary</source> + <translation>Lageren</translation> </message> <message> <location filename="../src/global.cpp" line="37"/> - <source>Taste</source> - <translation>Proeven</translation> + <source>Package</source> + <translation>Verpakken</translation> </message> <message> <location filename="../src/global.cpp" line="38"/> - <source>Ready</source> - <translation>Gereed</translation> + <source>Carbonation</source> + <translation>Carbonatie</translation> </message> <message> <location filename="../src/global.cpp" line="39"/> + <source>Mature</source> + <translation>Rijpen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="40"/> + <source>Taste</source> + <translation>Proeven</translation> + </message> + <message> + <location filename="../src/global.cpp" line="41"/> + <source>Ready</source> + <translation>Gereed</translation> + </message> + <message> + <location filename="../src/global.cpp" line="42"/> <source>Closed</source> <translation>Gesloten</translation> </message> @@ -12437,17 +12433,17 @@ <context> <name>RecipeType</name> <message> - <location filename="../src/global.cpp" line="53"/> + <location filename="../src/global.cpp" line="56"/> <source>Extract</source> <translation>Vloeibaar extract</translation> </message> <message> - <location filename="../src/global.cpp" line="54"/> + <location filename="../src/global.cpp" line="57"/> <source>Partial Mash</source> <translation>Deelmaisch</translation> </message> <message> - <location filename="../src/global.cpp" line="55"/> + <location filename="../src/global.cpp" line="58"/> <source>All Grain</source> <translation>Mout</translation> </message> @@ -12595,47 +12591,75 @@ <translation>Maisch Hop factor:</translation> </message> <message> - <location filename="../src/Setup.cpp" line="70"/> <source>Pellet Hop factor:</source> - <translation>Pellets Hop factor:</translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="76"/> + <translation type="vanished">Pellets Hop factor:</translation> + </message> + <message> <source>Hop Plugs factor:</source> - <translation>Hop Plugs factor:</translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="82"/> + <translation type="vanished">Hop Plugs factor:</translation> + </message> + <message> <source>Wet Hop factor:</source> - <translation>Natte Hop factor:</translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="88"/> + <translation type="vanished">Natte Hop factor:</translation> + </message> + <message> <source>Cryo Hop® factor:</source> - <translation>Cryo Hops® factor:</translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="98"/> - <location filename="../src/Setup.cpp" line="108"/> - <location filename="../src/Setup.cpp" line="118"/> - <location filename="../src/Setup.cpp" line="127"/> - <location filename="../src/Setup.cpp" line="137"/> - <location filename="../src/Setup.cpp" line="147"/> + <translation type="vanished">Cryo Hops® factor:</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="111"/> + <location filename="../src/Setup.cpp" line="121"/> + <location filename="../src/Setup.cpp" line="131"/> + <location filename="../src/Setup.cpp" line="141"/> + <location filename="../src/Setup.cpp" line="151"/> + <location filename="../src/Setup.cpp" line="161"/> + <location filename="../src/Setup.cpp" line="171"/> + <location filename="../src/Setup.cpp" line="181"/> <source>%</source> <translation></translation> </message> <message> - <location filename="../src/Setup.cpp" line="153"/> + <location filename="../src/Setup.cpp" line="130"/> + <source>The utilisation for hop pellets, default 22</source> + <translation>De efficientie van hop pellets, standaard 22</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="140"/> + <source>The utilisation for hop plugs, default 20.4</source> + <translation>De efficientie van hop plugs, standaard 20,4</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="150"/> + <source>The utilisation for hop leafs, default 20</source> + <translation>De efficientie van hop bloemen, standaard 20</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="160"/> + <source>The uyilisation for fresh hops, default 3.6</source> + <translation>De efficientie van verse hop, standaard 3,6</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="170"/> + <source>The utilisation for using Cryo Hop®, default 50</source> + <translation>De efficientie van Cryo Hop®, standaard 50</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="180"/> + <source>The utilisation for using CO2 hop extract, default 35</source> + <translation>De efficientie van CO2 hop extract, standaard 35</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="187"/> <source>Grain Absorbtion:</source> <translation>Graan absorbtie:</translation> </message> <message> - <location filename="../src/Setup.cpp" line="159"/> + <location filename="../src/Setup.cpp" line="193"/> <source>Brix Correction factor:</source> <translation>Brix correctie factor:</translation> </message> <message> - <location filename="../src/Setup.cpp" line="177"/> + <location filename="../src/Setup.cpp" line="211"/> <source>Brew settings.</source> <translation>Brouw instellingen.</translation> </message> @@ -12649,142 +12673,168 @@ <translation>De naam voor deze brouwerij.</translation> </message> <message> - <location filename="../src/Setup.cpp" line="97"/> + <location filename="../src/Setup.cpp" line="70"/> + <source>Hop Pellets utilisation:</source> + <translation>Hop pellets efficientie:</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="76"/> + <source>Hop Plugs utilisation:</source> + <translation>Hop plugs efficientie:</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="82"/> + <source>Hop Leafs utilisation:</source> + <translation>Hop bloemen efficientie:</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="88"/> + <source>Wet Hop utilisation:</source> + <translation>Verse hop efficientie:</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="94"/> + <source>Cryo Hop® utilisation:</source> + <translation>Cryo Hop® efficientie:</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="100"/> + <source>CO2 Hop Extract utilisation:</source> + <translation>CO2 hop extract efficientie:</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="110"/> <source>The efficiency for First Wort Hopping.</source> <translation>De efficientie van First Wort Hopping.</translation> </message> <message> - <location filename="../src/Setup.cpp" line="107"/> + <location filename="../src/Setup.cpp" line="120"/> <source>The efficiency for Mash hopping.</source> <translation>De effecientie voor maisch hoppen.</translation> </message> <message> - <location filename="../src/Setup.cpp" line="117"/> <source>The efficiency for hop pellets.</source> - <translation>De efficientie van hop pellets.</translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="126"/> + <translation type="vanished">De efficientie van hop pellets.</translation> + </message> + <message> <source>The efficiency for hop plugs.</source> - <translation>De efficientie van hop plugs.</translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="136"/> + <translation type="vanished">De efficientie van hop plugs.</translation> + </message> + <message> <source>The efficiency for fresh hops.</source> - <translation>De efficientie van verse hop.</translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="146"/> + <translation type="vanished">De efficientie van verse hop.</translation> + </message> + <message> <source>The efficiency for using Cryo Hop®.</source> - <translation>De efficientie van Cryo Hop®.</translation> - </message> - <message> - <location filename="../src/Setup.cpp" line="165"/> + <translation type="vanished">De efficientie van Cryo Hop®.</translation> + </message> + <message> + <location filename="../src/Setup.cpp" line="199"/> <source>Brewery height meters:</source> <translation>Brouwerij hoogte in meters:</translation> </message> <message> - <location filename="../src/Setup.cpp" line="183"/> + <location filename="../src/Setup.cpp" line="217"/> <source>Color Calculation:</source> <translation>Kleur berekening:</translation> </message> <message> - <location filename="../src/Setup.cpp" line="189"/> + <location filename="../src/Setup.cpp" line="223"/> <source>IBU Calculation:</source> <translation>IBU berekening:</translation> </message> <message> - <location filename="../src/Setup.cpp" line="195"/> + <location filename="../src/Setup.cpp" line="229"/> <source>Default Water:</source> <translation>Standaard water:</translation> </message> <message> - <location filename="../src/Setup.cpp" line="201"/> + <location filename="../src/Setup.cpp" line="235"/> <source>Private Yeast bank:</source> <translation>Prive gistbank:</translation> </message> <message> - <location filename="../src/Setup.cpp" line="213"/> + <location filename="../src/Setup.cpp" line="247"/> <source>Absorbtion with water by the grain (L/Kg)</source> <translation>Absorbtie met water door de mout (L/Kg)</translation> </message> <message> - <location filename="../src/Setup.cpp" line="214"/> + <location filename="../src/Setup.cpp" line="248"/> <source> L/Kg</source> <translation> L/Kg</translation> </message> <message> - <location filename="../src/Setup.cpp" line="226"/> + <location filename="../src/Setup.cpp" line="260"/> <source>Plato to Brix conversion factor.</source> <translation>Plato naar Brix correctie factor.</translation> </message> <message> - <location filename="../src/Setup.cpp" line="237"/> + <location filename="../src/Setup.cpp" line="271"/> <source>Height in meters above/below sealevel to calculate the exact boiling point and hop isomerizon.</source> <translation>Hoogte in meters boven/beneden de zeespiegel om het exacte kookpunt en hop isomersie te berekenen.</translation> </message> <message> - <location filename="../src/Setup.cpp" line="245"/> - <location filename="../src/Setup.cpp" line="253"/> - <location filename="../src/Setup.cpp" line="261"/> - <location filename="../src/Setup.cpp" line="269"/> + <location filename="../src/Setup.cpp" line="279"/> + <location filename="../src/Setup.cpp" line="287"/> + <location filename="../src/Setup.cpp" line="295"/> + <location filename="../src/Setup.cpp" line="303"/> <source>Choose color</source> <translation>Kies kleur</translation> </message> <message> - <location filename="../src/Setup.cpp" line="275"/> + <location filename="../src/Setup.cpp" line="309"/> <source>Logo here</source> <translation>Logo komt hier</translation> </message> <message> - <location filename="../src/Setup.cpp" line="283"/> + <location filename="../src/Setup.cpp" line="317"/> <source>Quit</source> <translation>Terug</translation> </message> <message> - <location filename="../src/Setup.cpp" line="291"/> + <location filename="../src/Setup.cpp" line="325"/> <source>Save</source> <translation>Bewaar</translation> </message> <message> - <location filename="../src/Setup.cpp" line="300"/> + <location filename="../src/Setup.cpp" line="334"/> <source>Load logo</source> <translation>Laad logo</translation> </message> <message> - <location filename="../src/Setup.cpp" line="310"/> - <location filename="../src/Setup.cpp" line="506"/> - <location filename="../src/Setup.cpp" line="533"/> + <location filename="../src/Setup.cpp" line="344"/> + <location filename="../src/Setup.cpp" line="547"/> + <location filename="../src/Setup.cpp" line="574"/> <source>Setup</source> <translation>Instellingen</translation> </message> <message> - <location filename="../src/Setup.cpp" line="356"/> + <location filename="../src/Setup.cpp" line="394"/> <source>Choose default water</source> <translation>Kies standaard water</translation> </message> <message> - <location filename="../src/Setup.cpp" line="372"/> + <location filename="../src/Setup.cpp" line="410"/> <source>Choose laboratory</source> <translation>Kies laboratorium</translation> </message> <message> - <location filename="../src/Setup.cpp" line="401"/> + <location filename="../src/Setup.cpp" line="439"/> <source>Cannot load %1: %2</source> <translation>Kan niet laden %1: %2</translation> </message> <message> - <location filename="../src/Setup.cpp" line="436"/> + <location filename="../src/Setup.cpp" line="474"/> <source>Open File</source> <translation>Open bestand</translation> </message> <message> - <location filename="../src/Setup.cpp" line="495"/> + <location filename="../src/Setup.cpp" line="536"/> <source>Database error</source> <translation>Database fout</translation> </message> <message> - <location filename="../src/Setup.cpp" line="496"/> + <location filename="../src/Setup.cpp" line="537"/> <source>MySQL error: %1 %2 %3</source> @@ -12793,12 +12843,12 @@ %3</translation> </message> <message> - <location filename="../src/Setup.cpp" line="513"/> + <location filename="../src/Setup.cpp" line="554"/> <source>Setup changed</source> <translation>Instellingen gewijzigd</translation> </message> <message> - <location filename="../src/Setup.cpp" line="513"/> + <location filename="../src/Setup.cpp" line="554"/> <source>The global setup has been modified. Save changes?</source> <translation>De globale setup is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -12812,37 +12862,37 @@ <context> <name>Splitter</name> <message> - <location filename="../src/global.cpp" line="43"/> + <location filename="../src/global.cpp" line="46"/> <source>Not divided</source> <translation>Niet gesplitst</translation> </message> <message> - <location filename="../src/global.cpp" line="44"/> - <source>After mash</source> - <translation>Na maischen</translation> - </message> - <message> - <location filename="../src/global.cpp" line="45"/> - <source>After boil</source> - <translation>Na koken</translation> - </message> - <message> - <location filename="../src/global.cpp" line="46"/> - <source>After cooling</source> - <translation>Na koelen</translation> - </message> - <message> <location filename="../src/global.cpp" line="47"/> - <source>After primary</source> - <translation>Na hoofdgisting</translation> + <source>After mash</source> + <translation>Na maischen</translation> </message> <message> <location filename="../src/global.cpp" line="48"/> - <source>After secondary</source> - <translation>Na nagisting</translation> + <source>After boil</source> + <translation>Na koken</translation> </message> <message> <location filename="../src/global.cpp" line="49"/> + <source>After cooling</source> + <translation>Na koelen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="50"/> + <source>After primary</source> + <translation>Na hoofdgisting</translation> + </message> + <message> + <location filename="../src/global.cpp" line="51"/> + <source>After secondary</source> + <translation>Na nagisting</translation> + </message> + <message> + <location filename="../src/global.cpp" line="52"/> <source>After tertiary</source> <translation>Na lageren</translation> </message> @@ -12850,17 +12900,17 @@ <context> <name>StepType</name> <message> - <location filename="../src/global.cpp" line="189"/> + <location filename="../src/global.cpp" line="192"/> <source>Infusion</source> <translation>Infusie</translation> </message> <message> - <location filename="../src/global.cpp" line="190"/> + <location filename="../src/global.cpp" line="193"/> <source>Temperature</source> <translation>Verwarmen</translation> </message> <message> - <location filename="../src/global.cpp" line="191"/> + <location filename="../src/global.cpp" line="194"/> <source>Decoction</source> <translation>Decoctie</translation> </message> @@ -12876,22 +12926,22 @@ <context> <name>TunMaterial</name> <message> - <location filename="../src/global.cpp" line="195"/> + <location filename="../src/global.cpp" line="198"/> <source>Stainless Steel</source> <translation>RVS</translation> </message> <message> - <location filename="../src/global.cpp" line="196"/> + <location filename="../src/global.cpp" line="199"/> <source>Aluminium</source> <translation>Aluminium</translation> </message> <message> - <location filename="../src/global.cpp" line="197"/> + <location filename="../src/global.cpp" line="200"/> <source>Plastics</source> <translation>Kunststof</translation> </message> <message> - <location filename="../src/global.cpp" line="198"/> + <location filename="../src/global.cpp" line="201"/> <source>Copper</source> <translation>Koper</translation> </message> @@ -12907,37 +12957,37 @@ <context> <name>YeastForm</name> <message> - <location filename="../src/global.cpp" line="166"/> + <location filename="../src/global.cpp" line="169"/> <source>Liquid</source> <translation>Vloeibaar</translation> </message> <message> - <location filename="../src/global.cpp" line="167"/> - <source>Dry</source> - <translation>Droog</translation> - </message> - <message> - <location filename="../src/global.cpp" line="168"/> - <source>Slant</source> - <translation>Schuine buis</translation> - </message> - <message> - <location filename="../src/global.cpp" line="169"/> - <source>Culture</source> - <translation>Slurry</translation> - </message> - <message> <location filename="../src/global.cpp" line="170"/> - <source>Frozen</source> - <translation>Ingevroren</translation> + <source>Dry</source> + <translation>Droog</translation> </message> <message> <location filename="../src/global.cpp" line="171"/> - <source>Bottle</source> - <translation>Flesdepot</translation> + <source>Slant</source> + <translation>Schuine buis</translation> </message> <message> <location filename="../src/global.cpp" line="172"/> + <source>Culture</source> + <translation>Slurry</translation> + </message> + <message> + <location filename="../src/global.cpp" line="173"/> + <source>Frozen</source> + <translation>Ingevroren</translation> + </message> + <message> + <location filename="../src/global.cpp" line="174"/> + <source>Bottle</source> + <translation>Flesdepot</translation> + </message> + <message> + <location filename="../src/global.cpp" line="175"/> <source>Dried</source> <translation>Gedroogd</translation> </message> @@ -12945,17 +12995,17 @@ <context> <name>YeastStarter</name> <message> - <location filename="../src/global.cpp" line="183"/> + <location filename="../src/global.cpp" line="186"/> <source>Stirred</source> <translation>Geroerd</translation> </message> <message> - <location filename="../src/global.cpp" line="184"/> + <location filename="../src/global.cpp" line="187"/> <source>Shaken</source> <translation>Geschud</translation> </message> <message> - <location filename="../src/global.cpp" line="185"/> + <location filename="../src/global.cpp" line="188"/> <source>Simple</source> <translation>Simpel</translation> </message> @@ -12963,42 +13013,42 @@ <context> <name>YeastType</name> <message> - <location filename="../src/global.cpp" line="155"/> + <location filename="../src/global.cpp" line="158"/> <source>Lager</source> <translation>Ondergist</translation> </message> <message> - <location filename="../src/global.cpp" line="156"/> - <source>Ale</source> - <translation>Bovengist</translation> - </message> - <message> - <location filename="../src/global.cpp" line="157"/> - <source>Wheat</source> - <translation>Tarwegist</translation> - </message> - <message> - <location filename="../src/global.cpp" line="158"/> - <source>Wine</source> - <translation>Wijngist</translation> - </message> - <message> <location filename="../src/global.cpp" line="159"/> - <source>Champagne</source> - <translation>Champagnegist</translation> + <source>Ale</source> + <translation>Bovengist</translation> </message> <message> <location filename="../src/global.cpp" line="160"/> - <source>Brett</source> - <translation>Brett</translation> + <source>Wheat</source> + <translation>Tarwegist</translation> </message> <message> <location filename="../src/global.cpp" line="161"/> - <source>Kveik</source> - <translation>Kveik</translation> + <source>Wine</source> + <translation>Wijngist</translation> </message> <message> <location filename="../src/global.cpp" line="162"/> + <source>Champagne</source> + <translation>Champagnegist</translation> + </message> + <message> + <location filename="../src/global.cpp" line="163"/> + <source>Brett</source> + <translation>Brett</translation> + </message> + <message> + <location filename="../src/global.cpp" line="164"/> + <source>Kveik</source> + <translation>Kveik</translation> + </message> + <message> + <location filename="../src/global.cpp" line="165"/> <source>Hybrid</source> <translation>Hybride</translation> </message> @@ -13006,22 +13056,22 @@ <context> <name>YeastUse</name> <message> - <location filename="../src/global.cpp" line="176"/> + <location filename="../src/global.cpp" line="179"/> <source>Primary</source> <translation>Hoofdgisting</translation> </message> <message> - <location filename="../src/global.cpp" line="177"/> + <location filename="../src/global.cpp" line="180"/> <source>Secondary</source> <translation>Nagisting</translation> </message> <message> - <location filename="../src/global.cpp" line="178"/> + <location filename="../src/global.cpp" line="181"/> <source>Tertiary</source> <translation>Lageren</translation> </message> <message> - <location filename="../src/global.cpp" line="179"/> + <location filename="../src/global.cpp" line="182"/> <source>Bottle</source> <translation>Bottelgist</translation> </message>