diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5a23cd7b4..c85a75cff 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -253,7 +253,11 @@ jobs: # that service to use it, so this step can't be done in forked repositories. # # Various settings here have to align with the "brewtarget" project in the "Brewtarget [OSS]" organisation - # registered at https://app.signpath.io/. + # registered at https://app.signpath.io/. In some places you have to be quite pedantic about the settings (both + # here and in the SignPath account). Eg at one point we were getting the following error: + # + # "The supplied repository URL 'https://github.com/Brewtarget/brewtarget' does not match + # the expected repository URLs 'https://github.com/Brewtarget/brewtarget/'." # # See https://github.com/SignPath/github-action-submit-signing-request for documentation of this action (including # parameters such as github-artifact-id). Also see https://github.com/SignPath/github-actions-extended-demo/ for diff --git a/CHANGES.markdown b/CHANGES.markdown index aaccf0a29..2eff6e469 100644 --- a/CHANGES.markdown +++ b/CHANGES.markdown @@ -13,6 +13,18 @@ happens, so I'm now setting it to a slightly arbitrary time early in the morning * Additional methods for calculating IBU * We'll list other new features here... +## v4.0.7 +Bug fixes and minor enhancements. + +### New Features +* None + +### Bug Fixes +* Some input fields not wide enough on various editors [849](https://github.com/Brewtarget/brewtarget/issues/849) + +### Release Timestamp +Mon, 7 Oct 2024 04:00:06 +0100 + ## v4.0.6 Bug fixes for the 4.0.5 release (ie bugs in 4.0.5 are fixed in this 4.0.6 release). @@ -28,7 +40,7 @@ Bug fixes for the 4.0.5 release (ie bugs in 4.0.5 are fixed in this 4.0.6 releas * Adding Mash Step causes core dump [847](https://github.com/Brewtarget/brewtarget/issues/847) ### Release Timestamp -Wed, 2 Oct 2024 04:00:06 +0100 +Sun, 6 Oct 2024 04:00:06 +0100 ## v4.0.5 Bug fixes for the 4.0.4 release (ie bugs in 4.0.4 are fixed in this 4.0.5 release). diff --git a/CMakeLists.txt b/CMakeLists.txt index b522ff646..87342ff58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,5 @@ #╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ -# CMakeLists.txt is part of Brewtarget, and is Copyright the following -# authors 2009-2024 +# CMakeLists.txt is part of Brewtarget, and is Copyright the following authors 2009-2024 # - Chris Pavetto # - Dan Cavanagh # - Daniel Moreno @@ -111,7 +110,7 @@ endif() #======================================================================================================================= # It's simplest to keep the project name all lower-case as it means we can use a lot more of the default settings for # Linux packaging (where directory names etc are expected to be all lower-case). -project(brewtarget VERSION 4.0.6 LANGUAGES CXX) +project(brewtarget VERSION 4.0.7 LANGUAGES CXX) message(STATUS "Building ${PROJECT_NAME} version ${PROJECT_VERSION}") message(STATUS "PROJECT_SOURCE_DIR is ${PROJECT_SOURCE_DIR}") # Sometimes we do need the capitalised version of the project name diff --git a/meson.build b/meson.build index 87083e334..d718797c0 100644 --- a/meson.build +++ b/meson.build @@ -189,7 +189,7 @@ # # project('brewtarget', 'cpp', - version: '4.0.6', + version: '4.0.7', license: 'GPL-3.0-or-later', meson_version: '>=0.60.0', default_options : ['cpp_std=c++20', diff --git a/src/editors/MashEditor.cpp b/src/editors/MashEditor.cpp index f3c564751..48b8fc960 100755 --- a/src/editors/MashEditor.cpp +++ b/src/editors/MashEditor.cpp @@ -34,7 +34,7 @@ MashEditor::MashEditor(QWidget* parent) : m_mashObs{nullptr} { setupUi(this); - SMART_FIELD_INIT(MashEditor, label_name , lineEdit_name , Mash, PropertyNames::NamedEntity::name ); +/// SMART_FIELD_INIT(MashEditor, label_name , lineEdit_name , Mash, PropertyNames::NamedEntity::name ); SMART_FIELD_INIT(MashEditor, label_grainTemp , lineEdit_grainTemp , Mash, PropertyNames::Mash::grainTemp_c , 1); SMART_FIELD_INIT(MashEditor, label_spargeTemp, lineEdit_spargeTemp, Mash, PropertyNames::Mash::spargeTemp_c , 1); SMART_FIELD_INIT(MashEditor, label_spargePh , lineEdit_spargePh , Mash, PropertyNames::Mash::ph , 0); diff --git a/src/widgets/CustomComboBox.cpp b/src/widgets/CustomComboBox.cpp index 9eccae2cf..1fe9efd98 100755 --- a/src/widgets/CustomComboBox.cpp +++ b/src/widgets/CustomComboBox.cpp @@ -29,7 +29,7 @@ CustomComboBox::CustomComboBox(QWidget* parent) : QComboBox(parent) { CustomComboBox::~CustomComboBox() = default; void CustomComboBox::showPopup() { - view()->setFixedWidth(300); +// view()->setFixedWidth(300); QComboBox::showPopup(); return; } diff --git a/src/widgets/InfoButton.cpp b/src/widgets/InfoButton.cpp index 5d5e254a4..ab39c01d6 100755 --- a/src/widgets/InfoButton.cpp +++ b/src/widgets/InfoButton.cpp @@ -54,9 +54,15 @@ namespace { } InfoButton::InfoButton(QWidget * parent) : QPushButton(parent), m_infoText{nullptr} { + // // Shrink the button down from its default size, otherwise the 'ⓘ' will be surrounded by too much space. Leave a // bit of space around the 'ⓘ' however, otherwise it looks cramped. (Yes, we are adding 10% twice -- once to make // the circle 10% bigger than it otherwise would be, and once to add 10% space around the outside of the circle.) + // + // This is one of the few places where we really do want to use setFixedSize (rather than setMinimumSize or + // setMinimumWidth). It doesn't make sense to let Qt's layout manager grow the button just because the window it is + // in is expanded. + // double const diameter = static_cast(this->getCircleDiameter()); int const width = static_cast(diameter * 1.1); int const height = width; diff --git a/src/widgets/SmartLineEdit.cpp b/src/widgets/SmartLineEdit.cpp index 1842e69f6..78ae2a3ca 100644 --- a/src/widgets/SmartLineEdit.cpp +++ b/src/widgets/SmartLineEdit.cpp @@ -92,7 +92,7 @@ class SmartLineEdit::impl { } this->calculateDisplaySize(sizingString); } - this->m_self.setFixedWidth(this->m_desiredWidthInPixels); + this->m_self.setMinimumWidth(this->m_desiredWidthInPixels); return; } diff --git a/translations/bt_ca.ts b/translations/bt_ca.ts index ab0eb9b60..2be5dfe69 100644 --- a/translations/bt_ca.ts +++ b/translations/bt_ca.ts @@ -2313,10 +2313,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5213,6 +5209,13 @@ El volum final al primari és de %1. Pas + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6241,17 +6244,29 @@ El volum final al primari és de %1. Notes - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + New + Nou + + + Save + Desa + + + Cancel + Cancel·lar + boilStepEditor @@ -6926,6 +6941,18 @@ El volum final al primari és de %1. Packaging Vessel Type + + New + Nou + + + Save + Desa + + + Cancel + Cancel·lar + fermentableEditor @@ -7237,6 +7264,18 @@ El volum final al primari és de %1. Grain Group + + New + Nou + + + Save + Desa + + + Cancel + Cancel·lar + fermentationEditor @@ -7261,17 +7300,29 @@ El volum final al primari és de %1. Notes - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + Nou + + + Save + Desa + + + Cancel + Cancel·lar + fermentationStepEditor @@ -7698,6 +7749,18 @@ El volum final al primari és de %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nou + + + Save + Desa + + + Cancel + Cancel·lar + instructionWidget @@ -8835,10 +8898,6 @@ El volum final al primari és de %1. Notes Notes - - New misc - - Save and close @@ -8871,6 +8930,18 @@ El volum final al primari és de %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nou + + + Save + Desa + + + Cancel + Cancel·lar + namedMashEditor @@ -9922,15 +9993,15 @@ El volum final al primari és de %1. New - Nou + Nou Save - Desa + Desa Cancel - Cancel·lar + Cancel·lar Main @@ -10157,17 +10228,29 @@ El volum final al primari és de %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + New + Nou + + + Save + Desa + + + Cancel + Cancel·lar + yeastEditor @@ -10471,5 +10554,17 @@ El volum final al primari és de %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nou + + + Save + Desa + + + Cancel + Cancel·lar + diff --git a/translations/bt_cs.ts b/translations/bt_cs.ts index 023525a06..b79c43f56 100644 --- a/translations/bt_cs.ts +++ b/translations/bt_cs.ts @@ -2202,10 +2202,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5079,6 +5075,13 @@ Celkový objem pro hlavní kvašení je %1. Krok + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6087,17 +6090,29 @@ Celkový objem pro hlavní kvašení je %1. Poznámky - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + New + Nový + + + Save + Uložit + + + Cancel + Zrušit + boilStepEditor @@ -6776,6 +6791,18 @@ Celkový objem pro hlavní kvašení je %1. Packaging Vessel Type + + New + Nový + + + Save + Uložit + + + Cancel + Zrušit + fermentableEditor @@ -7089,6 +7116,18 @@ Celkový objem pro hlavní kvašení je %1. Grain Group + + New + Nový + + + Save + Uložit + + + Cancel + Zrušit + fermentationEditor @@ -7113,17 +7152,29 @@ Celkový objem pro hlavní kvašení je %1. Poznámky - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + Nový + + + Save + Uložit + + + Cancel + Zrušit + fermentationStepEditor @@ -7550,6 +7601,18 @@ Celkový objem pro hlavní kvašení je %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nový + + + Save + Uložit + + + Cancel + Zrušit + instructionWidget @@ -8687,10 +8750,6 @@ Celkový objem pro hlavní kvašení je %1. Notes Poznámky - - New misc - - Save and close @@ -8723,6 +8782,18 @@ Celkový objem pro hlavní kvašení je %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nový + + + Save + Uložit + + + Cancel + Zrušit + namedMashEditor @@ -9758,15 +9829,15 @@ Celkový objem pro hlavní kvašení je %1. New - Nový + Nový Save - Uložit + Uložit Cancel - Zrušit + Zrušit Main @@ -9993,17 +10064,29 @@ Celkový objem pro hlavní kvašení je %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + New + Nový + + + Save + Uložit + + + Cancel + Zrušit + yeastEditor @@ -10299,5 +10382,17 @@ Celkový objem pro hlavní kvašení je %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nový + + + Save + Uložit + + + Cancel + Zrušit + diff --git a/translations/bt_de.ts b/translations/bt_de.ts index 4a3307912..bc186d3e0 100644 --- a/translations/bt_de.ts +++ b/translations/bt_de.ts @@ -2273,10 +2273,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5161,6 +5157,13 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. Schritt + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6150,17 +6153,29 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + New + Neu + + + Save + Speichern + + + Cancel + Abbruch + boilStepEditor @@ -6815,6 +6830,18 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. Packaging Vessel Type + + New + Neu + + + Save + Speichern + + + Cancel + Abbruch + fermentableEditor @@ -7134,6 +7161,18 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. Grain Group + + New + Neu + + + Save + Speichern + + + Cancel + Abbruch + fermentationEditor @@ -7158,17 +7197,29 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + Neu + + + Save + Speichern + + + Cancel + Abbruch + fermentationStepEditor @@ -7595,6 +7646,18 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Neu + + + Save + Speichern + + + Cancel + Abbruch + instructionWidget @@ -8728,10 +8791,6 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. Notes - - New misc - - Save and close @@ -8764,6 +8823,18 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Neu + + + Save + Speichern + + + Cancel + Abbruch + namedMashEditor @@ -9795,15 +9866,15 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. New - Neu + Neu Save - Speichern + Speichern Cancel - Abbruch + Abbruch Main @@ -10026,17 +10097,29 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + New + Neu + + + Save + Speichern + + + Cancel + Abbruch + yeastEditor @@ -10340,5 +10423,17 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Neu + + + Save + Speichern + + + Cancel + Abbruch + diff --git a/translations/bt_el.ts b/translations/bt_el.ts index 0e5df51ab..7bda5a36b 100644 --- a/translations/bt_el.ts +++ b/translations/bt_el.ts @@ -2226,10 +2226,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5103,6 +5099,13 @@ The final volume in the primary is %1. Βήμα + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6119,17 +6122,29 @@ The final volume in the primary is %1. Σημειώσεις - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + + + New + + Save + Αποθήκευση + + + Cancel + Ακύρωση + boilStepEditor @@ -6808,6 +6823,18 @@ The final volume in the primary is %1. Packaging Vessel Type + + New + + + + Save + Αποθήκευση + + + Cancel + Ακύρωση + fermentableEditor @@ -7123,6 +7150,18 @@ The final volume in the primary is %1. Grain Group + + New + + + + Save + Αποθήκευση + + + Cancel + Ακύρωση + fermentationEditor @@ -7147,17 +7186,29 @@ The final volume in the primary is %1. Σημειώσεις - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + + + + Save + Αποθήκευση + + + Cancel + Ακύρωση + fermentationStepEditor @@ -7584,6 +7635,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + + + + Save + Αποθήκευση + + + Cancel + Ακύρωση + instructionWidget @@ -8721,10 +8784,6 @@ The final volume in the primary is %1. Notes Σημειώσεις - - New misc - - Save and close @@ -8757,6 +8816,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + + + + Save + Αποθήκευση + + + Cancel + Ακύρωση + namedMashEditor @@ -9792,15 +9863,15 @@ The final volume in the primary is %1. New - Νέο + Νέο Save - Αποθήκευση + Αποθήκευση Cancel - Ακύρωση + Ακύρωση Main @@ -10027,17 +10098,29 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + + + New + + Save + Αποθήκευση + + + Cancel + Ακύρωση + yeastEditor @@ -10341,5 +10424,17 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + + + + Save + Αποθήκευση + + + Cancel + Ακύρωση + diff --git a/translations/bt_en.ts b/translations/bt_en.ts index a498086cd..4b890cc59 100644 --- a/translations/bt_en.ts +++ b/translations/bt_en.ts @@ -1365,10 +1365,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -3894,6 +3890,13 @@ The final volume in the primary is %1. + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -4702,15 +4705,27 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + + + New + + + + Save + + + + Cancel @@ -5264,6 +5279,18 @@ The final volume in the primary is %1. Packaging Vessel Type + + New + + + + Save + + + + Cancel + + fermentableEditor @@ -5515,6 +5542,18 @@ The final volume in the primary is %1. Grain Group + + New + + + + Save + + + + Cancel + + fermentationEditor @@ -5539,15 +5578,27 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + + + New + + + + Save + + + + Cancel @@ -5868,6 +5919,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + + + + Save + + + + Cancel + + instructionWidget @@ -6769,10 +6832,6 @@ The final volume in the primary is %1. Notes - - New misc - - Save and close @@ -6805,6 +6864,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + + + + Save + + + + Cancel + + namedMashEditor @@ -7710,6 +7781,18 @@ The final volume in the primary is %1. Overall Impression + + New + + + + Save + + + + Cancel + + timerListDialog @@ -7883,15 +7966,27 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + + + New + + + + Save + + + + Cancel @@ -8089,5 +8184,17 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + + + + Save + + + + Cancel + + diff --git a/translations/bt_es.ts b/translations/bt_es.ts index 3720c7b9f..10a663762 100644 --- a/translations/bt_es.ts +++ b/translations/bt_es.ts @@ -2297,10 +2297,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5177,6 +5173,13 @@ El volumen final en el primario es %1. + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6193,17 +6196,29 @@ El volumen final en el primario es %1. Notas - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + New + Nuevo + + + Save + Guardar + + + Cancel + Cancelar + boilStepEditor @@ -6878,6 +6893,18 @@ El volumen final en el primario es %1. Packaging Vessel Type + + New + Nuevo + + + Save + Guardar + + + Cancel + Cancelar + fermentableEditor @@ -7193,6 +7220,18 @@ El volumen final en el primario es %1. Grain Group + + New + Nuevo + + + Save + Guardar + + + Cancel + Cancelar + fermentationEditor @@ -7217,17 +7256,29 @@ El volumen final en el primario es %1. Notas - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + Nuevo + + + Save + Guardar + + + Cancel + Cancelar + fermentationStepEditor @@ -7654,6 +7705,18 @@ El volumen final en el primario es %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nuevo + + + Save + Guardar + + + Cancel + Cancelar + instructionWidget @@ -8787,10 +8850,6 @@ El volumen final en el primario es %1. Notes Notas - - New misc - - Save and close @@ -8823,6 +8882,18 @@ El volumen final en el primario es %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nuevo + + + Save + Guardar + + + Cancel + Cancelar + namedMashEditor @@ -9858,15 +9929,15 @@ El volumen final en el primario es %1. New - Nuevo + Nuevo Save - Guardar + Guardar Cancel - Cancelar + Cancelar Main @@ -10093,17 +10164,29 @@ El volumen final en el primario es %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + New + Nuevo + + + Save + Guardar + + + Cancel + Cancelar + yeastEditor @@ -10399,5 +10482,17 @@ El volumen final en el primario es %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nuevo + + + Save + Guardar + + + Cancel + Cancelar + diff --git a/translations/bt_et.ts b/translations/bt_et.ts index 0f6a1d834..4e34915dd 100644 --- a/translations/bt_et.ts +++ b/translations/bt_et.ts @@ -1438,10 +1438,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -3971,6 +3967,13 @@ The final volume in the primary is %1. Samm + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -4791,15 +4794,27 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + + + New + + + + Save + + + + Cancel @@ -5360,6 +5375,18 @@ The final volume in the primary is %1. Packaging Vessel Type + + New + + + + Save + + + + Cancel + + fermentableEditor @@ -5611,6 +5638,18 @@ The final volume in the primary is %1. Grain Group + + New + + + + Save + + + + Cancel + + fermentationEditor @@ -5635,15 +5674,27 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + + + New + + + + Save + + + + Cancel @@ -5968,6 +6019,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + + + + Save + + + + Cancel + + instructionWidget @@ -6877,10 +6940,6 @@ The final volume in the primary is %1. Notes - - New misc - - Save and close @@ -6913,6 +6972,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + + + + Save + + + + Cancel + + namedMashEditor @@ -7822,6 +7893,18 @@ The final volume in the primary is %1. Overall Impression + + New + + + + Save + + + + Cancel + + timerListDialog @@ -7995,15 +8078,27 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + + + New + + + + Save + + + + Cancel @@ -8201,5 +8296,17 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + + + + Save + + + + Cancel + + diff --git a/translations/bt_eu.ts b/translations/bt_eu.ts index 850db1a78..03253c1b4 100644 --- a/translations/bt_eu.ts +++ b/translations/bt_eu.ts @@ -1446,10 +1446,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -3983,6 +3979,13 @@ The final volume in the primary is %1. Urratsa + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -4803,15 +4806,27 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + + + New + + + + Save + + + + Cancel @@ -5372,6 +5387,18 @@ The final volume in the primary is %1. Packaging Vessel Type + + New + + + + Save + + + + Cancel + + fermentableEditor @@ -5623,6 +5650,18 @@ The final volume in the primary is %1. Grain Group + + New + + + + Save + + + + Cancel + + fermentationEditor @@ -5647,15 +5686,27 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + + + New + + + + Save + + + + Cancel @@ -5980,6 +6031,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + + + + Save + + + + Cancel + + instructionWidget @@ -6889,10 +6952,6 @@ The final volume in the primary is %1. Notes - - New misc - - Save and close @@ -6925,6 +6984,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + + + + Save + + + + Cancel + + namedMashEditor @@ -7834,6 +7905,18 @@ The final volume in the primary is %1. Overall Impression + + New + + + + Save + + + + Cancel + + timerListDialog @@ -8007,15 +8090,27 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + + + New + + + + Save + + + + Cancel @@ -8213,5 +8308,17 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + + + + Save + + + + Cancel + + diff --git a/translations/bt_fr.ts b/translations/bt_fr.ts index c7985cb1a..d9e483140 100644 --- a/translations/bt_fr.ts +++ b/translations/bt_fr.ts @@ -2317,10 +2317,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5213,6 +5209,13 @@ Le volume final dans la cuve de fermentation est de %1. Étape + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6237,17 +6240,29 @@ Le volume final dans la cuve de fermentation est de %1. Notes - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + New + Nouveau + + + Save + Sauvegarder + + + Cancel + Annuler + boilStepEditor @@ -6932,6 +6947,18 @@ Le volume final dans la cuve de fermentation est de %1. Packaging Vessel Type + + New + Nouveau + + + Save + Sauvegarder + + + Cancel + Annuler + fermentableEditor @@ -7251,6 +7278,18 @@ Le volume final dans la cuve de fermentation est de %1. Grain Group + + New + Nouveau + + + Save + Sauvegarder + + + Cancel + Annuler + fermentationEditor @@ -7275,17 +7314,29 @@ Le volume final dans la cuve de fermentation est de %1. Notes - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + Nouveau + + + Save + Sauvegarder + + + Cancel + Annuler + fermentationStepEditor @@ -7712,6 +7763,18 @@ Le volume final dans la cuve de fermentation est de %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nouveau + + + Save + Sauvegarder + + + Cancel + Annuler + instructionWidget @@ -8853,10 +8916,6 @@ Le volume final dans la cuve de fermentation est de %1. Notes Notes - - New misc - - Save and close @@ -8889,6 +8948,18 @@ Le volume final dans la cuve de fermentation est de %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nouveau + + + Save + Sauvegarder + + + Cancel + Annuler + namedMashEditor @@ -9940,15 +10011,15 @@ Le volume final dans la cuve de fermentation est de %1. New - Nouveau + Nouveau Save - Sauvegarder + Sauvegarder Cancel - Annuler + Annuler Main @@ -10175,17 +10246,29 @@ Le volume final dans la cuve de fermentation est de %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + New + Nouveau + + + Save + Sauvegarder + + + Cancel + Annuler + yeastEditor @@ -10489,5 +10572,17 @@ Le volume final dans la cuve de fermentation est de %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nouveau + + + Save + Sauvegarder + + + Cancel + Annuler + diff --git a/translations/bt_gl.ts b/translations/bt_gl.ts index 538c486b3..a243c259a 100644 --- a/translations/bt_gl.ts +++ b/translations/bt_gl.ts @@ -1718,10 +1718,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -4270,6 +4266,13 @@ The final volume in the primary is %1. Paso + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -5137,15 +5140,27 @@ The final volume in the primary is %1. Anotacións - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + + + New + Novo + + + Save + + + + Cancel @@ -5714,6 +5729,18 @@ The final volume in the primary is %1. Packaging Vessel Type + + New + Novo + + + Save + + + + Cancel + + fermentableEditor @@ -5965,6 +5992,18 @@ The final volume in the primary is %1. Grain Group + + New + Novo + + + Save + + + + Cancel + + fermentationEditor @@ -5989,15 +6028,27 @@ The final volume in the primary is %1. Anotacións - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + + + New + Novo + + + Save + + + + Cancel @@ -6326,6 +6377,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Novo + + + Save + + + + Cancel + + instructionWidget @@ -7251,10 +7314,6 @@ The final volume in the primary is %1. Notes Anotacións - - New misc - - Save and close @@ -7287,6 +7346,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Novo + + + Save + + + + Cancel + + namedMashEditor @@ -8166,7 +8237,7 @@ The final volume in the primary is %1. New - Novo + Novo Main @@ -8212,6 +8283,14 @@ The final volume in the primary is %1. Overall Impression + + Save + + + + Cancel + + timerListDialog @@ -8385,15 +8464,27 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + + + New + Novo + + + Save + + + + Cancel @@ -8591,5 +8682,17 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Novo + + + Save + + + + Cancel + + diff --git a/translations/bt_hu.ts b/translations/bt_hu.ts index c09588b5f..db0813bc8 100644 --- a/translations/bt_hu.ts +++ b/translations/bt_hu.ts @@ -2289,10 +2289,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5169,6 +5165,13 @@ Végleges mennyiség az elsődleges erjesztőben: %1 Lépés + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6165,17 +6168,29 @@ Végleges mennyiség az elsődleges erjesztőben: %1 Megjegyzések - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + New + Új + + + Save + Mentés + + + Cancel + Mégsem + boilStepEditor @@ -6854,6 +6869,18 @@ Végleges mennyiség az elsődleges erjesztőben: %1 Packaging Vessel Type + + New + Új + + + Save + Mentés + + + Cancel + Mégsem + fermentableEditor @@ -7161,6 +7188,18 @@ Végleges mennyiség az elsődleges erjesztőben: %1 Grain Group + + New + Új + + + Save + Mentés + + + Cancel + Mégsem + fermentationEditor @@ -7185,17 +7224,29 @@ Végleges mennyiség az elsődleges erjesztőben: %1 Megjegyzések - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + Új + + + Save + Mentés + + + Cancel + Mégsem + fermentationStepEditor @@ -7614,6 +7665,18 @@ Végleges mennyiség az elsődleges erjesztőben: %1 You can normally ignore this, but it's sometimes useful for debugging. + + New + Új + + + Save + Mentés + + + Cancel + Mégsem + instructionWidget @@ -8731,10 +8794,6 @@ Végleges mennyiség az elsődleges erjesztőben: %1 Notes Megjegyzések - - New misc - - Save and close @@ -8767,6 +8826,18 @@ Végleges mennyiség az elsődleges erjesztőben: %1 You can normally ignore this, but it's sometimes useful for debugging. + + New + Új + + + Save + Mentés + + + Cancel + Mégsem + namedMashEditor @@ -9662,15 +9733,15 @@ Végleges mennyiség az elsődleges erjesztőben: %1 New - Új + Új Save - Mentés + Mentés Cancel - Mégsem + Mégsem Main @@ -9893,17 +9964,29 @@ Végleges mennyiség az elsődleges erjesztőben: %1 - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + New + Új + + + Save + Mentés + + + Cancel + Mégsem + yeastEditor @@ -10167,5 +10250,17 @@ Végleges mennyiség az elsődleges erjesztőben: %1 You can normally ignore this, but it's sometimes useful for debugging. + + New + Új + + + Save + Mentés + + + Cancel + Mégsem + diff --git a/translations/bt_it.ts b/translations/bt_it.ts index f9fa3071e..3835c3653 100644 --- a/translations/bt_it.ts +++ b/translations/bt_it.ts @@ -2313,10 +2313,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5190,6 +5186,13 @@ Il Volume finale del primo è %1. Passo + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6214,15 +6217,27 @@ Il Volume finale del primo è %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + + + New + Nuovo + + + Save + Salva + + + Cancel @@ -6907,6 +6922,18 @@ Il Volume finale del primo è %1. Packaging Vessel Type + + New + Nuovo + + + Save + Salva + + + Cancel + + fermentableEditor @@ -7222,6 +7249,18 @@ Il Volume finale del primo è %1. Grain Group + + New + Nuovo + + + Save + Salva + + + Cancel + + fermentationEditor @@ -7246,15 +7285,27 @@ Il Volume finale del primo è %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + + + New + Nuovo + + + Save + Salva + + + Cancel @@ -7683,6 +7734,18 @@ Il Volume finale del primo è %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nuovo + + + Save + Salva + + + Cancel + + instructionWidget @@ -8824,10 +8887,6 @@ Il Volume finale del primo è %1. Notes - - New misc - - Save and close @@ -8860,6 +8919,18 @@ Il Volume finale del primo è %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nuovo + + + Save + Salva + + + Cancel + + namedMashEditor @@ -9913,15 +9984,15 @@ Il Volume finale del primo è %1. New - Nuovo + Nuovo Save - Salva + Salva Cancel - Cancella + Cancella Main @@ -10148,15 +10219,27 @@ Il Volume finale del primo è %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + + + New + Nuovo + + + Save + Salva + + + Cancel @@ -10462,5 +10545,17 @@ Il Volume finale del primo è %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nuovo + + + Save + Salva + + + Cancel + + diff --git a/translations/bt_lv.ts b/translations/bt_lv.ts index 77ca3b4ba..8dff91c10 100644 --- a/translations/bt_lv.ts +++ b/translations/bt_lv.ts @@ -1571,10 +1571,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -4123,6 +4119,13 @@ The final volume in the primary is %1. Solis + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -4970,15 +4973,27 @@ The final volume in the primary is %1. Piezīmes - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + + + New + Jauns + + + Save + + + + Cancel @@ -5547,6 +5562,18 @@ The final volume in the primary is %1. Packaging Vessel Type + + New + Jauns + + + Save + + + + Cancel + + fermentableEditor @@ -5806,6 +5833,18 @@ The final volume in the primary is %1. Grain Group + + New + Jauns + + + Save + + + + Cancel + + fermentationEditor @@ -5830,15 +5869,27 @@ The final volume in the primary is %1. Piezīmes - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + + + New + Jauns + + + Save + + + + Cancel @@ -6171,6 +6222,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Jauns + + + Save + + + + Cancel + + instructionWidget @@ -7100,10 +7163,6 @@ The final volume in the primary is %1. Notes Piezīmes - - New misc - - Save and close @@ -7136,6 +7195,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Jauns + + + Save + + + + Cancel + + namedMashEditor @@ -8011,7 +8082,7 @@ The final volume in the primary is %1. New - Jauns + Jauns Main @@ -8057,6 +8128,14 @@ The final volume in the primary is %1. Overall Impression + + Save + + + + Cancel + + timerListDialog @@ -8230,15 +8309,27 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + + + New + Jauns + + + Save + + + + Cancel @@ -8444,5 +8535,17 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Jauns + + + Save + + + + Cancel + + diff --git a/translations/bt_nb.ts b/translations/bt_nb.ts index c971bdc76..1f66e97dd 100644 --- a/translations/bt_nb.ts +++ b/translations/bt_nb.ts @@ -2222,10 +2222,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5110,6 +5106,13 @@ Sluttvolumet i primærgjæringskaret er %1. Trinn + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6130,17 +6133,29 @@ Sluttvolumet i primærgjæringskaret er %1. Notater - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + New + Ny + + + Save + Lagre + + + Cancel + Avbryt + boilStepEditor @@ -6819,6 +6834,18 @@ Sluttvolumet i primærgjæringskaret er %1. Packaging Vessel Type + + New + Ny + + + Save + Lagre + + + Cancel + Avbryt + fermentableEditor @@ -7134,6 +7161,18 @@ Sluttvolumet i primærgjæringskaret er %1. Grain Group + + New + Ny + + + Save + Lagre + + + Cancel + Avbryt + fermentationEditor @@ -7158,17 +7197,29 @@ Sluttvolumet i primærgjæringskaret er %1. Notater - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + Ny + + + Save + Lagre + + + Cancel + Avbryt + fermentationStepEditor @@ -7595,6 +7646,18 @@ Sluttvolumet i primærgjæringskaret er %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Ny + + + Save + Lagre + + + Cancel + Avbryt + instructionWidget @@ -8732,10 +8795,6 @@ Sluttvolumet i primærgjæringskaret er %1. Notes Notater - - New misc - - Save and close @@ -8768,6 +8827,18 @@ Sluttvolumet i primærgjæringskaret er %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Ny + + + Save + Lagre + + + Cancel + Avbryt + namedMashEditor @@ -9802,15 +9873,15 @@ Sluttvolumet i primærgjæringskaret er %1. New - Ny + Ny Save - Lagre + Lagre Cancel - Avbryt + Avbryt Main @@ -10037,17 +10108,29 @@ Sluttvolumet i primærgjæringskaret er %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + New + Ny + + + Save + Lagre + + + Cancel + Avbryt + yeastEditor @@ -10351,5 +10434,17 @@ Sluttvolumet i primærgjæringskaret er %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Ny + + + Save + Lagre + + + Cancel + Avbryt + diff --git a/translations/bt_nl.ts b/translations/bt_nl.ts index 657a20c99..dff3ef43d 100644 --- a/translations/bt_nl.ts +++ b/translations/bt_nl.ts @@ -2325,10 +2325,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5223,6 +5219,13 @@ Het uiteindelijke volume in de hoofdvergisting is %1. Stap + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6207,17 +6210,29 @@ Het uiteindelijke volume in de hoofdvergisting is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + New + Nieuw + + + Save + Opslaan + + + Cancel + Annuleren + boilStepEditor @@ -6900,6 +6915,18 @@ Het uiteindelijke volume in de hoofdvergisting is %1. Packaging Vessel Type + + New + Nieuw + + + Save + Opslaan + + + Cancel + Annuleren + fermentableEditor @@ -7207,6 +7234,18 @@ Het uiteindelijke volume in de hoofdvergisting is %1. Grain Group + + New + Nieuw + + + Save + Opslaan + + + Cancel + Annuleren + fermentationEditor @@ -7231,17 +7270,29 @@ Het uiteindelijke volume in de hoofdvergisting is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + Nieuw + + + Save + Opslaan + + + Cancel + Annuleren + fermentationStepEditor @@ -7668,6 +7719,18 @@ Het uiteindelijke volume in de hoofdvergisting is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nieuw + + + Save + Opslaan + + + Cancel + Annuleren + instructionWidget @@ -8761,10 +8824,6 @@ Het uiteindelijke volume in de hoofdvergisting is %1. Notes - - New misc - - Save and close @@ -8797,6 +8856,18 @@ Het uiteindelijke volume in de hoofdvergisting is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nieuw + + + Save + Opslaan + + + Cancel + Annuleren + namedMashEditor @@ -9756,15 +9827,15 @@ Het uiteindelijke volume in de hoofdvergisting is %1. New - Nieuw + Nieuw Save - Opslaan + Opslaan Cancel - Annuleren + Annuleren Main @@ -9987,17 +10058,29 @@ Het uiteindelijke volume in de hoofdvergisting is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + New + Nieuw + + + Save + Opslaan + + + Cancel + Annuleren + yeastEditor @@ -10301,5 +10384,17 @@ Het uiteindelijke volume in de hoofdvergisting is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nieuw + + + Save + Opslaan + + + Cancel + Annuleren + diff --git a/translations/bt_pl.ts b/translations/bt_pl.ts index f52f34df1..6dcc40072 100644 --- a/translations/bt_pl.ts +++ b/translations/bt_pl.ts @@ -2194,10 +2194,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5043,6 +5039,13 @@ Końcowa pojemność w fermentorze wyniesie %1. Krok + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6035,17 +6038,29 @@ Końcowa pojemność w fermentorze wyniesie %1. Notatki - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + New + Nowy + + + Save + Zapisz + + + Cancel + Anuluj + boilStepEditor @@ -6720,6 +6735,18 @@ Końcowa pojemność w fermentorze wyniesie %1. Packaging Vessel Type + + New + Nowy + + + Save + Zapisz + + + Cancel + Anuluj + fermentableEditor @@ -7039,6 +7066,18 @@ Końcowa pojemność w fermentorze wyniesie %1. Grain Group + + New + Nowy + + + Save + Zapisz + + + Cancel + Anuluj + fermentationEditor @@ -7063,17 +7102,29 @@ Końcowa pojemność w fermentorze wyniesie %1. Notatki - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + Nowy + + + Save + Zapisz + + + Cancel + Anuluj + fermentationStepEditor @@ -7500,6 +7551,18 @@ Końcowa pojemność w fermentorze wyniesie %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nowy + + + Save + Zapisz + + + Cancel + Anuluj + instructionWidget @@ -8637,10 +8700,6 @@ Końcowa pojemność w fermentorze wyniesie %1. Notes Notatki - - New misc - - Save and close @@ -8673,6 +8732,18 @@ Końcowa pojemność w fermentorze wyniesie %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nowy + + + Save + Zapisz + + + Cancel + Anuluj + namedMashEditor @@ -9708,15 +9779,15 @@ Końcowa pojemność w fermentorze wyniesie %1. New - Nowy + Nowy Save - Zapisz + Zapisz Cancel - Anuluj + Anuluj Main @@ -9943,17 +10014,29 @@ Końcowa pojemność w fermentorze wyniesie %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + New + Nowy + + + Save + Zapisz + + + Cancel + Anuluj + yeastEditor @@ -10257,5 +10340,17 @@ Końcowa pojemność w fermentorze wyniesie %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Nowy + + + Save + Zapisz + + + Cancel + Anuluj + diff --git a/translations/bt_pt.ts b/translations/bt_pt.ts index a157919e0..5544e4414 100644 --- a/translations/bt_pt.ts +++ b/translations/bt_pt.ts @@ -2253,10 +2253,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5141,6 +5137,13 @@ O volume final do fermentador primário é %1. Etapa + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6157,17 +6160,29 @@ O volume final do fermentador primário é %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + New + Novo + + + Save + Salvar + + + Cancel + Cancelar + boilStepEditor @@ -6846,6 +6861,18 @@ O volume final do fermentador primário é %1. Packaging Vessel Type + + New + Novo + + + Save + Salvar + + + Cancel + Cancelar + fermentableEditor @@ -7161,6 +7188,18 @@ O volume final do fermentador primário é %1. Grain Group + + New + Novo + + + Save + Salvar + + + Cancel + Cancelar + fermentationEditor @@ -7185,17 +7224,29 @@ O volume final do fermentador primário é %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + Novo + + + Save + Salvar + + + Cancel + Cancelar + fermentationStepEditor @@ -7622,6 +7673,18 @@ O volume final do fermentador primário é %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Novo + + + Save + Salvar + + + Cancel + Cancelar + instructionWidget @@ -8759,10 +8822,6 @@ O volume final do fermentador primário é %1. Notes - - New misc - - Save and close @@ -8795,6 +8854,18 @@ O volume final do fermentador primário é %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Novo + + + Save + Salvar + + + Cancel + Cancelar + namedMashEditor @@ -9842,15 +9913,15 @@ O volume final do fermentador primário é %1. New - Novo + Novo Save - Salvar + Salvar Cancel - Cancelar + Cancelar Main @@ -10077,17 +10148,29 @@ O volume final do fermentador primário é %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + New + Novo + + + Save + Salvar + + + Cancel + Cancelar + yeastEditor @@ -10391,5 +10474,17 @@ O volume final do fermentador primário é %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Novo + + + Save + Salvar + + + Cancel + Cancelar + diff --git a/translations/bt_ru.ts b/translations/bt_ru.ts index ea72d48bc..34659a8b6 100644 --- a/translations/bt_ru.ts +++ b/translations/bt_ru.ts @@ -2289,10 +2289,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5173,6 +5169,13 @@ The final volume in the primary is %1. Этап + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6189,17 +6192,29 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + New + Новый + + + Save + Сохранить + + + Cancel + Отменить + boilStepEditor @@ -6878,6 +6893,18 @@ The final volume in the primary is %1. Packaging Vessel Type + + New + Новый + + + Save + Сохранить + + + Cancel + Отменить + fermentableEditor @@ -7193,6 +7220,18 @@ The final volume in the primary is %1. Grain Group + + New + Новый + + + Save + Сохранить + + + Cancel + Отменить + fermentationEditor @@ -7217,17 +7256,29 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + Новый + + + Save + Сохранить + + + Cancel + Отменить + fermentationStepEditor @@ -7654,6 +7705,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Новый + + + Save + Сохранить + + + Cancel + Отменить + instructionWidget @@ -8787,10 +8850,6 @@ The final volume in the primary is %1. Notes - - New misc - - Save and close @@ -8823,6 +8882,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Новый + + + Save + Сохранить + + + Cancel + Отменить + namedMashEditor @@ -9850,15 +9921,15 @@ The final volume in the primary is %1. New - Новый + Новый Save - Сохранить + Сохранить Cancel - Отменить + Отменить Main @@ -10085,17 +10156,29 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + New + Новый + + + Save + Сохранить + + + Cancel + Отменить + yeastEditor @@ -10391,5 +10474,17 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Новый + + + Save + Сохранить + + + Cancel + Отменить + diff --git a/translations/bt_sr.ts b/translations/bt_sr.ts index 734aa6dec..404e19ce8 100644 --- a/translations/bt_sr.ts +++ b/translations/bt_sr.ts @@ -2062,10 +2062,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -4895,6 +4891,13 @@ The final volume in the primary is %1. Корак + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -5829,15 +5832,27 @@ The final volume in the primary is %1. Белешке - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + + + New + Нов + + + Save + Сачувај + + + Cancel @@ -6406,6 +6421,18 @@ The final volume in the primary is %1. Packaging Vessel Type + + New + Нов + + + Save + Сачувај + + + Cancel + + fermentableEditor @@ -6685,6 +6712,18 @@ The final volume in the primary is %1. Grain Group + + New + Нов + + + Save + Сачувај + + + Cancel + + fermentationEditor @@ -6709,15 +6748,27 @@ The final volume in the primary is %1. Белешке - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + + + New + Нов + + + Save + Сачувај + + + Cancel @@ -7090,6 +7141,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Нов + + + Save + Сачувај + + + Cancel + + instructionWidget @@ -8075,10 +8138,6 @@ The final volume in the primary is %1. Notes Белешке - - New misc - - Save and close @@ -8111,6 +8170,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Нов + + + Save + Сачувај + + + Cancel + + namedMashEditor @@ -9006,11 +9077,11 @@ The final volume in the primary is %1. New - Нов + Нов Save - Сачувај + Сачувај Main @@ -9056,6 +9127,10 @@ The final volume in the primary is %1. Overall Impression + + Cancel + + timerListDialog @@ -9229,15 +9304,27 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + + + New + Нов + + + Save + Сачувај + + + Cancel @@ -9491,5 +9578,17 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Нов + + + Save + Сачувај + + + Cancel + + diff --git a/translations/bt_sv.ts b/translations/bt_sv.ts index 3730bfc17..0254b449a 100644 --- a/translations/bt_sv.ts +++ b/translations/bt_sv.ts @@ -2317,10 +2317,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5206,6 +5202,13 @@ Primärens slutgiltiga volym är %1. Steg + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6198,17 +6201,29 @@ Primärens slutgiltiga volym är %1. Anteckningar - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + New + Ny + + + Save + Spara + + + Cancel + Avbryt + boilStepEditor @@ -6891,6 +6906,18 @@ Primärens slutgiltiga volym är %1. Packaging Vessel Type + + New + Ny + + + Save + Spara + + + Cancel + Avbryt + fermentableEditor @@ -7210,6 +7237,18 @@ Primärens slutgiltiga volym är %1. Grain Group + + New + Ny + + + Save + Spara + + + Cancel + Avbryt + fermentationEditor @@ -7234,17 +7273,29 @@ Primärens slutgiltiga volym är %1. Anteckningar - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + Ny + + + Save + Spara + + + Cancel + Avbryt + fermentationStepEditor @@ -7671,6 +7722,18 @@ Primärens slutgiltiga volym är %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Ny + + + Save + Spara + + + Cancel + Avbryt + instructionWidget @@ -8800,10 +8863,6 @@ Primärens slutgiltiga volym är %1. Notes Anteckningar - - New misc - - Save and close @@ -8836,6 +8895,18 @@ Primärens slutgiltiga volym är %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Ny + + + Save + Spara + + + Cancel + Avbryt + namedMashEditor @@ -9795,15 +9866,15 @@ Primärens slutgiltiga volym är %1. New - Ny + Ny Save - Spara + Spara Cancel - Avbryt + Avbryt Main @@ -10026,17 +10097,29 @@ Primärens slutgiltiga volym är %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + New + Ny + + + Save + Spara + + + Cancel + Avbryt + yeastEditor @@ -10340,5 +10423,17 @@ Primärens slutgiltiga volym är %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Ny + + + Save + Spara + + + Cancel + Avbryt + diff --git a/translations/bt_tr.ts b/translations/bt_tr.ts index 7d7ec3bdb..68df5c877 100644 --- a/translations/bt_tr.ts +++ b/translations/bt_tr.ts @@ -2186,10 +2186,6 @@ Günlük dosyası daha fazla detay içerebilir. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -5200,6 +5196,13 @@ The final volume in the primary is %1. Adım + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -6256,7 +6259,7 @@ The final volume in the primary is %1. New hop - Yeni şot + Yeni şot Save and close @@ -6266,6 +6269,22 @@ The final volume in the primary is %1. Discard and close Kaydetmeden çık + + New boil + + + + New + Yeni + + + Save + Kaydet + + + Cancel + İptal + boilStepEditor @@ -6873,6 +6892,18 @@ The final volume in the primary is %1. Packaging Vessel Type + + New + Yeni + + + Save + Kaydet + + + Cancel + İptal + fermentableEditor @@ -7172,6 +7203,18 @@ The final volume in the primary is %1. Grain Group + + New + Yeni + + + Save + Kaydet + + + Cancel + İptal + fermentationEditor @@ -7197,7 +7240,7 @@ The final volume in the primary is %1. New hop - Yeni şot + Yeni şot Save and close @@ -7207,6 +7250,22 @@ The final volume in the primary is %1. Discard and close Kaydetmeden çık + + New fermentation + + + + New + Yeni + + + Save + Kaydet + + + Cancel + İptal + fermentationStepEditor @@ -7581,6 +7640,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Yeni + + + Save + Kaydet + + + Cancel + İptal + instructionWidget @@ -8608,7 +8679,7 @@ The final volume in the primary is %1. New misc - Yeni diğer + Yeni diğer Save and close @@ -8642,6 +8713,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Yeni + + + Save + Kaydet + + + Cancel + İptal + namedMashEditor @@ -9627,6 +9710,18 @@ The final volume in the primary is %1. Overall Impression + + New + Yeni + + + Save + Kaydet + + + Cancel + İptal + timerListDialog @@ -9801,7 +9896,7 @@ The final volume in the primary is %1. New hop - Yeni şot + Yeni şot Save and close @@ -9811,6 +9906,22 @@ The final volume in the primary is %1. Discard and close Kaydetmeden çık + + New water + + + + New + Yeni + + + Save + Kaydet + + + Cancel + İptal + yeastEditor @@ -10086,5 +10197,17 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + Yeni + + + Save + Kaydet + + + Cancel + İptal + diff --git a/translations/bt_zh.ts b/translations/bt_zh.ts index af4ea90d3..c6c00c856 100644 --- a/translations/bt_zh.ts +++ b/translations/bt_zh.ts @@ -2114,10 +2114,6 @@ Log file may contain more details. Remove %1 from recipe - - Add %1 step to recipe - - Remove %1 @@ -4963,6 +4959,13 @@ The final volume in the primary is %1. 步驟 + + StepClass + + Add %1 step to recipe + + + StepExtended @@ -5963,17 +5966,29 @@ The final volume in the primary is %1. 说明Notes - New hop + Save and close - Save and close + Discard and close - Discard and close + New boil + + New + 新New + + + Save + 节省Save + + + Cancel + 取消 + boilStepEditor @@ -6648,6 +6663,18 @@ The final volume in the primary is %1. Packaging Vessel Type + + New + 新New + + + Save + 节省Save + + + Cancel + 取消 + fermentableEditor @@ -6963,6 +6990,18 @@ The final volume in the primary is %1. Grain Group + + New + 新New + + + Save + 节省Save + + + Cancel + 取消 + fermentationEditor @@ -6987,17 +7026,29 @@ The final volume in the primary is %1. 说明Notes - New hop + Save and close - Save and close + Discard and close - Discard and close + New fermentation + + New + 新New + + + Save + 节省Save + + + Cancel + 取消 + fermentationStepEditor @@ -7416,6 +7467,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + 新New + + + Save + 节省Save + + + Cancel + 取消 + instructionWidget @@ -8545,10 +8608,6 @@ The final volume in the primary is %1. Notes 说明Notes - - New misc - - Save and close @@ -8581,6 +8640,18 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + 新New + + + Save + 节省Save + + + Cancel + 取消 + namedMashEditor @@ -9616,15 +9687,15 @@ The final volume in the primary is %1. New - 新New + 新New Save - 节省Save + 节省Save Cancel - 取消 + 取消 Main @@ -9851,17 +9922,29 @@ The final volume in the primary is %1. - New hop + Save and close - Save and close + Discard and close - Discard and close + New water + + New + 新New + + + Save + 节省Save + + + Cancel + 取消 + yeastEditor @@ -10153,5 +10236,17 @@ The final volume in the primary is %1. You can normally ignore this, but it's sometimes useful for debugging. + + New + 新New + + + Save + 节省Save + + + Cancel + 取消 + diff --git a/ui/boilEditor.ui b/ui/boilEditor.ui index efa2d03e6..543ca50c9 100755 --- a/ui/boilEditor.ui +++ b/ui/boilEditor.ui @@ -27,7 +27,7 @@ - + Name @@ -47,7 +47,7 @@ - + Description @@ -57,12 +57,6 @@ - - - 0 - 0 - - Qt::CustomContextMenu @@ -74,7 +68,7 @@ - + Pre-Boil Size @@ -89,7 +83,7 @@ - + @@ -98,10 +92,10 @@ - New hop + New boil - + New @@ -115,7 +109,7 @@ Save and close - + Save @@ -129,7 +123,7 @@ Discard and close - + Cancel diff --git a/ui/boilStepEditor.ui b/ui/boilStepEditor.ui index 6b676bca0..0ca2c1e5d 100755 --- a/ui/boilStepEditor.ui +++ b/ui/boilStepEditor.ui @@ -27,25 +27,12 @@ - + Name - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -68,12 +55,6 @@ - - - 0 - 0 - - Qt::CustomContextMenu diff --git a/ui/equipmentEditor.ui b/ui/equipmentEditor.ui index bf4cc938d..5b731ed7a 100644 --- a/ui/equipmentEditor.ui +++ b/ui/equipmentEditor.ui @@ -66,8 +66,8 @@ - - + + Name to identify this equipment profile @@ -1087,7 +1087,7 @@ New equipment - + New @@ -1101,7 +1101,7 @@ Save and close - + Save @@ -1115,7 +1115,7 @@ Discard and close - + Cancel diff --git a/ui/fermentableEditor.ui b/ui/fermentableEditor.ui index 6a65c49e9..f4b3273fe 100644 --- a/ui/fermentableEditor.ui +++ b/ui/fermentableEditor.ui @@ -2,20 +2,6 @@ fermentableEditor - - - 0 - 0 - 661 - 348 - - - - - 0 - 0 - - Fermentable Editor @@ -50,25 +36,12 @@ - + Name - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -84,12 +57,6 @@ - - - 0 - 0 - - Fermantable Type @@ -97,12 +64,6 @@ - - - 0 - 0 - - Recommend Mash @@ -139,18 +100,6 @@ - - - 0 - 0 - - - - - 100 - 16777215 - - Lovibond rating @@ -158,12 +107,6 @@ - - - 0 - 0 - - Is Mashed @@ -197,12 +140,6 @@ - - - 0 - 0 - - Fermantable Grain Group @@ -210,12 +147,6 @@ - - - 0 - 0 - - Add After Boil @@ -226,12 +157,6 @@ - - - 0 - 0 - - This ingredient is added post boil. @@ -258,18 +183,6 @@ - - - 0 - 0 - - - - - 100 - 16777215 - - Amount in inventory @@ -277,12 +190,6 @@ - - - 0 - 0 - - Whether the amount is weight or volume @@ -296,12 +203,6 @@ - - - 0 - 0 - - Whether the amount is weight or volume @@ -319,12 +220,6 @@ - - - 0 - 0 - - Origin @@ -342,12 +237,6 @@ - - - 0 - 0 - - Protein percentage by mass @@ -365,12 +254,6 @@ - - - 0 - 0 - - Supplier @@ -388,12 +271,6 @@ - - - 0 - 0 - - Maximum recommended percentage of total grist @@ -411,12 +288,6 @@ - - - 0 - 0 - - Moisture percentage by mass @@ -437,12 +308,6 @@ - - - 0 - 0 - - Yield difference between coarse and fine grind @@ -463,12 +328,6 @@ - - - 0 - 0 - - Diastatic power @@ -486,12 +345,6 @@ - - - 0 - 0 - - Bitterness of pre-hopped extracts @@ -531,19 +384,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -899,12 +739,6 @@ - - - 1000 - 1000 - - @@ -932,7 +766,7 @@ New fermentable - + New @@ -946,7 +780,7 @@ Save and close - + Save @@ -960,7 +794,7 @@ Discard and close - + Cancel diff --git a/ui/fermentationEditor.ui b/ui/fermentationEditor.ui index fc7a5d363..4e09a676d 100755 --- a/ui/fermentationEditor.ui +++ b/ui/fermentationEditor.ui @@ -26,8 +26,8 @@ - - + + Name @@ -47,7 +47,7 @@ - + Description @@ -62,7 +62,7 @@ - + @@ -71,10 +71,10 @@ - New hop + New fermentation - + New @@ -88,7 +88,7 @@ Save and close - + Save @@ -102,7 +102,7 @@ Discard and close - + Cancel diff --git a/ui/fermentationStepEditor.ui b/ui/fermentationStepEditor.ui index b0483a222..9d9cc6bc9 100755 --- a/ui/fermentationStepEditor.ui +++ b/ui/fermentationStepEditor.ui @@ -27,25 +27,12 @@ - + Name - - - - Qt::Horizontal - - - - 40 - 20 - - - - diff --git a/ui/hopEditor.ui b/ui/hopEditor.ui index 3b81d7a00..4bd191de9 100644 --- a/ui/hopEditor.ui +++ b/ui/hopEditor.ui @@ -50,7 +50,7 @@ - + Name @@ -866,7 +866,7 @@ New hop - + New @@ -880,7 +880,7 @@ Save and close - + Save @@ -894,7 +894,7 @@ Discard and close - + Cancel diff --git a/ui/mashEditor.ui b/ui/mashEditor.ui index a1a860dba..cd33efa76 100644 --- a/ui/mashEditor.ui +++ b/ui/mashEditor.ui @@ -23,12 +23,6 @@ - - - 0 - 0 - - Name @@ -38,19 +32,7 @@ - - - - 0 - 0 - - - - - 100 - 16777215 - - + Name @@ -62,12 +44,6 @@ - - - 0 - 0 - - Qt::CustomContextMenu @@ -81,18 +57,6 @@ - - - 0 - 0 - - - - - 100 - 16777215 - - Initial grain temp @@ -104,12 +68,6 @@ - - - 0 - 0 - - Qt::CustomContextMenu @@ -123,18 +81,6 @@ - - - 0 - 0 - - - - - 100 - 16777215 - - Sparge temp target @@ -146,12 +92,6 @@ - - - 0 - 0 - - Sparge pH @@ -162,18 +102,6 @@ - - - 0 - 0 - - - - - 100 - 16777215 - - Sparge pH @@ -183,18 +111,6 @@ - - - 0 - 0 - - - - - 0 - 100 - - Notes @@ -238,12 +154,6 @@ - - - 0 - 0 - - Qt::CustomContextMenu @@ -257,18 +167,6 @@ - - - 0 - 0 - - - - - 100 - 16777215 - - Initial tun temp @@ -299,12 +197,6 @@ - - - 0 - 0 - - Qt::CustomContextMenu @@ -318,18 +210,6 @@ - - - 0 - 0 - - - - - 100 - 16777215 - - Tun mass @@ -341,12 +221,6 @@ - - - 0 - 0 - - Tun sp. heat @@ -357,18 +231,6 @@ - - - 0 - 0 - - - - - 100 - 16777215 - - Tun specific heat (cal/(g*K)) diff --git a/ui/miscEditor.ui b/ui/miscEditor.ui index 4d161d5ca..615f1c606 100644 --- a/ui/miscEditor.ui +++ b/ui/miscEditor.ui @@ -29,48 +29,28 @@ Main + - Name - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - lineEdit_name + Name - - - Name + + + Name - - - - Qt::Horizontal - - - - 40 - 20 - - - - + Type - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - comboBox_type @@ -83,6 +63,7 @@ + @@ -105,12 +86,6 @@ - - - 0 - 0 - - Whether the amount is weight or volume @@ -129,6 +104,7 @@ + @@ -163,19 +139,7 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - + @@ -200,8 +164,10 @@ + + Use for @@ -212,6 +178,7 @@ + Notes @@ -222,12 +189,17 @@ + + - + + + 2 + - + Qt::Horizontal @@ -242,10 +214,10 @@ - New misc + New - + New @@ -259,7 +231,7 @@ Save and close - + Save @@ -273,7 +245,7 @@ Discard and close - + Cancel @@ -283,6 +255,7 @@ + diff --git a/ui/styleEditor.ui b/ui/styleEditor.ui index f52c8308f..2b4fa0de9 100644 --- a/ui/styleEditor.ui +++ b/ui/styleEditor.ui @@ -50,13 +50,7 @@ - - - - 10 - 0 - - + Name @@ -205,34 +199,10 @@ - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 0 - - @@ -247,34 +217,10 @@ - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 0 - - @@ -286,34 +232,10 @@ - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 0 - - @@ -328,34 +250,10 @@ - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 0 - - @@ -367,34 +265,10 @@ - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 0 - - @@ -406,34 +280,10 @@ - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 0 - - @@ -567,7 +417,7 @@ New style - + New @@ -584,7 +434,7 @@ Save and close - + Save @@ -604,7 +454,7 @@ Discard and close - + Cancel diff --git a/ui/waterEditor.ui b/ui/waterEditor.ui index d8cc9e810..6bed509ff 100644 --- a/ui/waterEditor.ui +++ b/ui/waterEditor.ui @@ -61,22 +61,10 @@ - - - 0 - 0 - - - - - 0 - 0 - - Ca @@ -87,18 +75,6 @@ - - - 0 - 0 - - - - - 50 - 0 - - @@ -116,12 +92,6 @@ - - - 0 - 0 - - Cl @@ -132,28 +102,10 @@ - - - 0 - 0 - - - - - 50 - 0 - - - - - 0 - 0 - - Mg @@ -164,28 +116,10 @@ - - - 0 - 0 - - - - - 50 - 0 - - - - - 0 - 0 - - SO<sub>4</sub> @@ -199,28 +133,10 @@ - - - 0 - 0 - - - - - 50 - 0 - - - - - 0 - 0 - - Na @@ -231,28 +147,10 @@ - - - 0 - 0 - - - - - 50 - 0 - - - - - 0 - 0 - - Alkalinity @@ -266,28 +164,10 @@ - - - 0 - 0 - - - - - 50 - 0 - - - - - 0 - 0 - - pH @@ -298,28 +178,10 @@ - - - 0 - 0 - - - - - 50 - 0 - - - - - 0 - 0 - - Alkalinity measured as @@ -333,12 +195,6 @@ - - - 0 - 0 - - HCO3 @@ -443,18 +299,18 @@ - + - + - New hop + New water - + New @@ -468,7 +324,7 @@ Save and close - + Save @@ -482,7 +338,7 @@ Discard and close - + Cancel diff --git a/ui/yeastEditor.ui b/ui/yeastEditor.ui index 7412c2d48..5213b2543 100644 --- a/ui/yeastEditor.ui +++ b/ui/yeastEditor.ui @@ -44,7 +44,7 @@ - + Name @@ -82,12 +82,6 @@ - - - 0 - 0 - - Form @@ -115,12 +109,6 @@ - - - 0 - 0 - - Total amount in inventory @@ -128,12 +116,6 @@ - - - 0 - 0 - - Whether the amount is weight or volume @@ -232,12 +214,6 @@ - - - 0 - 0 - - Flocculation @@ -299,12 +275,6 @@ - - - 0 - 0 - - Min temp @@ -322,12 +292,6 @@ - - - 0 - 0 - - Max recultures @@ -348,12 +312,6 @@ - - - 0 - 0 - - Max temp @@ -371,12 +329,6 @@ - - - 0 - 0 - - Times this yeast has been recultured @@ -555,7 +507,7 @@ New yeast - + New @@ -569,7 +521,7 @@ Save and close - + Save @@ -583,7 +535,7 @@ Discard and close - + Cancel