Sat, 01 Jun 2024 21:10:54 +0200
Added fields for target_water and auto upgrade the products table
--- a/src/database/db_product.cpp Sat Jun 01 15:19:08 2024 +0200 +++ b/src/database/db_product.cpp Sat Jun 01 21:10:54 2024 +0200 @@ -23,6 +23,31 @@ { QSqlQuery query, yquery; + /* + * Upgrade database extra columns for target water. + */ + query.exec("SHOW COLUMNS FROM `products` LIKE 'tw_name'"); + if (! query.first()) { + qWarning() << "loadProduct upgrade for target water"; + QString sql = "ALTER TABLE `products` ADD `tw_name` VARCHAR(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL AFTER `calc_acid`, "; + sql.append("ADD `tw_calcium` FLOAT NOT NULL DEFAULT '0' AFTER `tw_name`, "); + sql.append("ADD `tw_sulfate` FLOAT NOT NULL DEFAULT '0' AFTER `tw_calcium`, "); + sql.append("ADD `tw_chloride` FLOAT NOT NULL DEFAULT '0' AFTER `tw_sulfate`, "); + sql.append("ADD `tw_sodium` FLOAT NOT NULL DEFAULT '0' AFTER `tw_chloride`, "); + sql.append("ADD `tw_magnesium` FLOAT NOT NULL DEFAULT '0' AFTER `tw_sodium`, "); + sql.append("ADD `tw_total_alkalinity` FLOAT NOT NULL DEFAULT '0' AFTER `tw_magnesium`;"); +// qDebug() << sql; + query.exec(sql); + if (query.lastError().isValid()) { + qWarning() << "loadProduct upgrade" << query.lastError(); + QMessageBox::warning(dialog, QObject::tr("Database error"), + QObject::tr("MySQL error: %1\n%2\n%3") + .arg(query.lastError().nativeErrorCode()) + .arg(query.lastError().driverText()) + .arg(query.lastError().databaseText())); + } + } + query.prepare("SELECT * FROM products WHERE record = :recno"); query.bindValue(":recno", recno); query.exec();
--- a/src/global.h Sat Jun 01 15:19:08 2024 +0200 +++ b/src/global.h Sat Jun 01 21:10:54 2024 +0200 @@ -610,6 +610,14 @@ QString mash_name; bool calc_acid; + QString tw_name; ///< Target water (since 0.4.6) + double tw_calcium; + double tw_sulfate; + double tw_chloride; + double tw_sodium; + double tw_magnesium; + double tw_total_alkalinity; + QString w1_name; ///< Water source 1 double w1_amount; double w1_calcium; @@ -638,6 +646,7 @@ double wg_magnesium; double wg_total_alkalinity; double wg_ph; + double wb_calcium; ///< Treated water double wb_sulfate; double wb_chloride;
--- a/translations/bmsapp_en.ts Sat Jun 01 15:19:08 2024 +0200 +++ b/translations/bmsapp_en.ts Sat Jun 01 21:10:54 2024 +0200 @@ -2483,14 +2483,14 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="55"/> - <location filename="../ui/EditProduct.ui" line="12255"/> + <location filename="../ui/EditProduct.ui" line="12264"/> <location filename="../src/EditProductTab9.cpp" line="552"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="75"/> - <location filename="../ui/EditProduct.ui" line="12204"/> + <location filename="../ui/EditProduct.ui" line="12213"/> <location filename="../src/EditProductTab3.cpp" line="74"/> <location filename="../src/EditProductTab3.cpp" line="162"/> <location filename="../src/EditProductTab4.cpp" line="60"/> @@ -2535,8 +2535,8 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="240"/> - <location filename="../ui/EditProduct.ui" line="7969"/> - <location filename="../ui/EditProduct.ui" line="8964"/> + <location filename="../ui/EditProduct.ui" line="7978"/> + <location filename="../ui/EditProduct.ui" line="8973"/> <source>Efficiency:</source> <translation type="unfinished"></translation> </message> @@ -2567,22 +2567,22 @@ <location filename="../ui/EditProduct.ui" line="3370"/> <location filename="../ui/EditProduct.ui" line="3423"/> <location filename="../ui/EditProduct.ui" line="4153"/> - <location filename="../ui/EditProduct.ui" line="7662"/> - <location filename="../ui/EditProduct.ui" line="8063"/> - <location filename="../ui/EditProduct.ui" line="9080"/> - <location filename="../ui/EditProduct.ui" line="9681"/> - <location filename="../ui/EditProduct.ui" line="9915"/> - <location filename="../ui/EditProduct.ui" line="10133"/> - <location filename="../ui/EditProduct.ui" line="10235"/> - <location filename="../ui/EditProduct.ui" line="10384"/> - <location filename="../ui/EditProduct.ui" line="10437"/> - <location filename="../ui/EditProduct.ui" line="10641"/> - <location filename="../ui/EditProduct.ui" line="10675"/> - <location filename="../ui/EditProduct.ui" line="10763"/> - <location filename="../ui/EditProduct.ui" line="11041"/> - <location filename="../ui/EditProduct.ui" line="11226"/> - <location filename="../ui/EditProduct.ui" line="11454"/> - <location filename="../ui/EditProduct.ui" line="11617"/> + <location filename="../ui/EditProduct.ui" line="7671"/> + <location filename="../ui/EditProduct.ui" line="8072"/> + <location filename="../ui/EditProduct.ui" line="9089"/> + <location filename="../ui/EditProduct.ui" line="9690"/> + <location filename="../ui/EditProduct.ui" line="9924"/> + <location filename="../ui/EditProduct.ui" line="10142"/> + <location filename="../ui/EditProduct.ui" line="10244"/> + <location filename="../ui/EditProduct.ui" line="10393"/> + <location filename="../ui/EditProduct.ui" line="10446"/> + <location filename="../ui/EditProduct.ui" line="10650"/> + <location filename="../ui/EditProduct.ui" line="10684"/> + <location filename="../ui/EditProduct.ui" line="10772"/> + <location filename="../ui/EditProduct.ui" line="11050"/> + <location filename="../ui/EditProduct.ui" line="11235"/> + <location filename="../ui/EditProduct.ui" line="11463"/> + <location filename="../ui/EditProduct.ui" line="11626"/> <source> %</source> <translation type="unfinished"></translation> </message> @@ -2590,12 +2590,12 @@ <location filename="../ui/EditProduct.ui" line="335"/> <location filename="../ui/EditProduct.ui" line="1922"/> <location filename="../ui/EditProduct.ui" line="2302"/> - <location filename="../ui/EditProduct.ui" line="8280"/> - <location filename="../ui/EditProduct.ui" line="8308"/> - <location filename="../ui/EditProduct.ui" line="8336"/> - <location filename="../ui/EditProduct.ui" line="8364"/> - <location filename="../ui/EditProduct.ui" line="8751"/> - <location filename="../ui/EditProduct.ui" line="8872"/> + <location filename="../ui/EditProduct.ui" line="8289"/> + <location filename="../ui/EditProduct.ui" line="8317"/> + <location filename="../ui/EditProduct.ui" line="8345"/> + <location filename="../ui/EditProduct.ui" line="8373"/> + <location filename="../ui/EditProduct.ui" line="8760"/> + <location filename="../ui/EditProduct.ui" line="8881"/> <source> min</source> <translation type="unfinished"></translation> </message> @@ -2620,24 +2620,24 @@ <location filename="../ui/EditProduct.ui" line="3178"/> <location filename="../ui/EditProduct.ui" line="4356"/> <location filename="../ui/EditProduct.ui" line="5692"/> - <location filename="../ui/EditProduct.ui" line="6428"/> - <location filename="../ui/EditProduct.ui" line="6765"/> - <location filename="../ui/EditProduct.ui" line="7091"/> - <location filename="../ui/EditProduct.ui" line="7770"/> - <location filename="../ui/EditProduct.ui" line="7836"/> - <location filename="../ui/EditProduct.ui" line="8088"/> - <location filename="../ui/EditProduct.ui" line="8119"/> - <location filename="../ui/EditProduct.ui" line="8453"/> - <location filename="../ui/EditProduct.ui" line="8481"/> - <location filename="../ui/EditProduct.ui" line="8515"/> - <location filename="../ui/EditProduct.ui" line="8945"/> - <location filename="../ui/EditProduct.ui" line="9030"/> - <location filename="../ui/EditProduct.ui" line="10576"/> - <location filename="../ui/EditProduct.ui" line="10607"/> - <location filename="../ui/EditProduct.ui" line="11013"/> - <location filename="../ui/EditProduct.ui" line="11135"/> - <location filename="../ui/EditProduct.ui" line="11495"/> - <location filename="../ui/EditProduct.ui" line="11576"/> + <location filename="../ui/EditProduct.ui" line="6434"/> + <location filename="../ui/EditProduct.ui" line="6771"/> + <location filename="../ui/EditProduct.ui" line="7100"/> + <location filename="../ui/EditProduct.ui" line="7779"/> + <location filename="../ui/EditProduct.ui" line="7845"/> + <location filename="../ui/EditProduct.ui" line="8097"/> + <location filename="../ui/EditProduct.ui" line="8128"/> + <location filename="../ui/EditProduct.ui" line="8462"/> + <location filename="../ui/EditProduct.ui" line="8490"/> + <location filename="../ui/EditProduct.ui" line="8524"/> + <location filename="../ui/EditProduct.ui" line="8954"/> + <location filename="../ui/EditProduct.ui" line="9039"/> + <location filename="../ui/EditProduct.ui" line="10585"/> + <location filename="../ui/EditProduct.ui" line="10616"/> + <location filename="../ui/EditProduct.ui" line="11022"/> + <location filename="../ui/EditProduct.ui" line="11144"/> + <location filename="../ui/EditProduct.ui" line="11504"/> + <location filename="../ui/EditProduct.ui" line="11585"/> <location filename="../src/EditProductExport.cpp" line="845"/> <location filename="../src/EditProductExport.cpp" line="853"/> <source> L</source> @@ -2879,7 +2879,18 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8431"/> + <location filename="../ui/EditProduct.ui" line="6353"/> + <location filename="../ui/EditProduct.ui" line="6422"/> + <source>Total brew and sparge water supply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6356"/> + <source>Total needed mixed water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8440"/> <source>Top up water:</source> <translation type="unfinished"></translation> </message> @@ -2947,7 +2958,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="2424"/> - <location filename="../ui/EditProduct.ui" line="8415"/> + <location filename="../ui/EditProduct.ui" line="8424"/> <source>Kettle trub loss:</source> <translation type="unfinished"></translation> </message> @@ -3006,7 +3017,7 @@ <location filename="../ui/EditProduct.ui" line="3222"/> <location filename="../ui/EditProduct.ui" line="4072"/> <location filename="../ui/EditProduct.ui" line="4227"/> - <location filename="../ui/EditProduct.ui" line="12132"/> + <location filename="../ui/EditProduct.ui" line="12141"/> <location filename="../src/EditProductExport.cpp" line="873"/> <source>Add</source> <translation type="unfinished"></translation> @@ -3089,10 +3100,10 @@ <message> <location filename="../ui/EditProduct.ui" line="3598"/> <location filename="../ui/EditProduct.ui" line="3687"/> - <location filename="../ui/EditProduct.ui" line="10352"/> - <location filename="../ui/EditProduct.ui" line="11713"/> - <location filename="../ui/EditProduct.ui" line="11794"/> - <location filename="../ui/EditProduct.ui" line="12103"/> + <location filename="../ui/EditProduct.ui" line="10361"/> + <location filename="../ui/EditProduct.ui" line="11722"/> + <location filename="../ui/EditProduct.ui" line="11803"/> + <location filename="../ui/EditProduct.ui" line="12112"/> <source>Set or clear date</source> <translation type="unfinished"></translation> </message> @@ -3101,29 +3112,29 @@ <location filename="../ui/EditProduct.ui" line="3690"/> <location filename="../ui/EditProduct.ui" line="4124"/> <location filename="../ui/EditProduct.ui" line="4191"/> - <location filename="../ui/EditProduct.ui" line="8141"/> - <location filename="../ui/EditProduct.ui" line="8180"/> - <location filename="../ui/EditProduct.ui" line="8777"/> - <location filename="../ui/EditProduct.ui" line="9102"/> - <location filename="../ui/EditProduct.ui" line="9176"/> - <location filename="../ui/EditProduct.ui" line="9197"/> - <location filename="../ui/EditProduct.ui" line="9236"/> - <location filename="../ui/EditProduct.ui" line="9307"/> - <location filename="../ui/EditProduct.ui" line="9394"/> - <location filename="../ui/EditProduct.ui" line="9703"/> - <location filename="../ui/EditProduct.ui" line="9723"/> - <location filename="../ui/EditProduct.ui" line="9762"/> - <location filename="../ui/EditProduct.ui" line="9937"/> - <location filename="../ui/EditProduct.ui" line="9957"/> - <location filename="../ui/EditProduct.ui" line="9996"/> - <location filename="../ui/EditProduct.ui" line="10155"/> - <location filename="../ui/EditProduct.ui" line="10290"/> - <location filename="../ui/EditProduct.ui" line="10310"/> - <location filename="../ui/EditProduct.ui" line="10355"/> - <location filename="../ui/EditProduct.ui" line="11716"/> - <location filename="../ui/EditProduct.ui" line="11736"/> - <location filename="../ui/EditProduct.ui" line="11797"/> - <location filename="../ui/EditProduct.ui" line="12106"/> + <location filename="../ui/EditProduct.ui" line="8150"/> + <location filename="../ui/EditProduct.ui" line="8189"/> + <location filename="../ui/EditProduct.ui" line="8786"/> + <location filename="../ui/EditProduct.ui" line="9111"/> + <location filename="../ui/EditProduct.ui" line="9185"/> + <location filename="../ui/EditProduct.ui" line="9206"/> + <location filename="../ui/EditProduct.ui" line="9245"/> + <location filename="../ui/EditProduct.ui" line="9316"/> + <location filename="../ui/EditProduct.ui" line="9403"/> + <location filename="../ui/EditProduct.ui" line="9712"/> + <location filename="../ui/EditProduct.ui" line="9732"/> + <location filename="../ui/EditProduct.ui" line="9771"/> + <location filename="../ui/EditProduct.ui" line="9946"/> + <location filename="../ui/EditProduct.ui" line="9966"/> + <location filename="../ui/EditProduct.ui" line="10005"/> + <location filename="../ui/EditProduct.ui" line="10164"/> + <location filename="../ui/EditProduct.ui" line="10299"/> + <location filename="../ui/EditProduct.ui" line="10319"/> + <location filename="../ui/EditProduct.ui" line="10364"/> + <location filename="../ui/EditProduct.ui" line="11725"/> + <location filename="../ui/EditProduct.ui" line="11745"/> + <location filename="../ui/EditProduct.ui" line="11806"/> + <location filename="../ui/EditProduct.ui" line="12115"/> <source>...</source> <translation type="unfinished"></translation> </message> @@ -3180,7 +3191,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="4121"/> - <location filename="../ui/EditProduct.ui" line="9194"/> + <location filename="../ui/EditProduct.ui" line="9203"/> <source>Set the date to today.</source> <translation type="unfinished"></translation> </message> @@ -3191,12 +3202,12 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="4172"/> - <location filename="../ui/EditProduct.ui" line="9217"/> - <location filename="../ui/EditProduct.ui" line="9272"/> - <location filename="../ui/EditProduct.ui" line="9743"/> - <location filename="../ui/EditProduct.ui" line="9977"/> - <location filename="../ui/EditProduct.ui" line="11697"/> - <location filename="../ui/EditProduct.ui" line="12087"/> + <location filename="../ui/EditProduct.ui" line="9226"/> + <location filename="../ui/EditProduct.ui" line="9281"/> + <location filename="../ui/EditProduct.ui" line="9752"/> + <location filename="../ui/EditProduct.ui" line="9986"/> + <location filename="../ui/EditProduct.ui" line="11706"/> + <location filename="../ui/EditProduct.ui" line="12096"/> <source>dd-MM-yyyy</source> <translation type="unfinished"></translation> </message> @@ -3336,8 +3347,8 @@ <location filename="../ui/EditProduct.ui" line="4822"/> <location filename="../ui/EditProduct.ui" line="4854"/> <location filename="../ui/EditProduct.ui" line="4885"/> - <location filename="../ui/EditProduct.ui" line="11082"/> - <location filename="../ui/EditProduct.ui" line="11426"/> + <location filename="../ui/EditProduct.ui" line="11091"/> + <location filename="../ui/EditProduct.ui" line="11435"/> <source> gr</source> <translation type="unfinished"></translation> </message> @@ -3494,791 +3505,791 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6353"/> - <source>Mixed water</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6750"/> + <location filename="../ui/EditProduct.ui" line="6756"/> <source>The division between the main and dilution water. The total volume does not change.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6837"/> + <location filename="../ui/EditProduct.ui" line="6843"/> <source>Optional dilution water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6840"/> + <location filename="../ui/EditProduct.ui" line="6846"/> <source>Choose dilution</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6953"/> + <location filename="../ui/EditProduct.ui" line="6959"/> <source>Hardness</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6994"/> + <location filename="../ui/EditProduct.ui" line="7000"/> <source>Mg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7010"/> + <location filename="../ui/EditProduct.ui" line="7016"/> <location filename="../src/EditProductTab7.cpp" line="35"/> <source>pH</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7038"/> + <location filename="../ui/EditProduct.ui" line="7044"/> <source>RA</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7135"/> + <location filename="../ui/EditProduct.ui" line="7085"/> + <source>Total brew and sparge water supply without optional dilution water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7144"/> <source>CaCO3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7204"/> + <location filename="../ui/EditProduct.ui" line="7213"/> <source>The main brewing water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7210"/> + <location filename="../ui/EditProduct.ui" line="7219"/> <source>Choose water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7223"/> + <location filename="../ui/EditProduct.ui" line="7232"/> <source>Cl</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7239"/> + <location filename="../ui/EditProduct.ui" line="7248"/> <source>Na</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7255"/> + <location filename="../ui/EditProduct.ui" line="7264"/> <source>Ca</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7271"/> + <location filename="../ui/EditProduct.ui" line="7280"/> <source>SO4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7287"/> + <location filename="../ui/EditProduct.ui" line="7296"/> <location filename="../src/EditProductTab6.cpp" line="342"/> <location filename="../src/EditProductTab7.cpp" line="35"/> <source>Volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7303"/> + <location filename="../ui/EditProduct.ui" line="7312"/> <source>HCO3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7319"/> + <location filename="../ui/EditProduct.ui" line="7328"/> <source>Water profile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7410"/> + <location filename="../ui/EditProduct.ui" line="7419"/> <source>Sparge water source 1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7432"/> + <location filename="../ui/EditProduct.ui" line="7441"/> <source>Sparge water source 2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7451"/> + <location filename="../ui/EditProduct.ui" line="7460"/> <source>Sparge water mixed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7467"/> + <location filename="../ui/EditProduct.ui" line="7476"/> <location filename="../src/EditProductTab5.cpp" line="723"/> <source>Sparge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7483"/> + <location filename="../ui/EditProduct.ui" line="7492"/> <source>Treated sparge water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7496"/> + <location filename="../ui/EditProduct.ui" line="7505"/> <source>Brewday</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7508"/> + <location filename="../ui/EditProduct.ui" line="7517"/> <source>Brewday plan:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7524"/> + <location filename="../ui/EditProduct.ui" line="7533"/> <source>Brewday end:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7540"/> + <location filename="../ui/EditProduct.ui" line="7549"/> <source>Mashing and Sparge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7552"/> + <location filename="../ui/EditProduct.ui" line="7561"/> <source>Mash pH:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7681"/> + <location filename="../ui/EditProduct.ui" line="7690"/> <source>Mash SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7697"/> + <location filename="../ui/EditProduct.ui" line="7706"/> <source>Mash efficiency:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7713"/> + <location filename="../ui/EditProduct.ui" line="7722"/> <source>Sparge water pH:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7729"/> + <location filename="../ui/EditProduct.ui" line="7738"/> <source>Sparge supply:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7745"/> + <location filename="../ui/EditProduct.ui" line="7754"/> <source>Sparge estimate:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7789"/> + <location filename="../ui/EditProduct.ui" line="7798"/> <source>Sparge temp:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7867"/> - <location filename="../ui/EditProduct.ui" line="8844"/> - <location filename="../ui/EditProduct.ui" line="9556"/> - <location filename="../ui/EditProduct.ui" line="9584"/> - <location filename="../ui/EditProduct.ui" line="9612"/> - <location filename="../ui/EditProduct.ui" line="9846"/> - <location filename="../ui/EditProduct.ui" line="10064"/> - <location filename="../ui/EditProduct.ui" line="11195"/> - <location filename="../ui/EditProduct.ui" line="11645"/> + <location filename="../ui/EditProduct.ui" line="7876"/> + <location filename="../ui/EditProduct.ui" line="8853"/> + <location filename="../ui/EditProduct.ui" line="9565"/> + <location filename="../ui/EditProduct.ui" line="9593"/> + <location filename="../ui/EditProduct.ui" line="9621"/> + <location filename="../ui/EditProduct.ui" line="9855"/> + <location filename="../ui/EditProduct.ui" line="10073"/> + <location filename="../ui/EditProduct.ui" line="11204"/> + <location filename="../ui/EditProduct.ui" line="11654"/> <source> °C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7909"/> + <location filename="../ui/EditProduct.ui" line="7918"/> <source>Pre boil</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7921"/> - <location filename="../ui/EditProduct.ui" line="9052"/> + <location filename="../ui/EditProduct.ui" line="7930"/> + <location filename="../ui/EditProduct.ui" line="9061"/> <location filename="../src/EditProductTab7.cpp" line="635"/> <source>Measured pH:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7937"/> - <location filename="../ui/EditProduct.ui" line="9119"/> + <location filename="../ui/EditProduct.ui" line="7946"/> + <location filename="../ui/EditProduct.ui" line="9128"/> <location filename="../src/EditProductTab7.cpp" line="667"/> <source>Measured SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7953"/> - <location filename="../ui/EditProduct.ui" line="9135"/> + <location filename="../ui/EditProduct.ui" line="7962"/> + <location filename="../ui/EditProduct.ui" line="9144"/> <source>Volume @100°C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8051"/> + <location filename="../ui/EditProduct.ui" line="8060"/> <source>Mash, sparge and lauter efficiency.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8138"/> - <location filename="../ui/EditProduct.ui" line="8177"/> - <location filename="../ui/EditProduct.ui" line="9099"/> - <location filename="../ui/EditProduct.ui" line="9173"/> + <location filename="../ui/EditProduct.ui" line="8147"/> + <location filename="../ui/EditProduct.ui" line="8186"/> + <location filename="../ui/EditProduct.ui" line="9108"/> + <location filename="../ui/EditProduct.ui" line="9182"/> <source>Edit volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8198"/> + <location filename="../ui/EditProduct.ui" line="8207"/> <source>Whirlpools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8210"/> + <location filename="../ui/EditProduct.ui" line="8219"/> <source>Whirlpool 72..79°C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8226"/> + <location filename="../ui/EditProduct.ui" line="8235"/> <source>Whirlpool 60..66°C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8242"/> + <location filename="../ui/EditProduct.ui" line="8251"/> <source>Whirlpool cold:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8258"/> + <location filename="../ui/EditProduct.ui" line="8267"/> <source>Whirlpool 85..100°C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8387"/> + <location filename="../ui/EditProduct.ui" line="8396"/> <source>Transfer to fermenter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8399"/> + <location filename="../ui/EditProduct.ui" line="8408"/> <source>Volume to fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8537"/> + <location filename="../ui/EditProduct.ui" line="8546"/> <source>SG in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8553"/> + <location filename="../ui/EditProduct.ui" line="8562"/> <source>EBC color in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8569"/> + <location filename="../ui/EditProduct.ui" line="8578"/> <source>IBU in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8675"/> + <location filename="../ui/EditProduct.ui" line="8684"/> <source>Aeration time & speed:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8697"/> + <location filename="../ui/EditProduct.ui" line="8706"/> <source> L/m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8729"/> + <location filename="../ui/EditProduct.ui" line="8738"/> <source>Aeration with:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8774"/> - <location filename="../ui/EditProduct.ui" line="10287"/> - <location filename="../ui/EditProduct.ui" line="10307"/> - <location filename="../ui/EditProduct.ui" line="11733"/> + <location filename="../ui/EditProduct.ui" line="8783"/> + <location filename="../ui/EditProduct.ui" line="10296"/> + <location filename="../ui/EditProduct.ui" line="10316"/> + <location filename="../ui/EditProduct.ui" line="11742"/> <source>Brew log chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8794"/> + <location filename="../ui/EditProduct.ui" line="8803"/> <source>Cooling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8806"/> + <location filename="../ui/EditProduct.ui" line="8815"/> <source>Cooling method:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8822"/> + <location filename="../ui/EditProduct.ui" line="8831"/> <source>Cooling to:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8894"/> + <location filename="../ui/EditProduct.ui" line="8903"/> <source>Cooling time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8924"/> + <location filename="../ui/EditProduct.ui" line="8933"/> <location filename="../src/EditProductExport.cpp" line="812"/> <source>After boil</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9068"/> + <location filename="../ui/EditProduct.ui" line="9077"/> <source>The overall efficiency.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9214"/> + <location filename="../ui/EditProduct.ui" line="9223"/> <source>Edit the brewdate plan or start.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9233"/> + <location filename="../ui/EditProduct.ui" line="9242"/> <source>Clear planned brewdate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9253"/> + <location filename="../ui/EditProduct.ui" line="9262"/> <source>Edit the brewdate start time.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9256"/> - <location filename="../ui/EditProduct.ui" line="9291"/> + <location filename="../ui/EditProduct.ui" line="9265"/> + <location filename="../ui/EditProduct.ui" line="9300"/> <source>hh:mm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9269"/> + <location filename="../ui/EditProduct.ui" line="9278"/> <source>Edit the brewdate end.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9288"/> + <location filename="../ui/EditProduct.ui" line="9297"/> <source>Edit the brewdate end time.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9304"/> + <location filename="../ui/EditProduct.ui" line="9313"/> <source>Set the brewdate end date.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9324"/> + <location filename="../ui/EditProduct.ui" line="9333"/> <source>End time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9340"/> + <location filename="../ui/EditProduct.ui" line="9349"/> <source>Start time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9356"/> + <location filename="../ui/EditProduct.ui" line="9365"/> <source>Show brewlog:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9375"/> + <location filename="../ui/EditProduct.ui" line="9384"/> <source>Confirm brew done:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9391"/> - <location filename="../ui/EditProduct.ui" line="9759"/> - <location filename="../ui/EditProduct.ui" line="9993"/> + <location filename="../ui/EditProduct.ui" line="9400"/> + <location filename="../ui/EditProduct.ui" line="9768"/> + <location filename="../ui/EditProduct.ui" line="10002"/> <source>Confirm the brew dates and times.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9408"/> + <location filename="../ui/EditProduct.ui" line="9417"/> <source>Fermenting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9420"/> + <location filename="../ui/EditProduct.ui" line="9429"/> <source>Primary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9432"/> + <location filename="../ui/EditProduct.ui" line="9441"/> <source>Start density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9448"/> + <location filename="../ui/EditProduct.ui" line="9457"/> <source>Start temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9464"/> + <location filename="../ui/EditProduct.ui" line="9473"/> <source>Peak temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9480"/> - <location filename="../ui/EditProduct.ui" line="9792"/> + <location filename="../ui/EditProduct.ui" line="9489"/> + <location filename="../ui/EditProduct.ui" line="9801"/> <source>End temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9496"/> - <location filename="../ui/EditProduct.ui" line="9808"/> + <location filename="../ui/EditProduct.ui" line="9505"/> + <location filename="../ui/EditProduct.ui" line="9817"/> <source>End density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9512"/> - <location filename="../ui/EditProduct.ui" line="9824"/> + <location filename="../ui/EditProduct.ui" line="9521"/> + <location filename="../ui/EditProduct.ui" line="9833"/> <source>End date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9656"/> - <location filename="../ui/EditProduct.ui" line="9890"/> - <location filename="../ui/EditProduct.ui" line="10108"/> + <location filename="../ui/EditProduct.ui" line="9665"/> + <location filename="../ui/EditProduct.ui" line="9899"/> + <location filename="../ui/EditProduct.ui" line="10117"/> <source>Apparent attenuation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9700"/> - <location filename="../ui/EditProduct.ui" line="9934"/> - <location filename="../ui/EditProduct.ui" line="10152"/> + <location filename="../ui/EditProduct.ui" line="9709"/> + <location filename="../ui/EditProduct.ui" line="9943"/> + <location filename="../ui/EditProduct.ui" line="10161"/> <source>Edit SG in Plato, Brix or SG</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9720"/> - <location filename="../ui/EditProduct.ui" line="9954"/> + <location filename="../ui/EditProduct.ui" line="9729"/> + <location filename="../ui/EditProduct.ui" line="9963"/> <source>Set the date to today</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9740"/> + <location filename="../ui/EditProduct.ui" line="9749"/> <source>Edit the date the primary fermentation was done.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9780"/> + <location filename="../ui/EditProduct.ui" line="9789"/> <source>Secondary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9974"/> + <location filename="../ui/EditProduct.ui" line="9983"/> <source>Edit the date the secondary fermentation was done.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10014"/> + <location filename="../ui/EditProduct.ui" line="10023"/> <source>Tertiary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10026"/> + <location filename="../ui/EditProduct.ui" line="10035"/> <source>Average temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10042"/> + <location filename="../ui/EditProduct.ui" line="10051"/> <source>Final density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10172"/> + <location filename="../ui/EditProduct.ui" line="10181"/> <source>Expected end density:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10210"/> + <location filename="../ui/EditProduct.ui" line="10219"/> <source>Alcohol volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10255"/> + <location filename="../ui/EditProduct.ui" line="10264"/> <source>Show fermenter unit log:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10271"/> + <location filename="../ui/EditProduct.ui" line="10280"/> <source>Show fermentation log:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10324"/> + <location filename="../ui/EditProduct.ui" line="10333"/> <source>Package</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10336"/> + <location filename="../ui/EditProduct.ui" line="10345"/> <source>Package date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10409"/> + <location filename="../ui/EditProduct.ui" line="10418"/> <source>Carbonation range:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10462"/> + <location filename="../ui/EditProduct.ui" line="10471"/> <source>Infusion or Dilution</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10474"/> + <location filename="../ui/EditProduct.ui" line="10483"/> <source>Package volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10490"/> + <location filename="../ui/EditProduct.ui" line="10499"/> <source>Extra added volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10506"/> + <location filename="../ui/EditProduct.ui" line="10515"/> <source>Extra remarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10522"/> + <location filename="../ui/EditProduct.ui" line="10531"/> <source>Estimated final ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10816"/> + <location filename="../ui/EditProduct.ui" line="10825"/> <source>Estimated final IBU:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10832"/> + <location filename="../ui/EditProduct.ui" line="10841"/> <source>Estimated final EBC:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10538"/> + <location filename="../ui/EditProduct.ui" line="10547"/> <source>Extra added ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10554"/> + <location filename="../ui/EditProduct.ui" line="10563"/> <source>pH from fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10598"/> + <location filename="../ui/EditProduct.ui" line="10607"/> <source>Extra dilution or infusion added to this batch.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10629"/> - <location filename="../ui/EditProduct.ui" line="10751"/> + <location filename="../ui/EditProduct.ui" line="10638"/> + <location filename="../ui/EditProduct.ui" line="10760"/> <source>The ABV including the infusion.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10660"/> + <location filename="../ui/EditProduct.ui" line="10669"/> <source>If there is alcohol in the infusion, give the percentage.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10719"/> + <location filename="../ui/EditProduct.ui" line="10728"/> <source>Could be the description of the infusion.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10735"/> + <location filename="../ui/EditProduct.ui" line="10744"/> <source>Estimated package ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10883"/> + <location filename="../ui/EditProduct.ui" line="10892"/> <source>Bottles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10895"/> - <location filename="../ui/EditProduct.ui" line="11473"/> + <location filename="../ui/EditProduct.ui" line="10904"/> + <location filename="../ui/EditProduct.ui" line="11482"/> <source>Volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10911"/> - <location filename="../ui/EditProduct.ui" line="11331"/> + <location filename="../ui/EditProduct.ui" line="10920"/> + <location filename="../ui/EditProduct.ui" line="11340"/> <source>Desired volume CO2:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10927"/> - <location filename="../ui/EditProduct.ui" line="11398"/> + <location filename="../ui/EditProduct.ui" line="10936"/> + <location filename="../ui/EditProduct.ui" line="11407"/> <source>Priming sugar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10943"/> - <location filename="../ui/EditProduct.ui" line="11315"/> + <location filename="../ui/EditProduct.ui" line="10952"/> + <location filename="../ui/EditProduct.ui" line="11324"/> <source>Sugar amount:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10959"/> - <location filename="../ui/EditProduct.ui" line="11363"/> + <location filename="../ui/EditProduct.ui" line="10968"/> + <location filename="../ui/EditProduct.ui" line="11372"/> <source>Priming:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10975"/> - <location filename="../ui/EditProduct.ui" line="11347"/> + <location filename="../ui/EditProduct.ui" line="10984"/> + <location filename="../ui/EditProduct.ui" line="11356"/> <source>Water amount:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10991"/> + <location filename="../ui/EditProduct.ui" line="11000"/> <source>Bottle fermentation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11110"/> - <location filename="../ui/EditProduct.ui" line="11526"/> + <location filename="../ui/EditProduct.ui" line="11119"/> + <location filename="../ui/EditProduct.ui" line="11535"/> <source> gr/L</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11157"/> + <location filename="../ui/EditProduct.ui" line="11166"/> <source>Expected pressure in bar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11173"/> + <location filename="../ui/EditProduct.ui" line="11182"/> <source>Bottles ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11271"/> + <location filename="../ui/EditProduct.ui" line="11280"/> <source>Kegs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11283"/> + <location filename="../ui/EditProduct.ui" line="11292"/> <source>Kegs ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11299"/> + <location filename="../ui/EditProduct.ui" line="11308"/> <source>Kegs pressure in bar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11379"/> + <location filename="../ui/EditProduct.ui" line="11388"/> <source>Kegs temperature:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11667"/> + <location filename="../ui/EditProduct.ui" line="11676"/> <source>Forced carbonation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11694"/> + <location filename="../ui/EditProduct.ui" line="11703"/> <source>Edit the package date.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11753"/> + <location filename="../ui/EditProduct.ui" line="11762"/> <source>Show carbonation log:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11766"/> + <location filename="../ui/EditProduct.ui" line="11775"/> <source>Tasting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11778"/> + <location filename="../ui/EditProduct.ui" line="11787"/> <source>Taste date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11814"/> + <location filename="../ui/EditProduct.ui" line="11823"/> <source>Taste rate:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11855"/> + <location filename="../ui/EditProduct.ui" line="11864"/> <source>Color:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11871"/> + <location filename="../ui/EditProduct.ui" line="11880"/> <source>Transparency:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11887"/> + <location filename="../ui/EditProduct.ui" line="11896"/> <source>Head:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11942"/> + <location filename="../ui/EditProduct.ui" line="11951"/> <source>Aroma:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11971"/> + <location filename="../ui/EditProduct.ui" line="11980"/> <source>Taste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12000"/> + <location filename="../ui/EditProduct.ui" line="12009"/> <source>Aftertaste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12029"/> + <location filename="../ui/EditProduct.ui" line="12038"/> <source>Mouthfeel:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12058"/> + <location filename="../ui/EditProduct.ui" line="12067"/> <source>Notes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12084"/> + <location filename="../ui/EditProduct.ui" line="12093"/> <source>Edit the tasting date.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12120"/> + <location filename="../ui/EditProduct.ui" line="12129"/> <source>Images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12221"/> + <location filename="../ui/EditProduct.ui" line="12230"/> <source>Previous</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12238"/> + <location filename="../ui/EditProduct.ui" line="12247"/> <source>Next</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12311"/> + <location filename="../ui/EditProduct.ui" line="12320"/> <source>Filename:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12327"/> + <location filename="../ui/EditProduct.ui" line="12336"/> <source>Comment:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12372"/> + <location filename="../ui/EditProduct.ui" line="12381"/> <source>Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12416"/> + <location filename="../ui/EditProduct.ui" line="12425"/> <source>Export</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12272"/> - <location filename="../ui/EditProduct.ui" line="12433"/> + <location filename="../ui/EditProduct.ui" line="12281"/> + <location filename="../ui/EditProduct.ui" line="12442"/> <source>Print</source> <translation type="unfinished"></translation> </message> @@ -5419,7 +5430,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12295"/> + <location filename="../ui/EditProduct.ui" line="12304"/> <location filename="../src/EditProductTab13.cpp" line="210"/> <source>Image here</source> <translation type="unfinished"></translation> @@ -12483,23 +12494,25 @@ <location filename="../src/database/db_recipe.cpp" line="31"/> <location filename="../src/database/db_recipe.cpp" line="661"/> <location filename="../src/database/db_recipe.cpp" line="694"/> - <location filename="../src/database/db_product.cpp" line="31"/> - <location filename="../src/database/db_product.cpp" line="1045"/> - <location filename="../src/database/db_product.cpp" line="1078"/> + <location filename="../src/database/db_product.cpp" line="40"/> + <location filename="../src/database/db_product.cpp" line="56"/> + <location filename="../src/database/db_product.cpp" line="1070"/> + <location filename="../src/database/db_product.cpp" line="1103"/> <source>Database error</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/database/db_recipe.cpp" line="31"/> - <location filename="../src/database/db_product.cpp" line="31"/> + <location filename="../src/database/db_product.cpp" line="56"/> <source>MySQL error: record %1 not found</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/database/db_recipe.cpp" line="662"/> <location filename="../src/database/db_recipe.cpp" line="695"/> - <location filename="../src/database/db_product.cpp" line="1046"/> - <location filename="../src/database/db_product.cpp" line="1079"/> + <location filename="../src/database/db_product.cpp" line="41"/> + <location filename="../src/database/db_product.cpp" line="1071"/> + <location filename="../src/database/db_product.cpp" line="1104"/> <source>MySQL error: %1 %2 %3</source>
--- a/translations/bmsapp_nl.ts Sat Jun 01 15:19:08 2024 +0200 +++ b/translations/bmsapp_nl.ts Sat Jun 01 21:10:54 2024 +0200 @@ -2820,14 +2820,14 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="55"/> - <location filename="../ui/EditProduct.ui" line="12255"/> + <location filename="../ui/EditProduct.ui" line="12264"/> <location filename="../src/EditProductTab9.cpp" line="552"/> <source>Save</source> <translation>Bewaar</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="75"/> - <location filename="../ui/EditProduct.ui" line="12204"/> + <location filename="../ui/EditProduct.ui" line="12213"/> <location filename="../src/EditProductTab3.cpp" line="74"/> <location filename="../src/EditProductTab3.cpp" line="162"/> <location filename="../src/EditProductTab4.cpp" line="60"/> @@ -2872,8 +2872,8 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="240"/> - <location filename="../ui/EditProduct.ui" line="7969"/> - <location filename="../ui/EditProduct.ui" line="8964"/> + <location filename="../ui/EditProduct.ui" line="7978"/> + <location filename="../ui/EditProduct.ui" line="8973"/> <source>Efficiency:</source> <translation>Rendement:</translation> </message> @@ -2904,22 +2904,22 @@ <location filename="../ui/EditProduct.ui" line="3370"/> <location filename="../ui/EditProduct.ui" line="3423"/> <location filename="../ui/EditProduct.ui" line="4153"/> - <location filename="../ui/EditProduct.ui" line="7662"/> - <location filename="../ui/EditProduct.ui" line="8063"/> - <location filename="../ui/EditProduct.ui" line="9080"/> - <location filename="../ui/EditProduct.ui" line="9681"/> - <location filename="../ui/EditProduct.ui" line="9915"/> - <location filename="../ui/EditProduct.ui" line="10133"/> - <location filename="../ui/EditProduct.ui" line="10235"/> - <location filename="../ui/EditProduct.ui" line="10384"/> - <location filename="../ui/EditProduct.ui" line="10437"/> - <location filename="../ui/EditProduct.ui" line="10641"/> - <location filename="../ui/EditProduct.ui" line="10675"/> - <location filename="../ui/EditProduct.ui" line="10763"/> - <location filename="../ui/EditProduct.ui" line="11041"/> - <location filename="../ui/EditProduct.ui" line="11226"/> - <location filename="../ui/EditProduct.ui" line="11454"/> - <location filename="../ui/EditProduct.ui" line="11617"/> + <location filename="../ui/EditProduct.ui" line="7671"/> + <location filename="../ui/EditProduct.ui" line="8072"/> + <location filename="../ui/EditProduct.ui" line="9089"/> + <location filename="../ui/EditProduct.ui" line="9690"/> + <location filename="../ui/EditProduct.ui" line="9924"/> + <location filename="../ui/EditProduct.ui" line="10142"/> + <location filename="../ui/EditProduct.ui" line="10244"/> + <location filename="../ui/EditProduct.ui" line="10393"/> + <location filename="../ui/EditProduct.ui" line="10446"/> + <location filename="../ui/EditProduct.ui" line="10650"/> + <location filename="../ui/EditProduct.ui" line="10684"/> + <location filename="../ui/EditProduct.ui" line="10772"/> + <location filename="../ui/EditProduct.ui" line="11050"/> + <location filename="../ui/EditProduct.ui" line="11235"/> + <location filename="../ui/EditProduct.ui" line="11463"/> + <location filename="../ui/EditProduct.ui" line="11626"/> <source> %</source> <translation> %</translation> </message> @@ -2927,12 +2927,12 @@ <location filename="../ui/EditProduct.ui" line="335"/> <location filename="../ui/EditProduct.ui" line="1922"/> <location filename="../ui/EditProduct.ui" line="2302"/> - <location filename="../ui/EditProduct.ui" line="8280"/> - <location filename="../ui/EditProduct.ui" line="8308"/> - <location filename="../ui/EditProduct.ui" line="8336"/> - <location filename="../ui/EditProduct.ui" line="8364"/> - <location filename="../ui/EditProduct.ui" line="8751"/> - <location filename="../ui/EditProduct.ui" line="8872"/> + <location filename="../ui/EditProduct.ui" line="8289"/> + <location filename="../ui/EditProduct.ui" line="8317"/> + <location filename="../ui/EditProduct.ui" line="8345"/> + <location filename="../ui/EditProduct.ui" line="8373"/> + <location filename="../ui/EditProduct.ui" line="8760"/> + <location filename="../ui/EditProduct.ui" line="8881"/> <source> min</source> <translation> min</translation> </message> @@ -2957,24 +2957,24 @@ <location filename="../ui/EditProduct.ui" line="3178"/> <location filename="../ui/EditProduct.ui" line="4356"/> <location filename="../ui/EditProduct.ui" line="5692"/> - <location filename="../ui/EditProduct.ui" line="6428"/> - <location filename="../ui/EditProduct.ui" line="6765"/> - <location filename="../ui/EditProduct.ui" line="7091"/> - <location filename="../ui/EditProduct.ui" line="7770"/> - <location filename="../ui/EditProduct.ui" line="7836"/> - <location filename="../ui/EditProduct.ui" line="8088"/> - <location filename="../ui/EditProduct.ui" line="8119"/> - <location filename="../ui/EditProduct.ui" line="8453"/> - <location filename="../ui/EditProduct.ui" line="8481"/> - <location filename="../ui/EditProduct.ui" line="8515"/> - <location filename="../ui/EditProduct.ui" line="8945"/> - <location filename="../ui/EditProduct.ui" line="9030"/> - <location filename="../ui/EditProduct.ui" line="10576"/> - <location filename="../ui/EditProduct.ui" line="10607"/> - <location filename="../ui/EditProduct.ui" line="11013"/> - <location filename="../ui/EditProduct.ui" line="11135"/> - <location filename="../ui/EditProduct.ui" line="11495"/> - <location filename="../ui/EditProduct.ui" line="11576"/> + <location filename="../ui/EditProduct.ui" line="6434"/> + <location filename="../ui/EditProduct.ui" line="6771"/> + <location filename="../ui/EditProduct.ui" line="7100"/> + <location filename="../ui/EditProduct.ui" line="7779"/> + <location filename="../ui/EditProduct.ui" line="7845"/> + <location filename="../ui/EditProduct.ui" line="8097"/> + <location filename="../ui/EditProduct.ui" line="8128"/> + <location filename="../ui/EditProduct.ui" line="8462"/> + <location filename="../ui/EditProduct.ui" line="8490"/> + <location filename="../ui/EditProduct.ui" line="8524"/> + <location filename="../ui/EditProduct.ui" line="8954"/> + <location filename="../ui/EditProduct.ui" line="9039"/> + <location filename="../ui/EditProduct.ui" line="10585"/> + <location filename="../ui/EditProduct.ui" line="10616"/> + <location filename="../ui/EditProduct.ui" line="11022"/> + <location filename="../ui/EditProduct.ui" line="11144"/> + <location filename="../ui/EditProduct.ui" line="11504"/> + <location filename="../ui/EditProduct.ui" line="11585"/> <location filename="../src/EditProductExport.cpp" line="845"/> <location filename="../src/EditProductExport.cpp" line="853"/> <source> L</source> @@ -3169,7 +3169,7 @@ <translation type="vanished">Trub koeler verlies:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8431"/> + <location filename="../ui/EditProduct.ui" line="8440"/> <source>Top up water:</source> <translation>Extra water in gistvat:</translation> </message> @@ -3242,7 +3242,7 @@ <location filename="../ui/EditProduct.ui" line="3222"/> <location filename="../ui/EditProduct.ui" line="4072"/> <location filename="../ui/EditProduct.ui" line="4227"/> - <location filename="../ui/EditProduct.ui" line="12132"/> + <location filename="../ui/EditProduct.ui" line="12141"/> <location filename="../src/EditProductExport.cpp" line="873"/> <source>Add</source> <translation>Nieuw</translation> @@ -3304,10 +3304,10 @@ <message> <location filename="../ui/EditProduct.ui" line="3598"/> <location filename="../ui/EditProduct.ui" line="3687"/> - <location filename="../ui/EditProduct.ui" line="10352"/> - <location filename="../ui/EditProduct.ui" line="11713"/> - <location filename="../ui/EditProduct.ui" line="11794"/> - <location filename="../ui/EditProduct.ui" line="12103"/> + <location filename="../ui/EditProduct.ui" line="10361"/> + <location filename="../ui/EditProduct.ui" line="11722"/> + <location filename="../ui/EditProduct.ui" line="11803"/> + <location filename="../ui/EditProduct.ui" line="12112"/> <source>Set or clear date</source> <translation>Zet of wis datum</translation> </message> @@ -3316,29 +3316,29 @@ <location filename="../ui/EditProduct.ui" line="3690"/> <location filename="../ui/EditProduct.ui" line="4124"/> <location filename="../ui/EditProduct.ui" line="4191"/> - <location filename="../ui/EditProduct.ui" line="8141"/> - <location filename="../ui/EditProduct.ui" line="8180"/> - <location filename="../ui/EditProduct.ui" line="8777"/> - <location filename="../ui/EditProduct.ui" line="9102"/> - <location filename="../ui/EditProduct.ui" line="9176"/> - <location filename="../ui/EditProduct.ui" line="9197"/> - <location filename="../ui/EditProduct.ui" line="9236"/> - <location filename="../ui/EditProduct.ui" line="9307"/> - <location filename="../ui/EditProduct.ui" line="9394"/> - <location filename="../ui/EditProduct.ui" line="9703"/> - <location filename="../ui/EditProduct.ui" line="9723"/> - <location filename="../ui/EditProduct.ui" line="9762"/> - <location filename="../ui/EditProduct.ui" line="9937"/> - <location filename="../ui/EditProduct.ui" line="9957"/> - <location filename="../ui/EditProduct.ui" line="9996"/> - <location filename="../ui/EditProduct.ui" line="10155"/> - <location filename="../ui/EditProduct.ui" line="10290"/> - <location filename="../ui/EditProduct.ui" line="10310"/> - <location filename="../ui/EditProduct.ui" line="10355"/> - <location filename="../ui/EditProduct.ui" line="11716"/> - <location filename="../ui/EditProduct.ui" line="11736"/> - <location filename="../ui/EditProduct.ui" line="11797"/> - <location filename="../ui/EditProduct.ui" line="12106"/> + <location filename="../ui/EditProduct.ui" line="8150"/> + <location filename="../ui/EditProduct.ui" line="8189"/> + <location filename="../ui/EditProduct.ui" line="8786"/> + <location filename="../ui/EditProduct.ui" line="9111"/> + <location filename="../ui/EditProduct.ui" line="9185"/> + <location filename="../ui/EditProduct.ui" line="9206"/> + <location filename="../ui/EditProduct.ui" line="9245"/> + <location filename="../ui/EditProduct.ui" line="9316"/> + <location filename="../ui/EditProduct.ui" line="9403"/> + <location filename="../ui/EditProduct.ui" line="9712"/> + <location filename="../ui/EditProduct.ui" line="9732"/> + <location filename="../ui/EditProduct.ui" line="9771"/> + <location filename="../ui/EditProduct.ui" line="9946"/> + <location filename="../ui/EditProduct.ui" line="9966"/> + <location filename="../ui/EditProduct.ui" line="10005"/> + <location filename="../ui/EditProduct.ui" line="10164"/> + <location filename="../ui/EditProduct.ui" line="10299"/> + <location filename="../ui/EditProduct.ui" line="10319"/> + <location filename="../ui/EditProduct.ui" line="10364"/> + <location filename="../ui/EditProduct.ui" line="11725"/> + <location filename="../ui/EditProduct.ui" line="11745"/> + <location filename="../ui/EditProduct.ui" line="11806"/> + <location filename="../ui/EditProduct.ui" line="12115"/> <source>...</source> <translation>...</translation> </message> @@ -3394,7 +3394,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="4121"/> - <location filename="../ui/EditProduct.ui" line="9194"/> + <location filename="../ui/EditProduct.ui" line="9203"/> <source>Set the date to today.</source> <translation>Zet de datum op vandaag.</translation> </message> @@ -3405,12 +3405,12 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="4172"/> - <location filename="../ui/EditProduct.ui" line="9217"/> - <location filename="../ui/EditProduct.ui" line="9272"/> - <location filename="../ui/EditProduct.ui" line="9743"/> - <location filename="../ui/EditProduct.ui" line="9977"/> - <location filename="../ui/EditProduct.ui" line="11697"/> - <location filename="../ui/EditProduct.ui" line="12087"/> + <location filename="../ui/EditProduct.ui" line="9226"/> + <location filename="../ui/EditProduct.ui" line="9281"/> + <location filename="../ui/EditProduct.ui" line="9752"/> + <location filename="../ui/EditProduct.ui" line="9986"/> + <location filename="../ui/EditProduct.ui" line="11706"/> + <location filename="../ui/EditProduct.ui" line="12096"/> <source>dd-MM-yyyy</source> <translation>dd-MM-yyyy</translation> </message> @@ -3456,55 +3456,55 @@ <translation type="vanished">Water overzicht</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7255"/> + <location filename="../ui/EditProduct.ui" line="7264"/> <source>Ca</source> <translation>Ca</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6994"/> + <location filename="../ui/EditProduct.ui" line="7000"/> <source>Mg</source> <translation>Mg</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7303"/> + <location filename="../ui/EditProduct.ui" line="7312"/> <source>HCO3</source> <translation>HCO3</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7135"/> + <location filename="../ui/EditProduct.ui" line="7144"/> <source>CaCO3</source> <translation>CaCO3</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7239"/> + <location filename="../ui/EditProduct.ui" line="7248"/> <source>Na</source> <translation>Na</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7223"/> + <location filename="../ui/EditProduct.ui" line="7232"/> <source>Cl</source> <translation>Cl</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7271"/> + <location filename="../ui/EditProduct.ui" line="7280"/> <source>SO4</source> <translation>SO4</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7010"/> + <location filename="../ui/EditProduct.ui" line="7016"/> <location filename="../src/EditProductTab7.cpp" line="35"/> <source>pH</source> <translation>pH</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7287"/> + <location filename="../ui/EditProduct.ui" line="7296"/> <location filename="../src/EditProductTab6.cpp" line="342"/> <location filename="../src/EditProductTab7.cpp" line="35"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6750"/> + <location filename="../ui/EditProduct.ui" line="6756"/> <source>The division between the main and dilution water. The total volume does not change.</source> <translation>De verdeling tussen het hoofd en verdunnings water. Het totale volume blijft gelijk.</translation> </message> @@ -3549,27 +3549,27 @@ <translation>De ideale hoeveelheid Zout moet minder dan 150 zijn.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7319"/> + <location filename="../ui/EditProduct.ui" line="7328"/> <source>Water profile</source> <translation>Water profiel</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7204"/> + <location filename="../ui/EditProduct.ui" line="7213"/> <source>The main brewing water</source> <translation>Het hoofd brouwwater</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7210"/> + <location filename="../ui/EditProduct.ui" line="7219"/> <source>Choose water</source> <translation>Kies water</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6837"/> + <location filename="../ui/EditProduct.ui" line="6843"/> <source>Optional dilution water</source> <translation>Optioneel meng water</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6840"/> + <location filename="../ui/EditProduct.ui" line="6846"/> <source>Choose dilution</source> <translation>Kies mengwater</translation> </message> @@ -3579,21 +3579,20 @@ <translation>Indien nodig, kies een doel water profiel.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6353"/> <source>Mixed water</source> - <translation>Gemengd water</translation> + <translation type="vanished">Gemengd water</translation> </message> <message> <source>Treated water</source> <translation type="vanished">Behandeld water</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7038"/> + <location filename="../ui/EditProduct.ui" line="7044"/> <source>RA</source> <translation></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6953"/> + <location filename="../ui/EditProduct.ui" line="6959"/> <source>Hardness</source> <translation>Hardheid</translation> </message> @@ -3722,8 +3721,8 @@ <location filename="../ui/EditProduct.ui" line="4822"/> <location filename="../ui/EditProduct.ui" line="4854"/> <location filename="../ui/EditProduct.ui" line="4885"/> - <location filename="../ui/EditProduct.ui" line="11082"/> - <location filename="../ui/EditProduct.ui" line="11426"/> + <location filename="../ui/EditProduct.ui" line="11091"/> + <location filename="../ui/EditProduct.ui" line="11435"/> <source> gr</source> <translation> gr</translation> </message> @@ -3835,92 +3834,92 @@ <translation>Geschat voor kook pH:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7496"/> + <location filename="../ui/EditProduct.ui" line="7505"/> <source>Brewday</source> <translation>Brouwdag</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7729"/> + <location filename="../ui/EditProduct.ui" line="7738"/> <source>Sparge supply:</source> <translation>Spoelwater voorraad:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7745"/> + <location filename="../ui/EditProduct.ui" line="7754"/> <source>Sparge estimate:</source> <translation>Spoelwater geschat:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7789"/> + <location filename="../ui/EditProduct.ui" line="7798"/> <source>Sparge temp:</source> <translation>Spoelwater temp:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9432"/> + <location filename="../ui/EditProduct.ui" line="9441"/> <source>Start density:</source> <translation>Begin densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9448"/> + <location filename="../ui/EditProduct.ui" line="9457"/> <source>Start temperature:</source> <translation>Start temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9464"/> + <location filename="../ui/EditProduct.ui" line="9473"/> <source>Peak temperature:</source> <translation>Piek temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9480"/> - <location filename="../ui/EditProduct.ui" line="9792"/> + <location filename="../ui/EditProduct.ui" line="9489"/> + <location filename="../ui/EditProduct.ui" line="9801"/> <source>End temperature:</source> <translation>Eind temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9496"/> - <location filename="../ui/EditProduct.ui" line="9808"/> + <location filename="../ui/EditProduct.ui" line="9505"/> + <location filename="../ui/EditProduct.ui" line="9817"/> <source>End density:</source> <translation>Eind densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9512"/> - <location filename="../ui/EditProduct.ui" line="9824"/> + <location filename="../ui/EditProduct.ui" line="9521"/> + <location filename="../ui/EditProduct.ui" line="9833"/> <source>End date:</source> <translation>Eind datum:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9656"/> - <location filename="../ui/EditProduct.ui" line="9890"/> - <location filename="../ui/EditProduct.ui" line="10108"/> + <location filename="../ui/EditProduct.ui" line="9665"/> + <location filename="../ui/EditProduct.ui" line="9899"/> + <location filename="../ui/EditProduct.ui" line="10117"/> <source>Apparent attenuation:</source> <translation>Schijnbare vergisting:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9974"/> + <location filename="../ui/EditProduct.ui" line="9983"/> <source>Edit the date the secondary fermentation was done.</source> <translation>Wijzig de datum dat de nagisting gereed was.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10026"/> + <location filename="../ui/EditProduct.ui" line="10035"/> <source>Average temperature:</source> <translation>Gemiddelde temperatuur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10042"/> + <location filename="../ui/EditProduct.ui" line="10051"/> <source>Final density:</source> <translation>Finale densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10172"/> + <location filename="../ui/EditProduct.ui" line="10181"/> <source>Expected end density:</source> <translation>Verwachte eind densiteit:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10490"/> + <location filename="../ui/EditProduct.ui" line="10499"/> <source>Extra added volume:</source> <translation>Toevoeging volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10506"/> + <location filename="../ui/EditProduct.ui" line="10515"/> <source>Extra remarks:</source> <translation>Toevoeging opmerking:</translation> </message> @@ -3930,45 +3929,45 @@ <translation>Finale ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10538"/> + <location filename="../ui/EditProduct.ui" line="10547"/> <source>Extra added ABV %:</source> <translation>Toevoeging extra ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10816"/> + <location filename="../ui/EditProduct.ui" line="10825"/> <source>Estimated final IBU:</source> <translation>Verwacht finale IBU:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10832"/> + <location filename="../ui/EditProduct.ui" line="10841"/> <source>Estimated final EBC:</source> <translation>Verwacht finale EBC:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10895"/> - <location filename="../ui/EditProduct.ui" line="11473"/> + <location filename="../ui/EditProduct.ui" line="10904"/> + <location filename="../ui/EditProduct.ui" line="11482"/> <source>Volume:</source> <translation>Volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10959"/> - <location filename="../ui/EditProduct.ui" line="11363"/> + <location filename="../ui/EditProduct.ui" line="10968"/> + <location filename="../ui/EditProduct.ui" line="11372"/> <source>Priming:</source> <translation>Carbonatie:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10991"/> + <location filename="../ui/EditProduct.ui" line="11000"/> <source>Bottle fermentation:</source> <translation>Flessen hergisting:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11110"/> - <location filename="../ui/EditProduct.ui" line="11526"/> + <location filename="../ui/EditProduct.ui" line="11119"/> + <location filename="../ui/EditProduct.ui" line="11535"/> <source> gr/L</source> <translation> gr/L</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11379"/> + <location filename="../ui/EditProduct.ui" line="11388"/> <source>Kegs temperature:</source> <translation>Fusten temperatuur:</translation> </message> @@ -3977,32 +3976,32 @@ <translation type="vanished">Brouwdag start:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7524"/> + <location filename="../ui/EditProduct.ui" line="7533"/> <source>Brewday end:</source> <translation>Brouwdag eind:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7540"/> + <location filename="../ui/EditProduct.ui" line="7549"/> <source>Mashing and Sparge</source> <translation>Maischen en Spoelen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7552"/> + <location filename="../ui/EditProduct.ui" line="7561"/> <source>Mash pH:</source> <translation>Maisch pH:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7681"/> + <location filename="../ui/EditProduct.ui" line="7690"/> <source>Mash SG:</source> <translation>Maisch SG:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7697"/> + <location filename="../ui/EditProduct.ui" line="7706"/> <source>Mash efficiency:</source> <translation>Maisch rendement:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7713"/> + <location filename="../ui/EditProduct.ui" line="7722"/> <source>Sparge water pH:</source> <translation>Spoelwater pH:</translation> </message> @@ -4035,94 +4034,94 @@ <translation type="vanished">Voor koken rendement:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8138"/> - <location filename="../ui/EditProduct.ui" line="8177"/> - <location filename="../ui/EditProduct.ui" line="9099"/> - <location filename="../ui/EditProduct.ui" line="9173"/> + <location filename="../ui/EditProduct.ui" line="8147"/> + <location filename="../ui/EditProduct.ui" line="8186"/> + <location filename="../ui/EditProduct.ui" line="9108"/> + <location filename="../ui/EditProduct.ui" line="9182"/> <source>Edit volume</source> <translation>Wijzig volume</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8242"/> + <location filename="../ui/EditProduct.ui" line="8251"/> <source>Whirlpool cold:</source> <translation>Whirlpool koud:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8675"/> + <location filename="../ui/EditProduct.ui" line="8684"/> <source>Aeration time & speed:</source> <translation>Beluchten tijd snelheid:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8806"/> + <location filename="../ui/EditProduct.ui" line="8815"/> <source>Cooling method:</source> <translation>Koelen methode:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8894"/> + <location filename="../ui/EditProduct.ui" line="8903"/> <source>Cooling time:</source> <translation>Koelen tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8387"/> + <location filename="../ui/EditProduct.ui" line="8396"/> <source>Transfer to fermenter</source> <translation>Naar gistvat</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7508"/> + <location filename="../ui/EditProduct.ui" line="7517"/> <source>Brewday plan:</source> <translation>Brouwdag plan:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7867"/> - <location filename="../ui/EditProduct.ui" line="8844"/> - <location filename="../ui/EditProduct.ui" line="9556"/> - <location filename="../ui/EditProduct.ui" line="9584"/> - <location filename="../ui/EditProduct.ui" line="9612"/> - <location filename="../ui/EditProduct.ui" line="9846"/> - <location filename="../ui/EditProduct.ui" line="10064"/> - <location filename="../ui/EditProduct.ui" line="11195"/> - <location filename="../ui/EditProduct.ui" line="11645"/> + <location filename="../ui/EditProduct.ui" line="7876"/> + <location filename="../ui/EditProduct.ui" line="8853"/> + <location filename="../ui/EditProduct.ui" line="9565"/> + <location filename="../ui/EditProduct.ui" line="9593"/> + <location filename="../ui/EditProduct.ui" line="9621"/> + <location filename="../ui/EditProduct.ui" line="9855"/> + <location filename="../ui/EditProduct.ui" line="10073"/> + <location filename="../ui/EditProduct.ui" line="11204"/> + <location filename="../ui/EditProduct.ui" line="11654"/> <source> °C</source> <translation> °C</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7909"/> + <location filename="../ui/EditProduct.ui" line="7918"/> <source>Pre boil</source> <translation>Begin koken</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7953"/> - <location filename="../ui/EditProduct.ui" line="9135"/> + <location filename="../ui/EditProduct.ui" line="7962"/> + <location filename="../ui/EditProduct.ui" line="9144"/> <source>Volume @100°C:</source> <translation>Volume @100°C:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8051"/> + <location filename="../ui/EditProduct.ui" line="8060"/> <source>Mash, sparge and lauter efficiency.</source> <translation>Maischen, spoelen en filteren rendement.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8198"/> + <location filename="../ui/EditProduct.ui" line="8207"/> <source>Whirlpools</source> <translation>Whirlpoolen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8210"/> + <location filename="../ui/EditProduct.ui" line="8219"/> <source>Whirlpool 72..79°C:</source> <translation>Whirlpool 72..79°C:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8226"/> + <location filename="../ui/EditProduct.ui" line="8235"/> <source>Whirlpool 60..66°C:</source> <translation>Whirlpool 60..66°C:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8258"/> + <location filename="../ui/EditProduct.ui" line="8267"/> <source>Whirlpool 85..100°C:</source> <translation>Whirlpool 85..100°C:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8399"/> + <location filename="../ui/EditProduct.ui" line="8408"/> <source>Volume to fermenter:</source> <translation>Volume naar gistvat:</translation> </message> @@ -4131,17 +4130,17 @@ <translation type="vanished">Trub en koeler verlies:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8537"/> + <location filename="../ui/EditProduct.ui" line="8546"/> <source>SG in fermenter:</source> <translation>SG in gistvat:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8553"/> + <location filename="../ui/EditProduct.ui" line="8562"/> <source>EBC color in fermenter:</source> <translation>EBC kleur in gistvat:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8569"/> + <location filename="../ui/EditProduct.ui" line="8578"/> <source>IBU in fermenter:</source> <translation>IBU in het gistvat:</translation> </message> @@ -4150,7 +4149,7 @@ <translation type="vanished">Beluchten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8729"/> + <location filename="../ui/EditProduct.ui" line="8738"/> <source>Aeration with:</source> <translation>Beluchten met:</translation> </message> @@ -4163,177 +4162,177 @@ <translation type="vanished">Beluchten snelheid:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8697"/> + <location filename="../ui/EditProduct.ui" line="8706"/> <source> L/m</source> <translation> L/m</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8774"/> - <location filename="../ui/EditProduct.ui" line="10287"/> - <location filename="../ui/EditProduct.ui" line="10307"/> - <location filename="../ui/EditProduct.ui" line="11733"/> + <location filename="../ui/EditProduct.ui" line="8783"/> + <location filename="../ui/EditProduct.ui" line="10296"/> + <location filename="../ui/EditProduct.ui" line="10316"/> + <location filename="../ui/EditProduct.ui" line="11742"/> <source>Brew log chart</source> <translation>Brouw log grafiek</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8794"/> + <location filename="../ui/EditProduct.ui" line="8803"/> <source>Cooling</source> <translation>Koelen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8822"/> + <location filename="../ui/EditProduct.ui" line="8831"/> <source>Cooling to:</source> <translation>Koelen tot:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8924"/> + <location filename="../ui/EditProduct.ui" line="8933"/> <location filename="../src/EditProductExport.cpp" line="812"/> <source>After boil</source> <translation>Einde koken</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9068"/> + <location filename="../ui/EditProduct.ui" line="9077"/> <source>The overall efficiency.</source> <translation>Het totale brouwzaal rendement.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9214"/> + <location filename="../ui/EditProduct.ui" line="9223"/> <source>Edit the brewdate plan or start.</source> <translation>Wijzig de brouwdag plan of start datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9233"/> + <location filename="../ui/EditProduct.ui" line="9242"/> <source>Clear planned brewdate</source> <translation>Wis geplande brouwdag</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9253"/> + <location filename="../ui/EditProduct.ui" line="9262"/> <source>Edit the brewdate start time.</source> <translation>Wijzig de brouwdag start tijd.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9256"/> - <location filename="../ui/EditProduct.ui" line="9291"/> + <location filename="../ui/EditProduct.ui" line="9265"/> + <location filename="../ui/EditProduct.ui" line="9300"/> <source>hh:mm</source> <translation>hh:mm</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9269"/> + <location filename="../ui/EditProduct.ui" line="9278"/> <source>Edit the brewdate end.</source> <translation>Wijzig de brouwdag eind datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9288"/> + <location filename="../ui/EditProduct.ui" line="9297"/> <source>Edit the brewdate end time.</source> <translation>Wijzig de brouwdag eind tijd.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9304"/> + <location filename="../ui/EditProduct.ui" line="9313"/> <source>Set the brewdate end date.</source> <translation>Zet de brouwdag eind datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9324"/> + <location filename="../ui/EditProduct.ui" line="9333"/> <source>End time:</source> <translation>Eind tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9340"/> + <location filename="../ui/EditProduct.ui" line="9349"/> <source>Start time:</source> <translation>Start tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9356"/> + <location filename="../ui/EditProduct.ui" line="9365"/> <source>Show brewlog:</source> <translation>Toon brouwlog:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9375"/> + <location filename="../ui/EditProduct.ui" line="9384"/> <source>Confirm brew done:</source> <translation>Bevestig brouwdag:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9391"/> - <location filename="../ui/EditProduct.ui" line="9759"/> - <location filename="../ui/EditProduct.ui" line="9993"/> + <location filename="../ui/EditProduct.ui" line="9400"/> + <location filename="../ui/EditProduct.ui" line="9768"/> + <location filename="../ui/EditProduct.ui" line="10002"/> <source>Confirm the brew dates and times.</source> <translation>Bevestig de brouw datums en tijden.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9408"/> + <location filename="../ui/EditProduct.ui" line="9417"/> <source>Fermenting</source> <translation>Vergisten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9420"/> + <location filename="../ui/EditProduct.ui" line="9429"/> <source>Primary fermentation</source> <translation>Hoofdvergisting</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9700"/> - <location filename="../ui/EditProduct.ui" line="9934"/> - <location filename="../ui/EditProduct.ui" line="10152"/> + <location filename="../ui/EditProduct.ui" line="9709"/> + <location filename="../ui/EditProduct.ui" line="9943"/> + <location filename="../ui/EditProduct.ui" line="10161"/> <source>Edit SG in Plato, Brix or SG</source> <translation>Wijzig SG in Plato, Brix of SG</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9720"/> - <location filename="../ui/EditProduct.ui" line="9954"/> + <location filename="../ui/EditProduct.ui" line="9729"/> + <location filename="../ui/EditProduct.ui" line="9963"/> <source>Set the date to today</source> <translation>Zet de datum op vandaag</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9740"/> + <location filename="../ui/EditProduct.ui" line="9749"/> <source>Edit the date the primary fermentation was done.</source> <translation>Wijzig de datum dat de hoofdgisting gereed was.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9780"/> + <location filename="../ui/EditProduct.ui" line="9789"/> <source>Secondary fermentation</source> <translation>Nagisting</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10014"/> + <location filename="../ui/EditProduct.ui" line="10023"/> <source>Tertiary fermentation</source> <translation>Lageren</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10210"/> + <location filename="../ui/EditProduct.ui" line="10219"/> <source>Alcohol volume:</source> <translation>Alcohol vol%:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10255"/> + <location filename="../ui/EditProduct.ui" line="10264"/> <source>Show fermenter unit log:</source> <translation>Toon gistkast log:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10271"/> + <location filename="../ui/EditProduct.ui" line="10280"/> <source>Show fermentation log:</source> <translation>Toon vergisting log:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10324"/> + <location filename="../ui/EditProduct.ui" line="10333"/> <source>Package</source> <translation>Verpakken</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10336"/> + <location filename="../ui/EditProduct.ui" line="10345"/> <source>Package date:</source> <translation>Verpakken datum:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10409"/> + <location filename="../ui/EditProduct.ui" line="10418"/> <source>Carbonation range:</source> <translation>Koolzuur volumes:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10462"/> + <location filename="../ui/EditProduct.ui" line="10471"/> <source>Infusion or Dilution</source> <translation>Infusie of verdunnen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10474"/> + <location filename="../ui/EditProduct.ui" line="10483"/> <source>Package volume:</source> <translation>Verpakken volume:</translation> </message> @@ -4343,7 +4342,7 @@ <translation>Verpakken ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10554"/> + <location filename="../ui/EditProduct.ui" line="10563"/> <source>pH from fermenter:</source> <translation>pH vanuit gistvat:</translation> </message> @@ -4448,7 +4447,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="2424"/> - <location filename="../ui/EditProduct.ui" line="8415"/> + <location filename="../ui/EditProduct.ui" line="8424"/> <source>Kettle trub loss:</source> <translation>Kookketel trub verlies:</translation> </message> @@ -4533,229 +4532,245 @@ <translation>Behandeld maisch water</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7410"/> + <location filename="../ui/EditProduct.ui" line="6353"/> + <location filename="../ui/EditProduct.ui" line="6422"/> + <source>Total brew and sparge water supply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6356"/> + <source>Total needed mixed water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7085"/> + <source>Total brew and sparge water supply without optional dilution water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7419"/> <source>Sparge water source 1</source> <translation>Spoelwater bron 1</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7432"/> + <location filename="../ui/EditProduct.ui" line="7441"/> <source>Sparge water source 2</source> <translation>Spoelwater bron 2</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7451"/> + <location filename="../ui/EditProduct.ui" line="7460"/> <source>Sparge water mixed</source> <translation>Gemengd spoelwater</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7467"/> + <location filename="../ui/EditProduct.ui" line="7476"/> <location filename="../src/EditProductTab5.cpp" line="723"/> <source>Sparge</source> <translation>Spoel</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7483"/> + <location filename="../ui/EditProduct.ui" line="7492"/> <source>Treated sparge water</source> <translation>Behandeld spoelwater</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10522"/> + <location filename="../ui/EditProduct.ui" line="10531"/> <source>Estimated final ABV %:</source> <translation>Verwacht finale ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10598"/> + <location filename="../ui/EditProduct.ui" line="10607"/> <source>Extra dilution or infusion added to this batch.</source> <translation>Toegevoegde verdunning of infusie aan deze batch.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10629"/> - <location filename="../ui/EditProduct.ui" line="10751"/> + <location filename="../ui/EditProduct.ui" line="10638"/> + <location filename="../ui/EditProduct.ui" line="10760"/> <source>The ABV including the infusion.</source> <translation>Het ABV inclusief infusie.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10660"/> + <location filename="../ui/EditProduct.ui" line="10669"/> <source>If there is alcohol in the infusion, give the percentage.</source> <translation>Als er alcohol in de infusie zit, geef hier het percentage.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10719"/> + <location filename="../ui/EditProduct.ui" line="10728"/> <source>Could be the description of the infusion.</source> <translation>Hier kun je de toevoeging beschrijven.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10735"/> + <location filename="../ui/EditProduct.ui" line="10744"/> <source>Estimated package ABV %:</source> <translation>Verwacht verpakken ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10883"/> + <location filename="../ui/EditProduct.ui" line="10892"/> <source>Bottles</source> <translation>Flessen</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10911"/> - <location filename="../ui/EditProduct.ui" line="11331"/> + <location filename="../ui/EditProduct.ui" line="10920"/> + <location filename="../ui/EditProduct.ui" line="11340"/> <source>Desired volume CO2:</source> <translation>Gewenst volume CO2:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10927"/> - <location filename="../ui/EditProduct.ui" line="11398"/> + <location filename="../ui/EditProduct.ui" line="10936"/> + <location filename="../ui/EditProduct.ui" line="11407"/> <source>Priming sugar:</source> <translation>Carbonatie suiker:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10943"/> - <location filename="../ui/EditProduct.ui" line="11315"/> + <location filename="../ui/EditProduct.ui" line="10952"/> + <location filename="../ui/EditProduct.ui" line="11324"/> <source>Sugar amount:</source> <translation>Suiker gewicht:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10975"/> - <location filename="../ui/EditProduct.ui" line="11347"/> + <location filename="../ui/EditProduct.ui" line="10984"/> + <location filename="../ui/EditProduct.ui" line="11356"/> <source>Water amount:</source> <translation>Water volume:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11157"/> + <location filename="../ui/EditProduct.ui" line="11166"/> <source>Expected pressure in bar:</source> <translation>Verwachte druk in bar:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11173"/> + <location filename="../ui/EditProduct.ui" line="11182"/> <source>Bottles ABV %:</source> <translation>Flessen ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11271"/> + <location filename="../ui/EditProduct.ui" line="11280"/> <source>Kegs</source> <translation>Fusten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11283"/> + <location filename="../ui/EditProduct.ui" line="11292"/> <source>Kegs ABV %:</source> <translation>Fusten ABV %:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11299"/> + <location filename="../ui/EditProduct.ui" line="11308"/> <source>Kegs pressure in bar:</source> <translation>Fusten druk in bar:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11667"/> + <location filename="../ui/EditProduct.ui" line="11676"/> <source>Forced carbonation:</source> <translation>Geforceerde carbonatie:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11694"/> + <location filename="../ui/EditProduct.ui" line="11703"/> <source>Edit the package date.</source> <translation>Wijzig de verpakkings datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11753"/> + <location filename="../ui/EditProduct.ui" line="11762"/> <source>Show carbonation log:</source> <translation>Toon carbonatie log:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11766"/> + <location filename="../ui/EditProduct.ui" line="11775"/> <source>Tasting</source> <translation>Proeven</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11778"/> + <location filename="../ui/EditProduct.ui" line="11787"/> <source>Taste date:</source> <translation>Proeven datum:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11814"/> + <location filename="../ui/EditProduct.ui" line="11823"/> <source>Taste rate:</source> <translation>Beoordeling cijfer:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11855"/> + <location filename="../ui/EditProduct.ui" line="11864"/> <source>Color:</source> <translation>Kleur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11871"/> + <location filename="../ui/EditProduct.ui" line="11880"/> <source>Transparency:</source> <translation>Helderheid:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11887"/> + <location filename="../ui/EditProduct.ui" line="11896"/> <source>Head:</source> <translation>Schuim:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11942"/> + <location filename="../ui/EditProduct.ui" line="11951"/> <source>Aroma:</source> <translation>Geur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="11971"/> + <location filename="../ui/EditProduct.ui" line="11980"/> <source>Taste:</source> <translation>Smaak:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12000"/> + <location filename="../ui/EditProduct.ui" line="12009"/> <source>Aftertaste:</source> <translation>Nasmaak:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12029"/> + <location filename="../ui/EditProduct.ui" line="12038"/> <source>Mouthfeel:</source> <translation>Mondgevoel:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12058"/> + <location filename="../ui/EditProduct.ui" line="12067"/> <source>Notes:</source> <translation>Opmerkingen:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12084"/> + <location filename="../ui/EditProduct.ui" line="12093"/> <source>Edit the tasting date.</source> <translation>Wijzig de datum van proeven.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12120"/> + <location filename="../ui/EditProduct.ui" line="12129"/> <source>Images</source> <translation>Plaatjes</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12221"/> + <location filename="../ui/EditProduct.ui" line="12230"/> <source>Previous</source> <translation>Vorige</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12238"/> + <location filename="../ui/EditProduct.ui" line="12247"/> <source>Next</source> <translation>Volgende</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12311"/> + <location filename="../ui/EditProduct.ui" line="12320"/> <source>Filename:</source> <translation>Bestand:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12327"/> + <location filename="../ui/EditProduct.ui" line="12336"/> <source>Comment:</source> <translation>Bijschrift:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12372"/> + <location filename="../ui/EditProduct.ui" line="12381"/> <source>Type:</source> <translation>Soort:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12416"/> + <location filename="../ui/EditProduct.ui" line="12425"/> <source>Export</source> <translation>Exporteer</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12272"/> - <location filename="../ui/EditProduct.ui" line="12433"/> + <location filename="../ui/EditProduct.ui" line="12281"/> + <location filename="../ui/EditProduct.ui" line="12442"/> <source>Print</source> <translation>Print</translation> </message> @@ -5587,8 +5602,8 @@ <translation>Verwarm tijd:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7921"/> - <location filename="../ui/EditProduct.ui" line="9052"/> + <location filename="../ui/EditProduct.ui" line="7930"/> + <location filename="../ui/EditProduct.ui" line="9061"/> <location filename="../src/EditProductTab7.cpp" line="635"/> <source>Measured pH:</source> <translation>Gemeten pH:</translation> @@ -5599,8 +5614,8 @@ <translation>Gemeten Brix:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7937"/> - <location filename="../ui/EditProduct.ui" line="9119"/> + <location filename="../ui/EditProduct.ui" line="7946"/> + <location filename="../ui/EditProduct.ui" line="9128"/> <location filename="../src/EditProductTab7.cpp" line="667"/> <source>Measured SG:</source> <translation>Gemeten SG:</translation> @@ -6068,7 +6083,7 @@ <translation>Kan niet laden %1: %2</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="12295"/> + <location filename="../ui/EditProduct.ui" line="12304"/> <location filename="../src/EditProductTab13.cpp" line="210"/> <source>Image here</source> <translation>Plaatje hier</translation> @@ -14175,23 +14190,25 @@ <location filename="../src/database/db_recipe.cpp" line="31"/> <location filename="../src/database/db_recipe.cpp" line="661"/> <location filename="../src/database/db_recipe.cpp" line="694"/> - <location filename="../src/database/db_product.cpp" line="31"/> - <location filename="../src/database/db_product.cpp" line="1045"/> - <location filename="../src/database/db_product.cpp" line="1078"/> + <location filename="../src/database/db_product.cpp" line="40"/> + <location filename="../src/database/db_product.cpp" line="56"/> + <location filename="../src/database/db_product.cpp" line="1070"/> + <location filename="../src/database/db_product.cpp" line="1103"/> <source>Database error</source> <translation>Database fout</translation> </message> <message> <location filename="../src/database/db_recipe.cpp" line="31"/> - <location filename="../src/database/db_product.cpp" line="31"/> + <location filename="../src/database/db_product.cpp" line="56"/> <source>MySQL error: record %1 not found</source> <translation>MySQL fout: record %1 niet gevonden</translation> </message> <message> <location filename="../src/database/db_recipe.cpp" line="662"/> <location filename="../src/database/db_recipe.cpp" line="695"/> - <location filename="../src/database/db_product.cpp" line="1046"/> - <location filename="../src/database/db_product.cpp" line="1079"/> + <location filename="../src/database/db_product.cpp" line="41"/> + <location filename="../src/database/db_product.cpp" line="1071"/> + <location filename="../src/database/db_product.cpp" line="1104"/> <source>MySQL error: %1 %2 %3</source>
--- a/ui/EditProduct.ui Sat Jun 01 15:19:08 2024 +0200 +++ b/ui/EditProduct.ui Sat Jun 01 21:10:54 2024 +0200 @@ -95,7 +95,7 @@ <enum>QTabWidget::Rounded</enum> </property> <property name="currentIndex"> - <number>10</number> + <number>7</number> </property> <property name="elideMode"> <enum>Qt::ElideNone</enum> @@ -5471,7 +5471,7 @@ <property name="geometry"> <rect> <x>750</x> - <y>160</y> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -5496,7 +5496,7 @@ <property name="geometry"> <rect> <x>670</x> - <y>160</y> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -5521,7 +5521,7 @@ <property name="geometry"> <rect> <x>590</x> - <y>160</y> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -5546,7 +5546,7 @@ <property name="geometry"> <rect> <x>1070</x> - <y>160</y> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -5574,7 +5574,7 @@ <property name="geometry"> <rect> <x>910</x> - <y>160</y> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -5599,7 +5599,7 @@ <property name="geometry"> <rect> <x>830</x> - <y>160</y> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -5624,7 +5624,7 @@ <property name="geometry"> <rect> <x>430</x> - <y>160</y> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -5649,7 +5649,7 @@ <property name="geometry"> <rect> <x>510</x> - <y>160</y> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -5674,7 +5674,7 @@ <property name="geometry"> <rect> <x>250</x> - <y>160</y> + <y>220</y> <width>81</width> <height>24</height> </rect> @@ -5705,7 +5705,7 @@ <property name="geometry"> <rect> <x>990</x> - <y>160</y> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -5730,7 +5730,7 @@ <property name="geometry"> <rect> <x>350</x> - <y>160</y> + <y>220</y> <width>71</width> <height>24</height> </rect> @@ -5755,7 +5755,7 @@ <property name="geometry"> <rect> <x>10</x> - <y>210</y> + <y>40</y> <width>181</width> <height>23</height> </rect> @@ -5771,7 +5771,7 @@ <property name="geometry"> <rect> <x>990</x> - <y>210</y> + <y>40</y> <width>71</width> <height>24</height> </rect> @@ -5796,7 +5796,7 @@ <property name="geometry"> <rect> <x>830</x> - <y>210</y> + <y>40</y> <width>71</width> <height>24</height> </rect> @@ -5821,7 +5821,7 @@ <property name="geometry"> <rect> <x>670</x> - <y>210</y> + <y>40</y> <width>71</width> <height>24</height> </rect> @@ -5846,7 +5846,7 @@ <property name="geometry"> <rect> <x>1070</x> - <y>210</y> + <y>40</y> <width>71</width> <height>24</height> </rect> @@ -5874,7 +5874,7 @@ <property name="geometry"> <rect> <x>590</x> - <y>210</y> + <y>40</y> <width>71</width> <height>24</height> </rect> @@ -5899,7 +5899,7 @@ <property name="geometry"> <rect> <x>350</x> - <y>210</y> + <y>40</y> <width>71</width> <height>24</height> </rect> @@ -5924,7 +5924,7 @@ <property name="geometry"> <rect> <x>750</x> - <y>210</y> + <y>40</y> <width>71</width> <height>24</height> </rect> @@ -5949,7 +5949,7 @@ <property name="geometry"> <rect> <x>430</x> - <y>210</y> + <y>40</y> <width>71</width> <height>24</height> </rect> @@ -5974,7 +5974,7 @@ <property name="geometry"> <rect> <x>510</x> - <y>210</y> + <y>40</y> <width>71</width> <height>24</height> </rect> @@ -5999,7 +5999,7 @@ <property name="geometry"> <rect> <x>510</x> - <y>130</y> + <y>190</y> <width>71</width> <height>24</height> </rect> @@ -6027,7 +6027,7 @@ <property name="geometry"> <rect> <x>990</x> - <y>130</y> + <y>190</y> <width>71</width> <height>24</height> </rect> @@ -6052,7 +6052,7 @@ <property name="geometry"> <rect> <x>10</x> - <y>130</y> + <y>190</y> <width>171</width> <height>21</height> </rect> @@ -6068,7 +6068,7 @@ <property name="geometry"> <rect> <x>910</x> - <y>130</y> + <y>190</y> <width>71</width> <height>24</height> </rect> @@ -6096,7 +6096,7 @@ <property name="geometry"> <rect> <x>670</x> - <y>130</y> + <y>190</y> <width>71</width> <height>24</height> </rect> @@ -6124,7 +6124,7 @@ <property name="geometry"> <rect> <x>590</x> - <y>130</y> + <y>190</y> <width>71</width> <height>24</height> </rect> @@ -6149,7 +6149,7 @@ <property name="geometry"> <rect> <x>750</x> - <y>130</y> + <y>190</y> <width>71</width> <height>24</height> </rect> @@ -6178,7 +6178,7 @@ <property name="geometry"> <rect> <x>350</x> - <y>130</y> + <y>190</y> <width>71</width> <height>24</height> </rect> @@ -6206,7 +6206,7 @@ <property name="geometry"> <rect> <x>1070</x> - <y>130</y> + <y>190</y> <width>71</width> <height>24</height> </rect> @@ -6234,7 +6234,7 @@ <property name="geometry"> <rect> <x>430</x> - <y>130</y> + <y>190</y> <width>71</width> <height>24</height> </rect> @@ -6262,7 +6262,7 @@ <property name="geometry"> <rect> <x>830</x> - <y>130</y> + <y>190</y> <width>71</width> <height>24</height> </rect> @@ -6291,7 +6291,7 @@ <property name="geometry"> <rect> <x>510</x> - <y>100</y> + <y>130</y> <width>71</width> <height>24</height> </rect> @@ -6316,7 +6316,7 @@ <property name="geometry"> <rect> <x>1070</x> - <y>100</y> + <y>130</y> <width>71</width> <height>24</height> </rect> @@ -6344,13 +6344,16 @@ <property name="geometry"> <rect> <x>10</x> - <y>100</y> + <y>130</y> <width>171</width> <height>21</height> </rect> </property> - <property name="text"> - <string>Mixed water</string> + <property name="toolTip"> + <string>Total brew and sparge water supply</string> + </property> + <property name="text"> + <string>Total needed mixed water</string> </property> <property name="alignment"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> @@ -6360,7 +6363,7 @@ <property name="geometry"> <rect> <x>350</x> - <y>100</y> + <y>130</y> <width>71</width> <height>24</height> </rect> @@ -6385,7 +6388,7 @@ <property name="geometry"> <rect> <x>990</x> - <y>100</y> + <y>130</y> <width>71</width> <height>24</height> </rect> @@ -6410,10 +6413,13 @@ <property name="geometry"> <rect> <x>250</x> - <y>100</y> - <width>71</width> - <height>24</height> - </rect> + <y>130</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>Total brew and sparge water supply</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -6438,7 +6444,7 @@ <property name="geometry"> <rect> <x>670</x> - <y>100</y> + <y>130</y> <width>71</width> <height>24</height> </rect> @@ -6463,7 +6469,7 @@ <property name="geometry"> <rect> <x>750</x> - <y>100</y> + <y>130</y> <width>71</width> <height>24</height> </rect> @@ -6488,7 +6494,7 @@ <property name="geometry"> <rect> <x>430</x> - <y>100</y> + <y>130</y> <width>71</width> <height>24</height> </rect> @@ -6513,7 +6519,7 @@ <property name="geometry"> <rect> <x>830</x> - <y>100</y> + <y>130</y> <width>71</width> <height>24</height> </rect> @@ -6538,7 +6544,7 @@ <property name="geometry"> <rect> <x>590</x> - <y>100</y> + <y>130</y> <width>71</width> <height>24</height> </rect> @@ -6563,7 +6569,7 @@ <property name="geometry"> <rect> <x>910</x> - <y>100</y> + <y>130</y> <width>71</width> <height>24</height> </rect> @@ -6588,7 +6594,7 @@ <property name="geometry"> <rect> <x>1070</x> - <y>70</y> + <y>100</y> <width>71</width> <height>24</height> </rect> @@ -6616,7 +6622,7 @@ <property name="geometry"> <rect> <x>350</x> - <y>70</y> + <y>100</y> <width>71</width> <height>24</height> </rect> @@ -6641,7 +6647,7 @@ <property name="geometry"> <rect> <x>830</x> - <y>70</y> + <y>100</y> <width>71</width> <height>24</height> </rect> @@ -6666,7 +6672,7 @@ <property name="geometry"> <rect> <x>430</x> - <y>70</y> + <y>100</y> <width>71</width> <height>24</height> </rect> @@ -6691,7 +6697,7 @@ <property name="geometry"> <rect> <x>910</x> - <y>70</y> + <y>100</y> <width>71</width> <height>24</height> </rect> @@ -6716,7 +6722,7 @@ <property name="geometry"> <rect> <x>990</x> - <y>70</y> + <y>100</y> <width>71</width> <height>24</height> </rect> @@ -6741,7 +6747,7 @@ <property name="geometry"> <rect> <x>250</x> - <y>70</y> + <y>100</y> <width>85</width> <height>24</height> </rect> @@ -6778,7 +6784,7 @@ <property name="geometry"> <rect> <x>670</x> - <y>70</y> + <y>100</y> <width>71</width> <height>24</height> </rect> @@ -6803,7 +6809,7 @@ <property name="geometry"> <rect> <x>750</x> - <y>70</y> + <y>100</y> <width>71</width> <height>24</height> </rect> @@ -6828,7 +6834,7 @@ <property name="geometry"> <rect> <x>10</x> - <y>70</y> + <y>100</y> <width>181</width> <height>23</height> </rect> @@ -6844,7 +6850,7 @@ <property name="geometry"> <rect> <x>590</x> - <y>70</y> + <y>100</y> <width>71</width> <height>24</height> </rect> @@ -6869,7 +6875,7 @@ <property name="geometry"> <rect> <x>510</x> - <y>70</y> + <y>100</y> <width>71</width> <height>24</height> </rect> @@ -6894,7 +6900,7 @@ <property name="geometry"> <rect> <x>430</x> - <y>40</y> + <y>70</y> <width>71</width> <height>24</height> </rect> @@ -6919,7 +6925,7 @@ <property name="geometry"> <rect> <x>510</x> - <y>40</y> + <y>70</y> <width>71</width> <height>24</height> </rect> @@ -6960,7 +6966,7 @@ <property name="geometry"> <rect> <x>910</x> - <y>40</y> + <y>70</y> <width>71</width> <height>24</height> </rect> @@ -7045,7 +7051,7 @@ <property name="geometry"> <rect> <x>990</x> - <y>40</y> + <y>70</y> <width>71</width> <height>24</height> </rect> @@ -7070,10 +7076,13 @@ <property name="geometry"> <rect> <x>250</x> - <y>40</y> - <width>71</width> - <height>24</height> - </rect> + <y>70</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>Total brew and sparge water supply without optional dilution water</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -7101,7 +7110,7 @@ <property name="geometry"> <rect> <x>830</x> - <y>40</y> + <y>70</y> <width>71</width> <height>24</height> </rect> @@ -7142,7 +7151,7 @@ <property name="geometry"> <rect> <x>590</x> - <y>40</y> + <y>70</y> <width>71</width> <height>24</height> </rect> @@ -7167,7 +7176,7 @@ <property name="geometry"> <rect> <x>1070</x> - <y>40</y> + <y>70</y> <width>71</width> <height>24</height> </rect> @@ -7195,7 +7204,7 @@ <property name="geometry"> <rect> <x>10</x> - <y>40</y> + <y>70</y> <width>181</width> <height>23</height> </rect> @@ -7326,7 +7335,7 @@ <property name="geometry"> <rect> <x>750</x> - <y>40</y> + <y>70</y> <width>71</width> <height>24</height> </rect> @@ -7351,7 +7360,7 @@ <property name="geometry"> <rect> <x>350</x> - <y>40</y> + <y>70</y> <width>71</width> <height>24</height> </rect> @@ -7376,7 +7385,7 @@ <property name="geometry"> <rect> <x>670</x> - <y>40</y> + <y>70</y> <width>71</width> <height>24</height> </rect> @@ -7401,7 +7410,7 @@ <property name="geometry"> <rect> <x>210</x> - <y>40</y> + <y>70</y> <width>21</width> <height>21</height> </rect> @@ -7423,7 +7432,7 @@ <property name="geometry"> <rect> <x>210</x> - <y>70</y> + <y>100</y> <width>21</width> <height>21</height> </rect> @@ -7442,7 +7451,7 @@ <property name="geometry"> <rect> <x>210</x> - <y>100</y> + <y>130</y> <width>21</width> <height>21</height> </rect> @@ -7474,7 +7483,7 @@ <property name="geometry"> <rect> <x>10</x> - <y>160</y> + <y>220</y> <width>171</width> <height>21</height> </rect> @@ -10703,7 +10712,7 @@ <double>14.000000000000000</double> </property> <property name="singleStep"> - <double>0.010000000000000</double> + <double>0.100000000000000</double> </property> </widget> <widget class="QLineEdit" name="pack_notesEdit">