diff --git a/src/HopEditor.cpp b/src/HopEditor.cpp index c26e6992a..d7d3f9613 100644 --- a/src/HopEditor.cpp +++ b/src/HopEditor.cpp @@ -47,17 +47,10 @@ HopEditor::HopEditor(QWidget * parent) : // this->comboBox_hopType->addItem(tr("Bittering" ), Hop::typeStringMapping.enumToString(Hop::Type::Bittering )); this->comboBox_hopType->addItem(tr("Aroma" ), Hop::typeStringMapping.enumToString(Hop::Type::Aroma )); - this->comboBox_hopType->addItem(tr("Aroma & Bittering" ), Hop::typeStringMapping.enumToString(Hop::Type::AromaAndBittering )); - this->comboBox_hopType->addItem(tr("Flavor" ), Hop::typeStringMapping.enumToString(Hop::Type::Flavor )); - this->comboBox_hopType->addItem(tr("Bittering & Flavor" ), Hop::typeStringMapping.enumToString(Hop::Type::BitteringAndFlavor )); - this->comboBox_hopType->addItem(tr("Aroma & Flavor" ), Hop::typeStringMapping.enumToString(Hop::Type::AromaAndFlavor )); - this->comboBox_hopType->addItem(tr("Aroma, Bittering & Flavor"), Hop::typeStringMapping.enumToString(Hop::Type::AromaBitteringAndFlavor)); + this->comboBox_hopType->addItem(tr("Aroma & Bittering" ), Hop::typeStringMapping.enumToString(Hop::Type::Both )); - this->comboBox_hopForm->addItem(tr("Extract" ), Hop::formStringMapping.enumToString(Hop::Form::Extract)); this->comboBox_hopForm->addItem(tr("Leaf" ), Hop::formStringMapping.enumToString(Hop::Form::Leaf )); - this->comboBox_hopForm->addItem(tr("Leaf (wet)"), Hop::formStringMapping.enumToString(Hop::Form::WetLeaf)); this->comboBox_hopForm->addItem(tr("Pellet" ), Hop::formStringMapping.enumToString(Hop::Form::Pellet )); - this->comboBox_hopForm->addItem(tr("Powder" ), Hop::formStringMapping.enumToString(Hop::Form::Powder )); this->comboBox_hopForm->addItem(tr("Plug" ), Hop::formStringMapping.enumToString(Hop::Form::Plug )); // Same comment for hop use, even thought it's not stored in BeerJSON diff --git a/src/PersistentSettings.cpp b/src/PersistentSettings.cpp index 741ce103b..4cfc048b0 100644 --- a/src/PersistentSettings.cpp +++ b/src/PersistentSettings.cpp @@ -131,7 +131,7 @@ void PersistentSettings::initialise(QString customUserDataDir) { configDir.absolutePath(); // Now we can set the full path of the persistent settings file - qSettings = std::make_unique(configDir.absoluteFilePath("brewkenPersistentSettings.conf"), + qSettings = std::make_unique(configDir.absoluteFilePath("brewtargetPersistentSettings.conf"), QSettings::IniFormat); // We've done enough now for calls to contains()/insert()/value() etc to work. Mark that we're initialised so we diff --git a/src/model/Hop.cpp b/src/model/Hop.cpp index fbab8eb4b..4a448b503 100644 --- a/src/model/Hop.cpp +++ b/src/model/Hop.cpp @@ -35,19 +35,12 @@ EnumStringMapping const Hop::typeStringMapping { {"aroma", Hop::Type::Aroma}, {"bittering", Hop::Type::Bittering}, - {"flavor", Hop::Type::Flavor}, - {"aroma/bittering", Hop::Type::AromaAndBittering}, // Previous seralisation (still used for BeerXML) was "Both" - {"bittering/flavor", Hop::Type::BitteringAndFlavor}, - {"aroma/flavor", Hop::Type::AromaAndFlavor}, - {"aroma/bittering/flavor", Hop::Type::AromaBitteringAndFlavor}, + {"both", Hop::Type::Both}, }; EnumStringMapping const Hop::formStringMapping { - {"extract", Hop::Form::Extract}, {"leaf", Hop::Form::Leaf}, - {"leaf (wet)", Hop::Form::WetLeaf}, {"pellet", Hop::Form::Pellet}, - {"powder", Hop::Form::Powder}, {"plug", Hop::Form::Plug} }; @@ -62,20 +55,13 @@ EnumStringMapping const Hop::useStringMapping { QMap const Hop::typeDisplayNames { {Hop::Type::Aroma, tr("Aroma" )}, {Hop::Type::Bittering, tr("Bittering" )}, - {Hop::Type::Flavor, tr("Flavor" )}, - {Hop::Type::AromaAndBittering, tr("Aroma & Bittering" )}, - {Hop::Type::BitteringAndFlavor, tr("Bittering & Flavor" )}, - {Hop::Type::AromaAndFlavor, tr("Aroma & Flavor" )}, - {Hop::Type::AromaBitteringAndFlavor, tr("Aroma, Bittering & Flavor")}, + {Hop::Type::Both , tr("Aroma & Bittering" )}, }; QMap const Hop::formDisplayNames { {Hop::Form::Leaf, tr("Leaf" )}, {Hop::Form::Pellet, tr("Pellet" )}, {Hop::Form::Plug, tr("Plug" )}, - {Hop::Form::Extract, tr("Extract")}, - {Hop::Form::WetLeaf, tr("WetLeaf")}, - {Hop::Form::Powder, tr("Powder" )}, }; QMap const Hop::useDisplayNames { diff --git a/src/model/Hop.h b/src/model/Hop.h index 397dc2105..edbb164eb 100644 --- a/src/model/Hop.h +++ b/src/model/Hop.h @@ -65,33 +65,18 @@ class Hop : public NamedEntityWithInventory { public: - /*! - * \brief The type of hop, meaning for what properties it is used. Arguably we should have three binary flags - * (aroma, bittering and flavor), but keeping a single enum makes the mappings to/from BeerXML and BeerJSON - * easier. - */ - enum class Type {Bittering, - Aroma, - AromaAndBittering, // was Both - Flavor, - BitteringAndFlavor, - AromaAndFlavor, - AromaBitteringAndFlavor}; + //! \brief The type of hop, meaning for what properties it is used. + enum class Type {Bittering, Aroma, Both}; + /*! * \brief Mapping between \c Hop::Type and string values suitable for serialisation in DB, BeerJSON, etc (but \b not * BeerXML) */ static EnumStringMapping const typeStringMapping; - /*! - * \brief The form of the hop. - */ - enum class Form {Leaf, - Pellet, - Plug, - Extract, - WetLeaf, - Powder}; + //! \brief The form of the hop. + enum class Form {Leaf, Pellet, Plug}; + /*! * \brief Mapping between \c Hop::Form and string values suitable for serialisation in DB, BeerJSON, etc (but \b not * BeerXML) diff --git a/src/unitTests/Testing.cpp b/src/unitTests/Testing.cpp index 5a79f10de..24c636541 100644 --- a/src/unitTests/Testing.cpp +++ b/src/unitTests/Testing.cpp @@ -399,7 +399,7 @@ void Testing::initTestCase() { this->cascade_4pct->setAlpha_pct(4.0); this->cascade_4pct->setUse(Hop::Use::Boil); this->cascade_4pct->setTime_min(60); - this->cascade_4pct->setType(Hop::Type::AromaAndBittering); + this->cascade_4pct->setType(Hop::Type::Both); this->cascade_4pct->setForm(Hop::Form::Leaf); // 70% yield, no moisture, 2 SRM diff --git a/src/xml/BeerXml.cpp b/src/xml/BeerXml.cpp index 1f78abb16..2febe918a 100644 --- a/src/xml/BeerXml.cpp +++ b/src/xml/BeerXml.cpp @@ -87,25 +87,12 @@ namespace { EnumStringMapping const BEER_XML_HOP_TYPE_MAPPER { {"Bittering", Hop::Type::Bittering}, {"Aroma", Hop::Type::Aroma}, - {"Both", Hop::Type::AromaAndBittering}, - // These other types are in BeerJSON but are not mentioned in the BeerXML 1.0 Standard. They get an approximate - // mapping when we write to BeerXML - // Note that we include a comment here to ensure we don't have multiple mappings for the same strings - {"Aroma", Hop::Type::Flavor}, - {"Both", Hop::Type::BitteringAndFlavor}, - {"Aroma", Hop::Type::AromaAndFlavor}, - {"Both", Hop::Type::AromaBitteringAndFlavor} + {"Both", Hop::Type::Both}, }; EnumStringMapping const BEER_XML_HOP_FORM_MAPPER { {"Pellet", Hop::Form::Pellet}, {"Plug", Hop::Form::Plug}, {"Leaf", Hop::Form::Leaf}, - // These other types are in BeerJSON but are not mentioned in the BeerXML 1.0 Standard. They get an approximate - // mapping when we write to BeerXML - // Note that we include a comment here to ensure we don't have multiple mappings for the same strings - {"Pellet", Hop::Form::Extract}, - {"Leaf", Hop::Form::WetLeaf}, - {"Pellet", Hop::Form::Powder} }; template<> XmlRecord::FieldDefinitions const BEER_XML_RECORD_FIELDS { // Type XPath Q_PROPERTY Enum Mapper diff --git a/translations/bt_ca.ts b/translations/bt_ca.ts index aa8569931..2ced356ca 100644 --- a/translations/bt_ca.ts +++ b/translations/bt_ca.ts @@ -1387,35 +1387,15 @@ Log file may contain more details. Flavor - Sabor + Sabor Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Extracte - - - WetLeaf - - - - Powder - + Extracte Post-Boil @@ -1485,40 +1465,20 @@ Log file may contain more details. Flavor - Sabor - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + Sabor Extract - Extracte + Extracte Leaf Flor - - Leaf (wet) - - Pellet Pèl·let - - Powder - - Plug «Plug» diff --git a/translations/bt_cs.ts b/translations/bt_cs.ts index 4ff86850d..48308f73e 100644 --- a/translations/bt_cs.ts +++ b/translations/bt_cs.ts @@ -1347,35 +1347,15 @@ Log file may contain more details. Flavor - Příchuť + Příchuť Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Výtažek - - - WetLeaf - - - - Powder - + Výtažek Post-Boil @@ -1445,40 +1425,20 @@ Log file may contain more details. Flavor - Příchuť - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + Příchuť Extract - Výtažek + Výtažek Leaf Hlávkový - - Leaf (wet) - - Pellet Granulovaný - - Powder - - Plug Lisovaný diff --git a/translations/bt_de.ts b/translations/bt_de.ts index 7747985dc..0d6b3c079 100644 --- a/translations/bt_de.ts +++ b/translations/bt_de.ts @@ -1371,35 +1371,15 @@ Log file may contain more details. Flavor - Aroma + Aroma Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Extrakt - - - WetLeaf - - - - Powder - + Extrakt Post-Boil @@ -1469,40 +1449,20 @@ Log file may contain more details. Flavor - Aroma - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + Aroma Extract - Extrakt + Extrakt Leaf Blatt - - Leaf (wet) - - Pellet Pellet - - Powder - - Plug diff --git a/translations/bt_el.ts b/translations/bt_el.ts index 37163f16b..270e5e238 100644 --- a/translations/bt_el.ts +++ b/translations/bt_el.ts @@ -1347,35 +1347,15 @@ Log file may contain more details. Flavor - Άρωματικές Ύλες + Άρωματικές Ύλες Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Υγρή Βύνη - - - WetLeaf - - - - Powder - + Υγρή Βύνη Post-Boil @@ -1445,40 +1425,20 @@ Log file may contain more details. Flavor - Άρωματικές Ύλες - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + Άρωματικές Ύλες Extract - Υγρή Βύνη + Υγρή Βύνη Leaf σε φύλλα - - Leaf (wet) - - Pellet Σφαιρίδια - - Powder - - Plug Ανθός diff --git a/translations/bt_en.ts b/translations/bt_en.ts index 6e8758932..ed1bda9c1 100644 --- a/translations/bt_en.ts +++ b/translations/bt_en.ts @@ -987,38 +987,10 @@ Log file may contain more details. Plug - - Flavor - - Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - - - Extract - - - - WetLeaf - - - - Powder - - Post-Boil @@ -1085,42 +1057,14 @@ Log file may contain more details. Aroma & Bittering - - Flavor - - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - - - Extract - - Leaf - - Leaf (wet) - - Pellet - - Powder - - Plug diff --git a/translations/bt_es.ts b/translations/bt_es.ts index 84003704e..1c649ecf5 100644 --- a/translations/bt_es.ts +++ b/translations/bt_es.ts @@ -1387,35 +1387,15 @@ Log file may contain more details. Flavor - Sabor + Sabor Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Extracto - - - WetLeaf - - - - Powder - + Extracto Post-Boil @@ -1485,40 +1465,20 @@ Log file may contain more details. Flavor - Sabor - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + Sabor Extract - Extracto + Extracto Leaf Flor - - Leaf (wet) - - Pellet Pellet - - Powder - - Plug diff --git a/translations/bt_et.ts b/translations/bt_et.ts index a57f59caf..1ced182ab 100644 --- a/translations/bt_et.ts +++ b/translations/bt_et.ts @@ -1038,38 +1038,10 @@ Log file may contain more details. Plug - - Flavor - - Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - - - Extract - - - - WetLeaf - - - - Powder - - Post-Boil @@ -1136,42 +1108,14 @@ Log file may contain more details. Aroma & Bittering - - Flavor - - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - - - Extract - - Leaf - - Leaf (wet) - - Pellet - - Powder - - Plug diff --git a/translations/bt_eu.ts b/translations/bt_eu.ts index 7bb2d1508..cb3722646 100644 --- a/translations/bt_eu.ts +++ b/translations/bt_eu.ts @@ -1046,38 +1046,10 @@ Log file may contain more details. Plug - - Flavor - - Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - - - Extract - - - - WetLeaf - - - - Powder - - Post-Boil @@ -1144,42 +1116,14 @@ Log file may contain more details. Aroma & Bittering - - Flavor - - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - - - Extract - - Leaf - - Leaf (wet) - - Pellet - - Powder - - Plug diff --git a/translations/bt_fr.ts b/translations/bt_fr.ts index d570e155b..e71f23a70 100644 --- a/translations/bt_fr.ts +++ b/translations/bt_fr.ts @@ -1387,35 +1387,15 @@ Log file may contain more details. Flavor - Saveur + Saveur Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Extrait - - - WetLeaf - - - - Powder - + Extrait Post-Boil @@ -1485,40 +1465,20 @@ Log file may contain more details. Flavor - Saveur - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + Saveur Extract - Extrait + Extrait Leaf Cône - - Leaf (wet) - - Pellet Pellet - - Powder - - Plug Plug diff --git a/translations/bt_gl.ts b/translations/bt_gl.ts index 1d55fc5ad..b7266ded8 100644 --- a/translations/bt_gl.ts +++ b/translations/bt_gl.ts @@ -1161,38 +1161,10 @@ Log file may contain more details. Plug - - Flavor - - Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - - - Extract - - - - WetLeaf - - - - Powder - - Post-Boil @@ -1259,42 +1231,14 @@ Log file may contain more details. Aroma & Bittering - - Flavor - - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - - - Extract - - Leaf - - Leaf (wet) - - Pellet - - Powder - - Plug diff --git a/translations/bt_hu.ts b/translations/bt_hu.ts index 51b16c7a0..2b4d657f2 100644 --- a/translations/bt_hu.ts +++ b/translations/bt_hu.ts @@ -1375,35 +1375,15 @@ Log file may contain more details. Flavor - Ízanyag + Ízanyag Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Folyékony malátasűrítmény (LME) - - - WetLeaf - - - - Powder - + Folyékony malátasűrítmény (LME) Post-Boil @@ -1473,40 +1453,20 @@ Log file may contain more details. Flavor - Ízanyag - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + Ízanyag Extract - Folyékony malátasűrítmény (LME) + Folyékony malátasűrítmény (LME) Leaf leveles - - Leaf (wet) - - Pellet Pellet - - Powder - - Plug Nagy pellet (komlódugó) diff --git a/translations/bt_it.ts b/translations/bt_it.ts index 155f9e21c..9525d78eb 100644 --- a/translations/bt_it.ts +++ b/translations/bt_it.ts @@ -1397,37 +1397,13 @@ Log file may contain more details. Plug Plug - - Flavor - - Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Estratto - - - WetLeaf - - - - Powder - + Estratto Post-Boil @@ -1495,42 +1471,18 @@ Log file may contain more details. Aroma & Bittering - - Flavor - - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Estratto + Estratto Leaf - - Leaf (wet) - - Pellet Pellet - - Powder - - Plug Plug diff --git a/translations/bt_lv.ts b/translations/bt_lv.ts index 7eb17970b..69bbd7784 100644 --- a/translations/bt_lv.ts +++ b/translations/bt_lv.ts @@ -1101,38 +1101,10 @@ Log file may contain more details. Plug - - Flavor - - Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - - - Extract - - - - WetLeaf - - - - Powder - - Post-Boil @@ -1199,42 +1171,14 @@ Log file may contain more details. Aroma & Bittering - - Flavor - - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - - - Extract - - Leaf - - Leaf (wet) - - Pellet - - Powder - - Plug diff --git a/translations/bt_nb.ts b/translations/bt_nb.ts index ee9fee65f..3962c638b 100644 --- a/translations/bt_nb.ts +++ b/translations/bt_nb.ts @@ -1347,35 +1347,15 @@ Log file may contain more details. Flavor - Smak + Smak Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Ekstrakt - - - WetLeaf - - - - Powder - + Ekstrakt Post-Boil @@ -1445,40 +1425,20 @@ Log file may contain more details. Flavor - Smak - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + Smak Extract - Ekstrakt + Ekstrakt Leaf - - Leaf (wet) - - Pellet Pellet - - Powder - - Plug Plugg diff --git a/translations/bt_nl.ts b/translations/bt_nl.ts index 3979cd64c..38659320b 100644 --- a/translations/bt_nl.ts +++ b/translations/bt_nl.ts @@ -1371,35 +1371,15 @@ Log file may contain more details. Flavor - Smaak + Smaak Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Extract - - - WetLeaf - - - - Powder - + Extract Post-Boil @@ -1469,40 +1449,20 @@ Log file may contain more details. Flavor - Smaak - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + Smaak Extract - Extract + Extract Leaf Blad - - Leaf (wet) - - Pellet Pellet - - Powder - - Plug Geperste hop diff --git a/translations/bt_pl.ts b/translations/bt_pl.ts index c95a7771d..84cf3766d 100644 --- a/translations/bt_pl.ts +++ b/translations/bt_pl.ts @@ -1347,35 +1347,15 @@ Log file may contain more details. Flavor - Aromat + Aromat Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Ekstrakt - - - WetLeaf - - - - Powder - + Ekstrakt Post-Boil @@ -1445,40 +1425,20 @@ Log file may contain more details. Flavor - Aromat - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + Aromat Extract - Ekstrakt + Ekstrakt Leaf Szyszka - - Leaf (wet) - - Pellet Granulat - - Powder - - Plug Tabletka diff --git a/translations/bt_pt.ts b/translations/bt_pt.ts index 1f5468ab5..c01ede4e6 100644 --- a/translations/bt_pt.ts +++ b/translations/bt_pt.ts @@ -1377,38 +1377,10 @@ Log file may contain more details. Plug Plugue - - Flavor - - Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - - - Extract - - - - WetLeaf - - - - Powder - - Post-Boil @@ -1475,42 +1447,14 @@ Log file may contain more details. Aroma & Bittering - - Flavor - - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - - - Extract - - Leaf Folha - - Leaf (wet) - - Pellet - - Powder - - Plug diff --git a/translations/bt_ru.ts b/translations/bt_ru.ts index 0ad3f8b18..5d8607eae 100644 --- a/translations/bt_ru.ts +++ b/translations/bt_ru.ts @@ -1385,37 +1385,13 @@ Log file may contain more details. Plug Пробка - - Flavor - - Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Экстракт - - - WetLeaf - - - - Powder - + Экстракт Post-Boil @@ -1483,42 +1459,18 @@ Log file may contain more details. Aroma & Bittering - - Flavor - - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Экстракт + Экстракт Leaf - - Leaf (wet) - - Pellet - - Powder - - Plug Пробка diff --git a/translations/bt_sr.ts b/translations/bt_sr.ts index 964ca77f4..e747c9b77 100644 --- a/translations/bt_sr.ts +++ b/translations/bt_sr.ts @@ -1231,35 +1231,15 @@ Log file may contain more details. Flavor - Укус + Укус Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Екстракт - - - WetLeaf - - - - Powder - + Екстракт Post-Boil @@ -1329,40 +1309,20 @@ Log file may contain more details. Flavor - Укус - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + Укус Extract - Екстракт + Екстракт Leaf Лист - - Leaf (wet) - - Pellet Грануле - - Powder - - Plug Чеп diff --git a/translations/bt_sv.ts b/translations/bt_sv.ts index 8b7edba8e..9ac3a2ff8 100644 --- a/translations/bt_sv.ts +++ b/translations/bt_sv.ts @@ -1371,35 +1371,15 @@ Log file may contain more details. Flavor - Smak + Smak Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Extrakt - - - WetLeaf - - - - Powder - + Extrakt Post-Boil @@ -1469,40 +1449,20 @@ Log file may contain more details. Flavor - Smak - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + Smak Extract - Extrakt + Extrakt Leaf Löv - - Leaf (wet) - - Pellet Pellets - - Powder - - Plug Puck diff --git a/translations/bt_tr.ts b/translations/bt_tr.ts index 296a005b9..f2c9eb31c 100644 --- a/translations/bt_tr.ts +++ b/translations/bt_tr.ts @@ -1048,35 +1048,15 @@ Log file may contain more details. Flavor - Aroma + Aroma Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - Ekstrakt - - - WetLeaf - - - - Powder - + Ekstrakt Post-Boil @@ -1146,40 +1126,20 @@ Log file may contain more details. Flavor - Aroma - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + Aroma Extract - Ekstrakt + Ekstrakt Leaf Yaprak - - Leaf (wet) - - Pellet Pelet - - Powder - - Plug Kozalak diff --git a/translations/bt_zh.ts b/translations/bt_zh.ts index 8137eed8b..11137b48d 100644 --- a/translations/bt_zh.ts +++ b/translations/bt_zh.ts @@ -1343,35 +1343,15 @@ Log file may contain more details. Flavor - 味Flavor + 味Flavor Aroma & Bittering - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - - Extract - 提取 - - - WetLeaf - - - - Powder - + 提取 Post-Boil @@ -1441,40 +1421,20 @@ Log file may contain more details. Flavor - 味Flavor - - - Bittering & Flavor - - - - Aroma & Flavor - - - - Aroma, Bittering & Flavor - + 味Flavor Extract - 提取 + 提取 Leaf - - Leaf (wet) - - Pellet - - Powder - - Plug