changeset
Finally the translation of string arrays is working.
Mon, 20 Jun 2022 19:55:23 +0200
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Mon, 20 Jun 2022 19:55:23 +0200
- changeset 301
- fe6346211b5b
- parent 300
- 2a97905cb637
- child 302
- 2e8462219332
Finally the translation of string arrays is working.
--- a/src/EditProduct.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditProduct.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -287,7 +287,7 @@ ui->st_guideEdit->setText(product->st_guide); ui->st_catEdit->setText(product->st_category); ui->st_catnrEdit->setText(QString("%1").arg(product->st_category_number)); - ui->st_typeEdit->setText(style_types[product->st_type]); + ui->st_typeEdit->setText(QCoreApplication::translate("BeerType", g_style_types[product->st_type])); ui->nameEdit->setText(product->name); ui->codeEdit->setText(product->code); ui->birthEdit->setText(product->birth.toString("dd MMM yyyy")); @@ -298,11 +298,11 @@ ui->boil_timeEdit->setValue(product->boil_time); ui->efficiencyEdit->setValue(product->efficiency); if (product->divide_type > 0) - ui->splitatEdit->setText(QString(tr("%1, part %2 of %3").arg(prod_split[product->divide_type]) + ui->splitatEdit->setText(QString(tr("%1, part %2 of %3").arg(QCoreApplication::translate("Splitter", g_prod_split[product->divide_type])) .arg(product->divide_part + 1) .arg(product->divide_parts + 1))); else - ui->splitatEdit->setText(prod_split[product->divide_type]); + ui->splitatEdit->setText(QCoreApplication::translate("Splitter", g_prod_split[product->divide_type])); ui->est_ogEdit->setValue(product->est_og); ui->est_ogShow->setRange(product->st_og_min, product->st_og_max); ui->est_ogShow->setPrecision(3);
--- a/src/EditProductExport.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditProductExport.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -784,7 +784,7 @@ stageEdit->setObjectName(QString::fromUtf8("stageEdit")); stageEdit->setGeometry(QRect(810, 80, 113, 23)); stageEdit->setReadOnly(true); - stageEdit->setText(prod_stages[product->stage]); + stageEdit->setText(QCoreApplication::translate("ProdStages", g_prod_stages[product->stage])); QLabel *splitatLabel = new QLabel(dialog); splitatLabel->setObjectName(QString::fromUtf8("splitatLabel"));
--- a/src/EditProductTab1.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditProductTab1.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -79,7 +79,7 @@ ui->st_guideEdit->setText(product->st_guide); ui->st_catEdit->setText(product->st_category); ui->st_catnrEdit->setText(QString("%1").arg(product->st_category_number)); - ui->st_typeEdit->setText(style_types[product->st_type]); + ui->st_typeEdit->setText(QCoreApplication::translate("BeerType", g_style_types[product->st_type])); ui->est_ogShow->setRange(query.value(7).toDouble(), query.value(8).toDouble()); ui->est_fgShow->setRange(query.value(9).toDouble(), query.value(10).toDouble()); @@ -220,14 +220,14 @@ stage = PROD_STAGE_MATURE; if (product->stage != stage) { - qDebug() << "setStage() change state:" << prod_stages[product->stage] << "to:" << prod_stages[stage]; + qDebug() << "setStage() change state:" << g_prod_stages[product->stage] << "to:" << g_prod_stages[stage]; product->stage = stage; is_changed(); } else { - qDebug() << "setStage() stage:" << prod_stages[stage]; + qDebug() << "setStage() stage:" << g_prod_stages[stage]; } - ui->stageEdit->setText(prod_stages[stage]); + ui->stageEdit->setText(QCoreApplication::translate("ProdStages", g_prod_stages[stage])); /* Tab 1, generic */ ui->typeEdit->setDisabled(stage > PROD_STAGE_WAIT);
--- a/src/EditProductTab10.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditProductTab10.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -339,7 +339,7 @@ axisY->setTickCount(11); axisY->setMinorTickCount(1); axisY->setLabelFormat("%i"); - axisY->setTitleText("Temp"); + axisY->setTitleText(tr("Temp °C")); axisY->setLabelsFont(QFont("Helvetica", 8, QFont::Normal)); chart->addAxis(axisY, Qt::AlignLeft); pv_air->attachAxis(axisY); @@ -350,7 +350,7 @@ axisYR->setRange(0, 100); axisYR->setTickCount(11); axisYR->setLabelFormat("%i"); - axisYR->setTitleText("Power %"); + axisYR->setTitleText(tr("Power %")); axisYR->setLabelsFont(QFont("Helvetica", 8, QFont::Normal)); chart->addAxis(axisYR, Qt::AlignRight); pwr_cool->attachAxis(axisYR); @@ -400,7 +400,7 @@ battery ->append(timestamp, query.value("battery").toDouble()); } - temperature->setName(tr("Temperature °C")); + temperature->setName(tr("Temp °C")); temperature->setColor(QColorConstants::Svg::red); density->setName(tr("SG")); QPen pen(QColorConstants::Svg::navy); @@ -428,14 +428,14 @@ QValueAxis *axisYT = new QValueAxis; axisYT->setTickCount(10); axisYT->setLabelFormat("%.1f"); - axisYT->setTitleText(tr("Temp °C")); + axisYT->setTitleText(tr("Temperature °C")); axisYT->setLabelsFont(QFont("Helvetica", 8, QFont::Normal)); chart->addAxis(axisYT, Qt::AlignRight); temperature->attachAxis(axisYT); QValueAxis *axisYD = new QValueAxis; axisYD->setTickCount(10); - axisYD->setLabelFormat("%.4f"); + axisYD->setLabelFormat("%.3f"); axisYD->setTitleText("SG"); axisYD->setLabelsFont(QFont("Helvetica", 8, QFont::Normal)); chart->addAxis(axisYD, Qt::AlignLeft); @@ -444,7 +444,7 @@ QValueAxis *axisYB = new QValueAxis; axisYB->setTickCount(10); axisYB->setLabelFormat("%.2f"); - axisYB->setTitleText(tr("Battery")); + axisYB->setTitleText(tr("Battery volt")); axisYB->setLabelsFont(QFont("Helvetica", 8, QFont::Normal)); chart->addAxis(axisYB, Qt::AlignRight); battery->attachAxis(axisYB);
--- a/src/EditProductTab2.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditProductTab2.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -25,7 +25,7 @@ /* Mashing */ ui->tun_volumeEdit->setValue(product->eq_tun_volume); - ui->tun_materialEdit->setText(tun_materials[product->eq_tun_material]); + ui->tun_materialEdit->setText(QCoreApplication::translate("TunMaterial", g_tun_materials[product->eq_tun_material])); ui->mash_volumeEdit->setValue(product->eq_mash_volume); ui->mash_maxEdit->setValue(product->eq_mash_max);
--- a/src/EditProductTab3.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditProductTab3.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -87,15 +87,15 @@ item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); ui->fermentablesTable->setItem(i, 2, item); - item = new QTableWidgetItem(fermentable_types[product->fermentables.at(i).type]); + item = new QTableWidgetItem(QCoreApplication::translate("FermentableType", g_fermentable_types[product->fermentables.at(i).type])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->fermentablesTable->setItem(i, 3, item); - item = new QTableWidgetItem(fermentable_graintypes[product->fermentables.at(i).graintype]); + item = new QTableWidgetItem(QCoreApplication::translate("FermentableGraintype", g_fermentable_graintypes[product->fermentables.at(i).graintype])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->fermentablesTable->setItem(i, 4, item); - item = new QTableWidgetItem(fermentable_added[product->fermentables.at(i).added]); + item = new QTableWidgetItem(QCoreApplication::translate("FermentableAdded", g_fermentable_added[product->fermentables.at(i).added])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->fermentablesTable->setItem(i, 5, item); @@ -843,11 +843,11 @@ item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); ui->fermentablesTable->setItem(product->fermentables_row, 2, item); - item = new QTableWidgetItem(fermentable_types[product->fermentables.at(product->fermentables_row).type]); + item = new QTableWidgetItem(QCoreApplication::translate("FermentableType", g_fermentable_types[product->fermentables.at(product->fermentables_row).type])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->fermentablesTable->setItem(product->fermentables_row, 3, item); - item = new QTableWidgetItem(fermentable_graintypes[product->fermentables.at(product->fermentables_row).graintype]); + item = new QTableWidgetItem(QCoreApplication::translate("FermentableGraintype", g_fermentable_graintypes[product->fermentables.at(product->fermentables_row).graintype])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->fermentablesTable->setItem(product->fermentables_row, 4, item); @@ -895,7 +895,7 @@ qDebug() << "ferment_added_changed()" << product->fermentables_row << val; product->fermentables[product->fermentables_row].added = val; - QTableWidgetItem *item = new QTableWidgetItem(fermentable_added[val]); + QTableWidgetItem *item = new QTableWidgetItem(QCoreApplication::translate("FermentableAdded", g_fermentable_added[val])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->fermentablesTable->setItem(product->fermentables_row, 5, item);
--- a/src/EditProductTab4.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditProductTab4.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -70,11 +70,11 @@ ui->hopsTable->setItem(i, 0, new QTableWidgetItem(product->hops.at(i).origin)); ui->hopsTable->setItem(i, 1, new QTableWidgetItem(product->hops.at(i).name)); - item = new QTableWidgetItem(hop_types[product->hops.at(i).type]); + item = new QTableWidgetItem(QCoreApplication::translate("HopTypes", g_hop_types[product->hops.at(i).type])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->hopsTable->setItem(i, 2, item); - item = new QTableWidgetItem(hop_forms[product->hops.at(i).form]); + item = new QTableWidgetItem(QCoreApplication::translate("HopForm", g_hop_forms[product->hops.at(i).form])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->hopsTable->setItem(i, 3, item); @@ -82,7 +82,7 @@ item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); ui->hopsTable->setItem(i, 4, item); - item = new QTableWidgetItem(hop_useat[product->hops.at(i).useat]); + item = new QTableWidgetItem(QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->hopsTable->setItem(i, 5, item); @@ -444,11 +444,13 @@ ui->hopsTable->setItem(product->hops_row, 0, new QTableWidgetItem(product->hops.at(product->hops_row).origin)); ui->hopsTable->setItem(product->hops_row, 1, new QTableWidgetItem(product->hops.at(product->hops_row).name)); - item = new QTableWidgetItem(hop_types[product->hops.at(product->hops_row).type]); + QString hoptype = QCoreApplication::translate("HopTypes", g_hop_types[product->hops.at(product->hops_row).type]); + item = new QTableWidgetItem(hoptype); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->hopsTable->setItem(product->hops_row, 2, item); - item = new QTableWidgetItem(hop_forms[product->hops.at(product->hops_row).form]); + + item = new QTableWidgetItem(QCoreApplication::translate("HopForm", g_hop_forms[product->hops.at(product->hops_row).form])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->hopsTable->setItem(product->hops_row, 3, item); @@ -504,7 +506,7 @@ qDebug() << "hop_useat_changed()" << product->hops_row << val; product->hops[product->hops_row].useat = val; - QTableWidgetItem *item = new QTableWidgetItem(hop_useat[val]); + QTableWidgetItem *item = new QTableWidgetItem(QCoreApplication::translate("HopUse", g_hop_useat[val])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->hopsTable->setItem(product->hops_row, 5, item);
--- a/src/EditProductTab5.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditProductTab5.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -71,11 +71,11 @@ ui->miscsTable->setItem(i, 0, new QTableWidgetItem(product->miscs.at(i).name)); - item = new QTableWidgetItem(misc_types[product->miscs.at(i).type]); + item = new QTableWidgetItem(QCoreApplication::translate("MiscType", g_misc_types[product->miscs.at(i).type])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(i, 1, item); - item = new QTableWidgetItem(misc_uses[product->miscs.at(i).use_use]); + item = new QTableWidgetItem(QCoreApplication::translate("MiscUse", g_misc_uses[product->miscs.at(i).use_use])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(i, 2, item); @@ -423,11 +423,11 @@ mnameEdit->setText(product->miscs.at(product->miscs_row).name); ui->miscsTable->setItem(product->miscs_row, 0, new QTableWidgetItem(product->miscs.at(product->miscs_row).name)); - item = new QTableWidgetItem(misc_types[product->miscs.at(product->miscs_row).type]); + item = new QTableWidgetItem(QCoreApplication::translate("MiscType", g_misc_types[product->miscs.at(product->miscs_row).type])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(product->miscs_row, 1, item); - item = new QTableWidgetItem(misc_uses[product->miscs.at(product->miscs_row).use_use]); + item = new QTableWidgetItem(QCoreApplication::translate("MiscUse", g_misc_uses[product->miscs.at(product->miscs_row).use_use])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(product->miscs_row, 2, item); useatEdit->setCurrentIndex(product->miscs.at(product->miscs_row).use_use); @@ -504,7 +504,7 @@ query.first(); this->mselectEdit->addItem(""); // Start with empty value for (int i = 0; i < query.size(); i++) { - this->mselectEdit->addItem(query.value(0).toString()+ " (" + misc_types[query.value(1).toInt()] + ") " + + this->mselectEdit->addItem(query.value(0).toString()+ " (" + QCoreApplication::translate("MiscType", g_misc_types[query.value(1).toInt()]) + ") " + QString("%1 %2").arg(query.value(3).toDouble() * 1000.0, 3, 'f', 2, '0').arg(query.value(2).toInt()?"gr":"ml")); query.next(); } @@ -517,7 +517,7 @@ qDebug() << "misc_useat_changed" << val; product->miscs[product->miscs_row].use_use = val; - item = new QTableWidgetItem(misc_uses[val]); + item = new QTableWidgetItem(QCoreApplication::translate("MiscUse", g_misc_uses[val])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(product->miscs_row, 2, item);
--- a/src/EditProductTab6.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditProductTab6.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -65,11 +65,11 @@ ui->yeastsTable->setItem(i, 1, new QTableWidgetItem(product->yeasts.at(i).laboratory)); ui->yeastsTable->setItem(i, 2, new QTableWidgetItem(product->yeasts.at(i).product_id)); - item = new QTableWidgetItem(yeast_forms[product->yeasts.at(i).form]); + item = new QTableWidgetItem(QCoreApplication::translate("YeastForm", g_yeast_forms[product->yeasts.at(i).form])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->yeastsTable->setItem(i, 3, item); - item = new QTableWidgetItem(yeast_use[product->yeasts.at(i).use]); + item = new QTableWidgetItem(QCoreApplication::translate("YeastUse", g_yeast_use[product->yeasts.at(i).use])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->yeastsTable->setItem(i, 4, item); @@ -146,8 +146,8 @@ ui->yeastsTable->setEditTriggers(QAbstractItemView::NoEditTriggers); - for (int i = 0; i < starters.size(); i++) { - ui->stmethodEdit->addItem(starters[i]); + for (int i = 0; i < 3; i++) { + ui->stmethodEdit->addItem(QCoreApplication::translate("YeastStarter", g_yeast_starter[i])); } ui->stmethodEdit->setCurrentIndex(product->starter_type); } @@ -382,7 +382,7 @@ } } ui->starterTable->setRowCount(step); - item = new QTableWidgetItem(starters[stype]); + item = new QTableWidgetItem(QCoreApplication::translate("YeastStarter", g_yeast_starter[stype])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->starterTable->setItem(step -1, 0, item); @@ -442,7 +442,7 @@ if (product->prop_volume[step] > 0) { result = calcStep(product->prop_volume[step] * 1000, product->prop_type[step], tcells); ui->starterTable->setRowCount(step + 1); - item = new QTableWidgetItem(starters[product->prop_type[step]]); + item = new QTableWidgetItem(QCoreApplication::translate("YeastStarter", g_yeast_starter[product->prop_type[step]])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->starterTable->setItem(step, 0, item); @@ -843,7 +843,7 @@ ui->yeastsTable->setItem(product->yeasts_row, 1, new QTableWidgetItem(product->yeasts.at(product->yeasts_row).laboratory)); ui->yeastsTable->setItem(product->yeasts_row, 2, new QTableWidgetItem(product->yeasts.at(product->yeasts_row).product_id)); - item = new QTableWidgetItem(yeast_forms[product->yeasts.at(product->yeasts_row).form]); + item = new QTableWidgetItem(QCoreApplication::translate("YeastForm", g_yeast_forms[product->yeasts.at(product->yeasts_row).form])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->yeastsTable->setItem(product->yeasts_row, 3, item); @@ -907,7 +907,7 @@ qDebug() << "yeast_useat_changed()" << product->yeasts_row << val; product->yeasts[product->yeasts_row].use = val; - QTableWidgetItem *item = new QTableWidgetItem(yeast_use[val]); + QTableWidgetItem *item = new QTableWidgetItem(QCoreApplication::translate("YeastUse", g_yeast_use[val])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->yeastsTable->setItem(product->yeasts_row, 5, item); is_changed();
--- a/src/EditProductTab7.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditProductTab7.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -61,7 +61,7 @@ ui->mashsTable->setItem(i, 0, new QTableWidgetItem(product->mashs.at(i).step_name)); - item = new QTableWidgetItem(step_types[product->mashs.at(i).step_type]); + item = new QTableWidgetItem(QCoreApplication::translate("StepType", g_step_types[product->mashs.at(i).step_type])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->mashsTable->setItem(i, 1, item);
--- a/src/EditRecipe.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditRecipe.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -179,7 +179,7 @@ ui->st_guideEdit->setText(recipe->st_guide); ui->st_catEdit->setText(recipe->st_category); ui->st_catnrEdit->setText(QString("%1").arg(recipe->st_category_number)); - ui->st_typeEdit->setText(style_types[recipe->st_type]); + ui->st_typeEdit->setText(QCoreApplication::translate("BeerType", g_style_types[recipe->st_type])); ui->nameEdit->setText(recipe->name); ui->notesEdit->setPlainText(recipe->notes); ui->typeEdit->setCurrentIndex(recipe->type);
--- a/src/EditRecipeTab1.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditRecipeTab1.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -73,7 +73,7 @@ ui->st_guideEdit->setText(recipe->st_guide); ui->st_catEdit->setText(recipe->st_category); ui->st_catnrEdit->setText(QString("%1").arg(recipe->st_category_number)); - ui->st_typeEdit->setText(style_types[recipe->st_type]); + ui->st_typeEdit->setText(QCoreApplication::translate("BeerType", g_style_types[recipe->st_type])); ui->est_ogShow->setRange(query.value(7).toDouble(), query.value(8).toDouble()); ui->est_fgShow->setRange(query.value(9).toDouble(), query.value(10).toDouble());
--- a/src/EditRecipeTab2.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditRecipeTab2.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -86,15 +86,15 @@ item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); ui->fermentablesTable->setItem(i, 2, item); - item = new QTableWidgetItem(fermentable_types[recipe->fermentables.at(i).type]); + item = new QTableWidgetItem(QCoreApplication::translate("FermentableType", g_fermentable_types[recipe->fermentables.at(i).type])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->fermentablesTable->setItem(i, 3, item); - item = new QTableWidgetItem(fermentable_graintypes[recipe->fermentables.at(i).graintype]); + item = new QTableWidgetItem(QCoreApplication::translate("FermentableGraintype", g_fermentable_graintypes[recipe->fermentables.at(i).graintype])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->fermentablesTable->setItem(i, 4, item); - item = new QTableWidgetItem(fermentable_added[recipe->fermentables.at(i).added]); + item = new QTableWidgetItem(QCoreApplication::translate("FermentableAdded", g_fermentable_added[recipe->fermentables.at(i).added])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->fermentablesTable->setItem(i, 5, item); @@ -740,11 +740,11 @@ item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); ui->fermentablesTable->setItem(recipe->fermentables_row, 2, item); - item = new QTableWidgetItem(fermentable_types[recipe->fermentables.at(recipe->fermentables_row).type]); + item = new QTableWidgetItem(QCoreApplication::translate("FermentableType", g_fermentable_types[recipe->fermentables.at(recipe->fermentables_row).type])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->fermentablesTable->setItem(recipe->fermentables_row, 3, item); - item = new QTableWidgetItem(fermentable_graintypes[recipe->fermentables.at(recipe->fermentables_row).graintype]); + item = new QTableWidgetItem(QCoreApplication::translate("FermentableGraintype", g_fermentable_graintypes[recipe->fermentables.at(recipe->fermentables_row).graintype])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->fermentablesTable->setItem(recipe->fermentables_row, 4, item); @@ -786,7 +786,7 @@ qDebug() << "ferment_added_changed()" << recipe->fermentables_row << val; recipe->fermentables[recipe->fermentables_row].added = val; - QTableWidgetItem *item = new QTableWidgetItem(fermentable_added[val]); + QTableWidgetItem *item = new QTableWidgetItem(QCoreApplication::translate("FermentableAdded", g_fermentable_added[val])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->fermentablesTable->setItem(recipe->fermentables_row, 5, item);
--- a/src/EditRecipeTab3.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditRecipeTab3.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -69,11 +69,11 @@ ui->hopsTable->setItem(i, 0, new QTableWidgetItem(recipe->hops.at(i).origin)); ui->hopsTable->setItem(i, 1, new QTableWidgetItem(recipe->hops.at(i).name)); - item = new QTableWidgetItem(hop_types[recipe->hops.at(i).type]); + item = new QTableWidgetItem(QCoreApplication::translate("HopTypes", g_hop_types[recipe->hops.at(i).type])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->hopsTable->setItem(i, 2, item); - item = new QTableWidgetItem(hop_forms[recipe->hops.at(i).form]); + item = new QTableWidgetItem(QCoreApplication::translate("HopForm", g_hop_forms[recipe->hops.at(i).form])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->hopsTable->setItem(i, 3, item); @@ -81,7 +81,7 @@ item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); ui->hopsTable->setItem(i, 4, item); - item = new QTableWidgetItem(hop_useat[recipe->hops.at(i).useat]); + item = new QTableWidgetItem(QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->hopsTable->setItem(i, 5, item); @@ -435,11 +435,13 @@ ui->hopsTable->setItem(recipe->hops_row, 0, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).origin)); ui->hopsTable->setItem(recipe->hops_row, 1, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).name)); - item = new QTableWidgetItem(hop_types[recipe->hops.at(recipe->hops_row).type]); + QString hoptype = QCoreApplication::translate("HopTypes", g_hop_types[recipe->hops.at(recipe->hops_row).type]); + item = new QTableWidgetItem(hoptype); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->hopsTable->setItem(recipe->hops_row, 2, item); - item = new QTableWidgetItem(hop_forms[recipe->hops.at(recipe->hops_row).form]); + item = new QTableWidgetItem(QCoreApplication::translate("HopForm", g_hop_forms[recipe->hops.at(recipe->hops_row).form])); + //item = new QTableWidgetItem(hop_forms[recipe->hops.at(recipe->hops_row).form]); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->hopsTable->setItem(recipe->hops_row, 3, item); @@ -481,7 +483,7 @@ void EditRecipe::hop_useat_changed(int val) { recipe->hops[recipe->hops_row].useat = val; - QTableWidgetItem *item = new QTableWidgetItem(hop_useat[val]); + QTableWidgetItem *item = new QTableWidgetItem(QCoreApplication::translate("HopUse", g_hop_useat[val])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->hopsTable->setItem(recipe->hops_row, 5, item); @@ -507,7 +509,7 @@ void EditRecipe::hop_form_changed(int val) { recipe->hops[recipe->hops_row].form = val; - QTableWidgetItem *item = new QTableWidgetItem(hop_forms[val]); + QTableWidgetItem *item = new QTableWidgetItem(QCoreApplication::translate("HopForm", g_hop_forms[val])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->hopsTable->setItem(recipe->hops_row, 3, item);
--- a/src/EditRecipeTab4.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditRecipeTab4.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -70,11 +70,11 @@ ui->miscsTable->setItem(i, 0, new QTableWidgetItem(recipe->miscs.at(i).name)); - item = new QTableWidgetItem(misc_types[recipe->miscs.at(i).type]); + item = new QTableWidgetItem(QCoreApplication::translate("MiscType", g_misc_types[recipe->miscs.at(i).type])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(i, 1, item); - item = new QTableWidgetItem(misc_uses[recipe->miscs.at(i).use_use]); + item = new QTableWidgetItem(QCoreApplication::translate("MiscUse", g_misc_uses[recipe->miscs.at(i).use_use])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(i, 2, item); @@ -395,11 +395,11 @@ mnameEdit->setText(recipe->miscs.at(recipe->miscs_row).name); ui->miscsTable->setItem(recipe->miscs_row, 0, new QTableWidgetItem(recipe->miscs.at(recipe->miscs_row).name)); - item = new QTableWidgetItem(misc_types[recipe->miscs.at(recipe->miscs_row).type]); + item = new QTableWidgetItem(QCoreApplication::translate("MiscType", g_misc_types[recipe->miscs.at(recipe->miscs_row).type])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(recipe->miscs_row, 1, item); - item = new QTableWidgetItem(misc_uses[recipe->miscs.at(recipe->miscs_row).use_use]); + item = new QTableWidgetItem(QCoreApplication::translate("MiscUse", g_misc_uses[recipe->miscs.at(recipe->miscs_row).use_use])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(recipe->miscs_row, 2, item); useatEdit->setCurrentIndex(recipe->miscs.at(recipe->miscs_row).use_use); @@ -467,7 +467,7 @@ query.first(); this->mselectEdit->addItem(""); // Start with empty value for (int i = 0; i < query.size(); i++) { - this->mselectEdit->addItem(query.value(0).toString()+ " (" + misc_types[query.value(1).toInt()] + ") " + + this->mselectEdit->addItem(query.value(0).toString()+ " (" + QCoreApplication::translate("MiscType", g_misc_types[query.value(1).toInt()]) + ") " + QString("%1 %2").arg(query.value(3).toDouble() * 1000.0, 3, 'f', 2, '0').arg(query.value(2).toInt()?"gr":"ml")); query.next(); } @@ -480,7 +480,7 @@ qDebug() << "misc_useat_changed" << val; recipe->miscs[recipe->miscs_row].use_use = val; - item = new QTableWidgetItem(misc_uses[val]); + item = new QTableWidgetItem(QCoreApplication::translate("MiscUse", g_misc_uses[val])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(recipe->miscs_row, 2, item);
--- a/src/EditRecipeTab5.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditRecipeTab5.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -64,11 +64,11 @@ ui->yeastsTable->setItem(i, 1, new QTableWidgetItem(recipe->yeasts.at(i).laboratory)); ui->yeastsTable->setItem(i, 2, new QTableWidgetItem(recipe->yeasts.at(i).product_id)); - item = new QTableWidgetItem(yeast_forms[recipe->yeasts.at(i).form]); + item = new QTableWidgetItem(QCoreApplication::translate("YeastForm", g_yeast_forms[recipe->yeasts.at(i).form])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->yeastsTable->setItem(i, 3, item); - item = new QTableWidgetItem(yeast_use[recipe->yeasts.at(i).use]); + item = new QTableWidgetItem(QCoreApplication::translate("YeastUse", g_yeast_use[recipe->yeasts.at(i).use])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->yeastsTable->setItem(i, 4, item); @@ -373,7 +373,7 @@ ui->yeastsTable->setItem(recipe->yeasts_row, 1, new QTableWidgetItem(recipe->yeasts.at(recipe->yeasts_row).laboratory)); ui->yeastsTable->setItem(recipe->yeasts_row, 2, new QTableWidgetItem(recipe->yeasts.at(recipe->yeasts_row).product_id)); - item = new QTableWidgetItem(yeast_forms[recipe->yeasts.at(recipe->yeasts_row).form]); + item = new QTableWidgetItem(QCoreApplication::translate("YeastForm", g_yeast_forms[recipe->yeasts.at(recipe->yeasts_row).form])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->yeastsTable->setItem(recipe->yeasts_row, 3, item); @@ -427,7 +427,7 @@ qDebug() << "yeast_useat_changed()" << recipe->yeasts_row << val; recipe->yeasts[recipe->yeasts_row].use = val; - QTableWidgetItem *item = new QTableWidgetItem(yeast_use[val]); + QTableWidgetItem *item = new QTableWidgetItem(QCoreApplication::translate("YeastUse", g_yeast_use[val])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->yeastsTable->setItem(recipe->yeasts_row, 5, item); is_changed();
--- a/src/EditRecipeTab6.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/EditRecipeTab6.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -57,7 +57,7 @@ ui->mashsTable->setItem(i, 0, new QTableWidgetItem(recipe->mashs.at(i).step_name)); - item = new QTableWidgetItem(step_types[recipe->mashs.at(i).step_type]); + item = new QTableWidgetItem(QCoreApplication::translate("StepType", g_step_types[recipe->mashs.at(i).step_type])); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->mashsTable->setItem(i, 1, item);
--- a/src/InventoryFermentables.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/InventoryFermentables.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -115,8 +115,8 @@ this->tableFermentables->setItem(ridx, 0, new QTableWidgetItem(query.value(6).toString())); this->tableFermentables->setItem(ridx, 1, new QTableWidgetItem(query.value(7).toString())); this->tableFermentables->setItem(ridx, 2, new QTableWidgetItem(query.value(1).toString())); - this->tableFermentables->setItem(ridx, 3, new QTableWidgetItem(fermentable_types[query.value(2).toInt()])); - this->tableFermentables->setItem(ridx, 4, new QTableWidgetItem(fermentable_graintypes[query.value(20).toInt()])); + this->tableFermentables->setItem(ridx, 3, new QTableWidgetItem(QCoreApplication::translate("FermentableType", g_fermentable_types[query.value(2).toInt()]))); + this->tableFermentables->setItem(ridx, 4, new QTableWidgetItem(QCoreApplication::translate("FermentableGraintype", g_fermentable_graintypes[query.value(20).toInt()]))); w = QString("%1 EBC").arg(query.value(4).toDouble(), 1, 'f', 0, '0' ); QTableWidgetItem *item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
--- a/src/InventoryHops.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/InventoryHops.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -115,8 +115,8 @@ for (int ridx = 0 ; ridx < query.size() ; ridx++ ) { this->tableHops->setItem(ridx, 0, new QTableWidgetItem(query.value(12).toString())); /* Origin */ this->tableHops->setItem(ridx, 1, new QTableWidgetItem(query.value(1).toString())); /* Name */ - this->tableHops->setItem(ridx, 2, new QTableWidgetItem(hop_types[query.value(9).toInt()])); /* Type */ - this->tableHops->setItem(ridx, 3, new QTableWidgetItem(hop_forms[query.value(10).toInt()])); /* Form */ + this->tableHops->setItem(ridx, 2, new QTableWidgetItem(g_hop_types[query.value(9).toInt()])); /* Type */ + this->tableHops->setItem(ridx, 3, new QTableWidgetItem(QCoreApplication::translate("HopForm", g_hop_forms[query.value(10).toInt()]))); /* Form */ w = QString("%1 %").arg(query.value(2).toDouble(), 2, 'f', 1, '0' ); /* Alpha% */ QTableWidgetItem *item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
--- a/src/InventoryMiscs.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/InventoryMiscs.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -109,21 +109,21 @@ query.first(); for (int ridx = 0 ; ridx < query.size() ; ridx++ ) { this->tableMiscs->setItem(ridx, 0, new QTableWidgetItem(query.value(1).toString())); /* Name */ - this->tableMiscs->setItem(ridx, 1, new QTableWidgetItem(misc_types[query.value(2).toInt()])); /* Type */ - this->tableMiscs->setItem(ridx, 2, new QTableWidgetItem(misc_uses[query.value(3).toInt()])); /* Use */ + this->tableMiscs->setItem(ridx, 1, new QTableWidgetItem(QCoreApplication::translate("MiscType", g_misc_types[query.value(2).toInt()])));/* Type */ + this->tableMiscs->setItem(ridx, 2, new QTableWidgetItem(QCoreApplication::translate("MiscUse", g_misc_uses[query.value(3).toInt()]))); /* Use */ w = QString(""); /* Use time */ if (query.value(4).toInt() > 0) { if (query.value(4).toInt() == 1) - w = QString("1 minute"); + w = QString(tr("1 minute")); else if (query.value(4).toInt() < 180) - w = QString("%1 minutes").arg(query.value(4).toInt()); + w = QString(tr("%1 minutes")).arg(query.value(4).toInt()); else if (query.value(4).toInt() < 1440) - w = QString("%1 hours").arg(query.value(4).toInt() / 60); + w = QString(tr("%1 hours")).arg(query.value(4).toInt() / 60); else if (query.value(4).toInt() == 1440) - w = QString("1 day"); + w = QString(tr("1 day")); else - w = QString("%1 days").arg(query.value(4).toInt() / 1440); + w = QString(tr("%1 days")).arg(query.value(4).toInt() / 1440); } QTableWidgetItem *item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
--- a/src/InventoryYeasts.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/InventoryYeasts.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -119,8 +119,8 @@ this->tableYeasts->setItem(ridx, 0, new QTableWidgetItem(query.value(4).toString())); /* Laboratory */ this->tableYeasts->setItem(ridx, 1, new QTableWidgetItem(query.value(5).toString())); /* Product id */ this->tableYeasts->setItem(ridx, 2, new QTableWidgetItem(query.value(1).toString())); /* Name */ - this->tableYeasts->setItem(ridx, 3, new QTableWidgetItem(yeast_types[query.value(2).toInt()])); /* Type */ - this->tableYeasts->setItem(ridx, 4, new QTableWidgetItem(yeast_forms[query.value(3).toInt()])); /* Form */ + this->tableYeasts->setItem(ridx, 3, new QTableWidgetItem(QCoreApplication::translate("YeastType", g_yeast_types[query.value(2).toInt()])));/* Type */ + this->tableYeasts->setItem(ridx, 4, new QTableWidgetItem(QCoreApplication::translate("YeastForm", g_yeast_forms[query.value(3).toInt()])));/* Form */ w = QString("%1 %").arg(query.value(9).toDouble(), 2, 'f', 1, '0' ); /* Attenuation% */ QTableWidgetItem *item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
--- a/src/PrinterDialog.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/PrinterDialog.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -105,7 +105,7 @@ y = 120; } painter.fillRect( 20, y, 715, 20, (i % 2) ? c_line1:c_line2); - painter.drawText( 20, y+4, 80, 20, Qt::AlignLeft, fermentable_types[query.value(0).toInt()]); + painter.drawText( 20, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("FermentableType", g_fermentable_types[query.value(0).toInt()])); painter.drawText(100, y+4, 100, 20, Qt::AlignLeft, query.value(2).toString()); painter.drawText(200, y+4, 260, 20, Qt::AlignLeft, query.value(1).toString()); w = QString("%1 kg").arg(query.value(3).toDouble(), 10, 'f', 3); @@ -154,7 +154,7 @@ painter.fillRect( 20, y, 715, 20, (i % 2) ? c_line1:c_line2); painter.drawText( 20, y+4, 120, 20, Qt::AlignLeft, query.value(2).toString()); painter.drawText(140, y+4, 240, 20, Qt::AlignLeft, query.value(0).toString()); - painter.drawText(380, y+4, 80, 20, Qt::AlignLeft, hop_forms[query.value(1).toInt()]); + painter.drawText(380, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("HopForm", g_hop_forms[query.value(1).toInt()])); if (query.value(3).toDouble() < 0.6) w = QString("%1 gr").arg(query.value(3).toDouble() * 1000.0, 10, 'f', 1); else @@ -251,7 +251,7 @@ y = 120; } painter.fillRect( 20, y, 715, 20, (i % 2) ? c_line1:c_line2); - painter.drawText( 20, y+4, 120, 20, Qt::AlignLeft, misc_types[query.value(1).toInt()]); + painter.drawText( 20, y+4, 120, 20, Qt::AlignLeft, QCoreApplication::translate("MiscType", g_misc_types[query.value(1).toInt()])); painter.drawText(140, y+4, 320, 20, Qt::AlignLeft, query.value(0).toString()); if (query.value(2).toInt()) w = QString("%1 gr").arg(query.value(3).toDouble() * 1000.0, 10, 'f', 1); @@ -301,8 +301,8 @@ painter.fillRect( 20, y, 715, 20, (i % 2) ? c_line1:c_line2); painter.drawText( 20, y+4, 180, 20, Qt::AlignLeft, query.value(0).toString()); painter.drawText(200, y+4, 230, 20, Qt::AlignLeft, query.value(5).toString()); - painter.drawText(430, y+4, 80, 20, Qt::AlignCenter, yeast_types[query.value(1).toInt()]); - painter.drawText(510, y+4, 80, 20, Qt::AlignCenter, yeast_forms[query.value(2).toInt()]); + painter.drawText(430, y+4, 80, 20, Qt::AlignCenter, QCoreApplication::translate("YeastType", g_yeast_types[query.value(1).toInt()])); + painter.drawText(510, y+4, 80, 20, Qt::AlignCenter, QCoreApplication::translate("YeastForm", g_yeast_forms[query.value(2).toInt()])); if (query.value(2).toInt() == 0) w = QString("%1 %2").arg(query.value(3).toDouble(), 10, 'f', 1).arg(y_unit[query.value(2).toInt()]); @@ -328,7 +328,7 @@ painter.setFont(QFont("Helvetica", 9, QFont::Normal)); painter.fillRect( 20, y, 330, 20, c_line1); painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft, tr("Brew type")); - painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, recipe_types[recipe->type]); + painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, QCoreApplication::translate("Recipe_type", g_recipe_types[recipe->type])); painter.fillRect(405, y, 330, 20, c_line1); painter.drawText(405, y+4, 150, 20, Qt::AlignLeft, tr("Efficiency")); painter.drawText(555, y+4, 180, 20, Qt::AlignLeft, QString("%1 %").arg(recipe->efficiency, 1, 'f', 1)); @@ -392,9 +392,9 @@ cost_fermentables += cost; if (recipe->fermentables.at(i).type == 0) - soort = fermentable_graintypes[recipe->fermentables.at(i).graintype]; + soort = QCoreApplication::translate("FermentableGraintype", g_fermentable_graintypes[recipe->fermentables.at(i).graintype]); else - soort = fermentable_types[recipe->fermentables.at(i).type]; + soort = QCoreApplication::translate("FermentableType", g_fermentable_types[recipe->fermentables.at(i).type]); if (recipe->fermentables.at(i).amount > 100) amount = QString("%1 kg").arg(recipe->fermentables.at(i).amount, 1, 'f', 1); @@ -411,7 +411,7 @@ painter.drawText(285, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(recipe->fermentables.at(i).percentage, 1, 'f', 1)); painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(recipe->fermentables.at(i).yield, 1, 'f', 1)); painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, soort); - painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, fermentable_added[recipe->fermentables.at(i).added]); + painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("FermentableAdded", g_fermentable_added[recipe->fermentables.at(i).added])); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount); painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3)); y += 20; @@ -442,11 +442,11 @@ recipe->ibu_method, 0, recipe->hops.at(i).time, 0, recipe->boil_time); if (recipe->hops.at(i).useat == 2 || recipe->hops.at(i).useat == 4) // Boil or Whirlpool - use = hop_useat[recipe->hops.at(i).useat] + QString(" %1 min").arg(recipe->hops.at(i).time); + use = QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat]) + QString(" %1 min").arg(recipe->hops.at(i).time); else if (recipe->hops.at(i).useat == 5) // Dryhop - use = hop_useat[recipe->hops.at(i).useat] + QString(" %1 days").arg(recipe->hops.at(i).time / 1440); + use = QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat]) + QString(" %1 days").arg(recipe->hops.at(i).time / 1440); else - use = hop_useat[recipe->hops.at(i).useat]; + use = QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat]); if (recipe->hops.at(i).amount > 1) amount = QString("%1 kg").arg(recipe->hops.at(i).amount, 1, 'f', 3); @@ -457,7 +457,7 @@ painter.drawText( 20, y+4, 260, 20, Qt::AlignLeft, recipe->hops.at(i).name + " (" + recipe->hops.at(i).origin + ")"); painter.drawText(285, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(recipe->hops.at(i).alpha, 1, 'f', 1)); painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(ibu, 1, 'f', 1)); - painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, hop_forms[recipe->hops.at(i).form]); + painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("HopForm", g_hop_forms[recipe->hops.at(i).form])); painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, use); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount); painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3)); @@ -495,8 +495,8 @@ recipe->yeasts.at(i).product_id + " (" + recipe->yeasts.at(i).name + ")"); painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(recipe->yeasts.at(i).attenuation, 1, 'f', 1)); - painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, yeast_forms[recipe->yeasts.at(i).form]); - painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, yeast_use[recipe->yeasts.at(i).use]); + painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("YeastForm", g_yeast_forms[recipe->yeasts.at(i).form])); + painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("YeastUse", g_yeast_use[recipe->yeasts.at(i).use])); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount); painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3)); y += 20; @@ -528,9 +528,9 @@ cost_miscs += cost; if (recipe->miscs.at(i).use_use == 2) - use = misc_uses[recipe->miscs.at(i).use_use] + QString(" %1 min").arg(recipe->miscs.at(i).time); + use = QCoreApplication::translate("MiscUse", g_misc_uses[recipe->miscs.at(i).use_use]) + QString(" %1 min").arg(recipe->miscs.at(i).time); else - use = misc_uses[recipe->miscs.at(i).use_use]; + use = QCoreApplication::translate("MiscUse", g_misc_uses[recipe->miscs.at(i).use_use]); if (recipe->miscs.at(i).type == 4) // Water agent painter.fillRect( 20, y, 715, 20, mw_line); @@ -541,7 +541,7 @@ else painter.fillRect( 20, y, 715, 20, mo_line); painter.drawText( 20, y+4, 410, 20, Qt::AlignLeft, recipe->miscs.at(i).name); - painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, misc_types[recipe->miscs.at(i).type]); + painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("MiscType", g_misc_types[recipe->miscs.at(i).type])); painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, use); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, QString("%1 %2").arg(recipe->miscs.at(i).amount * 1000.0, 1, 'f', 1).arg(recipe->miscs.at(i).amount_is_weight ? "gr":"ml")); @@ -576,7 +576,7 @@ for (int i = 0; i < recipe->mashs.size(); i++) { painter.fillRect( 20, y, 715, 20, line); painter.drawText( 20, y+4, 160, 20, Qt::AlignLeft, recipe->mashs.at(i).step_name); - painter.drawText(180, y+4, 80, 20, Qt::AlignLeft, step_types[recipe->mashs.at(i).step_type]); + painter.drawText(180, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("StepType", g_step_types[recipe->mashs.at(i).step_type])); painter.drawText(260, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(recipe->mashs.at(i).step_temp, 1, 'f', 1)); painter.drawText(325, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(recipe->mashs.at(i).end_temp, 1, 'f', 1)); painter.drawText(390, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(recipe->mashs.at(i).step_time, 1, 'f', 0)); @@ -704,7 +704,7 @@ painter.setFont(QFont("Helvetica", 9, QFont::Normal)); painter.fillRect( 20, y, 330, 20, c_line1); painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft, tr("Brew type")); - painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, recipe_types[product->type]); + painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, QCoreApplication::translate("RecipeType", g_recipe_types[product->type])); painter.fillRect(405, y, 330, 20, c_line1); painter.drawText(405, y+4, 150, 20, Qt::AlignLeft, tr("Efficiency")); painter.drawText(555, y+4, 180, 20, Qt::AlignLeft, QString("%1 %").arg(product->efficiency, 1, 'f', 1)); @@ -757,12 +757,12 @@ painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, product->st_name); painter.fillRect(405, y, 330, 20, c_line1); painter.drawText(405, y+4, 150, 20, Qt::AlignLeft, tr("Stage")); - painter.drawText(555, y+4, 180, 20, Qt::AlignLeft, prod_stages[product->stage]); + painter.drawText(555, y+4, 180, 20, Qt::AlignLeft, QCoreApplication::translate("ProdStages", g_prod_stages[product->stage])); if (product->divide_parts) { y += 20; painter.fillRect( 20, y, 330, 20, c_line1); painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft, tr("Split batch")); - painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, prod_split[product->divide_type]); + painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, QCoreApplication::translate("Splitter", g_prod_split[product->divide_type])); painter.fillRect(405, y, 330, 20, c_line1); painter.drawText(405, y+4, 150, 20, Qt::AlignLeft, tr("Batch number")); painter.drawText(555, y+4, 180, 20, Qt::AlignLeft, QString("%1 of %2").arg(product->divide_part + 1).arg(product->divide_parts + 1)); @@ -789,9 +789,9 @@ cost_fermentables += cost; if (product->fermentables.at(i).type == 0) - soort = fermentable_graintypes[product->fermentables.at(i).graintype]; + soort = QCoreApplication::translate("FermentableGraintype", g_fermentable_graintypes[product->fermentables.at(i).graintype]); else - soort = fermentable_types[product->fermentables.at(i).type]; + soort = QCoreApplication::translate("FermentableType", g_fermentable_types[product->fermentables.at(i).type]); if (product->fermentables.at(i).amount > 100) amount = QString("%1 kg").arg(product->fermentables.at(i).amount, 1, 'f', 1); @@ -811,7 +811,7 @@ painter.drawText(285, y+4, 70, 20, Qt::AlignRight, ""); painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(product->fermentables.at(i).yield, 1, 'f', 1)); painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, soort); - painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, fermentable_added[product->fermentables.at(i).added]); + painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("FermentableAdded", g_fermentable_added[product->fermentables.at(i).added])); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount); painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3)); y += 20; @@ -842,11 +842,11 @@ product->ibu_method, product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time); if (product->hops.at(i).useat == 2 || product->hops.at(i).useat == 4) // Boil or Whirlpool - use = hop_useat[product->hops.at(i).useat] + QString(" %1 min").arg(product->hops.at(i).time); + use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]) + QString(" %1 min").arg(product->hops.at(i).time); else if (product->hops.at(i).useat == 5) // Dryhop - use = hop_useat[product->hops.at(i).useat] + QString(" %1 days").arg(product->hops.at(i).time / 1440); + use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]) + QString(" %1 days").arg(product->hops.at(i).time / 1440); else - use = hop_useat[product->hops.at(i).useat]; + use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]); if (product->hops.at(i).amount > 1) amount = QString("%1 kg").arg(product->hops.at(i).amount, 1, 'f', 3); @@ -857,7 +857,7 @@ painter.drawText( 20, y+4, 260, 20, Qt::AlignLeft, product->hops.at(i).name + " (" + product->hops.at(i).origin + ")"); painter.drawText(285, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(product->hops.at(i).alpha, 1, 'f', 1)); painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(ibu, 1, 'f', 1)); - painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, hop_forms[product->hops.at(i).form]); + painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("HopForm", g_hop_forms[product->hops.at(i).form])); painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, use); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount); painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3)); @@ -895,8 +895,8 @@ product->yeasts.at(i).product_id + " (" + product->yeasts.at(i).name + ")"); painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(product->yeasts.at(i).attenuation, 1, 'f', 1)); - painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, yeast_forms[product->yeasts.at(i).form]); - painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, yeast_use[product->yeasts.at(i).use]); + painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("YeastForm", g_yeast_forms[product->yeasts.at(i).form])); + painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("YeastUse", g_yeast_use[product->yeasts.at(i).use])); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount); painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3)); y += 20; @@ -944,9 +944,9 @@ cost_miscs += cost; if (product->miscs.at(i).use_use == 2) - use = misc_uses[product->miscs.at(i).use_use] + QString(" %1 min").arg(product->miscs.at(i).time); + use = QCoreApplication::translate("MiscUse", g_misc_uses[product->miscs.at(i).use_use]) + QString(" %1 min").arg(product->miscs.at(i).time); else - use = misc_uses[product->miscs.at(i).use_use]; + use = QCoreApplication::translate("MiscUse", g_misc_uses[product->miscs.at(i).use_use]); if (product->miscs.at(i).type == 4) // Water agent painter.fillRect( 20, y, 715, 20, mw_line); @@ -957,7 +957,7 @@ else painter.fillRect( 20, y, 715, 20, mo_line); painter.drawText( 20, y+4, 410, 20, Qt::AlignLeft, product->miscs.at(i).name); - painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, misc_types[product->miscs.at(i).type]); + painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("MiscType", g_misc_types[product->miscs.at(i).type])); painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, use); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, QString("%1 %2").arg(product->miscs.at(i).amount * 1000.0, 1, 'f', 1).arg(product->miscs.at(i).amount_is_weight ? "gr":"ml")); @@ -992,7 +992,7 @@ for (int i = 0; i < product->mashs.size(); i++) { painter.fillRect( 20, y, 715, 20, line); painter.drawText( 20, y+4, 160, 20, Qt::AlignLeft, product->mashs.at(i).step_name); - painter.drawText(180, y+4, 80, 20, Qt::AlignLeft, step_types[product->mashs.at(i).step_type]); + painter.drawText(180, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("StepType", g_step_types[product->mashs.at(i).step_type])); painter.drawText(260, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(product->mashs.at(i).step_temp, 1, 'f', 1)); painter.drawText(325, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(product->mashs.at(i).end_temp, 1, 'f', 1)); painter.drawText(390, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(product->mashs.at(i).step_time, 1, 'f', 0)); @@ -1149,7 +1149,7 @@ painter.fillRect( 20, y, 715, 20, c_line1); painter.drawText( 20, y+4, 20, 20, Qt::AlignCenter, QString("%1").arg(i + 1)); painter.drawText( 40, y+4, 250, 20, Qt::AlignLeft, product->mashs.at(i).step_name); - painter.drawText(290, y+4, 120, 20, Qt::AlignLeft, step_types[product->mashs.at(i).step_type]); + painter.drawText(290, y+4, 120, 20, Qt::AlignLeft, QCoreApplication::translate("StepType", g_step_types[product->mashs.at(i).step_type])); painter.drawText(400, y+4, 110, 20, Qt::AlignLeft, QString("%1 - %2°C"). arg(product->mashs.at(i).step_temp, 1, 'f', 1).arg(product->mashs.at(i).end_temp, 1, 'f', 1)); painter.drawText(510, y+4, 75, 20, Qt::AlignLeft, QString("%1").arg(product->mashs.at(i).step_time, 1, 'f', 0)); @@ -2132,7 +2132,8 @@ if (product->divide_type && product->divide_type == moment) { *y += 20; painter->setFont(QFont("Helvetica", 14, QFont::Bold)); - painter->drawText(20, *y, 715, 20, Qt::AlignCenter, QString(tr("%1 split the batch here!")).arg(prod_split[product->divide_type])); + painter->drawText(20, *y, 715, 20, Qt::AlignCenter, + QString(tr("%1 split the batch here!")).arg(QCoreApplication::translate("Splitter", g_prod_split[product->divide_type]))); painter->setFont(QFont("Arial", 10, QFont::Normal)); *y += 26; return true;
--- a/src/ProdInprod.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/ProdInprod.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -105,15 +105,15 @@ this->tableInprod->setItem(ridx, 3, new QTableWidgetItem(query.value("name").toString())); int stage = query.value("stage").toInt(); - QString fase = prod_stages[stage]; + QString fase = QCoreApplication::translate("ProdStages", g_prod_stages[stage]); if (stage == PROD_STAGE_BREW) { - fase = prod_stages[stage] + tr(" on ") + query.value("brew_date_start").toDate().toString("dd MMM yyyy"); + fase = QCoreApplication::translate("ProdStages", g_prod_stages[stage]) + tr(" on ") + query.value("brew_date_start").toDate().toString("dd MMM yyyy"); } else if (stage == PROD_STAGE_CARBONATION) { int timeDiff = query.value("package_date").toDate().daysTo(QDate::currentDate()); - fase = prod_stages[stage] + QString(tr(" day %1 of day 14")).arg(timeDiff); + fase = QCoreApplication::translate("ProdStages", g_prod_stages[stage]) + QString(tr(" day %1 of day 14")).arg(timeDiff); } else if (stage == PROD_STAGE_MATURE) { int timeDiff = query.value("package_date").toDate().daysTo(QDate::currentDate()) - 14; - fase = prod_stages[stage] + QString(tr(" day %1 of day 28")).arg(timeDiff); + fase = QCoreApplication::translate("ProdStages", g_prod_stages[stage]) + QString(tr(" day %1 of day 28")).arg(timeDiff); } this->tableInprod->setItem(ridx, 4, new QTableWidgetItem(fase));
--- a/src/global.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/global.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -22,161 +22,161 @@ Recipe *recipe; Product *product; -const QStringList prod_stages({ - QObject::tr("Plan"), - QObject::tr("Wait"), - QObject::tr("Brew"), - QObject::tr("Primary"), - QObject::tr("Secondary"), - QObject::tr("Tertiary"), - QObject::tr("Package"), - QObject::tr("Carbonation"), - QObject::tr("Mature"), - QObject::tr("Taste"), - QObject::tr("Ready"), - QObject::tr("Closed") -}); +const char * const g_prod_stages[12] = { + QT_TRANSLATE_NOOP("ProdStages", "Plan"), + QT_TRANSLATE_NOOP("ProdStages", "Wait"), + QT_TRANSLATE_NOOP("ProdStages", "Brew"), + QT_TRANSLATE_NOOP("ProdStages", "Primary"), + QT_TRANSLATE_NOOP("ProdStages", "Secondary"), + QT_TRANSLATE_NOOP("ProdStages", "Tertiary"), + QT_TRANSLATE_NOOP("ProdStages", "Package"), + QT_TRANSLATE_NOOP("ProdStages", "Carbonation"), + QT_TRANSLATE_NOOP("ProdStages", "Mature"), + QT_TRANSLATE_NOOP("ProdStages", "Taste"), + QT_TRANSLATE_NOOP("ProdStages", "Ready"), + QT_TRANSLATE_NOOP("ProdStages", "Closed") +}; -const QStringList prod_split({ - QObject::tr("Not divided"), - QObject::tr("After mash"), - QObject::tr("After boil"), - QObject::tr("After cooling"), - QObject::tr("After primary"), - QObject::tr("After secondary"), - QObject::tr("After tertiary") -}); +const char * const g_prod_split[7] = { + QT_TRANSLATE_NOOP("Splitter", "Not divided"), + QT_TRANSLATE_NOOP("Splitter", "After mash"), + QT_TRANSLATE_NOOP("Splitter", "After boil"), + QT_TRANSLATE_NOOP("Splitter", "After cooling"), + QT_TRANSLATE_NOOP("Splitter", "After primary"), + QT_TRANSLATE_NOOP("Splitter", "After secondary"), + QT_TRANSLATE_NOOP("Splitter", "After tertiary") +}; -const QStringList recipe_types({ - QObject::tr("Extract"), - QObject::tr("Partial Mash"), - QObject::tr("All Grain") -}); +const char * const g_recipe_types[3] = { + QT_TRANSLATE_NOOP("RecipeType", "Extract"), + QT_TRANSLATE_NOOP("RecipeType", "Partial Mash"), + QT_TRANSLATE_NOOP("RecipeType", "All Grain") +}; -const QStringList style_types({ - QObject::tr("Lager"), - QObject::tr("Ale"), - QObject::tr("Mead"), - QObject::tr("Wheat"), - QObject::tr("Mixed"), - QObject::tr("Cider") -}); +const char * const g_style_types[6] = { + QT_TRANSLATE_NOOP("BeerType", "Lager"), + QT_TRANSLATE_NOOP("BeerType", "Ale"), + QT_TRANSLATE_NOOP("BeerType", "Mead"), + QT_TRANSLATE_NOOP("BeerType", "Wheat"), + QT_TRANSLATE_NOOP("BeerType", "Mixed"), + QT_TRANSLATE_NOOP("BeerType", "Cider") +}; -const QStringList fermentable_types({ - QObject::tr("Grain"), - QObject::tr("Sugar"), - QObject::tr("Extract"), - QObject::tr("Dry extract"), - QObject::tr("Adjunct") -}); +const char * const g_fermentable_types[5] = { + QT_TRANSLATE_NOOP("FermentableType", "Grain"), + QT_TRANSLATE_NOOP("FermentableType", "Sugar"), + QT_TRANSLATE_NOOP("FermentableType", "Extract"), + QT_TRANSLATE_NOOP("FermentableType", "Dry extract"), + QT_TRANSLATE_NOOP("FermentableType", "Adjunct") +}; -const QStringList fermentable_graintypes({ - QObject::tr("Base"), - QObject::tr("Roast"), - QObject::tr("Crystal"), - QObject::tr("Kilned"), - QObject::tr("Sour Malt"), - QObject::tr("Special"), - QObject::tr("No malt") -}); +const char * const g_fermentable_graintypes[7] = { + QT_TRANSLATE_NOOP("FermentableGraintype", "Base"), + QT_TRANSLATE_NOOP("FermentableGraintype", "Roast"), + QT_TRANSLATE_NOOP("FermentableGraintype", "Crystal"), + QT_TRANSLATE_NOOP("FermentableGraintype", "Kilned"), + QT_TRANSLATE_NOOP("FermentableGraintype", "Sour Malt"), + QT_TRANSLATE_NOOP("FermentableGraintype", "Special"), + QT_TRANSLATE_NOOP("FermentableGraintype", "No malt") +}; -const QStringList fermentable_added({ - QObject::tr("Mash"), - QObject::tr("Boil"), - QObject::tr("Fermentation"), - QObject::tr("Lagering"), - QObject::tr("Bottle"), - QObject::tr("Kegs") -}); +const char * const g_fermentable_added[6] = { + QT_TRANSLATE_NOOP("FermentableAdded", "Mash"), + QT_TRANSLATE_NOOP("FermentableAdded", "Boil"), + QT_TRANSLATE_NOOP("FermentableAdded", "Fermentation"), + QT_TRANSLATE_NOOP("FermentableAdded", "Lagering"), + QT_TRANSLATE_NOOP("FermentableAdded", "Bottle"), + QT_TRANSLATE_NOOP("FermentableAdded", "Kegs") +}; -const QStringList hop_types({ - QObject::tr("Bittering"), - QObject::tr("Aroma"), - QObject::tr("Both") -}); +const char * const g_hop_types[3] = { + QT_TRANSLATE_NOOP("HopTypes", "Bittering"), + QT_TRANSLATE_NOOP("HopTypes", "Aroma"), + QT_TRANSLATE_NOOP("HopTypes", "Both") +}; -const QStringList hop_forms({ - QObject::tr("Pellet"), - QObject::tr("Plug"), - QObject::tr("Leaf"), - QObject::tr("Leaf wet"), - QObject::tr("Cryo"), - QObject::tr("Extract") -}); +const char * const g_hop_forms[6] = { + QT_TRANSLATE_NOOP("HopForm", "Pellet"), + QT_TRANSLATE_NOOP("HopForm", "Plug"), + QT_TRANSLATE_NOOP("HopForm", "Leaf"), + QT_TRANSLATE_NOOP("HopForm", "Leaf wet"), + QT_TRANSLATE_NOOP("HopForm", "Cryo"), + QT_TRANSLATE_NOOP("HopForm", "Extract") +}; -const QStringList hop_useat({ - QObject::tr("Mash"), - QObject::tr("First wort"), - QObject::tr("Boil"), - QObject::tr("Aroma"), - QObject::tr("Whirlpool"), - QObject::tr("Dry hop"), - QObject::tr("Bottling") -}); +const char * const g_hop_useat[7] = { + QT_TRANSLATE_NOOP("HopUse", "Mash"), + QT_TRANSLATE_NOOP("HopUse", "First wort"), + QT_TRANSLATE_NOOP("HopUse", "Boil"), + QT_TRANSLATE_NOOP("HopUse", "Aroma"), + QT_TRANSLATE_NOOP("HopUse", "Whirlpool"), + QT_TRANSLATE_NOOP("HopUse", "Dry hop"), + QT_TRANSLATE_NOOP("HopUse", "Bottling") +}; -const QStringList misc_types({ - QObject::tr("Spice"), - QObject::tr("Herb"), - QObject::tr("Flavor"), - QObject::tr("Fining"), - QObject::tr("Water agent"), - QObject::tr("Yeast nutrient"), - QObject::tr("Other") -}); +const char * const g_misc_types[7] = { + QT_TRANSLATE_NOOP("MiscType", "Spice"), + QT_TRANSLATE_NOOP("MiscType", "Herb"), + QT_TRANSLATE_NOOP("MiscType", "Flavor"), + QT_TRANSLATE_NOOP("MiscType", "Fining"), + QT_TRANSLATE_NOOP("MiscType", "Water agent"), + QT_TRANSLATE_NOOP("MiscType", "Yeast nutrient"), + QT_TRANSLATE_NOOP("MiscType", "Other") +}; -const QStringList misc_uses({ - QObject::tr("Starter"), - QObject::tr("Mash"), - QObject::tr("Boil"), - QObject::tr("Primary"), - QObject::tr("Secondary"), - QObject::tr("Bottling") -}); +const char * const g_misc_uses[6] = { + QT_TRANSLATE_NOOP("MiscUse", "Starter"), + QT_TRANSLATE_NOOP("MiscUse", "Mash"), + QT_TRANSLATE_NOOP("MiscUse", "Boil"), + QT_TRANSLATE_NOOP("MiscUse", "Primary"), + QT_TRANSLATE_NOOP("MiscUse", "Secondary"), + QT_TRANSLATE_NOOP("MiscUse", "Bottling") +}; -const QStringList yeast_types({ - QObject::tr("Lager"), - QObject::tr("Ale"), - QObject::tr("Wheat"), - QObject::tr("Wine"), - QObject::tr("Champagne"), - QObject::tr("Brett"), - QObject::tr("Kveik"), - QObject::tr("Hybrid") -}); +const char * const g_yeast_types[8] = { + QT_TRANSLATE_NOOP("YeastType", "Lager"), + QT_TRANSLATE_NOOP("YeastType", "Ale"), + QT_TRANSLATE_NOOP("YeastType", "Wheat"), + QT_TRANSLATE_NOOP("YeastType", "Wine"), + QT_TRANSLATE_NOOP("YeastType", "Champagne"), + QT_TRANSLATE_NOOP("YeastType", "Brett"), + QT_TRANSLATE_NOOP("YeastType", "Kveik"), + QT_TRANSLATE_NOOP("YeastType", "Hybrid") +}; -const QStringList yeast_forms({ - QObject::tr("Liquid"), - QObject::tr("Dry"), - QObject::tr("Slant"), - QObject::tr("Culture"), - QObject::tr("Frozen"), - QObject::tr("Bottle"), - QObject::tr("Dried") -}); +const char * const g_yeast_forms[7] = { + QT_TRANSLATE_NOOP("YeastForm", "Liquid"), + QT_TRANSLATE_NOOP("YeastForm", "Dry"), + QT_TRANSLATE_NOOP("YeastForm", "Slant"), + QT_TRANSLATE_NOOP("YeastForm", "Culture"), + QT_TRANSLATE_NOOP("YeastForm", "Frozen"), + QT_TRANSLATE_NOOP("YeastForm", "Bottle"), + QT_TRANSLATE_NOOP("YeastForm", "Dried") +}; -const QStringList yeast_use({ - QObject::tr("Primary"), - QObject::tr("Secondary"), - QObject::tr("Tertiary"), - QObject::tr("Bottle") -}); +const char * const g_yeast_use[4] = { + QT_TRANSLATE_NOOP("YeastUse", "Primary"), + QT_TRANSLATE_NOOP("YeastUse", "Secondary"), + QT_TRANSLATE_NOOP("YeastUse", "Tertiary"), + QT_TRANSLATE_NOOP("YeastUse", "Bottle") +}; -const QStringList starters({ - QObject::tr("Stirred"), - QObject::tr("Shaken"), - QObject::tr("Simple") -}); +const char * const g_yeast_starter[3] = { + QT_TRANSLATE_NOOP("YeastStarter", "Stirred"), + QT_TRANSLATE_NOOP("YeastStarter", "Shaken"), + QT_TRANSLATE_NOOP("YeastStarter", "Simple") +}; -const QStringList step_types({ - QObject::tr("Infusion"), - QObject::tr("Temperature"), - QObject::tr("Decoction") -}); +const char * const g_step_types[3] = { + QT_TRANSLATE_NOOP("StepType", "Infusion"), + QT_TRANSLATE_NOOP("StepType", "Temperature"), + QT_TRANSLATE_NOOP("StepType", "Decoction") +}; -const QStringList tun_materials({ - QObject::tr("Stainless Steel"), - QObject::tr("Aluminium"), - QObject::tr("Plastics"), - QObject::tr("Copper") -}); +const char * const g_tun_materials[4] = { + QT_TRANSLATE_NOOP("TunMaterial", "Stainless Steel"), + QT_TRANSLATE_NOOP("TunMaterial", "Aluminium"), + QT_TRANSLATE_NOOP("TunMaterial", "Plastics"), + QT_TRANSLATE_NOOP("TunMaterial", "Copper") +};
--- a/src/global.h Sun Jun 19 19:42:29 2022 +0200 +++ b/src/global.h Mon Jun 20 19:55:23 2022 +0200 @@ -681,10 +681,10 @@ PROD_STAGE_CLOSED }; -extern const QStringList prod_stages; -extern const QStringList prod_split; -extern const QStringList recipe_types; -extern const QStringList style_types; +extern const char * const g_prod_stages[]; +extern const char * const g_prod_split[]; +extern const char * const g_recipe_types[]; +extern const char * const g_style_types[]; enum FermentableTypes { FERMENTABLE_TYPE_GRAIN, @@ -694,7 +694,7 @@ FERMENTABLE_TYPE_ADJUCT }; -extern const QStringList fermentable_types; +extern const char * const g_fermentable_types[]; enum FermentableGraintypes { FERMENTABLE_GRAINTYPE_BASE, @@ -706,7 +706,7 @@ FERMENTABLE_GRAINTYPE_NO_MALT }; -extern const QStringList fermentable_graintypes; +extern const char * const g_fermentable_graintypes[]; enum FermentableAdded { FERMENTABLE_ADDED_MASH, @@ -717,7 +717,7 @@ FERMENTABLE_ADDED_KEGS }; -extern const QStringList fermentable_added; +extern const char * const g_fermentable_added[]; enum HopTypes { HOP_TYPE_BITTERING, @@ -725,7 +725,7 @@ HOP_TYPE_BOTH }; -extern const QStringList hop_types; +extern const char * const g_hop_types[]; enum HopForms { HOP_FORMS_PELLET, @@ -736,7 +736,7 @@ HOP_FORMS_EXTRACT }; -extern const QStringList hop_forms; +extern const char * const g_hop_forms[]; enum HopUseat { HOP_USEAT_MASH, @@ -748,7 +748,7 @@ HOP_USEAT_BOTTLING }; -extern const QStringList hop_useat; +extern const char * const g_hop_useat[]; enum MiscTypes { MISC_TYPES_SPICE, @@ -760,7 +760,7 @@ MISC_TYPES_OTHER }; -extern const QStringList misc_types; +extern const char * const g_misc_types[]; enum MiscUses { MISC_USES_STARTER, @@ -771,7 +771,7 @@ MISC_USES_BOTTLING }; -extern const QStringList misc_uses; +extern const char * const g_misc_uses[]; enum YeastTypes { YEAST_TYPES_LAGER, @@ -784,7 +784,7 @@ YEAST_TYPES_HYBRID }; -extern const QStringList yeast_types; +extern const char * const g_yeast_types[]; enum YeastForms { YEAST_FORMS_LIQUID, @@ -796,7 +796,7 @@ YEAST_FORMS_DRIED }; -extern const QStringList yeast_forms; +extern const char * const g_yeast_forms[]; enum YeastUse { YEAST_USE_PRIMARY, @@ -805,7 +805,7 @@ YEAST_USE_BOTTLE }; -extern const QStringList yeast_use; +extern const char * const g_yeast_use[]; enum Starters { STARTERS_STIRRED, @@ -813,8 +813,8 @@ STARTERS_SIMPLE }; -extern const QStringList starters; -extern const QStringList step_types; -extern const QStringList tun_materials; +extern const char * const g_yeast_starter[]; +extern const char * const g_step_types[]; +extern const char * const g_tun_materials[]; #endif
--- a/translations/bmsapp_en.ts Sun Jun 19 19:42:29 2022 +0200 +++ b/translations/bmsapp_en.ts Mon Jun 20 19:55:23 2022 +0200 @@ -33,6 +33,39 @@ </message> </context> <context> + <name>BeerType</name> + <message> + <location filename="../src/global.cpp" line="57"/> + <source>Lager</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="58"/> + <source>Ale</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="59"/> + <source>Mead</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="60"/> + <source>Wheat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="61"/> + <source>Mixed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="62"/> + <source>Cider</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>EditEquipment</name> <message> <location filename="../ui/EditEquipment.ui" line="14"/> @@ -438,58 +471,97 @@ </message> <message> <location filename="../ui/EditFermentable.ui" line="528"/> - <location filename="../ui/EditFermentable.ui" line="612"/> - <location filename="../ui/EditFermentable.ui" line="656"/> - <location filename="../ui/EditFermentable.ui" line="678"/> - <location filename="../ui/EditFermentable.ui" line="700"/> - <location filename="../ui/EditFermentable.ui" line="722"/> + <location filename="../ui/EditFermentable.ui" line="618"/> + <location filename="../ui/EditFermentable.ui" line="662"/> + <location filename="../ui/EditFermentable.ui" line="684"/> + <location filename="../ui/EditFermentable.ui" line="706"/> + <location filename="../ui/EditFermentable.ui" line="728"/> <source> %</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="744"/> + <location filename="../ui/EditFermentable.ui" line="559"/> + <source> Kg</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditFermentable.ui" line="590"/> + <location filename="../ui/EditFermentable.ui" line="1006"/> + <source> €</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditFermentable.ui" line="750"/> <source> °WK</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="804"/> - <location filename="../ui/EditFermentable.ui" line="817"/> - <location filename="../ui/EditFermentable.ui" line="830"/> + <location filename="../ui/EditFermentable.ui" line="810"/> + <location filename="../ui/EditFermentable.ui" line="823"/> + <location filename="../ui/EditFermentable.ui" line="836"/> <source>Yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="879"/> - <location filename="../ui/EditFermentable.ui" line="912"/> + <location filename="../ui/EditFermentable.ui" line="885"/> + <location filename="../ui/EditFermentable.ui" line="918"/> <source>yyyy-MM-dd</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="934"/> + <location filename="../ui/EditFermentable.ui" line="940"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="954"/> + <location filename="../ui/EditFermentable.ui" line="960"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="974"/> + <location filename="../ui/EditFermentable.ui" line="980"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1010"/> + <location filename="../ui/EditFermentable.ui" line="1022"/> <source>Lintner:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1032"/> + <location filename="../ui/EditFermentable.ui" line="1044"/> <source> °L</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../ui/EditFermentable.ui" line="1066"/> + <source>Set the tht date to today.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditFermentable.ui" line="1069"/> + <location filename="../ui/EditFermentable.ui" line="1089"/> + <location filename="../ui/EditFermentable.ui" line="1109"/> + <location filename="../ui/EditFermentable.ui" line="1129"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditFermentable.ui" line="1086"/> + <source>Clear tht date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditFermentable.ui" line="1106"/> + <source>Set the production date to today.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditFermentable.ui" line="1126"/> + <source>Clear production date</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditFermentable.cpp" line="33"/> <source>Grain</source> <translation type="unfinished"></translation> @@ -580,58 +652,58 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="159"/> + <location filename="../src/EditFermentable.cpp" line="163"/> <source>BMSapp - Add new fermentable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="161"/> + <location filename="../src/EditFermentable.cpp" line="165"/> <source>BMSapp - Edit fermentable %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="177"/> <location filename="../src/EditFermentable.cpp" line="181"/> <location filename="../src/EditFermentable.cpp" line="185"/> + <location filename="../src/EditFermentable.cpp" line="189"/> <source>Edit Fermentable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="177"/> - <source>Name empty or too short.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditFermentable.cpp" line="181"/> - <source>Origin empty or too short.</source> + <source>Name empty or too short.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditFermentable.cpp" line="185"/> + <source>Origin empty or too short.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditFermentable.cpp" line="189"/> <source>Supplier empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="238"/> - <location filename="../src/EditFermentable.cpp" line="263"/> + <location filename="../src/EditFermentable.cpp" line="242"/> + <location filename="../src/EditFermentable.cpp" line="267"/> <source>Database error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="239"/> - <location filename="../src/EditFermentable.cpp" line="264"/> + <location filename="../src/EditFermentable.cpp" line="243"/> + <location filename="../src/EditFermentable.cpp" line="268"/> <source>MySQL error: %1 %2 %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="309"/> + <location filename="../src/EditFermentable.cpp" line="313"/> <source>Fermentable changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="309"/> + <location filename="../src/EditFermentable.cpp" line="313"/> <source>This fermentable has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -689,113 +761,152 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="239"/> - <location filename="../ui/EditHop.ui" line="255"/> + <location filename="../ui/EditHop.ui" line="182"/> + <source> Kg</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditHop.ui" line="213"/> + <location filename="../ui/EditHop.ui" line="373"/> + <source> €</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditHop.ui" line="252"/> + <location filename="../ui/EditHop.ui" line="285"/> <source>yyyy-MM-dd</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="277"/> + <location filename="../ui/EditHop.ui" line="307"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="297"/> + <location filename="../ui/EditHop.ui" line="327"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="317"/> + <location filename="../ui/EditHop.ui" line="347"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="372"/> + <location filename="../ui/EditHop.ui" line="405"/> <source>Type hop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="388"/> + <location filename="../ui/EditHop.ui" line="421"/> <source>Origin:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="404"/> + <location filename="../ui/EditHop.ui" line="437"/> <source>Substitudes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="420"/> - <location filename="../ui/EditHop.ui" line="628"/> + <location filename="../ui/EditHop.ui" line="453"/> + <location filename="../ui/EditHop.ui" line="661"/> <source>Hop Stability Index</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="423"/> + <location filename="../ui/EditHop.ui" line="456"/> <source>HSI:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="439"/> + <location filename="../ui/EditHop.ui" line="472"/> <source>Total oil:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="455"/> + <location filename="../ui/EditHop.ui" line="488"/> <source>Humulene:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="471"/> + <location filename="../ui/EditHop.ui" line="504"/> <source>Caryophyllene:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="487"/> + <location filename="../ui/EditHop.ui" line="520"/> <source>Myrcene:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="503"/> + <location filename="../ui/EditHop.ui" line="536"/> <source>Cohumulone:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="519"/> + <location filename="../ui/EditHop.ui" line="552"/> <source>Form:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="535"/> + <location filename="../ui/EditHop.ui" line="568"/> <source>Alpha %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="551"/> + <location filename="../ui/EditHop.ui" line="584"/> <source>Beta %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="567"/> + <location filename="../ui/EditHop.ui" line="600"/> <source>Always on stock:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="583"/> + <location filename="../ui/EditHop.ui" line="616"/> <source>Country and place of origin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="599"/> + <location filename="../ui/EditHop.ui" line="632"/> <source>Substitutes that can be used for this hop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="759"/> + <location filename="../ui/EditHop.ui" line="792"/> <source>Yes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../ui/EditHop.ui" line="805"/> + <source>Set the production date to today.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditHop.ui" line="808"/> + <location filename="../ui/EditHop.ui" line="828"/> + <location filename="../ui/EditHop.ui" line="848"/> + <location filename="../ui/EditHop.ui" line="868"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditHop.ui" line="825"/> + <source>Clear production date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditHop.ui" line="845"/> + <source>Clear tht date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditHop.ui" line="865"/> + <source>Set the tht date to today.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditHop.cpp" line="32"/> <source>Bittering</source> <translation type="unfinished"></translation> @@ -836,52 +947,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="124"/> + <location filename="../src/EditHop.cpp" line="41"/> + <source>Extract</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditHop.cpp" line="129"/> <source>BMSapp - Add new hop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="126"/> + <location filename="../src/EditHop.cpp" line="131"/> <source>BMSapp - Edit hop %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="142"/> - <location filename="../src/EditHop.cpp" line="146"/> + <location filename="../src/EditHop.cpp" line="147"/> + <location filename="../src/EditHop.cpp" line="151"/> <source>Edit Hop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="142"/> + <location filename="../src/EditHop.cpp" line="147"/> <source>Name empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="146"/> + <location filename="../src/EditHop.cpp" line="151"/> <source>Origin empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="192"/> - <location filename="../src/EditHop.cpp" line="217"/> + <location filename="../src/EditHop.cpp" line="197"/> + <location filename="../src/EditHop.cpp" line="222"/> <source>Database error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="193"/> - <location filename="../src/EditHop.cpp" line="218"/> + <location filename="../src/EditHop.cpp" line="198"/> + <location filename="../src/EditHop.cpp" line="223"/> <source>MySQL error: %1 %2 %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="244"/> + <location filename="../src/EditHop.cpp" line="249"/> <source>Hop changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditHop.cpp" line="244"/> + <location filename="../src/EditHop.cpp" line="249"/> <source>This hop has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -939,63 +1055,103 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="239"/> + <location filename="../ui/EditMisc.ui" line="182"/> + <location filename="../src/EditMisc.cpp" line="219"/> + <source> gr</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditMisc.ui" line="213"/> + <location filename="../ui/EditMisc.ui" line="379"/> + <source> €</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../ui/EditMisc.ui" line="255"/> + <location filename="../ui/EditMisc.ui" line="291"/> <source>yyyy-MM-dd</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="277"/> + <location filename="../ui/EditMisc.ui" line="313"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="297"/> + <location filename="../ui/EditMisc.ui" line="333"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="317"/> - <source>Delete</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ui/EditMisc.ui" line="353"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditMisc.ui" line="395"/> <source>Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="369"/> + <location filename="../ui/EditMisc.ui" line="411"/> <source>Amount is weight:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="385"/> + <location filename="../ui/EditMisc.ui" line="427"/> <source>Use at:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="401"/> + <location filename="../ui/EditMisc.ui" line="443"/> <source>Time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="417"/> + <location filename="../ui/EditMisc.ui" line="459"/> <source>Use for:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="433"/> + <location filename="../ui/EditMisc.ui" line="475"/> <source>Always on stock:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="481"/> - <location filename="../ui/EditMisc.ui" line="513"/> + <location filename="../ui/EditMisc.ui" line="523"/> + <location filename="../ui/EditMisc.ui" line="555"/> <source>Yes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../ui/EditMisc.ui" line="594"/> + <source>Clear production date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditMisc.ui" line="597"/> + <location filename="../ui/EditMisc.ui" line="617"/> + <location filename="../ui/EditMisc.ui" line="637"/> + <location filename="../ui/EditMisc.ui" line="657"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditMisc.ui" line="614"/> + <source>Set the production date to today.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditMisc.ui" line="634"/> + <source>Clear tht date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditMisc.ui" line="654"/> + <source>Set the tht date to today.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditMisc.cpp" line="32"/> <source>Spice</source> <translation type="unfinished"></translation> @@ -1061,46 +1217,51 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="117"/> + <location filename="../src/EditMisc.cpp" line="122"/> <source>BMSapp - Add new misc ingredient</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="119"/> + <location filename="../src/EditMisc.cpp" line="124"/> <source>BMSapp - Edit misc ingredient %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="135"/> + <location filename="../src/EditMisc.cpp" line="140"/> <source>Edit Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="135"/> + <location filename="../src/EditMisc.cpp" line="140"/> <source>Name empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="172"/> - <location filename="../src/EditMisc.cpp" line="197"/> + <location filename="../src/EditMisc.cpp" line="177"/> + <location filename="../src/EditMisc.cpp" line="202"/> <source>Database error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="173"/> - <location filename="../src/EditMisc.cpp" line="198"/> + <location filename="../src/EditMisc.cpp" line="178"/> + <location filename="../src/EditMisc.cpp" line="203"/> <source>MySQL error: %1 %2 %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="275"/> + <location filename="../src/EditMisc.cpp" line="221"/> + <source> ml</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditMisc.cpp" line="297"/> <source>Misc changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="275"/> + <location filename="../src/EditMisc.cpp" line="297"/> <source>The ingredient has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -1321,7 +1482,7 @@ <message> <location filename="../ui/EditProduct.ui" line="843"/> <location filename="../ui/EditProduct.ui" line="2541"/> - <location filename="../src/EditProductTab4.cpp" line="594"/> + <location filename="../src/EditProductTab4.cpp" line="596"/> <source>Bitterness IBU:</source> <translation type="unfinished"></translation> </message> @@ -1599,8 +1760,8 @@ <location filename="../ui/EditProduct.ui" line="3080"/> <location filename="../ui/EditProduct.ui" line="8958"/> <location filename="../ui/EditProduct.ui" line="10219"/> - <location filename="../ui/EditProduct.ui" line="10260"/> - <location filename="../ui/EditProduct.ui" line="10569"/> + <location filename="../ui/EditProduct.ui" line="10296"/> + <location filename="../ui/EditProduct.ui" line="10605"/> <source>Set or clear date</source> <translation type="unfinished"></translation> </message> @@ -1626,8 +1787,9 @@ <location filename="../ui/EditProduct.ui" line="8920"/> <location filename="../ui/EditProduct.ui" line="8961"/> <location filename="../ui/EditProduct.ui" line="10222"/> - <location filename="../ui/EditProduct.ui" line="10263"/> - <location filename="../ui/EditProduct.ui" line="10572"/> + <location filename="../ui/EditProduct.ui" line="10242"/> + <location filename="../ui/EditProduct.ui" line="10299"/> + <location filename="../ui/EditProduct.ui" line="10608"/> <source>...</source> <translation type="unfinished"></translation> </message> @@ -1700,7 +1862,7 @@ <location filename="../ui/EditProduct.ui" line="8353"/> <location filename="../ui/EditProduct.ui" line="8587"/> <location filename="../ui/EditProduct.ui" line="10203"/> - <location filename="../ui/EditProduct.ui" line="10553"/> + <location filename="../ui/EditProduct.ui" line="10589"/> <source>dd-MM-yyyy</source> <translation type="unfinished"></translation> </message> @@ -1712,7 +1874,7 @@ <message> <location filename="../ui/EditProduct.ui" line="3628"/> <location filename="../src/EditProductTab3.cpp" line="1031"/> - <location filename="../src/EditProductTab4.cpp" line="639"/> + <location filename="../src/EditProductTab4.cpp" line="641"/> <location filename="../src/EditProductTab5.cpp" line="647"/> <source>Mash</source> <translation type="unfinished"></translation> @@ -2369,6 +2531,7 @@ <location filename="../ui/EditProduct.ui" line="7407"/> <location filename="../ui/EditProduct.ui" line="8897"/> <location filename="../ui/EditProduct.ui" line="8917"/> + <location filename="../ui/EditProduct.ui" line="10239"/> <source>Brew log chart</source> <translation type="unfinished"></translation> </message> @@ -2630,72 +2793,77 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10232"/> + <location filename="../ui/EditProduct.ui" line="10259"/> + <source>Show carbonation log:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10268"/> <source>Tasting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10244"/> - <source>Taste date:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ui/EditProduct.ui" line="10280"/> + <source>Taste date:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10316"/> <source>Taste rate:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10321"/> + <location filename="../ui/EditProduct.ui" line="10357"/> <source>Color:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10337"/> + <location filename="../ui/EditProduct.ui" line="10373"/> <source>Transparency:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10353"/> + <location filename="../ui/EditProduct.ui" line="10389"/> <source>Head:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10408"/> + <location filename="../ui/EditProduct.ui" line="10444"/> <source>Aroma:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10437"/> + <location filename="../ui/EditProduct.ui" line="10473"/> <source>Taste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10466"/> + <location filename="../ui/EditProduct.ui" line="10502"/> <source>Aftertaste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10495"/> + <location filename="../ui/EditProduct.ui" line="10531"/> <source>Mouthfeel:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10524"/> + <location filename="../ui/EditProduct.ui" line="10560"/> <source>Notes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10550"/> + <location filename="../ui/EditProduct.ui" line="10586"/> <source>Edit the tasting date.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10591"/> + <location filename="../ui/EditProduct.ui" line="10627"/> <source>Export</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10608"/> + <location filename="../ui/EditProduct.ui" line="10644"/> <source>Print</source> <translation type="unfinished"></translation> </message> @@ -2756,6 +2924,7 @@ </message> <message> <location filename="../src/EditProduct.cpp" line="101"/> + <location filename="../src/EditProductTab10.cpp" line="303"/> <source>Air</source> <translation type="unfinished"></translation> </message> @@ -2765,48 +2934,48 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="262"/> + <location filename="../src/EditProduct.cpp" line="301"/> <source>%1, part %2 of %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="748"/> + <location filename="../src/EditProduct.cpp" line="788"/> <source>BMSapp - Add new product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="750"/> + <location filename="../src/EditProduct.cpp" line="790"/> <source>BMSapp - Edit product %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="766"/> - <location filename="../src/EditProduct.cpp" line="770"/> + <location filename="../src/EditProduct.cpp" line="806"/> + <location filename="../src/EditProduct.cpp" line="810"/> <source>Edit Product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="766"/> + <location filename="../src/EditProduct.cpp" line="806"/> <source>Name empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="770"/> + <location filename="../src/EditProduct.cpp" line="810"/> <source>No beerstyle selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="807"/> + <location filename="../src/EditProduct.cpp" line="847"/> <source>Delete product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="831"/> + <location filename="../src/EditProduct.cpp" line="871"/> <source>Product changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="831"/> + <location filename="../src/EditProduct.cpp" line="871"/> <source>The product has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -2904,7 +3073,7 @@ <location filename="../src/EditProductTab5.cpp" line="328"/> <location filename="../src/EditProductTab6.cpp" line="718"/> <location filename="../src/EditProductTab7.cpp" line="303"/> - <location filename="../src/EditProduct.cpp" line="807"/> + <location filename="../src/EditProduct.cpp" line="847"/> <source>Delete %1</source> <translation type="unfinished"></translation> </message> @@ -2936,7 +3105,7 @@ </message> <message> <location filename="../src/EditProductTab3.cpp" line="966"/> - <location filename="../src/EditProductTab4.cpp" line="579"/> + <location filename="../src/EditProductTab4.cpp" line="581"/> <location filename="../src/EditProductTab6.cpp" line="977"/> <source>Use at:</source> <translation type="unfinished"></translation> @@ -2949,7 +3118,7 @@ </message> <message> <location filename="../src/EditProductTab3.cpp" line="976"/> - <location filename="../src/EditProductTab4.cpp" line="589"/> + <location filename="../src/EditProductTab4.cpp" line="591"/> <location filename="../src/EditProductTab5.cpp" line="603"/> <location filename="../src/EditProductTab6.cpp" line="962"/> <source>In stock:</source> @@ -2962,7 +3131,7 @@ </message> <message> <location filename="../src/EditProductTab3.cpp" line="1032"/> - <location filename="../src/EditProductTab4.cpp" line="641"/> + <location filename="../src/EditProductTab4.cpp" line="643"/> <location filename="../src/EditProductTab5.cpp" line="648"/> <source>Boil</source> <translation type="unfinished"></translation> @@ -3006,6 +3175,7 @@ <message> <location filename="../src/EditProductTab4.cpp" line="48"/> <location filename="../src/EditProductTab5.cpp" line="55"/> + <location filename="../src/EditProductTab9.cpp" line="514"/> <source>Time</source> <translation type="unfinished"></translation> </message> @@ -3050,8 +3220,8 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="512"/> - <location filename="../src/EditProductTab4.cpp" line="571"/> + <location filename="../src/EditProductTab4.cpp" line="514"/> + <location filename="../src/EditProductTab4.cpp" line="573"/> <location filename="../src/EditProductTab5.cpp" line="443"/> <location filename="../src/EditProductTab5.cpp" line="532"/> <location filename="../src/EditProductTab5.cpp" line="590"/> @@ -3059,8 +3229,8 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="516"/> - <location filename="../src/EditProductTab4.cpp" line="569"/> + <location filename="../src/EditProductTab4.cpp" line="518"/> + <location filename="../src/EditProductTab4.cpp" line="571"/> <location filename="../src/EditProductTab5.cpp" line="438"/> <location filename="../src/EditProductTab5.cpp" line="527"/> <location filename="../src/EditProductTab5.cpp" line="588"/> @@ -3068,17 +3238,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="553"/> + <location filename="../src/EditProductTab4.cpp" line="555"/> <source>Current hop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="558"/> + <location filename="../src/EditProductTab4.cpp" line="560"/> <source>Origin:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="563"/> + <location filename="../src/EditProductTab4.cpp" line="565"/> <location filename="../src/EditProductTab5.cpp" line="454"/> <location filename="../src/EditProductTab5.cpp" line="579"/> <location filename="../src/EditProductTab6.cpp" line="832"/> @@ -3087,27 +3257,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="584"/> + <location filename="../src/EditProductTab4.cpp" line="586"/> <source>Select hop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="640"/> - <source>First wort</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProductTab4.cpp" line="642"/> - <source>Aroma</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="643"/> - <source>Whirlpool</source> + <source>First wort</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab4.cpp" line="644"/> + <source>Aroma</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="645"/> + <source>Whirlpool</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="646"/> <source>Dry hop</source> <translation type="unfinished"></translation> </message> @@ -3153,6 +3323,7 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab4.cpp" line="647"/> <location filename="../src/EditProductTab5.cpp" line="651"/> <source>Bottling</source> <translation type="unfinished"></translation> @@ -3321,6 +3492,7 @@ </message> <message> <location filename="../src/EditProductTab7.cpp" line="37"/> + <location filename="../src/EditProductTab10.cpp" line="405"/> <source>SG</source> <translation type="unfinished"></translation> </message> @@ -3698,6 +3870,11 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab9.cpp" line="525"/> + <source>Temperature °C or Power %</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab10.cpp" line="42"/> <source>Refractometer Brix:</source> <translation type="unfinished"></translation> @@ -3723,6 +3900,61 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab10.cpp" line="273"/> + <source>Fermenter log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="305"/> + <source>Beer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="309"/> + <source>Chiller</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="331"/> + <location filename="../src/EditProductTab10.cpp" line="421"/> + <location filename="../src/EditProductTab11.cpp" line="629"/> + <source>Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="342"/> + <location filename="../src/EditProductTab10.cpp" line="403"/> + <location filename="../src/EditProductTab11.cpp" line="638"/> + <source>Temp °C</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="353"/> + <source>Power %</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="378"/> + <source>iSpindel log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="409"/> + <source>Battery</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="431"/> + <location filename="../src/EditProductTab11.cpp" line="614"/> + <source>Temperature °C</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="447"/> + <source>Battery volt</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab11.cpp" line="295"/> <source>Confirm package</source> <translation type="unfinished"></translation> @@ -3733,6 +3965,21 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab11.cpp" line="591"/> + <source>Carbonation log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab11.cpp" line="616"/> + <source>Pressure bar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab11.cpp" line="646"/> + <source>Bar</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab12.cpp" line="36"/> <source>Confirm tasting</source> <translation type="unfinished"></translation> @@ -4568,7 +4815,7 @@ <message> <location filename="../ui/EditRecipe.ui" line="837"/> <location filename="../ui/EditRecipe.ui" line="1395"/> - <location filename="../src/EditRecipeTab3.cpp" line="603"/> + <location filename="../src/EditRecipeTab3.cpp" line="605"/> <source>Bitterness IBU:</source> <translation type="unfinished"></translation> </message> @@ -4754,7 +5001,7 @@ <message> <location filename="../ui/EditRecipe.ui" line="2309"/> <location filename="../src/EditRecipeTab2.cpp" line="922"/> - <location filename="../src/EditRecipeTab3.cpp" line="657"/> + <location filename="../src/EditRecipeTab3.cpp" line="659"/> <location filename="../src/EditRecipeTab4.cpp" line="610"/> <source>Mash</source> <translation type="unfinished"></translation> @@ -5126,6 +5373,7 @@ </message> <message> <location filename="../src/EditRecipe.cpp" line="41"/> + <location filename="../src/EditRecipeTab3.cpp" line="676"/> <source>Extract</source> <translation type="unfinished"></translation> </message> @@ -5309,7 +5557,7 @@ </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="857"/> - <location filename="../src/EditRecipeTab3.cpp" line="583"/> + <location filename="../src/EditRecipeTab3.cpp" line="585"/> <location filename="../src/EditRecipeTab5.cpp" line="497"/> <source>Use at:</source> <translation type="unfinished"></translation> @@ -5322,7 +5570,7 @@ </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="867"/> - <location filename="../src/EditRecipeTab3.cpp" line="598"/> + <location filename="../src/EditRecipeTab3.cpp" line="600"/> <location filename="../src/EditRecipeTab4.cpp" line="566"/> <location filename="../src/EditRecipeTab5.cpp" line="482"/> <source>In stock:</source> @@ -5335,7 +5583,7 @@ </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="923"/> - <location filename="../src/EditRecipeTab3.cpp" line="659"/> + <location filename="../src/EditRecipeTab3.cpp" line="661"/> <location filename="../src/EditRecipeTab4.cpp" line="611"/> <source>Boil</source> <translation type="unfinished"></translation> @@ -5434,8 +5682,8 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="489"/> - <location filename="../src/EditRecipeTab3.cpp" line="575"/> + <location filename="../src/EditRecipeTab3.cpp" line="491"/> + <location filename="../src/EditRecipeTab3.cpp" line="577"/> <location filename="../src/EditRecipeTab4.cpp" line="415"/> <location filename="../src/EditRecipeTab4.cpp" line="495"/> <location filename="../src/EditRecipeTab4.cpp" line="553"/> @@ -5443,8 +5691,8 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="493"/> - <location filename="../src/EditRecipeTab3.cpp" line="573"/> + <location filename="../src/EditRecipeTab3.cpp" line="495"/> + <location filename="../src/EditRecipeTab3.cpp" line="575"/> <location filename="../src/EditRecipeTab4.cpp" line="410"/> <location filename="../src/EditRecipeTab4.cpp" line="490"/> <location filename="../src/EditRecipeTab4.cpp" line="551"/> @@ -5452,17 +5700,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="552"/> + <location filename="../src/EditRecipeTab3.cpp" line="554"/> <source>Current hop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="557"/> + <location filename="../src/EditRecipeTab3.cpp" line="559"/> <source>Origin:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="562"/> + <location filename="../src/EditRecipeTab3.cpp" line="564"/> <location filename="../src/EditRecipeTab4.cpp" line="426"/> <location filename="../src/EditRecipeTab4.cpp" line="542"/> <location filename="../src/EditRecipeTab5.cpp" line="365"/> @@ -5471,62 +5719,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="567"/> + <location filename="../src/EditRecipeTab3.cpp" line="569"/> <source>Alpha percent:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="588"/> + <location filename="../src/EditRecipeTab3.cpp" line="590"/> <source>Hop form:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="593"/> + <location filename="../src/EditRecipeTab3.cpp" line="595"/> <source>Select hop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="658"/> - <source>First wort</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditRecipeTab3.cpp" line="660"/> - <source>Aroma</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab3.cpp" line="661"/> - <source>Whirlpool</source> + <source>First wort</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="662"/> + <source>Aroma</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab3.cpp" line="663"/> + <source>Whirlpool</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab3.cpp" line="664"/> <source>Dry hop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="668"/> - <source>Pellet</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab3.cpp" line="669"/> - <source>Plug</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab3.cpp" line="670"/> - <source>Leaf</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditRecipeTab3.cpp" line="671"/> - <source>Wet leaf</source> + <source>Pellet</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="672"/> + <source>Plug</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab3.cpp" line="673"/> + <source>Leaf</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab3.cpp" line="674"/> + <source>Wet leaf</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab3.cpp" line="675"/> <source>Cryo</source> <translation type="unfinished"></translation> </message> @@ -5572,6 +5820,7 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditRecipeTab3.cpp" line="665"/> <location filename="../src/EditRecipeTab4.cpp" line="614"/> <source>Bottling</source> <translation type="unfinished"></translation> @@ -6264,179 +6513,213 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="239"/> - <location filename="../ui/EditYeast.ui" line="255"/> + <location filename="../ui/EditYeast.ui" line="210"/> + <location filename="../ui/EditYeast.ui" line="376"/> + <source> €</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditYeast.ui" line="252"/> + <location filename="../ui/EditYeast.ui" line="288"/> <source>yyyy-MM-dd</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="277"/> + <location filename="../ui/EditYeast.ui" line="310"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="297"/> + <location filename="../ui/EditYeast.ui" line="330"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="317"/> + <location filename="../ui/EditYeast.ui" line="350"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="353"/> + <location filename="../ui/EditYeast.ui" line="389"/> <source>Product id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="372"/> + <location filename="../ui/EditYeast.ui" line="408"/> <source>Product number, name or code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="385"/> + <location filename="../ui/EditYeast.ui" line="421"/> <source>Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="401"/> + <location filename="../ui/EditYeast.ui" line="437"/> <source>Form:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="417"/> + <location filename="../ui/EditYeast.ui" line="453"/> <source>Laboratory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="433"/> + <location filename="../ui/EditYeast.ui" line="469"/> <source>Best for:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="449"/> + <location filename="../ui/EditYeast.ui" line="485"/> <source>Yeast bank:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="465"/> + <location filename="../ui/EditYeast.ui" line="501"/> <source>POF+:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="481"/> + <location filename="../ui/EditYeast.ui" line="517"/> <source>STA1 (diastatic):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="532"/> + <location filename="../ui/EditYeast.ui" line="568"/> <source>Yeast laboratory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="548"/> + <location filename="../ui/EditYeast.ui" line="584"/> <source>Yeast bank remark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="561"/> + <location filename="../ui/EditYeast.ui" line="597"/> <source>Best used in these style of beers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="574"/> - <location filename="../ui/EditYeast.ui" line="587"/> - <location filename="../ui/EditYeast.ui" line="1048"/> - <location filename="../ui/EditYeast.ui" line="1077"/> + <location filename="../ui/EditYeast.ui" line="610"/> + <location filename="../ui/EditYeast.ui" line="623"/> + <location filename="../ui/EditYeast.ui" line="1084"/> + <location filename="../ui/EditYeast.ui" line="1113"/> <source>Yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="622"/> + <location filename="../ui/EditYeast.ui" line="658"/> <source>Min. temperature °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="638"/> + <location filename="../ui/EditYeast.ui" line="674"/> <source>Max. temperature °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="654"/> + <location filename="../ui/EditYeast.ui" line="690"/> <source>Attenuatiom %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="670"/> + <location filename="../ui/EditYeast.ui" line="706"/> <source>Alcohol tolerance %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="686"/> + <location filename="../ui/EditYeast.ui" line="722"/> <source>Flocculation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="702"/> - <location filename="../src/EditYeast.cpp" line="178"/> + <location filename="../ui/EditYeast.ui" line="738"/> + <location filename="../src/EditYeast.cpp" line="182"/> <source>Billion cells/gram:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="718"/> + <location filename="../ui/EditYeast.ui" line="754"/> <source>Max. reuse:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="734"/> + <location filename="../ui/EditYeast.ui" line="770"/> <source>Pitch temperature °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="750"/> + <location filename="../ui/EditYeast.ui" line="786"/> <source>Harvest time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="912"/> - <location filename="../ui/EditYeast.ui" line="931"/> + <location filename="../ui/EditYeast.ui" line="948"/> + <location filename="../ui/EditYeast.ui" line="967"/> <source>grams / 100 litres</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="950"/> - <location filename="../ui/EditYeast.ui" line="975"/> + <location filename="../ui/EditYeast.ui" line="986"/> + <location filename="../ui/EditYeast.ui" line="1011"/> <source>at this gravity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="1000"/> + <location filename="../ui/EditYeast.ui" line="1036"/> <source>Pitch from gr/hl:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="1016"/> + <location filename="../ui/EditYeast.ui" line="1052"/> <source>Pitch upto gr/hl:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="1032"/> + <location filename="../ui/EditYeast.ui" line="1068"/> <source>Bacteria:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="1061"/> + <location filename="../ui/EditYeast.ui" line="1097"/> <source>Harvest top:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="1090"/> - <location filename="../ui/EditYeast.ui" line="1103"/> + <location filename="../ui/EditYeast.ui" line="1126"/> + <location filename="../ui/EditYeast.ui" line="1139"/> <source>@</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../ui/EditYeast.ui" line="1152"/> + <source>Clear tht date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditYeast.ui" line="1155"/> + <location filename="../ui/EditYeast.ui" line="1175"/> + <location filename="../ui/EditYeast.ui" line="1195"/> + <location filename="../ui/EditYeast.ui" line="1215"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditYeast.ui" line="1172"/> + <source>Clear production date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditYeast.ui" line="1192"/> + <source>Set the production date to today.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditYeast.ui" line="1212"/> + <source>Set the tht date to today.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditYeast.cpp" line="32"/> <source>Lager</source> <translation type="unfinished"></translation> @@ -6532,97 +6815,285 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="166"/> + <location filename="../src/EditYeast.cpp" line="170"/> <source>Price per pack:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="167"/> + <location filename="../src/EditYeast.cpp" line="171"/> <source>Inventory Packs:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="168"/> + <location filename="../src/EditYeast.cpp" line="172"/> <source>Billion cells/pack:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="176"/> + <location filename="../src/EditYeast.cpp" line="180"/> <source>Price per Kg:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="177"/> + <location filename="../src/EditYeast.cpp" line="181"/> <source>Inventory gram:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="186"/> + <location filename="../src/EditYeast.cpp" line="190"/> <source>Price per litre:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="187"/> + <location filename="../src/EditYeast.cpp" line="191"/> <source>Inventory ml:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="188"/> + <location filename="../src/EditYeast.cpp" line="192"/> <source>Billion cells/ml:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="225"/> + <location filename="../src/EditYeast.cpp" line="229"/> <source>BMSapp - Add new yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="227"/> + <location filename="../src/EditYeast.cpp" line="231"/> <source>BMSapp - Edit yeast %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="243"/> <location filename="../src/EditYeast.cpp" line="247"/> + <location filename="../src/EditYeast.cpp" line="251"/> <source>Edit Yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="243"/> - <source>Name empty or too short.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditYeast.cpp" line="247"/> + <source>Name empty or too short.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditYeast.cpp" line="251"/> <source>Laboratory empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="310"/> - <location filename="../src/EditYeast.cpp" line="335"/> + <location filename="../src/EditYeast.cpp" line="314"/> + <location filename="../src/EditYeast.cpp" line="339"/> <source>Database error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="311"/> - <location filename="../src/EditYeast.cpp" line="336"/> + <location filename="../src/EditYeast.cpp" line="315"/> + <location filename="../src/EditYeast.cpp" line="340"/> <source>MySQL error: %1 %2 %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="410"/> + <location filename="../src/EditYeast.cpp" line="414"/> <source>Yeast changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="410"/> + <location filename="../src/EditYeast.cpp" line="414"/> <source>The yeast has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>FermentableAdded</name> + <message> + <location filename="../src/global.cpp" line="84"/> + <source>Mash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="85"/> + <source>Boil</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="86"/> + <source>Fermentation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="87"/> + <source>Lagering</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="88"/> + <source>Bottle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="89"/> + <source>Kegs</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>FermentableGraintype</name> + <message> + <location filename="../src/global.cpp" line="74"/> + <source>Base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="75"/> + <source>Roast</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="76"/> + <source>Crystal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="77"/> + <source>Kilned</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="78"/> + <source>Sour Malt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="79"/> + <source>Special</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="80"/> + <source>No malt</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>FermentableType</name> + <message> + <location filename="../src/global.cpp" line="66"/> + <source>Grain</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="67"/> + <source>Sugar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="68"/> + <source>Extract</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="69"/> + <source>Dry extract</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="70"/> + <source>Adjunct</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HopForm</name> + <message> + <location filename="../src/global.cpp" line="99"/> + <source>Pellet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="100"/> + <source>Plug</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="101"/> + <source>Leaf</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="102"/> + <source>Leaf wet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="103"/> + <source>Cryo</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="104"/> + <source>Extract</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HopTypes</name> + <message> + <location filename="../src/global.cpp" line="93"/> + <source>Bittering</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="94"/> + <source>Aroma</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="95"/> + <source>Both</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HopUse</name> + <message> + <location filename="../src/global.cpp" line="108"/> + <source>Mash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="109"/> + <source>First wort</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="110"/> + <source>Boil</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="111"/> + <source>Aroma</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="112"/> + <source>Whirlpool</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="113"/> + <source>Dry hop</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="114"/> + <source>Bottling</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImportXML</name> <message> <location filename="../ui/ImportXML.ui" line="14"/> @@ -6983,6 +7454,31 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../src/InventoryMiscs.cpp" line="118"/> + <source>1 minute</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/InventoryMiscs.cpp" line="120"/> + <source>%1 minutes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/InventoryMiscs.cpp" line="122"/> + <source>%1 hours</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/InventoryMiscs.cpp" line="124"/> + <source>1 day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/InventoryMiscs.cpp" line="126"/> + <source>%1 days</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/InventoryMiscs.cpp" line="157"/> <source>Total items: %1</source> <translation type="unfinished"></translation> @@ -7412,6 +7908,77 @@ </message> </context> <context> + <name>MiscType</name> + <message> + <location filename="../src/global.cpp" line="118"/> + <source>Spice</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="119"/> + <source>Herb</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="120"/> + <source>Flavor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="121"/> + <source>Fining</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="122"/> + <source>Water agent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="123"/> + <source>Yeast nutrient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="124"/> + <source>Other</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MiscUse</name> + <message> + <location filename="../src/global.cpp" line="128"/> + <source>Starter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="129"/> + <source>Mash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="130"/> + <source>Boil</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="131"/> + <source>Primary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="132"/> + <source>Secondary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="133"/> + <source>Bottling</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PrinterDialog</name> <message> <location filename="../src/PrinterDialog.cpp" line="69"/> @@ -8695,29 +9262,29 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2135"/> + <location filename="../src/PrinterDialog.cpp" line="2136"/> <source>%1 split the batch here!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2174"/> + <location filename="../src/PrinterDialog.cpp" line="2175"/> <source>Inventory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2176"/> + <location filename="../src/PrinterDialog.cpp" line="2177"/> <source>Yeastbank</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2186"/> + <location filename="../src/PrinterDialog.cpp" line="2187"/> <source>Date and time</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="756"/> - <location filename="../src/PrinterDialog.cpp" line="2189"/> - <location filename="../src/PrinterDialog.cpp" line="2193"/> + <location filename="../src/PrinterDialog.cpp" line="2190"/> + <location filename="../src/PrinterDialog.cpp" line="2194"/> <source>Beer style</source> <translation type="unfinished"></translation> </message> @@ -9130,6 +9697,69 @@ </message> </context> <context> + <name>ProdStages</name> + <message> + <location filename="../src/global.cpp" line="26"/> + <source>Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="27"/> + <source>Wait</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="28"/> + <source>Brew</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="29"/> + <source>Primary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="30"/> + <source>Secondary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="31"/> + <source>Tertiary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="32"/> + <source>Package</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="33"/> + <source>Carbonation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="34"/> + <source>Mature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="35"/> + <source>Taste</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="36"/> + <source>Ready</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="37"/> + <source>Closed</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ProfileFerments</name> <message> <location filename="../src/ProfileFerments.cpp" line="52"/> @@ -9428,452 +10058,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/global.cpp" line="51"/> - <location filename="../src/global.cpp" line="68"/> - <source>Extract</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="52"/> - <source>Partial Mash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="53"/> - <source>All Grain</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="57"/> - <location filename="../src/global.cpp" line="135"/> - <source>Lager</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="58"/> - <location filename="../src/global.cpp" line="136"/> - <source>Ale</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="59"/> - <source>Mead</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="60"/> - <location filename="../src/global.cpp" line="137"/> - <source>Wheat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="61"/> - <source>Mixed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="62"/> - <source>Cider</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="66"/> - <source>Grain</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="67"/> - <source>Sugar</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="69"/> - <source>Dry extract</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="70"/> - <source>Adjunct</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="74"/> - <source>Base</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="75"/> - <source>Roast</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="76"/> - <source>Crystal</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="77"/> - <source>Kilned</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="78"/> - <source>Sour Malt</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="79"/> - <source>Special</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="80"/> - <source>No malt</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="84"/> - <location filename="../src/global.cpp" line="107"/> - <location filename="../src/global.cpp" line="127"/> - <source>Mash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="85"/> - <location filename="../src/global.cpp" line="109"/> - <location filename="../src/global.cpp" line="128"/> - <source>Boil</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="86"/> - <source>Fermentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="87"/> - <source>Lagering</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="88"/> - <location filename="../src/global.cpp" line="151"/> - <location filename="../src/global.cpp" line="159"/> - <source>Bottle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="89"/> - <source>Kegs</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="93"/> - <source>Bittering</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="94"/> - <location filename="../src/global.cpp" line="110"/> - <source>Aroma</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="95"/> - <source>Both</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="99"/> - <source>Pellet</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="100"/> - <source>Plug</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="101"/> - <source>Leaf</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="102"/> - <source>Leaf wet</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="103"/> - <source>Cryo</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="108"/> - <source>First wort</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="111"/> - <source>Whirlpool</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="112"/> - <source>Dry hop</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="116"/> - <source>Spice</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="117"/> - <source>Herb</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="118"/> - <source>Flavor</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="119"/> - <source>Fining</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="120"/> - <source>Water agent</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="121"/> - <source>Yeast nutrient</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="122"/> - <source>Other</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="126"/> - <source>Starter</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="175"/> - <source>Stainless Steel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="176"/> - <source>Aluminium</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="177"/> - <source>Plastics</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="178"/> - <source>Copper</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="29"/> - <location filename="../src/global.cpp" line="129"/> - <location filename="../src/global.cpp" line="156"/> - <source>Primary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="26"/> - <source>Plan</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="27"/> - <source>Wait</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="28"/> - <source>Brew</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="30"/> - <location filename="../src/global.cpp" line="130"/> - <location filename="../src/global.cpp" line="157"/> - <source>Secondary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="32"/> - <source>Package</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="33"/> - <source>Carbonation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="34"/> - <source>Mature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="35"/> - <source>Taste</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="36"/> - <source>Ready</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="37"/> - <source>Closed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="41"/> - <source>Not divided</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="42"/> - <source>After mash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="43"/> - <source>After boil</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="44"/> - <source>After cooling</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="45"/> - <source>After primary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="46"/> - <source>After secondary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="47"/> - <source>After tertiary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="131"/> - <source>Bottling</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="138"/> - <source>Wine</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="139"/> - <source>Champagne</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="140"/> - <source>Brett</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="141"/> - <source>Kveik</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="142"/> - <source>Hybrid</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="146"/> - <source>Liquid</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="147"/> - <source>Dry</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="148"/> - <source>Slant</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="149"/> - <source>Culture</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="150"/> - <source>Frozen</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="152"/> - <source>Dried</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="31"/> - <location filename="../src/global.cpp" line="158"/> - <source>Tertiary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="163"/> - <source>Stirred</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="164"/> - <source>Shaken</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="165"/> - <source>Simple</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="169"/> - <source>Infusion</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="170"/> - <source>Temperature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/global.cpp" line="171"/> - <source>Decoction</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/database/db_recipe.cpp" line="31"/> <location filename="../src/database/db_recipe.cpp" line="636"/> <location filename="../src/database/db_recipe.cpp" line="669"/> @@ -9901,6 +10085,24 @@ </message> </context> <context> + <name>RecipeType</name> + <message> + <location filename="../src/global.cpp" line="51"/> + <source>Extract</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="52"/> + <source>Partial Mash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="53"/> + <source>All Grain</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>RecipesTree</name> <message> <location filename="../src/RecipesTree.cpp" line="52"/> @@ -10235,4 +10437,205 @@ <translation type="unfinished"></translation> </message> </context> +<context> + <name>Splitter</name> + <message> + <location filename="../src/global.cpp" line="41"/> + <source>Not divided</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="42"/> + <source>After mash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="43"/> + <source>After boil</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="44"/> + <source>After cooling</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="45"/> + <source>After primary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="46"/> + <source>After secondary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="47"/> + <source>After tertiary</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>StepType</name> + <message> + <location filename="../src/global.cpp" line="171"/> + <source>Infusion</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="172"/> + <source>Temperature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="173"/> + <source>Decoction</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>TunMaterial</name> + <message> + <location filename="../src/global.cpp" line="177"/> + <source>Stainless Steel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="178"/> + <source>Aluminium</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="179"/> + <source>Plastics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="180"/> + <source>Copper</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>YeastForm</name> + <message> + <location filename="../src/global.cpp" line="148"/> + <source>Liquid</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="149"/> + <source>Dry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="150"/> + <source>Slant</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="151"/> + <source>Culture</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="152"/> + <source>Frozen</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="153"/> + <source>Bottle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="154"/> + <source>Dried</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>YeastStarter</name> + <message> + <location filename="../src/global.cpp" line="165"/> + <source>Stirred</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="166"/> + <source>Shaken</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="167"/> + <source>Simple</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>YeastType</name> + <message> + <location filename="../src/global.cpp" line="137"/> + <source>Lager</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="138"/> + <source>Ale</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="139"/> + <source>Wheat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="140"/> + <source>Wine</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="141"/> + <source>Champagne</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="142"/> + <source>Brett</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="143"/> + <source>Kveik</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="144"/> + <source>Hybrid</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>YeastUse</name> + <message> + <location filename="../src/global.cpp" line="158"/> + <source>Primary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="159"/> + <source>Secondary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="160"/> + <source>Tertiary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/global.cpp" line="161"/> + <source>Bottle</source> + <translation type="unfinished"></translation> + </message> +</context> </TS>
--- a/translations/bmsapp_nl.ts Sun Jun 19 19:42:29 2022 +0200 +++ b/translations/bmsapp_nl.ts Mon Jun 20 19:55:23 2022 +0200 @@ -46,6 +46,39 @@ </message> </context> <context> + <name>BeerType</name> + <message> + <location filename="../src/global.cpp" line="57"/> + <source>Lager</source> + <translation>Ondergist</translation> + </message> + <message> + <location filename="../src/global.cpp" line="58"/> + <source>Ale</source> + <translation>Bovengist</translation> + </message> + <message> + <location filename="../src/global.cpp" line="59"/> + <source>Mead</source> + <translation>Mede</translation> + </message> + <message> + <location filename="../src/global.cpp" line="60"/> + <source>Wheat</source> + <translation>Tarwebier</translation> + </message> + <message> + <location filename="../src/global.cpp" line="61"/> + <source>Mixed</source> + <translation>Gemengd</translation> + </message> + <message> + <location filename="../src/global.cpp" line="62"/> + <source>Cider</source> + <translation>Cider</translation> + </message> +</context> +<context> <name>EditEquipment</name> <message> <location filename="../ui/EditEquipment.ui" line="14"/> @@ -471,58 +504,97 @@ </message> <message> <location filename="../ui/EditFermentable.ui" line="528"/> - <location filename="../ui/EditFermentable.ui" line="612"/> - <location filename="../ui/EditFermentable.ui" line="656"/> - <location filename="../ui/EditFermentable.ui" line="678"/> - <location filename="../ui/EditFermentable.ui" line="700"/> - <location filename="../ui/EditFermentable.ui" line="722"/> + <location filename="../ui/EditFermentable.ui" line="618"/> + <location filename="../ui/EditFermentable.ui" line="662"/> + <location filename="../ui/EditFermentable.ui" line="684"/> + <location filename="../ui/EditFermentable.ui" line="706"/> + <location filename="../ui/EditFermentable.ui" line="728"/> <source> %</source> <translation> %</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="744"/> + <location filename="../ui/EditFermentable.ui" line="559"/> + <source> Kg</source> + <translation> Kg</translation> + </message> + <message> + <location filename="../ui/EditFermentable.ui" line="590"/> + <location filename="../ui/EditFermentable.ui" line="1006"/> + <source> €</source> + <translation> €</translation> + </message> + <message> + <location filename="../ui/EditFermentable.ui" line="750"/> <source> °WK</source> <translation> °WK</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="804"/> - <location filename="../ui/EditFermentable.ui" line="817"/> - <location filename="../ui/EditFermentable.ui" line="830"/> + <location filename="../ui/EditFermentable.ui" line="810"/> + <location filename="../ui/EditFermentable.ui" line="823"/> + <location filename="../ui/EditFermentable.ui" line="836"/> <source>Yes</source> <translation>Ja</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="879"/> - <location filename="../ui/EditFermentable.ui" line="912"/> + <location filename="../ui/EditFermentable.ui" line="885"/> + <location filename="../ui/EditFermentable.ui" line="918"/> <source>yyyy-MM-dd</source> <translation>yyyy-MM-dd</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="934"/> + <location filename="../ui/EditFermentable.ui" line="940"/> <source>Quit</source> <translation>Terug</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="954"/> + <location filename="../ui/EditFermentable.ui" line="960"/> <source>Save</source> <translation>Bewaar</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="974"/> + <location filename="../ui/EditFermentable.ui" line="980"/> <source>Delete</source> <translation>Verwijder</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1010"/> + <location filename="../ui/EditFermentable.ui" line="1022"/> <source>Lintner:</source> <translation>Lintner:</translation> </message> <message> - <location filename="../ui/EditFermentable.ui" line="1032"/> + <location filename="../ui/EditFermentable.ui" line="1044"/> <source> °L</source> <translation> °L</translation> </message> <message> + <location filename="../ui/EditFermentable.ui" line="1066"/> + <source>Set the tht date to today.</source> + <translation>Zet de tht datum op vandaag.</translation> + </message> + <message> + <location filename="../ui/EditFermentable.ui" line="1069"/> + <location filename="../ui/EditFermentable.ui" line="1089"/> + <location filename="../ui/EditFermentable.ui" line="1109"/> + <location filename="../ui/EditFermentable.ui" line="1129"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../ui/EditFermentable.ui" line="1086"/> + <source>Clear tht date</source> + <translation>Verwijder de tht datum</translation> + </message> + <message> + <location filename="../ui/EditFermentable.ui" line="1106"/> + <source>Set the production date to today.</source> + <translation>Zet de productie datum op vandaag.</translation> + </message> + <message> + <location filename="../ui/EditFermentable.ui" line="1126"/> + <source>Clear production date</source> + <translation>Verwijder de productie datum</translation> + </message> + <message> <location filename="../src/EditFermentable.cpp" line="33"/> <source>Grain</source> <translation>Mout</translation> @@ -613,46 +685,46 @@ <translation>Fusten</translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="159"/> + <location filename="../src/EditFermentable.cpp" line="163"/> <source>BMSapp - Add new fermentable</source> <translation>BMSapp - Nieuw vergistbaar ingredient</translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="161"/> + <location filename="../src/EditFermentable.cpp" line="165"/> <source>BMSapp - Edit fermentable %1</source> <translation>BMSapp - Wijzig vergistbaar ingredient %1</translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="177"/> <location filename="../src/EditFermentable.cpp" line="181"/> <location filename="../src/EditFermentable.cpp" line="185"/> + <location filename="../src/EditFermentable.cpp" line="189"/> <source>Edit Fermentable</source> <translation>Wijzig vergistbaar ingredient</translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="177"/> - <source>Name empty or too short.</source> - <translation>De naam is leeg of te kort.</translation> - </message> - <message> <location filename="../src/EditFermentable.cpp" line="181"/> - <source>Origin empty or too short.</source> - <translation>Herkomst leeg of te kort.</translation> + <source>Name empty or too short.</source> + <translation>De naam is leeg of te kort.</translation> </message> <message> <location filename="../src/EditFermentable.cpp" line="185"/> + <source>Origin empty or too short.</source> + <translation>Herkomst leeg of te kort.</translation> + </message> + <message> + <location filename="../src/EditFermentable.cpp" line="189"/> <source>Supplier empty or too short.</source> <translation>Leverancier leeg of te kort.</translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="238"/> - <location filename="../src/EditFermentable.cpp" line="263"/> + <location filename="../src/EditFermentable.cpp" line="242"/> + <location filename="../src/EditFermentable.cpp" line="267"/> <source>Database error</source> <translation>Database fout</translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="239"/> - <location filename="../src/EditFermentable.cpp" line="264"/> + <location filename="../src/EditFermentable.cpp" line="243"/> + <location filename="../src/EditFermentable.cpp" line="268"/> <source>MySQL error: %1 %2 %3</source> @@ -661,12 +733,12 @@ %3</translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="309"/> + <location filename="../src/EditFermentable.cpp" line="313"/> <source>Fermentable changed</source> <translation>Vergistbaar ingredient gewijzigd</translation> </message> <message> - <location filename="../src/EditFermentable.cpp" line="309"/> + <location filename="../src/EditFermentable.cpp" line="313"/> <source>This fermentable has been modified. Save changes?</source> <translation>Dit vergistbaar ingredient is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -730,113 +802,152 @@ <translation>Opmerkingen en gebruik tips.</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="239"/> - <location filename="../ui/EditHop.ui" line="255"/> + <location filename="../ui/EditHop.ui" line="182"/> + <source> Kg</source> + <translation> Kg</translation> + </message> + <message> + <location filename="../ui/EditHop.ui" line="213"/> + <location filename="../ui/EditHop.ui" line="373"/> + <source> €</source> + <translation> €</translation> + </message> + <message> + <location filename="../ui/EditHop.ui" line="252"/> + <location filename="../ui/EditHop.ui" line="285"/> <source>yyyy-MM-dd</source> <translation>yyyy-MM-dd</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="277"/> + <location filename="../ui/EditHop.ui" line="307"/> <source>Quit</source> <translation>Terug</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="297"/> + <location filename="../ui/EditHop.ui" line="327"/> <source>Save</source> <translation>Bewaar</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="317"/> + <location filename="../ui/EditHop.ui" line="347"/> <source>Delete</source> <translation>Verwijder</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="372"/> + <location filename="../ui/EditHop.ui" line="405"/> <source>Type hop:</source> <translation>Soort hop:</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="388"/> + <location filename="../ui/EditHop.ui" line="421"/> <source>Origin:</source> <translation>Herkomst:</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="404"/> + <location filename="../ui/EditHop.ui" line="437"/> <source>Substitudes:</source> <translation>Vervangers:</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="420"/> - <location filename="../ui/EditHop.ui" line="628"/> + <location filename="../ui/EditHop.ui" line="453"/> + <location filename="../ui/EditHop.ui" line="661"/> <source>Hop Stability Index</source> <translation>Hop Stabiliteit Index</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="423"/> + <location filename="../ui/EditHop.ui" line="456"/> <source>HSI:</source> <translation>HSI:</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="439"/> + <location filename="../ui/EditHop.ui" line="472"/> <source>Total oil:</source> <translation>Totaal olie:</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="455"/> + <location filename="../ui/EditHop.ui" line="488"/> <source>Humulene:</source> <translation></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="471"/> + <location filename="../ui/EditHop.ui" line="504"/> <source>Caryophyllene:</source> <translation></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="487"/> + <location filename="../ui/EditHop.ui" line="520"/> <source>Myrcene:</source> <translation></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="503"/> + <location filename="../ui/EditHop.ui" line="536"/> <source>Cohumulone:</source> <translation></translation> </message> <message> - <location filename="../ui/EditHop.ui" line="519"/> + <location filename="../ui/EditHop.ui" line="552"/> <source>Form:</source> <translation>Vorm:</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="535"/> + <location filename="../ui/EditHop.ui" line="568"/> <source>Alpha %:</source> <translation>Alpha %:</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="551"/> + <location filename="../ui/EditHop.ui" line="584"/> <source>Beta %:</source> <translation>Beta %:</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="567"/> + <location filename="../ui/EditHop.ui" line="600"/> <source>Always on stock:</source> <translation>Altijd in voorraad:</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="583"/> + <location filename="../ui/EditHop.ui" line="616"/> <source>Country and place of origin</source> <translation>Land van herkomst</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="599"/> + <location filename="../ui/EditHop.ui" line="632"/> <source>Substitutes that can be used for this hop</source> <translation>Vervangers die gebruikt kunnen worden</translation> </message> <message> - <location filename="../ui/EditHop.ui" line="759"/> + <location filename="../ui/EditHop.ui" line="792"/> <source>Yes</source> <translation>Ja</translation> </message> <message> + <location filename="../ui/EditHop.ui" line="805"/> + <source>Set the production date to today.</source> + <translation>Zet de productie datum op vandaag.</translation> + </message> + <message> + <location filename="../ui/EditHop.ui" line="808"/> + <location filename="../ui/EditHop.ui" line="828"/> + <location filename="../ui/EditHop.ui" line="848"/> + <location filename="../ui/EditHop.ui" line="868"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../ui/EditHop.ui" line="825"/> + <source>Clear production date</source> + <translation>Verwijder de productie datum</translation> + </message> + <message> + <location filename="../ui/EditHop.ui" line="845"/> + <source>Clear tht date</source> + <translation>Verwijder de tht datum</translation> + </message> + <message> + <location filename="../ui/EditHop.ui" line="865"/> + <source>Set the tht date to today.</source> + <translation>Zet de tht datum op vandaag.</translation> + </message> + <message> <location filename="../src/EditHop.cpp" line="32"/> <source>Bittering</source> <translation>Bitterhop</translation> @@ -877,40 +988,45 @@ <translation>Cryo hop</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="124"/> + <location filename="../src/EditHop.cpp" line="41"/> + <source>Extract</source> + <translation>Extract</translation> + </message> + <message> + <location filename="../src/EditHop.cpp" line="129"/> <source>BMSapp - Add new hop</source> <translation>BMSapp - Nieuwe hop</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="126"/> + <location filename="../src/EditHop.cpp" line="131"/> <source>BMSapp - Edit hop %1</source> <translation>BMSapp - Wijzig hop %1</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="142"/> - <location filename="../src/EditHop.cpp" line="146"/> + <location filename="../src/EditHop.cpp" line="147"/> + <location filename="../src/EditHop.cpp" line="151"/> <source>Edit Hop</source> <translation>Wijzig hop</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="142"/> + <location filename="../src/EditHop.cpp" line="147"/> <source>Name empty or too short.</source> <translation>De naam is leeg of te kort.</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="146"/> + <location filename="../src/EditHop.cpp" line="151"/> <source>Origin empty or too short.</source> <translation>Herkomst leeg of te kort.</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="192"/> - <location filename="../src/EditHop.cpp" line="217"/> + <location filename="../src/EditHop.cpp" line="197"/> + <location filename="../src/EditHop.cpp" line="222"/> <source>Database error</source> <translation>Database fout</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="193"/> - <location filename="../src/EditHop.cpp" line="218"/> + <location filename="../src/EditHop.cpp" line="198"/> + <location filename="../src/EditHop.cpp" line="223"/> <source>MySQL error: %1 %2 %3</source> @@ -919,12 +1035,12 @@ %3</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="244"/> + <location filename="../src/EditHop.cpp" line="249"/> <source>Hop changed</source> <translation>Hop gewijzigd</translation> </message> <message> - <location filename="../src/EditHop.cpp" line="244"/> + <location filename="../src/EditHop.cpp" line="249"/> <source>This hop has been modified. Save changes?</source> <translation>Deze hop is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -988,63 +1104,103 @@ <translation>Opmerkingen en gebruik tips.</translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="239"/> + <location filename="../ui/EditMisc.ui" line="182"/> + <location filename="../src/EditMisc.cpp" line="219"/> + <source> gr</source> + <translation> gr</translation> + </message> + <message> + <location filename="../ui/EditMisc.ui" line="213"/> + <location filename="../ui/EditMisc.ui" line="379"/> + <source> €</source> + <translation> €</translation> + </message> + <message> <location filename="../ui/EditMisc.ui" line="255"/> + <location filename="../ui/EditMisc.ui" line="291"/> <source>yyyy-MM-dd</source> <translation>yyyy-MM-dd</translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="277"/> + <location filename="../ui/EditMisc.ui" line="313"/> <source>Quit</source> <translation>Terug</translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="297"/> + <location filename="../ui/EditMisc.ui" line="333"/> <source>Save</source> <translation>Bewaar</translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="317"/> - <source>Delete</source> - <translation>Verwijder</translation> - </message> - <message> <location filename="../ui/EditMisc.ui" line="353"/> + <source>Delete</source> + <translation>Verwijder</translation> + </message> + <message> + <location filename="../ui/EditMisc.ui" line="395"/> <source>Type:</source> <translation>Soort:</translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="369"/> + <location filename="../ui/EditMisc.ui" line="411"/> <source>Amount is weight:</source> <translation>Eenheid is gewicht:</translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="385"/> + <location filename="../ui/EditMisc.ui" line="427"/> <source>Use at:</source> <translation>Toevoegen bij:</translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="401"/> + <location filename="../ui/EditMisc.ui" line="443"/> <source>Time:</source> <translation>Tijd:</translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="417"/> + <location filename="../ui/EditMisc.ui" line="459"/> <source>Use for:</source> <translation>Toepassing:</translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="433"/> + <location filename="../ui/EditMisc.ui" line="475"/> <source>Always on stock:</source> <translation>Altijd in voorraad:</translation> </message> <message> - <location filename="../ui/EditMisc.ui" line="481"/> - <location filename="../ui/EditMisc.ui" line="513"/> + <location filename="../ui/EditMisc.ui" line="523"/> + <location filename="../ui/EditMisc.ui" line="555"/> <source>Yes</source> <translation>Ja</translation> </message> <message> + <location filename="../ui/EditMisc.ui" line="594"/> + <source>Clear production date</source> + <translation>Verwijder de productie datum</translation> + </message> + <message> + <location filename="../ui/EditMisc.ui" line="597"/> + <location filename="../ui/EditMisc.ui" line="617"/> + <location filename="../ui/EditMisc.ui" line="637"/> + <location filename="../ui/EditMisc.ui" line="657"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../ui/EditMisc.ui" line="614"/> + <source>Set the production date to today.</source> + <translation>Zet de productie datum op vandaag.</translation> + </message> + <message> + <location filename="../ui/EditMisc.ui" line="634"/> + <source>Clear tht date</source> + <translation>Verwijder de tht datum</translation> + </message> + <message> + <location filename="../ui/EditMisc.ui" line="654"/> + <source>Set the tht date to today.</source> + <translation>Zet de tht datum op vandaag.</translation> + </message> + <message> <location filename="../src/EditMisc.cpp" line="32"/> <source>Spice</source> <translation>Specerij</translation> @@ -1110,34 +1266,34 @@ <translation>Bottelen</translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="117"/> + <location filename="../src/EditMisc.cpp" line="122"/> <source>BMSapp - Add new misc ingredient</source> <translation>BMSapp - Nieuw overig ingredient</translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="119"/> + <location filename="../src/EditMisc.cpp" line="124"/> <source>BMSapp - Edit misc ingredient %1</source> <translation>BMSapp - Wijzig overig ingredient %1</translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="135"/> + <location filename="../src/EditMisc.cpp" line="140"/> <source>Edit Misc</source> <translation>Wijzig ingredient</translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="135"/> + <location filename="../src/EditMisc.cpp" line="140"/> <source>Name empty or too short.</source> <translation>De naam is leeg of te kort.</translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="172"/> - <location filename="../src/EditMisc.cpp" line="197"/> + <location filename="../src/EditMisc.cpp" line="177"/> + <location filename="../src/EditMisc.cpp" line="202"/> <source>Database error</source> <translation>Database fout</translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="173"/> - <location filename="../src/EditMisc.cpp" line="198"/> + <location filename="../src/EditMisc.cpp" line="178"/> + <location filename="../src/EditMisc.cpp" line="203"/> <source>MySQL error: %1 %2 %3</source> @@ -1146,12 +1302,17 @@ %3</translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="275"/> + <location filename="../src/EditMisc.cpp" line="221"/> + <source> ml</source> + <translation> ml</translation> + </message> + <message> + <location filename="../src/EditMisc.cpp" line="297"/> <source>Misc changed</source> <translation>Ingredient gewijzigd</translation> </message> <message> - <location filename="../src/EditMisc.cpp" line="275"/> + <location filename="../src/EditMisc.cpp" line="297"/> <source>The ingredient has been modified. Save changes?</source> <translation>Dit ingredient is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -1378,7 +1539,7 @@ <message> <location filename="../ui/EditProduct.ui" line="843"/> <location filename="../ui/EditProduct.ui" line="2541"/> - <location filename="../src/EditProductTab4.cpp" line="594"/> + <location filename="../src/EditProductTab4.cpp" line="596"/> <source>Bitterness IBU:</source> <translation>Bitterheid IBU:</translation> </message> @@ -1660,8 +1821,8 @@ <location filename="../ui/EditProduct.ui" line="3080"/> <location filename="../ui/EditProduct.ui" line="8958"/> <location filename="../ui/EditProduct.ui" line="10219"/> - <location filename="../ui/EditProduct.ui" line="10260"/> - <location filename="../ui/EditProduct.ui" line="10569"/> + <location filename="../ui/EditProduct.ui" line="10296"/> + <location filename="../ui/EditProduct.ui" line="10605"/> <source>Set or clear date</source> <translation>Zet of wis datum</translation> </message> @@ -1687,8 +1848,9 @@ <location filename="../ui/EditProduct.ui" line="8920"/> <location filename="../ui/EditProduct.ui" line="8961"/> <location filename="../ui/EditProduct.ui" line="10222"/> - <location filename="../ui/EditProduct.ui" line="10263"/> - <location filename="../ui/EditProduct.ui" line="10572"/> + <location filename="../ui/EditProduct.ui" line="10242"/> + <location filename="../ui/EditProduct.ui" line="10299"/> + <location filename="../ui/EditProduct.ui" line="10608"/> <source>...</source> <translation>...</translation> </message> @@ -1761,7 +1923,7 @@ <location filename="../ui/EditProduct.ui" line="8353"/> <location filename="../ui/EditProduct.ui" line="8587"/> <location filename="../ui/EditProduct.ui" line="10203"/> - <location filename="../ui/EditProduct.ui" line="10553"/> + <location filename="../ui/EditProduct.ui" line="10589"/> <source>dd-MM-yyyy</source> <translation>dd-MM-yyyy</translation> </message> @@ -1773,7 +1935,7 @@ <message> <location filename="../ui/EditProduct.ui" line="3628"/> <location filename="../src/EditProductTab3.cpp" line="1031"/> - <location filename="../src/EditProductTab4.cpp" line="639"/> + <location filename="../src/EditProductTab4.cpp" line="641"/> <location filename="../src/EditProductTab5.cpp" line="647"/> <source>Mash</source> <translation>Maischen</translation> @@ -2474,6 +2636,7 @@ <location filename="../ui/EditProduct.ui" line="7407"/> <location filename="../ui/EditProduct.ui" line="8897"/> <location filename="../ui/EditProduct.ui" line="8917"/> + <location filename="../ui/EditProduct.ui" line="10239"/> <source>Brew log chart</source> <translation>Brouw log grafiek</translation> </message> @@ -2740,72 +2903,77 @@ <translation>Wijzig de verpakkings datum.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10232"/> + <location filename="../ui/EditProduct.ui" line="10259"/> + <source>Show carbonation log:</source> + <translation>Toon carbonatie log:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10268"/> <source>Tasting</source> <translation>Proeven</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10244"/> - <source>Taste date:</source> - <translation>Proeven datum:</translation> - </message> - <message> <location filename="../ui/EditProduct.ui" line="10280"/> + <source>Taste date:</source> + <translation>Proeven datum:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="10316"/> <source>Taste rate:</source> <translation>Beoordeling cijfer:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10321"/> + <location filename="../ui/EditProduct.ui" line="10357"/> <source>Color:</source> <translation>Kleur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10337"/> + <location filename="../ui/EditProduct.ui" line="10373"/> <source>Transparency:</source> <translation>Helderheid:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10353"/> + <location filename="../ui/EditProduct.ui" line="10389"/> <source>Head:</source> <translation>Schuim:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10408"/> + <location filename="../ui/EditProduct.ui" line="10444"/> <source>Aroma:</source> <translation>Geur:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10437"/> + <location filename="../ui/EditProduct.ui" line="10473"/> <source>Taste:</source> <translation>Smaak:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10466"/> + <location filename="../ui/EditProduct.ui" line="10502"/> <source>Aftertaste:</source> <translation>Nasmaak:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10495"/> + <location filename="../ui/EditProduct.ui" line="10531"/> <source>Mouthfeel:</source> <translation>Mondgevoel:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10524"/> + <location filename="../ui/EditProduct.ui" line="10560"/> <source>Notes:</source> <translation>Opmerkingen:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10550"/> + <location filename="../ui/EditProduct.ui" line="10586"/> <source>Edit the tasting date.</source> <translation>Wijzig de datum van proeven.</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10591"/> + <location filename="../ui/EditProduct.ui" line="10627"/> <source>Export</source> <translation>Exporteer</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10608"/> + <location filename="../ui/EditProduct.ui" line="10644"/> <source>Print</source> <translation>Print</translation> </message> @@ -2866,6 +3034,7 @@ </message> <message> <location filename="../src/EditProduct.cpp" line="101"/> + <location filename="../src/EditProductTab10.cpp" line="303"/> <source>Air</source> <translation>Lucht</translation> </message> @@ -2883,7 +3052,7 @@ <translation type="vanished">MySQL fout: record %1 niet gevonden</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="262"/> + <location filename="../src/EditProduct.cpp" line="301"/> <source>%1, part %2 of %3</source> <translation>%1, deel %2 van %3</translation> </message> @@ -2892,28 +3061,28 @@ <translation type="vanished">Koken %1 minuten</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="748"/> + <location filename="../src/EditProduct.cpp" line="788"/> <source>BMSapp - Add new product</source> <translation>BMSapp - Nieuw product</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="750"/> + <location filename="../src/EditProduct.cpp" line="790"/> <source>BMSapp - Edit product %1</source> <translation>BMSapp - Wijzig product %1</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="766"/> - <location filename="../src/EditProduct.cpp" line="770"/> + <location filename="../src/EditProduct.cpp" line="806"/> + <location filename="../src/EditProduct.cpp" line="810"/> <source>Edit Product</source> <translation>Wijzig Product</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="766"/> + <location filename="../src/EditProduct.cpp" line="806"/> <source>Name empty or too short.</source> <translation>De naam is leeg of te kort.</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="770"/> + <location filename="../src/EditProduct.cpp" line="810"/> <source>No beerstyle selected.</source> <translation>Geen bierstijl gekozen.</translation> </message> @@ -2926,17 +3095,17 @@ %3</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="807"/> + <location filename="../src/EditProduct.cpp" line="847"/> <source>Delete product</source> <translation>Verwijder product</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="831"/> + <location filename="../src/EditProduct.cpp" line="871"/> <source>Product changed</source> <translation>Product gewijzigd</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="831"/> + <location filename="../src/EditProduct.cpp" line="871"/> <source>The product has been modified. Save changes?</source> <translation>Het product is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -3034,7 +3203,7 @@ <location filename="../src/EditProductTab5.cpp" line="328"/> <location filename="../src/EditProductTab6.cpp" line="718"/> <location filename="../src/EditProductTab7.cpp" line="303"/> - <location filename="../src/EditProduct.cpp" line="807"/> + <location filename="../src/EditProduct.cpp" line="847"/> <source>Delete %1</source> <translation>Verwijder %1</translation> </message> @@ -3066,7 +3235,7 @@ </message> <message> <location filename="../src/EditProductTab3.cpp" line="966"/> - <location filename="../src/EditProductTab4.cpp" line="579"/> + <location filename="../src/EditProductTab4.cpp" line="581"/> <location filename="../src/EditProductTab6.cpp" line="977"/> <source>Use at:</source> <translation>Toevoegen bij:</translation> @@ -3079,7 +3248,7 @@ </message> <message> <location filename="../src/EditProductTab3.cpp" line="976"/> - <location filename="../src/EditProductTab4.cpp" line="589"/> + <location filename="../src/EditProductTab4.cpp" line="591"/> <location filename="../src/EditProductTab5.cpp" line="603"/> <location filename="../src/EditProductTab6.cpp" line="962"/> <source>In stock:</source> @@ -3092,7 +3261,7 @@ </message> <message> <location filename="../src/EditProductTab3.cpp" line="1032"/> - <location filename="../src/EditProductTab4.cpp" line="641"/> + <location filename="../src/EditProductTab4.cpp" line="643"/> <location filename="../src/EditProductTab5.cpp" line="648"/> <source>Boil</source> <translation>Koken</translation> @@ -3136,6 +3305,7 @@ <message> <location filename="../src/EditProductTab4.cpp" line="48"/> <location filename="../src/EditProductTab5.cpp" line="55"/> + <location filename="../src/EditProductTab9.cpp" line="514"/> <source>Time</source> <translation>Tijd</translation> </message> @@ -3180,8 +3350,8 @@ <translation>Verwijder hop</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="512"/> - <location filename="../src/EditProductTab4.cpp" line="571"/> + <location filename="../src/EditProductTab4.cpp" line="514"/> + <location filename="../src/EditProductTab4.cpp" line="573"/> <location filename="../src/EditProductTab5.cpp" line="443"/> <location filename="../src/EditProductTab5.cpp" line="532"/> <location filename="../src/EditProductTab5.cpp" line="590"/> @@ -3189,8 +3359,8 @@ <translation>Tijd in minuten:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="516"/> - <location filename="../src/EditProductTab4.cpp" line="569"/> + <location filename="../src/EditProductTab4.cpp" line="518"/> + <location filename="../src/EditProductTab4.cpp" line="571"/> <location filename="../src/EditProductTab5.cpp" line="438"/> <location filename="../src/EditProductTab5.cpp" line="527"/> <location filename="../src/EditProductTab5.cpp" line="588"/> @@ -3198,17 +3368,17 @@ <translation>Tijd in dagen:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="553"/> + <location filename="../src/EditProductTab4.cpp" line="555"/> <source>Current hop:</source> <translation>Huidige hop:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="558"/> + <location filename="../src/EditProductTab4.cpp" line="560"/> <source>Origin:</source> <translation>Herkomst:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="563"/> + <location filename="../src/EditProductTab4.cpp" line="565"/> <location filename="../src/EditProductTab5.cpp" line="454"/> <location filename="../src/EditProductTab5.cpp" line="579"/> <location filename="../src/EditProductTab6.cpp" line="832"/> @@ -3217,27 +3387,35 @@ <translation>Gewicht in gr:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="584"/> + <location filename="../src/EditProductTab4.cpp" line="586"/> <source>Select hop:</source> <translation>Kies hop:</translation> </message> <message> - <location filename="../src/EditProductTab4.cpp" line="640"/> - <source>First wort</source> - <translation>Maischhop</translation> - </message> - <message> <location filename="../src/EditProductTab4.cpp" line="642"/> - <source>Aroma</source> - <translation>Aromahop</translation> - </message> - <message> - <location filename="../src/EditProductTab4.cpp" line="643"/> - <source>Whirlpool</source> - <translation>Hopstand</translation> + <source>First wort</source> + <translation>Maischhop</translation> </message> <message> <location filename="../src/EditProductTab4.cpp" line="644"/> + <source>Aroma</source> + <translation>Aromahop</translation> + </message> + <message> + <source>Bittering</source> + <translation type="obsolete">Bitterhop</translation> + </message> + <message> + <source>Both</source> + <translation type="obsolete">Beide</translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="645"/> + <source>Whirlpool</source> + <translation>Hopstand</translation> + </message> + <message> + <location filename="../src/EditProductTab4.cpp" line="646"/> <source>Dry hop</source> <translation>Koudhop</translation> </message> @@ -3283,6 +3461,7 @@ <translation>Nagisting/lagering</translation> </message> <message> + <location filename="../src/EditProductTab4.cpp" line="647"/> <location filename="../src/EditProductTab5.cpp" line="651"/> <source>Bottling</source> <translation>Bottelen</translation> @@ -3451,6 +3630,7 @@ </message> <message> <location filename="../src/EditProductTab7.cpp" line="37"/> + <location filename="../src/EditProductTab10.cpp" line="405"/> <source>SG</source> <translation>SG</translation> </message> @@ -3837,6 +4017,11 @@ <translation> cm</translation> </message> <message> + <location filename="../src/EditProductTab9.cpp" line="525"/> + <source>Temperature °C or Power %</source> + <translation>Temperatuur °C of Power %</translation> + </message> + <message> <location filename="../src/EditProductTab10.cpp" line="42"/> <source>Refractometer Brix:</source> <translation>Refractometer Brix:</translation> @@ -3862,6 +4047,61 @@ <translation>Bevesting dat de nagisting datum en gegevens kloppen</translation> </message> <message> + <location filename="../src/EditProductTab10.cpp" line="273"/> + <source>Fermenter log</source> + <translation>Gistkast log</translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="305"/> + <source>Beer</source> + <translation>Bier</translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="309"/> + <source>Chiller</source> + <translation>Koeler</translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="331"/> + <location filename="../src/EditProductTab10.cpp" line="421"/> + <location filename="../src/EditProductTab11.cpp" line="629"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="342"/> + <location filename="../src/EditProductTab10.cpp" line="403"/> + <location filename="../src/EditProductTab11.cpp" line="638"/> + <source>Temp °C</source> + <translation>Temp °C</translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="353"/> + <source>Power %</source> + <translation>Power %</translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="378"/> + <source>iSpindel log</source> + <translation>iSpindel log</translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="409"/> + <source>Battery</source> + <translation>Batterij</translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="431"/> + <location filename="../src/EditProductTab11.cpp" line="614"/> + <source>Temperature °C</source> + <translation>Temperatuur °C</translation> + </message> + <message> + <location filename="../src/EditProductTab10.cpp" line="447"/> + <source>Battery volt</source> + <translation>Batterij volt</translation> + </message> + <message> <location filename="../src/EditProductTab11.cpp" line="295"/> <source>Confirm package</source> <translation>Bevestig verpakken</translation> @@ -3872,6 +4112,21 @@ <translation>Bevestig dat het bier verpakt is en de gegevens kloppen</translation> </message> <message> + <location filename="../src/EditProductTab11.cpp" line="591"/> + <source>Carbonation log</source> + <translation>Carbonatie log</translation> + </message> + <message> + <location filename="../src/EditProductTab11.cpp" line="616"/> + <source>Pressure bar</source> + <translation>Druk in bar</translation> + </message> + <message> + <location filename="../src/EditProductTab11.cpp" line="646"/> + <source>Bar</source> + <translation>Bar</translation> + </message> + <message> <location filename="../src/EditProductTab12.cpp" line="36"/> <source>Confirm tasting</source> <translation>Bevestig proeven</translation> @@ -4741,7 +4996,7 @@ <message> <location filename="../ui/EditRecipe.ui" line="837"/> <location filename="../ui/EditRecipe.ui" line="1395"/> - <location filename="../src/EditRecipeTab3.cpp" line="603"/> + <location filename="../src/EditRecipeTab3.cpp" line="605"/> <source>Bitterness IBU:</source> <translation>Bitterheid IBU:</translation> </message> @@ -4931,7 +5186,7 @@ <message> <location filename="../ui/EditRecipe.ui" line="2309"/> <location filename="../src/EditRecipeTab2.cpp" line="922"/> - <location filename="../src/EditRecipeTab3.cpp" line="657"/> + <location filename="../src/EditRecipeTab3.cpp" line="659"/> <location filename="../src/EditRecipeTab4.cpp" line="610"/> <source>Mash</source> <translation>Maischen</translation> @@ -5308,6 +5563,7 @@ </message> <message> <location filename="../src/EditRecipe.cpp" line="41"/> + <location filename="../src/EditRecipeTab3.cpp" line="676"/> <source>Extract</source> <translation>Extract</translation> </message> @@ -5507,7 +5763,7 @@ </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="857"/> - <location filename="../src/EditRecipeTab3.cpp" line="583"/> + <location filename="../src/EditRecipeTab3.cpp" line="585"/> <location filename="../src/EditRecipeTab5.cpp" line="497"/> <source>Use at:</source> <translation>Toevoegen bij:</translation> @@ -5520,7 +5776,7 @@ </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="867"/> - <location filename="../src/EditRecipeTab3.cpp" line="598"/> + <location filename="../src/EditRecipeTab3.cpp" line="600"/> <location filename="../src/EditRecipeTab4.cpp" line="566"/> <location filename="../src/EditRecipeTab5.cpp" line="482"/> <source>In stock:</source> @@ -5533,7 +5789,7 @@ </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="923"/> - <location filename="../src/EditRecipeTab3.cpp" line="659"/> + <location filename="../src/EditRecipeTab3.cpp" line="661"/> <location filename="../src/EditRecipeTab4.cpp" line="611"/> <source>Boil</source> <translation>Koken</translation> @@ -5632,8 +5888,8 @@ <translation>Verwijder hop</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="489"/> - <location filename="../src/EditRecipeTab3.cpp" line="575"/> + <location filename="../src/EditRecipeTab3.cpp" line="491"/> + <location filename="../src/EditRecipeTab3.cpp" line="577"/> <location filename="../src/EditRecipeTab4.cpp" line="415"/> <location filename="../src/EditRecipeTab4.cpp" line="495"/> <location filename="../src/EditRecipeTab4.cpp" line="553"/> @@ -5641,8 +5897,8 @@ <translation>Tijd in minuten:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="493"/> - <location filename="../src/EditRecipeTab3.cpp" line="573"/> + <location filename="../src/EditRecipeTab3.cpp" line="495"/> + <location filename="../src/EditRecipeTab3.cpp" line="575"/> <location filename="../src/EditRecipeTab4.cpp" line="410"/> <location filename="../src/EditRecipeTab4.cpp" line="490"/> <location filename="../src/EditRecipeTab4.cpp" line="551"/> @@ -5650,17 +5906,17 @@ <translation>Tijd in dagen:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="552"/> + <location filename="../src/EditRecipeTab3.cpp" line="554"/> <source>Current hop:</source> <translation>Huidige hop:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="557"/> + <location filename="../src/EditRecipeTab3.cpp" line="559"/> <source>Origin:</source> <translation>Herkomst:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="562"/> + <location filename="../src/EditRecipeTab3.cpp" line="564"/> <location filename="../src/EditRecipeTab4.cpp" line="426"/> <location filename="../src/EditRecipeTab4.cpp" line="542"/> <location filename="../src/EditRecipeTab5.cpp" line="365"/> @@ -5669,7 +5925,7 @@ <translation>Gewicht in gr:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="567"/> + <location filename="../src/EditRecipeTab3.cpp" line="569"/> <source>Alpha percent:</source> <translation>Alpha procent:</translation> </message> @@ -5678,57 +5934,57 @@ <translation type="vanished">Alpha percentage:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="588"/> + <location filename="../src/EditRecipeTab3.cpp" line="590"/> <source>Hop form:</source> <translation>Hop vorm:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="593"/> + <location filename="../src/EditRecipeTab3.cpp" line="595"/> <source>Select hop:</source> <translation>Kies hop:</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="658"/> - <source>First wort</source> - <translation>Maischhop</translation> - </message> - <message> <location filename="../src/EditRecipeTab3.cpp" line="660"/> - <source>Aroma</source> - <translation>Aromahop</translation> - </message> - <message> - <location filename="../src/EditRecipeTab3.cpp" line="661"/> - <source>Whirlpool</source> - <translation>Whirlpool hop</translation> + <source>First wort</source> + <translation>Maischhop</translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="662"/> + <source>Aroma</source> + <translation>Aromahop</translation> + </message> + <message> + <location filename="../src/EditRecipeTab3.cpp" line="663"/> + <source>Whirlpool</source> + <translation>Whirlpool hop</translation> + </message> + <message> + <location filename="../src/EditRecipeTab3.cpp" line="664"/> <source>Dry hop</source> <translation>Koudhop</translation> </message> <message> - <location filename="../src/EditRecipeTab3.cpp" line="668"/> - <source>Pellet</source> - <translation>Pellets</translation> - </message> - <message> - <location filename="../src/EditRecipeTab3.cpp" line="669"/> - <source>Plug</source> - <translation>Plugs</translation> - </message> - <message> - <location filename="../src/EditRecipeTab3.cpp" line="670"/> - <source>Leaf</source> - <translation>Bloemen</translation> - </message> - <message> <location filename="../src/EditRecipeTab3.cpp" line="671"/> - <source>Wet leaf</source> - <translation>Nat, vers</translation> + <source>Pellet</source> + <translation>Pellets</translation> </message> <message> <location filename="../src/EditRecipeTab3.cpp" line="672"/> + <source>Plug</source> + <translation>Plugs</translation> + </message> + <message> + <location filename="../src/EditRecipeTab3.cpp" line="673"/> + <source>Leaf</source> + <translation>Bloemen</translation> + </message> + <message> + <location filename="../src/EditRecipeTab3.cpp" line="674"/> + <source>Wet leaf</source> + <translation>Nat, vers</translation> + </message> + <message> + <location filename="../src/EditRecipeTab3.cpp" line="675"/> <source>Cryo</source> <translation>Cryo hop</translation> </message> @@ -5774,6 +6030,7 @@ <translation>Nagisting/lagering</translation> </message> <message> + <location filename="../src/EditRecipeTab3.cpp" line="665"/> <location filename="../src/EditRecipeTab4.cpp" line="614"/> <source>Bottling</source> <translation>Bottelen</translation> @@ -6487,179 +6744,213 @@ <translation>Opmerkingen en gebruik tips.</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="239"/> - <location filename="../ui/EditYeast.ui" line="255"/> + <location filename="../ui/EditYeast.ui" line="210"/> + <location filename="../ui/EditYeast.ui" line="376"/> + <source> €</source> + <translation> €</translation> + </message> + <message> + <location filename="../ui/EditYeast.ui" line="252"/> + <location filename="../ui/EditYeast.ui" line="288"/> <source>yyyy-MM-dd</source> <translation>yyyy-MM-dd</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="277"/> + <location filename="../ui/EditYeast.ui" line="310"/> <source>Quit</source> <translation>Terug</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="297"/> + <location filename="../ui/EditYeast.ui" line="330"/> <source>Save</source> <translation>Bewaar</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="317"/> + <location filename="../ui/EditYeast.ui" line="350"/> <source>Delete</source> <translation>Verwijder</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="353"/> + <location filename="../ui/EditYeast.ui" line="389"/> <source>Product id:</source> <translation>Product code:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="372"/> + <location filename="../ui/EditYeast.ui" line="408"/> <source>Product number, name or code</source> <translation>Product nummer, naam of code</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="385"/> + <location filename="../ui/EditYeast.ui" line="421"/> <source>Type:</source> <translation>Soort:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="401"/> + <location filename="../ui/EditYeast.ui" line="437"/> <source>Form:</source> <translation>Vorm:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="417"/> + <location filename="../ui/EditYeast.ui" line="453"/> <source>Laboratory:</source> <translation>Laboratorium:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="433"/> + <location filename="../ui/EditYeast.ui" line="469"/> <source>Best for:</source> <translation>Geschikt voor:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="449"/> + <location filename="../ui/EditYeast.ui" line="485"/> <source>Yeast bank:</source> <translation>Gist bank:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="465"/> + <location filename="../ui/EditYeast.ui" line="501"/> <source>POF+:</source> <translation>POF+:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="481"/> + <location filename="../ui/EditYeast.ui" line="517"/> <source>STA1 (diastatic):</source> <translation>STA1 (diastatic):</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="532"/> + <location filename="../ui/EditYeast.ui" line="568"/> <source>Yeast laboratory</source> <translation>Gist laboratorium</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="548"/> + <location filename="../ui/EditYeast.ui" line="584"/> <source>Yeast bank remark</source> <translation>Gistbank opmerkingen</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="561"/> + <location filename="../ui/EditYeast.ui" line="597"/> <source>Best used in these style of beers</source> <translation>Geschikt voor deze bierstijlen</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="574"/> - <location filename="../ui/EditYeast.ui" line="587"/> - <location filename="../ui/EditYeast.ui" line="1048"/> - <location filename="../ui/EditYeast.ui" line="1077"/> + <location filename="../ui/EditYeast.ui" line="610"/> + <location filename="../ui/EditYeast.ui" line="623"/> + <location filename="../ui/EditYeast.ui" line="1084"/> + <location filename="../ui/EditYeast.ui" line="1113"/> <source>Yes</source> <translation>Ja</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="622"/> + <location filename="../ui/EditYeast.ui" line="658"/> <source>Min. temperature °C:</source> <translation>Min. temperatuur °C:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="638"/> + <location filename="../ui/EditYeast.ui" line="674"/> <source>Max. temperature °C:</source> <translation>Max. temperatuur °C:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="654"/> + <location filename="../ui/EditYeast.ui" line="690"/> <source>Attenuatiom %:</source> <translation>Vergistingsgraad %:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="670"/> + <location filename="../ui/EditYeast.ui" line="706"/> <source>Alcohol tolerance %:</source> <translation>Alcohol tolerantie %:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="686"/> + <location filename="../ui/EditYeast.ui" line="722"/> <source>Flocculation:</source> <translation>Flocculatie:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="702"/> - <location filename="../src/EditYeast.cpp" line="178"/> + <location filename="../ui/EditYeast.ui" line="738"/> + <location filename="../src/EditYeast.cpp" line="182"/> <source>Billion cells/gram:</source> <translation>Miljard cellen/gram:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="718"/> + <location filename="../ui/EditYeast.ui" line="754"/> <source>Max. reuse:</source> <translation>Max. hergebruik:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="734"/> + <location filename="../ui/EditYeast.ui" line="770"/> <source>Pitch temperature °C:</source> <translation>Ent temperatuur °C:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="750"/> + <location filename="../ui/EditYeast.ui" line="786"/> <source>Harvest time:</source> <translation>Oogst tijd:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="912"/> - <location filename="../ui/EditYeast.ui" line="931"/> + <location filename="../ui/EditYeast.ui" line="948"/> + <location filename="../ui/EditYeast.ui" line="967"/> <source>grams / 100 litres</source> <translation>grammen per 100 liter</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="950"/> - <location filename="../ui/EditYeast.ui" line="975"/> + <location filename="../ui/EditYeast.ui" line="986"/> + <location filename="../ui/EditYeast.ui" line="1011"/> <source>at this gravity</source> <translation>op deze densiteit</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="1000"/> + <location filename="../ui/EditYeast.ui" line="1036"/> <source>Pitch from gr/hl:</source> <translation>Ent vanaf gr/hl:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="1016"/> + <location filename="../ui/EditYeast.ui" line="1052"/> <source>Pitch upto gr/hl:</source> <translation>Ent tot gr/hl:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="1032"/> + <location filename="../ui/EditYeast.ui" line="1068"/> <source>Bacteria:</source> <translation>Bevat bacterien:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="1061"/> + <location filename="../ui/EditYeast.ui" line="1097"/> <source>Harvest top:</source> <translation>Oogst van boven:</translation> </message> <message> - <location filename="../ui/EditYeast.ui" line="1090"/> - <location filename="../ui/EditYeast.ui" line="1103"/> + <location filename="../ui/EditYeast.ui" line="1126"/> + <location filename="../ui/EditYeast.ui" line="1139"/> <source>@</source> <translation>@</translation> </message> <message> + <location filename="../ui/EditYeast.ui" line="1152"/> + <source>Clear tht date</source> + <translation>Verwijder de tht datum</translation> + </message> + <message> + <location filename="../ui/EditYeast.ui" line="1155"/> + <location filename="../ui/EditYeast.ui" line="1175"/> + <location filename="../ui/EditYeast.ui" line="1195"/> + <location filename="../ui/EditYeast.ui" line="1215"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../ui/EditYeast.ui" line="1172"/> + <source>Clear production date</source> + <translation>Verwijder de productie datum</translation> + </message> + <message> + <location filename="../ui/EditYeast.ui" line="1192"/> + <source>Set the production date to today.</source> + <translation>Zet de productie datum op vandaag.</translation> + </message> + <message> + <location filename="../ui/EditYeast.ui" line="1212"/> + <source>Set the tht date to today.</source> + <translation>Zet de tht datum op vandaag.</translation> + </message> + <message> <location filename="../src/EditYeast.cpp" line="32"/> <source>Lager</source> <translation>Ondergist</translation> @@ -6755,80 +7046,80 @@ <translation>Zeer hoog</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="166"/> + <location filename="../src/EditYeast.cpp" line="170"/> <source>Price per pack:</source> <translation>Prijs per pak:</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="167"/> + <location filename="../src/EditYeast.cpp" line="171"/> <source>Inventory Packs:</source> <translation>Voorraad pakken:</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="168"/> + <location filename="../src/EditYeast.cpp" line="172"/> <source>Billion cells/pack:</source> <translation>Miljard cellen/pak:</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="176"/> + <location filename="../src/EditYeast.cpp" line="180"/> <source>Price per Kg:</source> <translation>Prijs per kg:</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="177"/> + <location filename="../src/EditYeast.cpp" line="181"/> <source>Inventory gram:</source> <translation>Voorraad gram:</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="186"/> + <location filename="../src/EditYeast.cpp" line="190"/> <source>Price per litre:</source> <translation>Prijs per liter:</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="187"/> + <location filename="../src/EditYeast.cpp" line="191"/> <source>Inventory ml:</source> <translation>Voorraad ml:</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="188"/> + <location filename="../src/EditYeast.cpp" line="192"/> <source>Billion cells/ml:</source> <translation>Miljard cellen/ml:</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="225"/> + <location filename="../src/EditYeast.cpp" line="229"/> <source>BMSapp - Add new yeast</source> <translation>BMSapp - Nieuwe gist</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="227"/> + <location filename="../src/EditYeast.cpp" line="231"/> <source>BMSapp - Edit yeast %1</source> <translation>BMSapp - Wijzig gist %1</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="243"/> - <location filename="../src/EditYeast.cpp" line="247"/> - <source>Edit Yeast</source> - <translation>Wijzig gist</translation> - </message> - <message> - <location filename="../src/EditYeast.cpp" line="243"/> - <source>Name empty or too short.</source> - <translation>De naam is leeg of te kort.</translation> - </message> - <message> <location filename="../src/EditYeast.cpp" line="247"/> + <location filename="../src/EditYeast.cpp" line="251"/> + <source>Edit Yeast</source> + <translation>Wijzig gist</translation> + </message> + <message> + <location filename="../src/EditYeast.cpp" line="247"/> + <source>Name empty or too short.</source> + <translation>De naam is leeg of te kort.</translation> + </message> + <message> + <location filename="../src/EditYeast.cpp" line="251"/> <source>Laboratory empty or too short.</source> <translation>Laboratorium leeg of te kort.</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="310"/> - <location filename="../src/EditYeast.cpp" line="335"/> + <location filename="../src/EditYeast.cpp" line="314"/> + <location filename="../src/EditYeast.cpp" line="339"/> <source>Database error</source> <translation>Database fout</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="311"/> - <location filename="../src/EditYeast.cpp" line="336"/> + <location filename="../src/EditYeast.cpp" line="315"/> + <location filename="../src/EditYeast.cpp" line="340"/> <source>MySQL error: %1 %2 %3</source> @@ -6837,12 +7128,12 @@ %3</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="410"/> + <location filename="../src/EditYeast.cpp" line="414"/> <source>Yeast changed</source> <translation>Gist gewijzigd</translation> </message> <message> - <location filename="../src/EditYeast.cpp" line="410"/> + <location filename="../src/EditYeast.cpp" line="414"/> <source>The yeast has been modified. Save changes?</source> <translation>Deze gist is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -6854,6 +7145,217 @@ </message> </context> <context> + <name>FermentableAdded</name> + <message> + <location filename="../src/global.cpp" line="84"/> + <source>Mash</source> + <translation>Maischen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="85"/> + <source>Boil</source> + <translation>Koken</translation> + </message> + <message> + <location filename="../src/global.cpp" line="86"/> + <source>Fermentation</source> + <translation>Hoofdvergisting</translation> + </message> + <message> + <location filename="../src/global.cpp" line="87"/> + <source>Lagering</source> + <translation>Nagisting/lagering</translation> + </message> + <message> + <location filename="../src/global.cpp" line="88"/> + <source>Bottle</source> + <translation>Bottelen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="89"/> + <source>Kegs</source> + <translation>Fusten</translation> + </message> +</context> +<context> + <name>FermentableGraintype</name> + <message> + <location filename="../src/global.cpp" line="74"/> + <source>Base</source> + <translation>Basismout</translation> + </message> + <message> + <location filename="../src/global.cpp" line="75"/> + <source>Roast</source> + <translation>Geroosterde mout</translation> + </message> + <message> + <location filename="../src/global.cpp" line="76"/> + <source>Crystal</source> + <translation>Cara/crystal mout</translation> + </message> + <message> + <location filename="../src/global.cpp" line="77"/> + <source>Kilned</source> + <translation>Geëeste mout</translation> + </message> + <message> + <location filename="../src/global.cpp" line="78"/> + <source>Sour Malt</source> + <translation>Zuurmout</translation> + </message> + <message> + <location filename="../src/global.cpp" line="79"/> + <source>Special</source> + <translation>Speciale mout</translation> + </message> + <message> + <location filename="../src/global.cpp" line="80"/> + <source>No malt</source> + <translation>Geen mout</translation> + </message> +</context> +<context> + <name>FermentableType</name> + <message> + <location filename="../src/global.cpp" line="66"/> + <source>Grain</source> + <translation>Mout</translation> + </message> + <message> + <location filename="../src/global.cpp" line="67"/> + <source>Sugar</source> + <translation>Suiker</translation> + </message> + <message> + <location filename="../src/global.cpp" line="68"/> + <source>Extract</source> + <translation></translation> + </message> + <message> + <location filename="../src/global.cpp" line="69"/> + <source>Dry extract</source> + <translation>Droog extract</translation> + </message> + <message> + <location filename="../src/global.cpp" line="70"/> + <source>Adjunct</source> + <translation>Ongemout graan</translation> + </message> +</context> +<context> + <name>HopForm</name> + <message> + <location filename="../src/global.cpp" line="99"/> + <source>Pellet</source> + <translation>Pellets</translation> + </message> + <message> + <location filename="../src/global.cpp" line="100"/> + <source>Plug</source> + <translation>Plugs</translation> + </message> + <message> + <location filename="../src/global.cpp" line="101"/> + <source>Leaf</source> + <translation>Bloemen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="102"/> + <source>Leaf wet</source> + <translation>Nat, vers</translation> + </message> + <message> + <location filename="../src/global.cpp" line="103"/> + <source>Cryo</source> + <translation>Cryo hop</translation> + </message> + <message> + <location filename="../src/global.cpp" line="104"/> + <source>Extract</source> + <translation>Extract</translation> + </message> +</context> +<context> + <name>HopForms</name> + <message> + <source>Pellet</source> + <translation type="obsolete">Pellets</translation> + </message> + <message> + <source>Plug</source> + <translation type="obsolete">Plugs</translation> + </message> + <message> + <source>Leaf</source> + <translation type="obsolete">Bloemen</translation> + </message> + <message> + <source>Leaf wet</source> + <translation type="obsolete">Nat, vers</translation> + </message> + <message> + <source>Cryo</source> + <translation type="obsolete">Cryo hop</translation> + </message> +</context> +<context> + <name>HopTypes</name> + <message> + <location filename="../src/global.cpp" line="93"/> + <source>Bittering</source> + <translation>Bitterhop</translation> + </message> + <message> + <location filename="../src/global.cpp" line="94"/> + <source>Aroma</source> + <translation>Aromahop</translation> + </message> + <message> + <location filename="../src/global.cpp" line="95"/> + <source>Both</source> + <translation>Beide</translation> + </message> +</context> +<context> + <name>HopUse</name> + <message> + <location filename="../src/global.cpp" line="108"/> + <source>Mash</source> + <translation>Maischen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="109"/> + <source>First wort</source> + <translation>Eerste wort</translation> + </message> + <message> + <location filename="../src/global.cpp" line="110"/> + <source>Boil</source> + <translation>Koken</translation> + </message> + <message> + <location filename="../src/global.cpp" line="111"/> + <source>Aroma</source> + <translation>Vlamuit</translation> + </message> + <message> + <location filename="../src/global.cpp" line="112"/> + <source>Whirlpool</source> + <translation>Hopstand</translation> + </message> + <message> + <location filename="../src/global.cpp" line="113"/> + <source>Dry hop</source> + <translation>Koudhop</translation> + </message> + <message> + <location filename="../src/global.cpp" line="114"/> + <source>Bottling</source> + <translation>Bottelen</translation> + </message> +</context> +<context> <name>ImportXML</name> <message> <location filename="../ui/ImportXML.ui" line="14"/> @@ -7306,6 +7808,31 @@ <translation>Wijzig</translation> </message> <message> + <location filename="../src/InventoryMiscs.cpp" line="118"/> + <source>1 minute</source> + <translation>1 minuut</translation> + </message> + <message> + <location filename="../src/InventoryMiscs.cpp" line="120"/> + <source>%1 minutes</source> + <translation>%1 minuten</translation> + </message> + <message> + <location filename="../src/InventoryMiscs.cpp" line="122"/> + <source>%1 hours</source> + <translation>%1 uren</translation> + </message> + <message> + <location filename="../src/InventoryMiscs.cpp" line="124"/> + <source>1 day</source> + <translation>1 dag</translation> + </message> + <message> + <location filename="../src/InventoryMiscs.cpp" line="126"/> + <source>%1 days</source> + <translation>%1 dagen</translation> + </message> + <message> <source>Spice</source> <translation type="vanished">Specerij</translation> </message> @@ -7855,6 +8382,77 @@ </message> </context> <context> + <name>MiscType</name> + <message> + <location filename="../src/global.cpp" line="118"/> + <source>Spice</source> + <translation>Specerij</translation> + </message> + <message> + <location filename="../src/global.cpp" line="119"/> + <source>Herb</source> + <translation>Kruid</translation> + </message> + <message> + <location filename="../src/global.cpp" line="120"/> + <source>Flavor</source> + <translation>Smaakstof</translation> + </message> + <message> + <location filename="../src/global.cpp" line="121"/> + <source>Fining</source> + <translation>Klaringsmiddel</translation> + </message> + <message> + <location filename="../src/global.cpp" line="122"/> + <source>Water agent</source> + <translation>Brouwzout</translation> + </message> + <message> + <location filename="../src/global.cpp" line="123"/> + <source>Yeast nutrient</source> + <translation>Gistvoeding</translation> + </message> + <message> + <location filename="../src/global.cpp" line="124"/> + <source>Other</source> + <translation>Anders</translation> + </message> +</context> +<context> + <name>MiscUse</name> + <message> + <location filename="../src/global.cpp" line="128"/> + <source>Starter</source> + <translation>Starter</translation> + </message> + <message> + <location filename="../src/global.cpp" line="129"/> + <source>Mash</source> + <translation>Maischen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="130"/> + <source>Boil</source> + <translation>Koken</translation> + </message> + <message> + <location filename="../src/global.cpp" line="131"/> + <source>Primary</source> + <translation>Hoofdgisting</translation> + </message> + <message> + <location filename="../src/global.cpp" line="132"/> + <source>Secondary</source> + <translation>Nagisting/lagering</translation> + </message> + <message> + <location filename="../src/global.cpp" line="133"/> + <source>Bottling</source> + <translation>Bottelen</translation> + </message> +</context> +<context> <name>PrinterDialog</name> <message> <source>Grain</source> @@ -9262,29 +9860,29 @@ <translation>Gemeten:</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2135"/> + <location filename="../src/PrinterDialog.cpp" line="2136"/> <source>%1 split the batch here!</source> <translation>%1 splits de batch hier!</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2174"/> + <location filename="../src/PrinterDialog.cpp" line="2175"/> <source>Inventory</source> <translation>Inventaris</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2176"/> + <location filename="../src/PrinterDialog.cpp" line="2177"/> <source>Yeastbank</source> <translation>Gistbank</translation> </message> <message> - <location filename="../src/PrinterDialog.cpp" line="2186"/> + <location filename="../src/PrinterDialog.cpp" line="2187"/> <source>Date and time</source> <translation>Datum en tijd</translation> </message> <message> <location filename="../src/PrinterDialog.cpp" line="756"/> - <location filename="../src/PrinterDialog.cpp" line="2189"/> - <location filename="../src/PrinterDialog.cpp" line="2193"/> + <location filename="../src/PrinterDialog.cpp" line="2190"/> + <location filename="../src/PrinterDialog.cpp" line="2194"/> <source>Beer style</source> <translation>Bierstijl</translation> </message> @@ -9345,7 +9943,7 @@ <message> <location filename="../src/ProdInprod.cpp" line="116"/> <source> day %1 of day 28</source> - <translation> dat %1 van dag 28</translation> + <translation> dag %1 van dag 28</translation> </message> <message> <location filename="../src/ProdInprod.cpp" line="134"/> @@ -9697,6 +10295,69 @@ </message> </context> <context> + <name>ProdStages</name> + <message> + <location filename="../src/global.cpp" line="26"/> + <source>Plan</source> + <translation>Plan</translation> + </message> + <message> + <location filename="../src/global.cpp" line="27"/> + <source>Wait</source> + <translation>Wacht</translation> + </message> + <message> + <location filename="../src/global.cpp" line="28"/> + <source>Brew</source> + <translation>Brouwen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="29"/> + <source>Primary</source> + <translation>Hoofdgisting</translation> + </message> + <message> + <location filename="../src/global.cpp" line="30"/> + <source>Secondary</source> + <translation>Nagisting</translation> + </message> + <message> + <location filename="../src/global.cpp" line="31"/> + <source>Tertiary</source> + <translation>Lageren</translation> + </message> + <message> + <location filename="../src/global.cpp" line="32"/> + <source>Package</source> + <translation>Verpakken</translation> + </message> + <message> + <location filename="../src/global.cpp" line="33"/> + <source>Carbonation</source> + <translation>Carbonatie</translation> + </message> + <message> + <location filename="../src/global.cpp" line="34"/> + <source>Mature</source> + <translation>Rijpen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="35"/> + <source>Taste</source> + <translation>Proeven</translation> + </message> + <message> + <location filename="../src/global.cpp" line="36"/> + <source>Ready</source> + <translation>Gereed</translation> + </message> + <message> + <location filename="../src/global.cpp" line="37"/> + <source>Closed</source> + <translation>Gesloten</translation> + </message> +</context> +<context> <name>ProfileFerments</name> <message> <location filename="../src/ProfileFerments.cpp" line="52"/> @@ -9997,450 +10658,348 @@ <translation>dagen, </translation> </message> <message> - <location filename="../src/global.cpp" line="51"/> - <location filename="../src/global.cpp" line="68"/> <source>Extract</source> - <translation>Extract</translation> - </message> - <message> - <location filename="../src/global.cpp" line="52"/> + <translation type="vanished">Extract</translation> + </message> + <message> <source>Partial Mash</source> - <translation>Deelmaisch</translation> - </message> - <message> - <location filename="../src/global.cpp" line="53"/> + <translation type="vanished">Deelmaisch</translation> + </message> + <message> <source>All Grain</source> - <translation>Mout</translation> - </message> - <message> - <location filename="../src/global.cpp" line="57"/> - <location filename="../src/global.cpp" line="135"/> + <translation type="vanished">Mout</translation> + </message> + <message> <source>Lager</source> - <translation>Ondergist</translation> - </message> - <message> - <location filename="../src/global.cpp" line="58"/> - <location filename="../src/global.cpp" line="136"/> + <translation type="vanished">Ondergist</translation> + </message> + <message> <source>Ale</source> - <translation>Bovengist</translation> - </message> - <message> - <location filename="../src/global.cpp" line="59"/> + <translation type="vanished">Bovengist</translation> + </message> + <message> <source>Mead</source> - <translation>Mede</translation> - </message> - <message> - <location filename="../src/global.cpp" line="60"/> - <location filename="../src/global.cpp" line="137"/> + <translation type="vanished">Mede</translation> + </message> + <message> <source>Wheat</source> - <translation>Tarwebier</translation> - </message> - <message> - <location filename="../src/global.cpp" line="61"/> + <translation type="vanished">Tarwebier</translation> + </message> + <message> <source>Mixed</source> - <translation>Gemengd</translation> - </message> - <message> - <location filename="../src/global.cpp" line="62"/> + <translation type="vanished">Gemengd</translation> + </message> + <message> <source>Cider</source> - <translation>Cider</translation> - </message> - <message> - <location filename="../src/global.cpp" line="66"/> + <translation type="vanished">Cider</translation> + </message> + <message> <source>Grain</source> - <translation>Mout</translation> - </message> - <message> - <location filename="../src/global.cpp" line="67"/> + <translation type="vanished">Mout</translation> + </message> + <message> <source>Sugar</source> - <translation>Suiker</translation> - </message> - <message> - <location filename="../src/global.cpp" line="69"/> + <translation type="vanished">Suiker</translation> + </message> + <message> <source>Dry extract</source> - <translation>Droog extract</translation> - </message> - <message> - <location filename="../src/global.cpp" line="70"/> + <translation type="vanished">Droog extract</translation> + </message> + <message> <source>Adjunct</source> - <translation>Ongemout graan</translation> - </message> - <message> - <location filename="../src/global.cpp" line="74"/> + <translation type="vanished">Ongemout graan</translation> + </message> + <message> <source>Base</source> - <translation>Basismout</translation> - </message> - <message> - <location filename="../src/global.cpp" line="75"/> + <translation type="vanished">Basismout</translation> + </message> + <message> <source>Roast</source> - <translation>Geroosterde mout</translation> - </message> - <message> - <location filename="../src/global.cpp" line="76"/> + <translation type="vanished">Geroosterde mout</translation> + </message> + <message> <source>Crystal</source> - <translation>Cara- of crystalmout</translation> - </message> - <message> - <location filename="../src/global.cpp" line="77"/> + <translation type="vanished">Cara- of crystalmout</translation> + </message> + <message> <source>Kilned</source> - <translation>Geëeste mout</translation> - </message> - <message> - <location filename="../src/global.cpp" line="78"/> + <translation type="vanished">Geëeste mout</translation> + </message> + <message> <source>Sour Malt</source> - <translation>Zuurmout</translation> - </message> - <message> - <location filename="../src/global.cpp" line="79"/> + <translation type="vanished">Zuurmout</translation> + </message> + <message> <source>Special</source> - <translation>Speciale mout</translation> - </message> - <message> - <location filename="../src/global.cpp" line="80"/> + <translation type="vanished">Speciale mout</translation> + </message> + <message> <source>No malt</source> - <translation>Geen mout</translation> - </message> - <message> - <location filename="../src/global.cpp" line="84"/> - <location filename="../src/global.cpp" line="107"/> - <location filename="../src/global.cpp" line="127"/> + <translation type="vanished">Geen mout</translation> + </message> + <message> <source>Mash</source> - <translation>Maischen</translation> - </message> - <message> - <location filename="../src/global.cpp" line="85"/> - <location filename="../src/global.cpp" line="109"/> - <location filename="../src/global.cpp" line="128"/> + <translation type="vanished">Maischen</translation> + </message> + <message> <source>Boil</source> - <translation>Koken</translation> - </message> - <message> - <location filename="../src/global.cpp" line="86"/> + <translation type="vanished">Koken</translation> + </message> + <message> <source>Fermentation</source> - <translation>Hoofdvergisting</translation> - </message> - <message> - <location filename="../src/global.cpp" line="87"/> + <translation type="vanished">Hoofdvergisting</translation> + </message> + <message> <source>Lagering</source> - <translation>Nagisting/lagering</translation> - </message> - <message> - <location filename="../src/global.cpp" line="88"/> - <location filename="../src/global.cpp" line="151"/> - <location filename="../src/global.cpp" line="159"/> + <translation type="vanished">Nagisting/lagering</translation> + </message> + <message> <source>Bottle</source> - <translation>Bottelen</translation> - </message> - <message> - <location filename="../src/global.cpp" line="89"/> + <translation type="vanished">Bottelen</translation> + </message> + <message> <source>Kegs</source> - <translation>Fusten</translation> - </message> - <message> - <location filename="../src/global.cpp" line="93"/> + <translation type="vanished">Fusten</translation> + </message> + <message> <source>Bittering</source> - <translation>Bitterhop</translation> - </message> - <message> - <location filename="../src/global.cpp" line="94"/> - <location filename="../src/global.cpp" line="110"/> + <translation type="vanished">Bitterhop</translation> + </message> + <message> <source>Aroma</source> - <translation>Aromahop</translation> - </message> - <message> - <location filename="../src/global.cpp" line="95"/> + <translation type="vanished">Aromahop</translation> + </message> + <message> <source>Both</source> - <translation>Beide</translation> - </message> - <message> - <location filename="../src/global.cpp" line="99"/> + <translation type="vanished">Beide</translation> + </message> + <message> <source>Pellet</source> - <translation>Pellets</translation> - </message> - <message> - <location filename="../src/global.cpp" line="100"/> + <translation type="vanished">Pellets</translation> + </message> + <message> <source>Plug</source> - <translation>Plugs</translation> - </message> - <message> - <location filename="../src/global.cpp" line="101"/> + <translation type="vanished">Plugs</translation> + </message> + <message> <source>Leaf</source> - <translation>Bloemen</translation> - </message> - <message> - <location filename="../src/global.cpp" line="102"/> + <translation type="vanished">Bloemen</translation> + </message> + <message> <source>Leaf wet</source> - <translation>Nat, vers</translation> - </message> - <message> - <location filename="../src/global.cpp" line="103"/> + <translation type="vanished">Nat, vers</translation> + </message> + <message> <source>Cryo</source> - <translation>Cryo hop</translation> - </message> - <message> - <location filename="../src/global.cpp" line="108"/> + <translation type="vanished">Cryo hop</translation> + </message> + <message> <source>First wort</source> - <translation>Maischhop</translation> - </message> - <message> - <location filename="../src/global.cpp" line="111"/> + <translation type="vanished">Maischhop</translation> + </message> + <message> <source>Whirlpool</source> - <translation>Whirlpool</translation> - </message> - <message> - <location filename="../src/global.cpp" line="112"/> + <translation type="vanished">Whirlpool</translation> + </message> + <message> <source>Dry hop</source> - <translation>Koudhop</translation> - </message> - <message> - <location filename="../src/global.cpp" line="116"/> + <translation type="vanished">Koudhop</translation> + </message> + <message> <source>Spice</source> - <translation>Specerij</translation> - </message> - <message> - <location filename="../src/global.cpp" line="117"/> + <translation type="vanished">Specerij</translation> + </message> + <message> <source>Herb</source> - <translation>Kruid</translation> - </message> - <message> - <location filename="../src/global.cpp" line="118"/> + <translation type="vanished">Kruid</translation> + </message> + <message> <source>Flavor</source> - <translation>Smaakstof</translation> - </message> - <message> - <location filename="../src/global.cpp" line="119"/> + <translation type="vanished">Smaakstof</translation> + </message> + <message> <source>Fining</source> - <translation>Klaringsmiddel</translation> - </message> - <message> - <location filename="../src/global.cpp" line="120"/> + <translation type="vanished">Klaringsmiddel</translation> + </message> + <message> <source>Water agent</source> - <translation>Brouwzout</translation> - </message> - <message> - <location filename="../src/global.cpp" line="121"/> + <translation type="vanished">Brouwzout</translation> + </message> + <message> <source>Yeast nutrient</source> - <translation>Gistvoeding</translation> - </message> - <message> - <location filename="../src/global.cpp" line="122"/> + <translation type="vanished">Gistvoeding</translation> + </message> + <message> <source>Other</source> - <translation>Anders</translation> - </message> - <message> - <location filename="../src/global.cpp" line="126"/> + <translation type="vanished">Anders</translation> + </message> + <message> <source>Starter</source> - <translation>Starter</translation> - </message> - <message> - <location filename="../src/global.cpp" line="175"/> + <translation type="vanished">Starter</translation> + </message> + <message> <source>Stainless Steel</source> - <translation>RVS</translation> - </message> - <message> - <location filename="../src/global.cpp" line="176"/> + <translation type="vanished">RVS</translation> + </message> + <message> <source>Aluminium</source> - <translation>Aluminium</translation> - </message> - <message> - <location filename="../src/global.cpp" line="177"/> + <translation type="vanished">Aluminium</translation> + </message> + <message> <source>Plastics</source> - <translation>Kunststof</translation> - </message> - <message> - <location filename="../src/global.cpp" line="178"/> + <translation type="vanished">Kunststof</translation> + </message> + <message> <source>Copper</source> - <translation>Koper</translation> - </message> - <message> - <location filename="../src/global.cpp" line="29"/> - <location filename="../src/global.cpp" line="129"/> - <location filename="../src/global.cpp" line="156"/> + <translation type="vanished">Koper</translation> + </message> + <message> <source>Primary</source> - <translation>Hoofdgisting</translation> - </message> - <message> - <location filename="../src/global.cpp" line="26"/> + <translation type="vanished">Hoofdgisting</translation> + </message> + <message> <source>Plan</source> - <translation>Plan</translation> - </message> - <message> - <location filename="../src/global.cpp" line="27"/> + <translation type="vanished">Plan</translation> + </message> + <message> <source>Wait</source> - <translation>Wacht</translation> - </message> - <message> - <location filename="../src/global.cpp" line="28"/> + <translation type="vanished">Wacht</translation> + </message> + <message> <source>Brew</source> - <translation>Brouwen</translation> - </message> - <message> - <location filename="../src/global.cpp" line="30"/> - <location filename="../src/global.cpp" line="130"/> - <location filename="../src/global.cpp" line="157"/> + <translation type="vanished">Brouwen</translation> + </message> + <message> <source>Secondary</source> - <translation>Nagisting/lagering</translation> - </message> - <message> - <location filename="../src/global.cpp" line="32"/> + <translation type="vanished">Nagisting/lagering</translation> + </message> + <message> <source>Package</source> - <translation>Verpakken</translation> - </message> - <message> - <location filename="../src/global.cpp" line="33"/> + <translation type="vanished">Verpakken</translation> + </message> + <message> <source>Carbonation</source> - <translation>Carbonatie</translation> - </message> - <message> - <location filename="../src/global.cpp" line="34"/> + <translation type="vanished">Carbonatie</translation> + </message> + <message> <source>Mature</source> - <translation>Rijpen</translation> - </message> - <message> - <location filename="../src/global.cpp" line="35"/> + <translation type="vanished">Rijpen</translation> + </message> + <message> <source>Taste</source> - <translation>Proeven</translation> - </message> - <message> - <location filename="../src/global.cpp" line="36"/> + <translation type="vanished">Proeven</translation> + </message> + <message> <source>Ready</source> - <translation>Gereed</translation> - </message> - <message> - <location filename="../src/global.cpp" line="37"/> + <translation type="vanished">Gereed</translation> + </message> + <message> <source>Closed</source> - <translation>Gesloten</translation> - </message> - <message> - <location filename="../src/global.cpp" line="41"/> + <translation type="vanished">Gesloten</translation> + </message> + <message> <source>Not divided</source> - <translation>Niet gesplitst</translation> - </message> - <message> - <location filename="../src/global.cpp" line="42"/> + <translation type="vanished">Niet gesplitst</translation> + </message> + <message> <source>After mash</source> - <translation>Na maischen</translation> - </message> - <message> - <location filename="../src/global.cpp" line="43"/> + <translation type="vanished">Na maischen</translation> + </message> + <message> <source>After boil</source> - <translation>Na koken</translation> - </message> - <message> - <location filename="../src/global.cpp" line="44"/> + <translation type="vanished">Na koken</translation> + </message> + <message> <source>After cooling</source> - <translation>Na koelen</translation> - </message> - <message> - <location filename="../src/global.cpp" line="45"/> + <translation type="vanished">Na koelen</translation> + </message> + <message> <source>After primary</source> - <translation>Na hoofdgisting</translation> - </message> - <message> - <location filename="../src/global.cpp" line="46"/> + <translation type="vanished">Na hoofdgisting</translation> + </message> + <message> <source>After secondary</source> - <translation>Na nagisting</translation> - </message> - <message> - <location filename="../src/global.cpp" line="47"/> + <translation type="vanished">Na nagisting</translation> + </message> + <message> <source>After tertiary</source> - <translation>Na lageren</translation> - </message> - <message> - <location filename="../src/global.cpp" line="131"/> + <translation type="vanished">Na lageren</translation> + </message> + <message> <source>Bottling</source> - <translation>Bottelen</translation> - </message> - <message> - <location filename="../src/global.cpp" line="138"/> + <translation type="vanished">Bottelen</translation> + </message> + <message> <source>Wine</source> - <translation>Wijngist</translation> - </message> - <message> - <location filename="../src/global.cpp" line="139"/> + <translation type="vanished">Wijngist</translation> + </message> + <message> <source>Champagne</source> - <translation>Champagnegist</translation> - </message> - <message> - <location filename="../src/global.cpp" line="140"/> + <translation type="vanished">Champagnegist</translation> + </message> + <message> <source>Brett</source> - <translation>Brett</translation> - </message> - <message> - <location filename="../src/global.cpp" line="141"/> + <translation type="vanished">Brett</translation> + </message> + <message> <source>Kveik</source> - <translation>Kveik</translation> - </message> - <message> - <location filename="../src/global.cpp" line="142"/> + <translation type="vanished">Kveik</translation> + </message> + <message> <source>Hybrid</source> - <translation>Hybride</translation> - </message> - <message> - <location filename="../src/global.cpp" line="146"/> + <translation type="vanished">Hybride</translation> + </message> + <message> <source>Liquid</source> - <translation>Vloeibaar</translation> - </message> - <message> - <location filename="../src/global.cpp" line="147"/> + <translation type="vanished">Vloeibaar</translation> + </message> + <message> <source>Dry</source> - <translation>Droog</translation> - </message> - <message> - <location filename="../src/global.cpp" line="148"/> + <translation type="vanished">Droog</translation> + </message> + <message> <source>Slant</source> - <translation>Schuine buis</translation> - </message> - <message> - <location filename="../src/global.cpp" line="149"/> + <translation type="vanished">Schuine buis</translation> + </message> + <message> <source>Culture</source> - <translation>Slurry</translation> - </message> - <message> - <location filename="../src/global.cpp" line="150"/> + <translation type="vanished">Slurry</translation> + </message> + <message> <source>Frozen</source> - <translation>Ingevroren</translation> - </message> - <message> - <location filename="../src/global.cpp" line="152"/> + <translation type="vanished">Ingevroren</translation> + </message> + <message> <source>Dried</source> - <translation>Gedroogd</translation> - </message> - <message> - <location filename="../src/global.cpp" line="31"/> - <location filename="../src/global.cpp" line="158"/> + <translation type="vanished">Gedroogd</translation> + </message> + <message> <source>Tertiary</source> - <translation>Nagisten</translation> - </message> - <message> - <location filename="../src/global.cpp" line="163"/> + <translation type="vanished">Nagisten</translation> + </message> + <message> <source>Stirred</source> - <translation>Geroerd</translation> - </message> - <message> - <location filename="../src/global.cpp" line="164"/> + <translation type="vanished">Geroerd</translation> + </message> + <message> <source>Shaken</source> - <translation>Geschud</translation> - </message> - <message> - <location filename="../src/global.cpp" line="165"/> + <translation type="vanished">Geschud</translation> + </message> + <message> <source>Simple</source> - <translation>Simpel</translation> - </message> - <message> - <location filename="../src/global.cpp" line="169"/> + <translation type="vanished">Simpel</translation> + </message> + <message> <source>Infusion</source> - <translation>Infusie</translation> - </message> - <message> - <location filename="../src/global.cpp" line="170"/> + <translation type="vanished">Infusie</translation> + </message> + <message> <source>Temperature</source> - <translation>Verwarmen</translation> - </message> - <message> - <location filename="../src/global.cpp" line="171"/> + <translation type="vanished">Verwarmen</translation> + </message> + <message> <source>Decoction</source> - <translation>Decoctie</translation> + <translation type="vanished">Decoctie</translation> </message> <message> <location filename="../src/database/db_recipe.cpp" line="31"/> @@ -10472,6 +11031,24 @@ </message> </context> <context> + <name>RecipeType</name> + <message> + <location filename="../src/global.cpp" line="51"/> + <source>Extract</source> + <translation>Vloeibaar extract</translation> + </message> + <message> + <location filename="../src/global.cpp" line="52"/> + <source>Partial Mash</source> + <translation>Deelmaisch</translation> + </message> + <message> + <location filename="../src/global.cpp" line="53"/> + <source>All Grain</source> + <translation>Mout</translation> + </message> +</context> +<context> <name>RecipesTree</name> <message> <location filename="../src/RecipesTree.cpp" line="52"/> @@ -10818,4 +11395,205 @@ Wijzigingen opslaan?</translation> </message> </context> +<context> + <name>Splitter</name> + <message> + <location filename="../src/global.cpp" line="41"/> + <source>Not divided</source> + <translation>Niet gesplitst</translation> + </message> + <message> + <location filename="../src/global.cpp" line="42"/> + <source>After mash</source> + <translation>Na maischen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="43"/> + <source>After boil</source> + <translation>Na koken</translation> + </message> + <message> + <location filename="../src/global.cpp" line="44"/> + <source>After cooling</source> + <translation>Na koelen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="45"/> + <source>After primary</source> + <translation>Na hoofdgisting</translation> + </message> + <message> + <location filename="../src/global.cpp" line="46"/> + <source>After secondary</source> + <translation>Na nagisting</translation> + </message> + <message> + <location filename="../src/global.cpp" line="47"/> + <source>After tertiary</source> + <translation>Na lageren</translation> + </message> +</context> +<context> + <name>StepType</name> + <message> + <location filename="../src/global.cpp" line="171"/> + <source>Infusion</source> + <translation>Infusie</translation> + </message> + <message> + <location filename="../src/global.cpp" line="172"/> + <source>Temperature</source> + <translation>Verwarmen</translation> + </message> + <message> + <location filename="../src/global.cpp" line="173"/> + <source>Decoction</source> + <translation>Decoctie</translation> + </message> +</context> +<context> + <name>TunMaterial</name> + <message> + <location filename="../src/global.cpp" line="177"/> + <source>Stainless Steel</source> + <translation>RVS</translation> + </message> + <message> + <location filename="../src/global.cpp" line="178"/> + <source>Aluminium</source> + <translation>Aluminium</translation> + </message> + <message> + <location filename="../src/global.cpp" line="179"/> + <source>Plastics</source> + <translation>Kunststof</translation> + </message> + <message> + <location filename="../src/global.cpp" line="180"/> + <source>Copper</source> + <translation>Koper</translation> + </message> +</context> +<context> + <name>YeastForm</name> + <message> + <location filename="../src/global.cpp" line="148"/> + <source>Liquid</source> + <translation>Vloeibaar</translation> + </message> + <message> + <location filename="../src/global.cpp" line="149"/> + <source>Dry</source> + <translation>Droog</translation> + </message> + <message> + <location filename="../src/global.cpp" line="150"/> + <source>Slant</source> + <translation>Schuine buis</translation> + </message> + <message> + <location filename="../src/global.cpp" line="151"/> + <source>Culture</source> + <translation>Slurry</translation> + </message> + <message> + <location filename="../src/global.cpp" line="152"/> + <source>Frozen</source> + <translation>Ingevroren</translation> + </message> + <message> + <location filename="../src/global.cpp" line="153"/> + <source>Bottle</source> + <translation>Flesdepot</translation> + </message> + <message> + <location filename="../src/global.cpp" line="154"/> + <source>Dried</source> + <translation>Gedroogd</translation> + </message> +</context> +<context> + <name>YeastStarter</name> + <message> + <location filename="../src/global.cpp" line="165"/> + <source>Stirred</source> + <translation>Geroerd</translation> + </message> + <message> + <location filename="../src/global.cpp" line="166"/> + <source>Shaken</source> + <translation>Geschud</translation> + </message> + <message> + <location filename="../src/global.cpp" line="167"/> + <source>Simple</source> + <translation>Simpel</translation> + </message> +</context> +<context> + <name>YeastType</name> + <message> + <location filename="../src/global.cpp" line="137"/> + <source>Lager</source> + <translation>Ondergist</translation> + </message> + <message> + <location filename="../src/global.cpp" line="138"/> + <source>Ale</source> + <translation>Bovengist</translation> + </message> + <message> + <location filename="../src/global.cpp" line="139"/> + <source>Wheat</source> + <translation>Tarwegist</translation> + </message> + <message> + <location filename="../src/global.cpp" line="140"/> + <source>Wine</source> + <translation>Wijngist</translation> + </message> + <message> + <location filename="../src/global.cpp" line="141"/> + <source>Champagne</source> + <translation>Champagnegist</translation> + </message> + <message> + <location filename="../src/global.cpp" line="142"/> + <source>Brett</source> + <translation>Brett</translation> + </message> + <message> + <location filename="../src/global.cpp" line="143"/> + <source>Kveik</source> + <translation>Kveik</translation> + </message> + <message> + <location filename="../src/global.cpp" line="144"/> + <source>Hybrid</source> + <translation>Hybride</translation> + </message> +</context> +<context> + <name>YeastUse</name> + <message> + <location filename="../src/global.cpp" line="158"/> + <source>Primary</source> + <translation>Hoofdgisting</translation> + </message> + <message> + <location filename="../src/global.cpp" line="159"/> + <source>Secondary</source> + <translation>Nagisting</translation> + </message> + <message> + <location filename="../src/global.cpp" line="160"/> + <source>Tertiary</source> + <translation>Lageren</translation> + </message> + <message> + <location filename="../src/global.cpp" line="161"/> + <source>Bottle</source> + <translation>Bottelgist</translation> + </message> +</context> </TS>
