Brewtarget 2.0.3 Manual

"); + body += QString(""); + body += QString("") + .arg( style->name() ); + + // First row -- category and number (letter) + body += QString("") + .arg(tr("Category")) + .arg(style->category()); + body += QString("") + .arg(tr("Code")) + .arg(style->categoryNumber()) + .arg(style->styleLetter()); + + // Second row: guide and type + body += QString("") + .arg(tr("Guide")) + .arg(style->styleGuide()); + body += QString("") + .arg(tr("Type")) + .arg(style->typeString()); + + body += "

%1
%1	%2	%1	%2%3
%1	%2	%1	%2

"; + + return header + body; + +} + +QString RecipeFormatter::getToolTip(Equipment* kit) +{ + QString header; + QString body; + + if ( kit == 0 ) + return ""; + + cssName = QString(":/css/tooltip.css"); + + // Do the style sheet first + header = ""; + + body = ""; + + body += QString("

"); + body += QString(""); + body += QString("") + .arg( kit->name() ); + + // First row -- batchsize and boil time + body += QString("") + .arg(tr("Preboil")) + .arg(Brewtarget::displayAmount(kit->boilSize_l(), Units::liters) ); + body += QString("") + .arg(tr("BoilTime")) + .arg(Brewtarget::displayAmount(kit->boilTime_min(), Units::minutes) ); + + body += "

%1
%1	%2	%1	%2

"; + + return header + body; + +} + +// Once we do inventory, this needs to be fixed to show amount on hand +QString RecipeFormatter::getToolTip(Fermentable* ferm) +{ + QString header; + QString body; + + if ( ferm == 0 ) + return ""; + + cssName = QString(":/css/tooltip.css"); + + // Do the style sheet first + header = ""; + + body = ""; + + body += QString("

"); + body += QString(""); + body += QString("") + .arg( ferm->name() ); + + // First row -- type and color + body += QString("") + .arg(tr("Type")) + .arg(ferm->typeStringTr()); + body += QString("") + .arg(tr("Color")) + .arg(Brewtarget::displayColor(ferm->color_srm(), noUnit, false)); + // Second row -- isMashed and yield? + body += QString("") + .arg(tr("Mashed")) + .arg( ferm->isMashed() ? tr("Yes") : tr("No") ); + body += QString("") + .arg(tr("Yield")) + .arg(Brewtarget::displayAmount(ferm->yield_pct(), 0)); + + body += "

%1
%1	%2	%1	%2
%1	%2	%1	%2

"; + + return header + body; + +} + +QString RecipeFormatter::getToolTip(Hop* hop) +{ + QString header; + QString body; + + if ( hop == 0 ) + return ""; + + cssName = QString(":/css/tooltip.css"); + + // Do the style sheet first + header = ""; + + body = ""; + + body += QString("

"); + body += QString(""); + body += QString("") + .arg( hop->name() ); + + // First row -- alpha and beta + body += QString("") + .arg(tr("Alpha")) + .arg(Brewtarget::displayAmount(hop->alpha_pct(), 0)); + body += QString("") + .arg(tr("Beta")) + .arg(Brewtarget::displayAmount(hop->beta_pct(), 0)); + + // Second row -- form and use + body += QString("") + .arg(tr("Form")) + .arg( hop->formStringTr() ); + body += QString("") + .arg(tr("Use")) + .arg( hop->useStringTr() ); + + body += "

%1
%1	%2	%1	%2
%1	%2	%1	%2

"; + + return header + body; + +} + +QString RecipeFormatter::getToolTip(Misc* misc) +{ + QString header; + QString body; + + if ( misc == 0 ) + return ""; + + cssName = QString(":/css/tooltip.css"); + + // Do the style sheet first + header = ""; + + body = ""; + + body += QString("

"); + body += QString(""); + body += QString("") + .arg( misc->name() ); + + // First row -- type and use + body += QString("") + .arg(tr("Type")) + .arg(misc->typeStringTr()); + body += QString("") + .arg(tr("Use")) + .arg(misc->useStringTr()); + + body += "

%1
%1	%2	%1	%2

"; + + return header + body; + +} + +QString RecipeFormatter::getToolTip(Yeast* yeast) +{ + QString header; + QString body; + + if ( yeast == 0 ) + return ""; + + cssName = QString(":/css/tooltip.css"); + + // Do the style sheet first + header = ""; + + body = ""; + + body += QString("

"); + body += QString(""); + body += QString("") + .arg( yeast->name() ); + + // First row -- type and form + body += QString("") + .arg(tr("Type")) + .arg(yeast->typeStringTr()); + body += QString("") + .arg(tr("Form")) + .arg(yeast->formStringTr()); + // Second row -- lab and prod id + body += QString("") + .arg(tr("Lab")) + .arg(yeast->laboratory()); + body += QString("") + .arg(tr("Attenuation")) + .arg(Brewtarget::displayAmount(yeast->attenuation_pct(), 0)); + + // third row -- atten and floc + body += QString("") + .arg(tr("Id")) + .arg(yeast->productID()); + body += QString("") + .arg(tr("Flocculation")) + .arg( yeast->flocculationStringTr()); + + + body += "

%1
%1	%2	%1	%2
%1	%2	%1	%2
%1	%2	%1	%2

"; + + return header + body; + +} + void RecipeFormatter::toTextClipboard() { QApplication::clipboard()->setText(getTextFormat()); @@ -458,8 +768,6 @@ { QString header; QString body; - QString color; - QString bitterness; Style* style = 0; if ( rec == 0 ) @@ -522,42 +830,20 @@ .arg(Brewtarget::displayFG(rec->fg(), rec->og(), noUnit, true)); // Fourth row: ABV and Bitterness. We need to set the bitterness string up first - bitterness = QString("%1 IBU (%2)") - .arg( Brewtarget::displayAmount(rec->IBU(), 0, 1) ); - switch ( Brewtarget::ibuFormula ) - { - case Brewtarget::TINSETH: - bitterness = bitterness.arg("Tinseth"); - break; - case Brewtarget::RAGER: - bitterness = bitterness.arg("Rager"); - break; - default: - bitterness = bitterness.arg(tr("Unknown")); - } body += QString("%1%2%") .arg(tr("ABV")) .arg(Brewtarget::displayAmount(rec->ABV_pct(), 0, 1)); - body += QString("%1%2") - .arg(tr("Bitterness")) - .arg(bitterness); + body += QString("%1%2 (%3)") + .arg(tr("IBU")) + .arg(Brewtarget::displayAmount(rec->IBU(), 0, 1)) + .arg(Brewtarget::ibuFormulaName() ); + // Fifth row: Color and calories. Set up the color string first - color = QString("%1 (%2)").arg(Brewtarget::displayColor(rec->color_srm(),noUnit,true)); - switch( Brewtarget::colorFormula ) - { - case Brewtarget::MOREY: - color = color.arg("Morey"); - break; - case Brewtarget::DANIEL: - color = color.arg("Daniels"); - break; - case Brewtarget::MOSHER: - color = color.arg("Mosher"); - break; - } - body += QString("%1%2") + body += QString("%1%2 (%3)") .arg(tr("Color")) - .arg(color); + .arg(Brewtarget::displayColor(rec->color_srm(),noUnit,true)) + .arg(Brewtarget::colorFormulaName()); + body += QString("%1%2") .arg(tr("Calories (per 12 oz.)")) .arg(Brewtarget::displayAmount(rec->calories(), 0, 0)); diff -Nru brewtarget-2.0.3/src/RecipeFormatter.h brewtarget-2.1.0/src/RecipeFormatter.h --- brewtarget-2.0.3/src/RecipeFormatter.h 2014-03-09 16:36:31.000000000 +0000 +++ brewtarget-2.1.0/src/RecipeFormatter.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,20 +1,22 @@ /* -* RecipeFormatter.h is part of Brewtarget, and is Copyright Philip G. Lee -* (rocketman768@gmail.com), 2009-2013. -* -* Brewtarget is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* Brewtarget is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * RecipeFormatter.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #ifndef RECIPE_FORMATTER_H #define RECIPE_FORMATTER_H @@ -52,8 +54,16 @@ QString getTextFormat(); //! Get an html view. QString getHTMLFormat(); - //! Get a BBCode view. + //! Get a BBCode view. Why is this here? QString getBBCodeFormat(); + //! Generate a tooltip for a recipe + QString getToolTip(Recipe* rec); + QString getToolTip(Style* style); + QString getToolTip(Equipment* kit); + QString getToolTip(Fermentable* ferm); + QString getToolTip(Hop* hop); + QString getToolTip(Misc* misc); + QString getToolTip(Yeast* yeast); //! Get the maximum number of characters in a list of strings. unsigned int getMaxLength( QStringList* list ); //! Prepend a string with spaces until its final length is the given length. diff -Nru brewtarget-2.0.3/src/recipe.h brewtarget-2.1.0/src/recipe.h --- brewtarget-2.0.3/src/recipe.h 2014-03-09 16:36:31.000000000 +0000 +++ brewtarget-2.1.0/src/recipe.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,21 @@ /* - * recipe.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * recipe.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Kregg K + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -128,7 +132,7 @@ Q_PROPERTY( double primingSugarEquiv READ primingSugarEquiv WRITE setPrimingSugarEquiv /*NOTIFY changed*/ /*changedPrimingSugarEquiv*/ ) //! \brief The factor required to convert the amount of sugar required for bottles to keg (usually about 0.5). Q_PROPERTY( double kegPrimingFactor READ kegPrimingFactor WRITE setKegPrimingFactor /*NOTIFY changed*/ /*changedKegPrimingFactor*/ ) - + // Calculated stored properties. //! \brief The calculated OG. Q_PROPERTY( double og READ og WRITE setOg /*NOTIFY changed*/ /*changedOg*/ ) @@ -208,9 +212,7 @@ //void addInstruction( Instruction* ins ); void removeInstruction( Instruction* ins ); /*! - * \brief Swap instructions j and k. - * \param j some integer less than getNumInstructions() - * \param k some integer less than getNumInstructions() + * \brief Swap instructions \c ins1 and \c ins2 */ void swapInstructions( Instruction* ins1, Instruction* ins2 ); //! \brief Remove all instructions. diff -Nru brewtarget-2.0.3/src/RefractoDialog.cpp brewtarget-2.1.0/src/RefractoDialog.cpp --- brewtarget-2.0.3/src/RefractoDialog.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/RefractoDialog.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * RefractoDialog.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com) and Eric Tamme, 2009-2013. + * RefractoDialog.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Eric Tamme + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -56,30 +58,30 @@ if( ! haveCP ) return; - ri = Algorithms::Instance().refractiveIndex(currentPlato); + ri = Algorithms::refractiveIndex(currentPlato); lineEdit_ri->setText(Brewtarget::displayAmount(ri)); if( (!haveOG) && haveOP ) { - inputOG = Algorithms::Instance().PlatoToSG_20C20C( originalPlato ); + inputOG = Algorithms::PlatoToSG_20C20C( originalPlato ); lineEdit_inputOG->setText(Brewtarget::displayAmount(inputOG)); } else if( (!haveOP) && haveOG ) { - originalPlato = Algorithms::Instance().SG_20C20C_toPlato( inputOG ); + originalPlato = Algorithms::SG_20C20C_toPlato( inputOG ); lineEdit_op->setText(Brewtarget::displayAmount(originalPlato)); } else if( (!haveOP) && (!haveOG) ) return; // Can't do much if we don't have OG or OP. - og = Algorithms::Instance().PlatoToSG_20C20C( originalPlato ); + og = Algorithms::PlatoToSG_20C20C( originalPlato ); if( originalPlato != currentPlato ) - sg = Algorithms::Instance().sgByStartingPlato( originalPlato, currentPlato ); + sg = Algorithms::sgByStartingPlato( originalPlato, currentPlato ); else sg = og; - re = Algorithms::Instance().realExtract( sg, currentPlato ); - abv = Algorithms::Instance().getABVBySGPlato( sg, currentPlato ); - abw = Algorithms::Instance().getABWBySGPlato( sg, currentPlato ); + re = Algorithms::realExtract( sg, currentPlato ); + abv = Algorithms::getABVBySGPlato( sg, currentPlato ); + abw = Algorithms::getABWBySGPlato( sg, currentPlato ); // Warn the user if the inputOG and calculated og don't match. if( qAbs(og - inputOG) > 0.002 ) diff -Nru brewtarget-2.0.3/src/RefractoDialog.h brewtarget-2.1.0/src/RefractoDialog.h --- brewtarget-2.0.3/src/RefractoDialog.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/RefractoDialog.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,18 @@ /* - * RefractoDialog.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * RefractoDialog.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/ScaleRecipeTool.cpp brewtarget-2.1.0/src/ScaleRecipeTool.cpp --- brewtarget-2.0.3/src/ScaleRecipeTool.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/ScaleRecipeTool.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,20 +1,21 @@ /* -* ScaleRecipeTool.cpp is part of Brewtarget, and is Copyright Philip G. Lee -* (rocketman768@gmail.com), 2009-2013. -* -* Brewtarget is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* Brewtarget is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * ScaleRecipeTool.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #include "ScaleRecipeTool.h" #include diff -Nru brewtarget-2.0.3/src/ScaleRecipeTool.h brewtarget-2.1.0/src/ScaleRecipeTool.h --- brewtarget-2.0.3/src/ScaleRecipeTool.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/ScaleRecipeTool.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,20 +1,21 @@ /* -* ScaleRecipeTool.h is part of Brewtarget, and is Copyright Philip G. Lee -* (rocketman768@gmail.com), 2009-2013. -* -* Brewtarget is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* Brewtarget is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * ScaleRecipeTool.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #ifndef SCALE_RECIPE_TOOL_H #define SCALE_RECIPE_TOOL_H diff -Nru brewtarget-2.0.3/src/SetterCommand.cpp brewtarget-2.1.0/src/SetterCommand.cpp --- brewtarget-2.0.3/src/SetterCommand.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/SetterCommand.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,18 @@ /* - * SetterCommand.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * SetterCommand.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/SetterCommand.h brewtarget-2.1.0/src/SetterCommand.h --- brewtarget-2.0.3/src/SetterCommand.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/SetterCommand.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,18 @@ /* - * SetterCommand.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * SetterCommand.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/SetterCommandStack.cpp brewtarget-2.1.0/src/SetterCommandStack.cpp --- brewtarget-2.0.3/src/SetterCommandStack.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/SetterCommandStack.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,20 +1,23 @@ /* -* SetterCommandStack.cpp is part of Brewtarget, and is Copyright Philip G. Lee -* (rocketman768@gmail.com), 2009-2013. -* -* Brewtarget is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* Brewtarget is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * SetterCommandStack.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - A.J. Drobnich + * - Mik Firestone + * - Philip Greggory Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #include "SetterCommandStack.h" #include "SetterCommand.h" diff -Nru brewtarget-2.0.3/src/SetterCommandStack.h brewtarget-2.1.0/src/SetterCommandStack.h --- brewtarget-2.0.3/src/SetterCommandStack.h 2014-01-18 22:34:39.000000000 +0000 +++ brewtarget-2.1.0/src/SetterCommandStack.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,20 @@ /* - * SetterCommandStack.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * SetterCommandStack.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - A.J. Drobnich + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/SIVolumeUnitSystem.cpp brewtarget-2.1.0/src/SIVolumeUnitSystem.cpp --- brewtarget-2.0.3/src/SIVolumeUnitSystem.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/SIVolumeUnitSystem.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * SIVolumeUnitSystem.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * SIVolumeUnitSystem.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/SIVolumeUnitSystem.h brewtarget-2.1.0/src/SIVolumeUnitSystem.h --- brewtarget-2.0.3/src/SIVolumeUnitSystem.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/SIVolumeUnitSystem.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * SIVolumeUnitSystem.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * SIVolumeUnitSystem.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/SIWeightUnitSystem.cpp brewtarget-2.1.0/src/SIWeightUnitSystem.cpp --- brewtarget-2.0.3/src/SIWeightUnitSystem.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/SIWeightUnitSystem.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * SIWeightUnitSystem.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * SIWeightUnitSystem.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/SIWeightUnitSystem.h brewtarget-2.1.0/src/SIWeightUnitSystem.h --- brewtarget-2.0.3/src/SIWeightUnitSystem.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/SIWeightUnitSystem.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * SIWeightUnitSystem.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * SIWeightUnitSystem.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/StrikeWaterDialog.cpp brewtarget-2.1.0/src/StrikeWaterDialog.cpp --- brewtarget-2.0.3/src/StrikeWaterDialog.cpp 1970-01-01 00:00:00.000000000 +0000 +++ brewtarget-2.1.0/src/StrikeWaterDialog.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -0,0 +1,76 @@ +/* + * StrikeWaterDialog.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Maxime Lavigne + * - Philip G. Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include +#include +#include "StrikeWaterDialog.h" +#include "brewtarget.h" + +// From Northern Brewer ~0.38 but Jon Palmer suggest 0.41 +// to compensate for the lost to the tun even if the tun is pre-heaten +const double StrikeWaterDialog::specificHeatBarley = 0.41; + +StrikeWaterDialog::StrikeWaterDialog(QWidget* parent) : QDialog(parent) { + setupUi(this); + connect(pushButton_calculate, SIGNAL(clicked()), this, SLOT(calculate())); +} + +StrikeWaterDialog::~StrikeWaterDialog() {} + +void StrikeWaterDialog::calculate() { + double initial = computeInitialInfusion(); + double mash = computeMashInfusion(); + initialResultTxt->setText(Algorithms::isNan(initial) + ? tr("N/A") : Brewtarget::displayAmount(initial, Units::celsius)); + mashResultTxt->setText(Algorithms::isNan(mash) + ? tr("N/A") : Brewtarget::displayAmount(mash, Units::liters)); +} + +double StrikeWaterDialog::computeInitialInfusion() { + double grainTemp = Brewtarget::tempQStringToSI(grainTempVal->text()); + double targetMash = Brewtarget::tempQStringToSI(targetMashVal->text()); + double waterVolume = Brewtarget::volQStringToSI(waterVolumeVal->text()); + double grainWeight = Brewtarget::weightQStringToSI(grainWeightInitVal->text()); + + return initialInfusionSi( + grainTemp, + targetMash, + waterVolume / grainWeight + ); +} + +double StrikeWaterDialog::computeMashInfusion() { + double mashVol = Brewtarget::volQStringToSI(mashVolVal->text()); + double grainWeight = Brewtarget::weightQStringToSI(grainWeightVal->text()); + double actualMash = Brewtarget::tempQStringToSI(actualMashVal->text()); + double targetMashInf = Brewtarget::tempQStringToSI(targetMashInfVal->text()); + double infusionWater = Brewtarget::tempQStringToSI(infusionWaterVal->text()); + return mashInfusionSi(actualMash, targetMashInf, grainWeight, infusionWater, mashVol); +} + +double StrikeWaterDialog::initialInfusionSi(double grainTemp, double targetTemp, + double waterToGrain) { + return (specificHeatBarley / waterToGrain) * (targetTemp - grainTemp) + targetTemp; +} +double StrikeWaterDialog::mashInfusionSi(double initialTemp, double targetTemp, + double grainWeight, double infusionWater, double mashVolume) { + return ((targetTemp - initialTemp) * (specificHeatBarley * grainWeight + mashVolume)) + / (infusionWater - targetTemp); +} + diff -Nru brewtarget-2.0.3/src/StrikeWaterDialog.h brewtarget-2.1.0/src/StrikeWaterDialog.h --- brewtarget-2.0.3/src/StrikeWaterDialog.h 1970-01-01 00:00:00.000000000 +0000 +++ brewtarget-2.1.0/src/StrikeWaterDialog.h 2014-08-17 15:18:31.000000000 +0000 @@ -0,0 +1,56 @@ +/* + * StrikeWaterDialog.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Maxime Lavigne + * - Philip G. Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#ifndef _STRIKEWATERDIALOG_H +#define _STRIKEWATERDIALOG_H + +#include +#include +#include +#include "ui_strikeWaterDialog.h" +#include "unit.h" + +/*! + * \class StrikeWaterDialog + * \author Maxime Lavigne + * + * \brief Dialog to calculate the amount and temperature of the strike water. + */ +class StrikeWaterDialog : public QDialog, public Ui::strikeWaterDialog +{ + Q_OBJECT + public: + StrikeWaterDialog(QWidget* parent = 0); + ~StrikeWaterDialog(); + + public slots: + void calculate(); + + private: + static const double specificHeatBarley; + + double initialInfusionSi(double grainTemp, double targetTemp, double waterToGrain); + double mashInfusionSi(double initialTemp, double targetTemp, + double grainWeight, double infusionWater, double mashVolume); + + double computeInitialInfusion(); + double computeMashInfusion(); +}; + +#endif \ No newline at end of file diff -Nru brewtarget-2.0.3/src/StyleButton.cpp brewtarget-2.1.0/src/StyleButton.cpp --- brewtarget-2.0.3/src/StyleButton.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/StyleButton.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,20 +1,22 @@ /* -* StyleButton.cpp is part of Brewtarget, and is Copyright Philip G. Lee -* (rocketman768@gmail.com), 2009-2013. -* -* Brewtarget is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* Brewtarget is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * StyleButton.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #include "StyleButton.h" #include "style.h" diff -Nru brewtarget-2.0.3/src/StyleButton.h brewtarget-2.1.0/src/StyleButton.h --- brewtarget-2.0.3/src/StyleButton.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/StyleButton.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,20 +1,22 @@ /* -* StyleButton.h is part of Brewtarget, and is Copyright Philip G. Lee -* (rocketman768@gmail.com), 2009-2013. -* -* Brewtarget is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* Brewtarget is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * StyleButton.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #ifndef _STYLEBUTTON_H #define _STYLEBUTTON_H diff -Nru brewtarget-2.0.3/src/style.cpp brewtarget-2.1.0/src/style.cpp --- brewtarget-2.0.3/src/style.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/style.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * style.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * style.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/StyleEditor.cpp brewtarget-2.1.0/src/StyleEditor.cpp --- brewtarget-2.0.3/src/StyleEditor.cpp 2014-03-09 16:36:31.000000000 +0000 +++ brewtarget-2.1.0/src/StyleEditor.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * StyleEditor.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * StyleEditor.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -54,6 +56,20 @@ connect( styleComboBox, SIGNAL(activated( const QString& )), this, SLOT( styleSelected(const QString&) ) ); setStyle( styleListModel->at(styleComboBox->currentIndex())); + + connect( lineEdit_ogMin, SIGNAL(editingFinished()), this, SLOT(updateField())); + connect( lineEdit_fgMin, SIGNAL(editingFinished()), this, SLOT(updateField())); + connect( lineEdit_ibuMin, SIGNAL(editingFinished()), this, SLOT(updateField())); + connect( lineEdit_colorMin, SIGNAL(editingFinished()), this, SLOT(updateField())); + connect( lineEdit_carbMin, SIGNAL(editingFinished()), this, SLOT(updateField())); + connect( lineEdit_abvMin, SIGNAL(editingFinished()), this, SLOT(updateField())); + + connect( lineEdit_ogMax, SIGNAL(editingFinished()), this, SLOT(updateField())); + connect( lineEdit_fgMax, SIGNAL(editingFinished()), this, SLOT(updateField())); + connect( lineEdit_ibuMax, SIGNAL(editingFinished()), this, SLOT(updateField())); + connect( lineEdit_colorMax, SIGNAL(editingFinished()), this, SLOT(updateField())); + connect( lineEdit_carbMax, SIGNAL(editingFinished()), this, SLOT(updateField())); + connect( lineEdit_abvMax, SIGNAL(editingFinished()), this, SLOT(updateField())); } void StyleEditor::setStyle( Style* s ) @@ -74,7 +90,7 @@ void StyleEditor::removeStyle() { if( obsStyle ) - Database::instance().removeStyle(obsStyle); + Database::instance().remove(obsStyle); setStyle(0); } @@ -170,6 +186,33 @@ textEdit_notes->setText(QString("")); } +void StyleEditor::updateField() +{ + + QObject* selection = sender(); + QLineEdit* field = qobject_cast(selection); + double val; + + if ( field == lineEdit_ogMin || field == lineEdit_fgMin || + field == lineEdit_ogMax || field == lineEdit_fgMax ) + { + val = Brewtarget::densityQStringToSI(field->text()); + field->setText(Brewtarget::displayOG( val, noUnit, true)); + } + else if ( field == lineEdit_colorMin || field == lineEdit_colorMax ) + { + val = field->text().toDouble(); + field->setText(Brewtarget::displayColor(val, noUnit, false)); + } + else + { + //Everything else is a number, so just format nicely + val = field->text().toDouble(); + field->setText(Brewtarget::displayAmount(val)); + } + +} + void StyleEditor::showChanges(QMetaProperty* metaProp) { bool updateAll = false; @@ -203,7 +246,7 @@ lineEdit_category->setText(s->category()); lineEdit_categoryNumber->setText(s->categoryNumber()); lineEdit_styleLetter->setText(s->styleLetter()); - lineEdit_styleGuide->setText(s->styleGuide()); + lineEdit_styleGuide->setText(s->styleGuide()); comboBox_type->setCurrentIndex(s->type()); lineEdit_ogMin->setText(Brewtarget::displayOG(s->ogMin(),noUnit,true)); lineEdit_ogMax->setText(Brewtarget::displayOG(s->ogMax(),noUnit,true)); diff -Nru brewtarget-2.0.3/src/StyleEditor.h brewtarget-2.1.0/src/StyleEditor.h --- brewtarget-2.0.3/src/StyleEditor.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/StyleEditor.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,20 @@ /* - * StyleEditor.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * StyleEditor.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -55,6 +58,8 @@ void styleSelected( const QString& text ); void changed(QMetaProperty,QVariant); + + void updateField(); private: Style* obsStyle; StyleListModel* styleListModel; diff -Nru brewtarget-2.0.3/src/style.h brewtarget-2.1.0/src/style.h --- brewtarget-2.0.3/src/style.h 2014-03-09 16:36:31.000000000 +0000 +++ brewtarget-2.1.0/src/style.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,20 @@ /* - * style.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * style.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -142,6 +145,7 @@ signals: //! \brief Emitted when \c name() changes. void changedName(QString); + /* void changedCategory(QString); void changedCategoryNumber(QString); @@ -177,6 +181,8 @@ static QHash tagToPropHash(); }; +Q_DECLARE_METATYPE( Style* ) + inline bool StylePtrLt( Style* lhs, Style* rhs) { return *lhs < *rhs; diff -Nru brewtarget-2.0.3/src/StyleListModel.cpp brewtarget-2.1.0/src/StyleListModel.cpp --- brewtarget-2.0.3/src/StyleListModel.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/StyleListModel.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,20 +1,22 @@ /* -* StyleListModel.cpp is part of Brewtarget, and is Copyright Philip G. Lee -* (rocketman768@gmail.com), 2009-2013. -* -* Brewtarget is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* Brewtarget is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * StyleListModel.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee + * - swstim + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #include "StyleListModel.h" #include "style.h" diff -Nru brewtarget-2.0.3/src/StyleListModel.h brewtarget-2.1.0/src/StyleListModel.h --- brewtarget-2.0.3/src/StyleListModel.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/StyleListModel.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,20 +1,21 @@ /* -* StyleListModel.h is part of Brewtarget, and is Copyright Philip G. Lee -* (rocketman768@gmail.com), 2009-2013. -* -* Brewtarget is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* Brewtarget is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * StyleListModel.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #include #include diff -Nru brewtarget-2.0.3/src/StyleRangeWidget.cpp brewtarget-2.1.0/src/StyleRangeWidget.cpp --- brewtarget-2.0.3/src/StyleRangeWidget.cpp 1970-01-01 00:00:00.000000000 +0000 +++ brewtarget-2.1.0/src/StyleRangeWidget.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -0,0 +1,44 @@ +/* + * StyleRangeWidget.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip G. Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "StyleRangeWidget.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +StyleRangeWidget::StyleRangeWidget(QWidget* parent) + : RangedSlider(parent) +{ + setBackgroundBrush(QColor(121,201,121)); + setPreferredRangeBrush(QColor(0,127,0)); + setMarkerTextIsValue(true); + + repaint(); +} diff -Nru brewtarget-2.0.3/src/StyleRangeWidget.h brewtarget-2.1.0/src/StyleRangeWidget.h --- brewtarget-2.0.3/src/StyleRangeWidget.h 1970-01-01 00:00:00.000000000 +0000 +++ brewtarget-2.1.0/src/StyleRangeWidget.h 2014-08-17 15:18:31.000000000 +0000 @@ -0,0 +1,41 @@ +/* + * StyleRangeWidget.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip G. Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef STYLERANGEWIDGET_H +#define STYLERANGEWIDGET_H + +#include +#include +#include +#include "RangedSlider.h" +class QPaintEvent; +class QMouseEvent; + +/*! + * \brief Widget to display a recipe statistic with "in-range" context from the style. + * \author Philip G. Lee + */ +class StyleRangeWidget : public RangedSlider +{ + Q_OBJECT +public: + StyleRangeWidget(QWidget* parent=0); +}; + +#endif /*STYLERANGEWIDGET_H*/ diff -Nru brewtarget-2.0.3/src/StyleSortFilterProxyModel.cpp brewtarget-2.1.0/src/StyleSortFilterProxyModel.cpp --- brewtarget-2.0.3/src/StyleSortFilterProxyModel.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/StyleSortFilterProxyModel.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,6 +1,7 @@ /* - * StyleSortFilterProxyModel.cpp is part of Brewtarget, and is Copyright - * Philip G. Lee (rocketman768@gmail.com, 2010-2013. + * StyleSortFilterProxyModel.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru brewtarget-2.0.3/src/StyleSortFilterProxyModel.h brewtarget-2.1.0/src/StyleSortFilterProxyModel.h --- brewtarget-2.0.3/src/StyleSortFilterProxyModel.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/StyleSortFilterProxyModel.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,6 +1,7 @@ /* - * StyleSortFilterProxyModel.h is part of Brewtarget, and is Copyright - * Philip G. Lee (rocketman768@gmail.com, 2010-2013. + * StyleSortFilterProxyModel.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru brewtarget-2.0.3/src/Testing.cpp brewtarget-2.1.0/src/Testing.cpp --- brewtarget-2.0.3/src/Testing.cpp 1970-01-01 00:00:00.000000000 +0000 +++ brewtarget-2.1.0/src/Testing.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -0,0 +1,22 @@ +/* + * Testing.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include + +QTEST_MAIN(Testing) diff -Nru brewtarget-2.0.3/src/Testing.h brewtarget-2.1.0/src/Testing.h --- brewtarget-2.0.3/src/Testing.h 1970-01-01 00:00:00.000000000 +0000 +++ brewtarget-2.1.0/src/Testing.h 2014-08-17 15:18:31.000000000 +0000 @@ -0,0 +1,107 @@ +/* + * Testing.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip G. Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef TESTING_H +#define TESTING_H + +#include +#include +#include +#include +#include + +#include "brewtarget.h" +//#include "MainWindow.h" +//#include "recipe.h" + +class Testing : public QObject +{ + Q_OBJECT + +public: + + //! \brief True iff. a <= c <= b + static bool inRange( double c, double a, double b ) + { + return (a <= c) && (c <= b); + } + + //! \brief True iff. b-tol <= a <= b+tol + static bool fuzzyComp( double a, double b, double tol ) + { + return inRange( a, b-tol, b+tol ); + } + +private slots: + + // Run once before all test cases + void initTestCase() + { + // Create a different set of options to avoid clobbering real options + QCoreApplication::setOrganizationName("brewtarget"); + QCoreApplication::setOrganizationDomain("brewtarget.org"); + QCoreApplication::setApplicationName("brewtarget-test"); + + // Set options so that any data modification does not affect any other data + Brewtarget::setOption("user_data_dir", QDir::tempPath()); + Brewtarget::setOption("color_formula", "morey"); + Brewtarget::setOption("ibu_formula", "tinseth"); + + QVERIFY( Brewtarget::initialize() ); + } + + // Run once after all test cases + void cleanupTestCase() + { + Brewtarget::cleanup(); + } + + //! \brief Unit test: verify brewtarget runs + void runTest() + { + QVERIFY( 1==1 ); + /* + MainWindow* mw = Brewtarget::mainWindow(); + QVERIFY( mw ); + */ + } + + //! \brief Test: verify some standard recipe calculates properly + void recipeCalcTest() + { + QVERIFY( 42==42 ); + + /* + Recipe* rec = Database::instance().newRecipe(); + rec->setName("TestRecipe"); + rec->setBatchSize_l(18.93); // 5 gallons + rec->setBoilSize_l(23.47); // 6.2 gallons + rec->setEfficiency_pct(70.0); + + ... + + // Verify all recipe parameters within some tolerance. + QVERIFY2( fuzzyComp(rec->og(), 1.050, 0.002), "Wrong OG calculation" ); + QVERIFY2( fuzzyComp(rec->IBU(), 30, 5), "Wrong IBU calculation" ); + ... + */ + } +}; + +#endif /*TESTING_H*/ diff -Nru brewtarget-2.0.3/src/TimerListDialog.cpp brewtarget-2.1.0/src/TimerListDialog.cpp --- brewtarget-2.0.3/src/TimerListDialog.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/TimerListDialog.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,20 +1,21 @@ /* -* TimerListDialog.cpp is part of Brewtarget, and is Copyright Philip G. Lee -* (rocketman768@gmail.com), 2009-2013. -* -* Brewtarget is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* Brewtarget is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * TimerListDialog.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #include "TimerListDialog.h" #include "TimerWidget.h" diff -Nru brewtarget-2.0.3/src/TimerListDialog.h brewtarget-2.1.0/src/TimerListDialog.h --- brewtarget-2.0.3/src/TimerListDialog.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/TimerListDialog.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,20 +1,21 @@ /* -* TimerListDialog.h is part of Brewtarget, and is Copyright Philip G. Lee -* (rocketman768@gmail.com), 2009-2013. -* -* Brewtarget is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* Brewtarget is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * TimerListDialog.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee + * + * Brewtarget is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Brewtarget is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #ifndef TIMERLISTDIALOG_H #define TIMERLISTDIALOG_H diff -Nru brewtarget-2.0.3/src/TimerWidget.cpp brewtarget-2.1.0/src/TimerWidget.cpp --- brewtarget-2.0.3/src/TimerWidget.cpp 2014-05-03 14:10:32.000000000 +0000 +++ brewtarget-2.1.0/src/TimerWidget.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,23 @@ /* - * TimerWidget.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * TimerWidget.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Julein + * - Maxime Lavigne (malavv) + * - mik firestone + * - Philip Greggory Lee + * - przybysh + * - Ted Wright * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -21,6 +27,7 @@ #include #include #include +#include #include #include "brewtarget.h" diff -Nru brewtarget-2.0.3/src/TimerWidget.h brewtarget-2.1.0/src/TimerWidget.h --- brewtarget-2.0.3/src/TimerWidget.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/TimerWidget.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,20 @@ /* - * TimerWidget.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * TimerWidget.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Eric Tamme + * - Julein + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/TimeUnitSystem.cpp brewtarget-2.1.0/src/TimeUnitSystem.cpp --- brewtarget-2.0.3/src/TimeUnitSystem.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/TimeUnitSystem.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * TimeUnitSystem.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * TimeUnitSystem.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/TimeUnitSystem.h brewtarget-2.1.0/src/TimeUnitSystem.h --- brewtarget-2.0.3/src/TimeUnitSystem.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/TimeUnitSystem.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * TimeUnitSystem.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * TimeUnitSystem.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/unit.cpp brewtarget-2.1.0/src/unit.cpp --- brewtarget-2.0.3/src/unit.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/unit.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,20 @@ /* - * unit.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * unit.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee + * - Rob Taylor * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/unit.h brewtarget-2.1.0/src/unit.h --- brewtarget-2.0.3/src/unit.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/unit.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,21 @@ /* - * unit.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * unit.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Mik Firestone + * - Philip Greggory Lee + * - Rob Taylor * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/UnitSystem.cpp brewtarget-2.1.0/src/UnitSystem.cpp --- brewtarget-2.0.3/src/UnitSystem.cpp 2014-01-18 22:34:39.000000000 +0000 +++ brewtarget-2.1.0/src/UnitSystem.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,18 +1,20 @@ /* - * UnitSystem.cpp is part of Brewtarget, written by Mik Firestone - * (mikfire@gmail.com) and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * UnitSystem.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/UnitSystem.h brewtarget-2.1.0/src/UnitSystem.h --- brewtarget-2.0.3/src/UnitSystem.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/UnitSystem.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,20 @@ /* - * UnitSystem.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * UnitSystem.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/UnitSystems.cpp brewtarget-2.1.0/src/UnitSystems.cpp --- brewtarget-2.0.3/src/UnitSystems.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/UnitSystems.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,22 +1,22 @@ /* - * UnitSystems.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * UnitSystems.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "UnitSystems.h" #include "USWeightUnitSystem.h" #include "SIWeightUnitSystem.h" diff -Nru brewtarget-2.0.3/src/UnitSystems.h brewtarget-2.1.0/src/UnitSystems.h --- brewtarget-2.0.3/src/UnitSystems.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/UnitSystems.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,21 +1,25 @@ /* - * UnitSystems.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * UnitSystems.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +#ifndef UNITSYSTEMS_H +#define UNITSYSTEMS_H + class USWeightUnitSystem; class SIWeightUnitSystem; class ImperialVolumeUnitSystem; @@ -41,3 +45,4 @@ static TimeUnitSystem* timeUnitSystem(); }; +#endif /*UNITSYSTEMS_H*/ diff -Nru brewtarget-2.0.3/src/USVolumeUnitSystem.cpp brewtarget-2.1.0/src/USVolumeUnitSystem.cpp --- brewtarget-2.0.3/src/USVolumeUnitSystem.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/USVolumeUnitSystem.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * USVolumeUnitSystem.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * USVolumeUnitSystem.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/USVolumeUnitSystem.h brewtarget-2.1.0/src/USVolumeUnitSystem.h --- brewtarget-2.0.3/src/USVolumeUnitSystem.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/USVolumeUnitSystem.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * USVolumeUnitSystem.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * USVolumeUnitSystem.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/USWeightUnitSystem.cpp brewtarget-2.1.0/src/USWeightUnitSystem.cpp --- brewtarget-2.0.3/src/USWeightUnitSystem.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/USWeightUnitSystem.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * USWeightUnitSystem.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * USWeightUnitSystem.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/USWeightUnitSystem.h brewtarget-2.1.0/src/USWeightUnitSystem.h --- brewtarget-2.0.3/src/USWeightUnitSystem.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/USWeightUnitSystem.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * USWeightUnitSystem.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * USWeightUnitSystem.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/water.cpp brewtarget-2.1.0/src/water.cpp --- brewtarget-2.0.3/src/water.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/water.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,18 @@ /* - * water.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * water.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/WaterEditor.cpp brewtarget-2.1.0/src/WaterEditor.cpp --- brewtarget-2.0.3/src/WaterEditor.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/WaterEditor.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * WaterEditor.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * WaterEditor.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/WaterEditor.h brewtarget-2.1.0/src/WaterEditor.h --- brewtarget-2.0.3/src/WaterEditor.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/WaterEditor.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * WaterEditor.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * WaterEditor.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/water.h brewtarget-2.1.0/src/water.h --- brewtarget-2.0.3/src/water.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/water.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,20 @@ /* - * water.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * water.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/WaterTableModel.cpp brewtarget-2.1.0/src/WaterTableModel.cpp --- brewtarget-2.0.3/src/WaterTableModel.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/WaterTableModel.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,20 @@ /* - * WaterTableModel.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * WaterTableModel.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee + * - swstim * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/WaterTableModel.h brewtarget-2.1.0/src/WaterTableModel.h --- brewtarget-2.0.3/src/WaterTableModel.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/WaterTableModel.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * WaterTableModel.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * WaterTableModel.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/WaterTableWidget.cpp brewtarget-2.1.0/src/WaterTableWidget.cpp --- brewtarget-2.0.3/src/WaterTableWidget.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/WaterTableWidget.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,18 @@ /* - * WaterTableWidget.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * WaterTableWidget.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/WaterTableWidget.h brewtarget-2.1.0/src/WaterTableWidget.h --- brewtarget-2.0.3/src/WaterTableWidget.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/WaterTableWidget.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,18 @@ /* - * WaterTableWidget.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * WaterTableWidget.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/yeast.cpp brewtarget-2.1.0/src/yeast.cpp --- brewtarget-2.0.3/src/yeast.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/yeast.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,21 @@ /* - * yeast.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * yeast.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - marker5a + * - Philip Greggory Lee + * - plut0nium + * - Samuel Östling * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -35,6 +39,7 @@ //propHash["TYPE"] = "type"; //propHash["FORM"] = "form"; propHash["AMOUNT"] = "amount"; + propHash["INVENTORY"] = "inventory"; propHash["AMOUNT_IS_WEIGHT"] = "amountIsWeight"; propHash["LABORATORY"] = "laboratory"; propHash["PRODUCT_ID"] = "productID"; @@ -120,6 +125,11 @@ return get("amount").toDouble(); } +int Yeast::inventory() const +{ + return getInventory("quanta").toInt(); +} + bool Yeast::amountIsWeight() const { return get("amount_is_weight").toBool(); @@ -219,6 +229,14 @@ set("amount", "amount", var); } +void Yeast::setInventoryQuanta( int var ) +{ + if( var < 0.0 ) + Brewtarget::logW( QString("Yeast: inventory < 0: %1").arg(var) ); + else + setInventory("inventory", "quanta", var); +} + void Yeast::setAmountIsWeight( bool var ) { set("amountIsWeight", "amount_is_weight", var); diff -Nru brewtarget-2.0.3/src/YeastDialog.cpp brewtarget-2.1.0/src/YeastDialog.cpp --- brewtarget-2.0.3/src/YeastDialog.cpp 2014-03-09 16:36:31.000000000 +0000 +++ brewtarget-2.1.0/src/YeastDialog.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * YeastDialog.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * YeastDialog.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -36,6 +38,7 @@ setupUi(this); yeastTableModel = new YeastTableModel(yeastTableWidget, false); + yeastTableModel->setInventoryEditable(true); yeastTableProxy = new YeastSortFilterProxyModel(yeastTableWidget); yeastTableProxy->setSourceModel(yeastTableModel); yeastTableWidget->setModel(yeastTableProxy); @@ -75,7 +78,7 @@ // proxy model does the heavy lifting, as long as we do the call. translated = yeastTableProxy->mapToSource(selected[0]); Yeast *yeast = yeastTableModel->getYeast(translated.row()); - Database::instance().removeYeast(yeast); + Database::instance().remove(yeast); } void YeastDialog::addYeast(const QModelIndex& index) diff -Nru brewtarget-2.0.3/src/YeastDialog.h brewtarget-2.1.0/src/YeastDialog.h --- brewtarget-2.0.3/src/YeastDialog.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/YeastDialog.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,19 @@ /* - * YeastDialog.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * YeastDialog.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/YeastEditor.cpp brewtarget-2.1.0/src/YeastEditor.cpp --- brewtarget-2.0.3/src/YeastEditor.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/YeastEditor.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,21 @@ /* - * YeastEditor.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * YeastEditor.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Kregg K + * - Mik Firestone + * - Philip Greggory Lee + * - Samuel Östling * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,6 +34,11 @@ connect( buttonBox, SIGNAL( accepted() ), this, SLOT( save() )); connect( buttonBox, SIGNAL( rejected() ), this, SLOT( clearAndClose() )); + + connect( lineEdit_amount, SIGNAL(editingFinished()), this, SLOT(updateField())); + connect( lineEdit_minTemperature, SIGNAL(editingFinished()), this, SLOT(updateField())); + connect( lineEdit_maxTemperature, SIGNAL(editingFinished()), this, SLOT(updateField())); + connect( lineEdit_attenuation, SIGNAL(editingFinished()), this, SLOT(updateField())); } void YeastEditor::setYeast( Yeast* y ) @@ -65,6 +74,8 @@ y->setForm(static_cast(comboBox_form->currentIndex())); y->setAmountIsWeight( (checkBox_amountIsWeight->checkState() == Qt::Checked)? true : false ); y->setAmount( y->amountIsWeight() ? Brewtarget::weightQStringToSI(lineEdit_amount->text()) : Brewtarget::volQStringToSI(lineEdit_amount->text()) ); + y->setInventoryQuanta( lineEdit_inventory->text().toInt() ); + y->setLaboratory( lineEdit_laboratory->text() ); y->setProductID( lineEdit_productID->text() ); @@ -96,6 +107,42 @@ showChanges(&prop); } +void YeastEditor::updateField() +{ + + QObject* selection = sender(); + QLineEdit* field = qobject_cast(selection); + double val; + + if ( field == lineEdit_amount ) + { + // this is a bit harder, since we have to do something different based + // on teh "Amount is weight" box + if ( checkBox_amountIsWeight->checkState() == Qt::Checked ) + { + val = Brewtarget::weightQStringToSI(field->text()); + field->setText(Brewtarget::displayAmount( val, Units::kilograms)); + } + else + { + val = Brewtarget::volQStringToSI(field->text()); + field->setText(Brewtarget::displayAmount( val, Units::liters)); + } + } + else if ( field == lineEdit_minTemperature || field == lineEdit_maxTemperature ) + { + val = Brewtarget::tempQStringToSI(field->text()); + field->setText(Brewtarget::displayAmount( val, Units::celsius)); + } + else + { + //Everything else is a %, so just format nicely + val = field->text().toDouble(); + field->setText(Brewtarget::displayAmount(val)); + } + +} + void YeastEditor::showChanges(QMetaProperty* metaProp) { Yeast* y = obsYeast; @@ -135,6 +182,11 @@ if( ! updateAll ) return; } + if( propName == "inventory" || updateAll ) { + lineEdit_inventory->setText( QString::number(obsYeast->inventory()) ); + if( ! updateAll ) + return; + } if( propName == "amountIsWeight" || updateAll ) { checkBox_amountIsWeight->setCheckState( (obsYeast->amountIsWeight())? Qt::Checked : Qt::Unchecked ); if( ! updateAll ) diff -Nru brewtarget-2.0.3/src/YeastEditor.h brewtarget-2.1.0/src/YeastEditor.h --- brewtarget-2.0.3/src/YeastEditor.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/YeastEditor.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,20 @@ /* - * YeastEditor.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * YeastEditor.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -49,6 +52,7 @@ void save(); void clearAndClose(); void changed(QMetaProperty,QVariant); + void updateField(); private: Yeast* obsYeast; diff -Nru brewtarget-2.0.3/src/yeast.h brewtarget-2.1.0/src/yeast.h --- brewtarget-2.0.3/src/yeast.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/yeast.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,21 @@ /* - * yeast.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * yeast.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Mik Firestone + * - Philip Greggory Lee + * - Samuel Östling * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -66,6 +70,8 @@ Q_PROPERTY( QString formStringTr READ formStringTr ) //! \brief The amount in either liters or kg depending on \c amountIsWeight(). Q_PROPERTY( double amount READ amount WRITE setAmount /*NOTIFY changed*/ /*changedAmount*/ ) + //! \brief The amount in inventory in either liters or kg depending on \c amountIsWeight(). + Q_PROPERTY( double inventory READ inventory WRITE setInventoryQuanta /*NOTIFY changed*/ /*changedInventory*/ ) //! \brief Whether the \c amount() is weight (kg) or volume (liters). Q_PROPERTY( bool amountIsWeight READ amountIsWeight WRITE setAmountIsWeight /*NOTIFY changed*/ /*changedAmountIsWeight*/ ) //! \brief The lab from which it came. @@ -100,6 +106,7 @@ void setType( Type t ); void setForm( Form f ); void setAmount( double var ); + void setInventoryQuanta( int var ); void setAmountIsWeight( bool var ); void setLaboratory( const QString& var ); void setProductID( const QString& var ); @@ -122,6 +129,7 @@ const QString formString() const; const QString formStringTr() const; double amount() const; + int inventory() const; bool amountIsWeight() const; QString laboratory() const; QString productID() const; diff -Nru brewtarget-2.0.3/src/YeastSortFilterProxyModel.cpp brewtarget-2.1.0/src/YeastSortFilterProxyModel.cpp --- brewtarget-2.0.3/src/YeastSortFilterProxyModel.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/YeastSortFilterProxyModel.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,18 +1,19 @@ /* - * YeastSortFilterProxyModel.cpp is part of Brewtarget, and is Copyright - * Mik Firestone (mikfire@gmail.com), 2010-2013, - * Philip G. Lee , 2010-2013. + * YeastSortFilterProxyModel.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/YeastSortFilterProxyModel.h brewtarget-2.1.0/src/YeastSortFilterProxyModel.h --- brewtarget-2.0.3/src/YeastSortFilterProxyModel.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/YeastSortFilterProxyModel.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,18 +1,19 @@ /* - * YeastSortFilterProxyModel.cpp is part of Brewtarget, and is Copyright Mik - * Firestone (mikfire@gmail.com) and Philip G. Lee (rocketman768@gmail.com), - * 2010-2013. + * YeastSortFilterProxyModel.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff -Nru brewtarget-2.0.3/src/YeastTableModel.cpp brewtarget-2.1.0/src/YeastTableModel.cpp --- brewtarget-2.0.3/src/YeastTableModel.cpp 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/YeastTableModel.cpp 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,21 @@ /* - * YeastTableModel.cpp is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * YeastTableModel.cpp is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Mik Firestone + * - Philip Greggory Lee + * - Samuel Östling + * - swstim * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -36,7 +40,7 @@ #include "recipe.h" YeastTableModel::YeastTableModel(QTableView* parent, bool editable) -: QAbstractTableModel(parent), editable(editable), parentTableWidget(parent), recObs(0) +: QAbstractTableModel(parent), editable(editable), _inventoryEditable(false), parentTableWidget(parent), recObs(0) { yeastObs.clear(); } @@ -254,6 +258,13 @@ return QVariant(row->form()); else return QVariant(); + case YEASTINVENTORYCOL: + if( role != Qt::DisplayRole ) + return QVariant(); + + unit = displayUnit(index.column()); + + return QVariant( row->inventory() ); case YEASTAMOUNTCOL: if( role != Qt::DisplayRole ) return QVariant(); @@ -287,6 +298,8 @@ return QVariant(tr("Type")); case YEASTFORMCOL: return QVariant(tr("Form")); + case YEASTINVENTORYCOL: + return QVariant(tr("Inventory")); case YEASTAMOUNTCOL: return QVariant(tr("Amount")); case YEASTLABCOL: @@ -309,6 +322,8 @@ { case YEASTNAMECOL: return Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled; + case YEASTINVENTORYCOL: + return (Qt::ItemIsEnabled | (_inventoryEditable ? Qt::ItemIsEditable : Qt::NoItemFlags)); default: return Qt::ItemIsSelectable | (editable ? Qt::ItemIsEditable : Qt::NoItemFlags) | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled; @@ -366,6 +381,15 @@ return true; } else + return false; + case YEASTINVENTORYCOL: + if( value.canConvert(QVariant::String) ) + { + unit = displayUnit(YEASTINVENTORYCOL); + row->setInventoryQuanta( value.toInt() ); + return true; + } + else return false; case YEASTAMOUNTCOL: if( value.canConvert(QVariant::String) ) diff -Nru brewtarget-2.0.3/src/YeastTableModel.h brewtarget-2.1.0/src/YeastTableModel.h --- brewtarget-2.0.3/src/YeastTableModel.h 2014-01-18 22:34:38.000000000 +0000 +++ brewtarget-2.1.0/src/YeastTableModel.h 2014-08-17 15:18:31.000000000 +0000 @@ -1,17 +1,21 @@ /* - * YeastTableModel.h is part of Brewtarget, and is Copyright Philip G. Lee - * (rocketman768@gmail.com), 2009-2013. + * YeastTableModel.h is part of Brewtarget, and is Copyright the following + * authors 2009-2014 + * - Jeff Bailey + * - Mik Firestone + * - Philip Greggory Lee + * - Samuel Östling * * Brewtarget is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - + * * Brewtarget is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -38,7 +42,7 @@ class YeastTableWidget; class Recipe; -enum{ YEASTNAMECOL, YEASTLABCOL, YEASTPRODIDCOL, YEASTTYPECOL, YEASTFORMCOL, YEASTAMOUNTCOL, YEASTNUMCOLS /*This one MUST be last*/}; +enum{ YEASTNAMECOL, YEASTLABCOL, YEASTPRODIDCOL, YEASTTYPECOL, YEASTFORMCOL, YEASTAMOUNTCOL, YEASTINVENTORYCOL, YEASTNUMCOLS /*This one MUST be last*/}; /*! * \class YeastTableModel @@ -64,6 +68,13 @@ //! \brief Clear the model. void removeAll(); + /*! + * \brief True if the inventory column should be editable, false otherwise. + * + * The default is that the inventory column is not editable + */ + void setInventoryEditable( bool var ) { _inventoryEditable = var; } + //! \brief Reimplemented from QAbstractTableModel. virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; //! \brief Reimplemented from QAbstractTableModel. @@ -95,6 +106,7 @@ private: bool editable; + bool _inventoryEditable; QList yeastObs; QTableView* parentTableWidget; Recipe* recObs; diff -Nru brewtarget-2.0.3/translations/bt_ca.ts brewtarget-2.1.0/translations/bt_ca.ts --- brewtarget-2.0.3/translations/bt_ca.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_ca.ts 2014-09-14 16:29:29.000000000 +0000 @@ -200,223 +200,255 @@ - BrewTargetTreeModel + Brewtarget - Name - Nom + Default + Defecte - Brew Date - Data d'elaboració + EBC + EBC - Style - Estil + SRM + SRM - Boil Time - Temps d'ebullició + Plato + Escenari - Color - Color + Specific Gravity + Pes específic - Type - Tipus + SI + SI - Use - Ús + US Customary + US Customary - Form - Format + Milligrams + Miligrams - Category - Categoria + Grams + Grams - Number - + Kilograms + Kilograms - Letter - + Ounces + Onces - Guide - + Pounds + Lliures - - - BrewTargetTreeView - New Recipe - Recepta nova + Celsius + Centígrads - Brew It! - A elaborar! + Fahrenheit + Fahrenheit - Brew Again - A elaborar + British Imperial + British Imperial - Delete - Esborrar + MilliLiters + Mililitres + + + Liters + Litres + + + Teaspoons + Culleretes - New Equipment - Nou equip + Tablespoons + Cullerades - New Fermentable - Nou fermentable + Cups + Botes - New Hop - Nou llúpol + Quarts + Quarts - New Misc - Nou ingredient extra + Gallons + Galons - New Yeast - Nou llevat + Unknown + + + + BtDigitWidget - Copy - Copiar + Too low for style. + Massa baix per l'estil. - Export - Exportar + In range for style. + Correcte per l'estil. - Import - Importar + Too high for style. + Massa alt per l'estil. + + + BtTreeModel - Change date - + Name + Nom - New Style - + Brew Date + Fecha d'elaboració - Recalculate eff + Style + Estil + + + Boil Time + Temps d'ebullició + + + Color + Color + + + Type + Tipus + + + Use + Ús + + + Form - - - Brewtarget - Default - Defecte + Category + Categoria - EBC - EBC + Number + - SRM - SRM + Letter + - Plato - Escenari + Guide + - Specific Gravity - Pes específic + PATH + - SI - SI + FULLPATH + + + + BtTreeView - US Customary - US Customary + New + Nou - Milligrams - Miligrams + Recipe + Recepta - Grams - Grams + Brew It! + - Kilograms - Kilograms + Brew Again + - Ounces - Onces + Change date + - Pounds - Lliures + Recalculate eff + - Celsius - Centígrads + Delete + - Fahrenheit - Fahrenheit + Equipment + Equip - British Imperial - British Imperial + Fermentable + - MilliLiters - Mililitres + Hop + - Liters - Litres + Misc + Extres - Teaspoons - Culleretes + Style + Estil - Tablespoons - Cullerades + Yeast + Llevat - Cups - Botes + Folder + - Quarts - Quarts + Copy + - Gallons - Galons + Export + - - - BtDigitWidget - Too low for style. - Massa baix per l'estil. + Import + - In range for style. - Correcte per l'estil. + Delete %1 + - Too high for style. - Massa alt per l'estil. + Delete %1 %2? + + + + BrewNote + @@ -561,6 +593,10 @@ Color (EBC) Color (EBC) + + Inventory + + Hop @@ -677,68 +713,67 @@ Form Format - - - MainWindow - Open - Obrir - - - BeerXML files (*.xml) - Fitxers BeerXML (*.xml) + Inventory + + + + IbuGuSlider - Save - Desar + Cloying + - Equipment request - Petició d'equip + Extra Malty + - Would you like to set the batch size, boil size and time to that requested by the equipment? - Vols configurar la mida del lot, el volum i el temps de bullir al sol·licitat l'equip? + Slightly Malty + - Delete %1 - Elimina %1 + Balanced + - Delete %1 %2? - Eliminar %1 %2? + Slightly Hoppy + - HTML files (*.html) - HTML files (*.html) + Extra Hoppy + - New - Nou + Way Hoppy + + + + MainWindow - Recipe - Recepta + Open + Obrir - Equipment - Equip + BeerXML files (*.xml) + Fitxers BeerXML (*.xml) - Fermentable - Fermentable + Save + Desar - Hop - Llúpol + Equipment request + Petició d'equip - Miscellaneous - Ingredients extres + Would you like to set the batch size, boil size and time to that requested by the equipment? + Vols configurar la mida del lot, el volum i el temps de bullir al sol·licitat l'equip? - Yeast - Llevat + HTML files (*.html) + HTML files (*.html) Copy %1 @@ -873,10 +908,6 @@ - Style - Estil - - Copy Style @@ -892,36 +923,25 @@ The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - MaltinessWidget - - Cloying - Embafa - - - Extra malty - Molt maltosa - - Slightly malty - Una mica maltosa + Folder name + - Balanced - Equilibrada + Folder name: + - Slightly hoppy - Una mica llupolosa + Bad Name + - Extra hoppy - Molt llupolosa + A folder name must have at least one non-whitespace character in it + - Way hoppy - Llupolosa + A folder name must have at least one non-/ character in it + @@ -1149,6 +1169,10 @@ Amount Type + + Inventory + + OptionDialog @@ -1172,6 +1196,58 @@ Please restart Brewtarget. Per favor reinicieu Brewtarget. + + Catalan + + + + Czech + + + + German + + + + English + + + + Greek + + + + Spanish + + + + French + + + + Italian + + + + Dutch + + + + Polish + + + + Portuguese + + + + Russian + + + + Chinese + + QObject @@ -1358,10 +1434,6 @@ "%1" no es pot llegir. - Config directory "%1" cannot be read. - Carpeta de configuració "%1% no es pot llegir. - - New Version Versió nova @@ -1581,6 +1653,14 @@ Style Estil + + Folder + + + + Failed to update the database + + Recipe @@ -1854,18 +1934,10 @@ DF - Unknown - Desconegut - - ABV ABV - Bitterness - Amargor - - Color Color @@ -2041,6 +2113,42 @@ Print Document Imprimir document + + Category + Categoria + + + Code + + + + Guide + + + + BoilTime + + + + Beta + + + + Lab + Lab + + + Attenuation + + + + Id + + + + Flocculation + Precipitat + RefractoDialog @@ -2069,6 +2177,13 @@ + StrikeWaterDialog + + N/A + N/A + + + StyleEditor Style name @@ -2225,6 +2340,10 @@ Product ID ID del producte + + Inventory + + aboutDialog @@ -2233,20 +2352,38 @@ Quant a Brewtarget + Donate + Donació + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2263,26 +2400,9 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> - - Donate - Donació - brewDayScrollWidget @@ -2907,6 +3027,18 @@ Notes: Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + hopDialog @@ -2962,10 +3094,6 @@ Percentatge d'alfa-àcids per massa - Amount - Quantitat - - Amount Quantitat @@ -3085,6 +3213,18 @@ Notes: Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + htmlViewer @@ -3594,6 +3734,18 @@ Mashes + + 1.0 + 1.0 + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator + + mashDesigner @@ -3948,6 +4100,18 @@ Notes: Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + namedMashEditor @@ -4250,50 +4414,6 @@ Llenguatge - Czech - Txec - - - Catalan - Català - - - German - Alemany - - - English - Anglès - - - Spanish - Espanyol - - - French - Francès - - - Italian - Italià - - - Dutch - Holandès - - - Polish - Polac - - - Portuguese - Portuguès - - - Russian - - - <qt> Know another language? @@ -4685,6 +4805,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + + + + Original Grain Temperature + + + + Target Mash Temperature + + + + Weight of Grain + + + + Volume of Water + + + + Mash Infusion + + + + Total Volume of Water + + + + Grain Weight + + + + Actual Mash Temperature + + + + Infusion Water Temperature + + + + Calculate + Calcular + + + Strike Water Temperature + + + + Volume to add + + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -5065,5 +5248,17 @@ Notes: Notes: + + Default Amount + + + + Quanta in Inventory + + + + Quanta in inventory + + diff -Nru brewtarget-2.0.3/translations/bt_cs.ts brewtarget-2.1.0/translations/bt_cs.ts --- brewtarget-2.0.3/translations/bt_cs.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_cs.ts 2014-09-14 16:29:29.000000000 +0000 @@ -85,7 +85,7 @@ Volume into fermenter - Množství do spilky + Spílaný objem Print Document @@ -184,7 +184,7 @@ Volume in fermenter: - Množství do spilky: + Objem ve spilce: Print Document @@ -200,120 +200,6 @@ - BrewTargetTreeModel - - Name - Název - - - Brew Date - Poprvé uvařeno - - - Style - Styl - - - Boil Time - Délka varu - - - Color - Barva - - - Type - Druh - - - Use - Použití - - - Form - Forma - - - Category - Kategorie - - - Number - Číslo - - - Letter - Písmeno - - - Guide - Průvodce - - - - BrewTargetTreeView - - New Recipe - Nový recept - - - Brew It! - Uvařit! - - - Brew Again - Uvařit znovu - - - Delete - Odstranit - - - New Equipment - Nové vybavení - - - New Fermentable - Nová surovina - - - New Hop - Nový chmel - - - New Misc - Nový přípravek - - - New Yeast - Nové kvasnice - - - Copy - Kopírovat - - - Export - Exportovat - - - Import - Importovat - - - Change date - Datum změny - - - New Style - Nový styl - - - Recalculate eff - Přepočítat výtěž. - - - Brewtarget Default @@ -403,6 +289,10 @@ Gallons Galony + + Unknown + Neznámý + BtDigitWidget @@ -420,6 +310,148 @@ + BtTreeModel + + Name + Název + + + Brew Date + Datum vaření + + + Style + Styl + + + Boil Time + Délka chmelovaru + + + Color + Barva + + + Type + Druh + + + Use + Použití + + + Form + Forma + + + Category + Kategorie + + + Number + Číslo + + + Letter + + + + Guide + + + + PATH + + + + FULLPATH + + + + + BtTreeView + + New + Nový + + + Recipe + Recept + + + Brew It! + Uvařit! + + + Brew Again + Uvařit znovu + + + Change date + Datum změny + + + Recalculate eff + Přepočít. výtěž. + + + Delete + Smazat + + + Equipment + Vybavení + + + Fermentable + Zkvasitelné + + + Hop + Chmel + + + Misc + Přípravky + + + Style + Styl + + + Yeast + Kvasnice + + + Folder + Adresář + + + Copy + Kopírovat + + + Export + Exportovat + + + Import + Importovat + + + Delete %1 + Smazat %1 + + + Delete %1 %2? + Smazat %1 %2? + + + BrewNote + + + + Database Merge Database @@ -561,6 +593,10 @@ Color (EBC) Barva (EBC) + + Inventory + Sklad + Hop @@ -677,68 +713,67 @@ Form Forma - - - MainWindow - - Open - Otevřít - - BeerXML files (*.xml) - Soubory BeerXML (*.xml) + Inventory + Sklad + + + IbuGuSlider - Save - Uložit + Cloying + Sladké - Equipment request - Požadavek na vybavení + Extra Malty + Výrazně sladové - Would you like to set the batch size, boil size and time to that requested by the equipment? - Chcete nastavit velikost várky, objeml pro chmelovar a čas podle požadavků vybavení? + Slightly Malty + Mírně sladové - Delete %1 - Odebrat %1 + Balanced + Vyvážené - Delete %1 %2? - Odebrat %1 %2? + Slightly Hoppy + Nahořklé - HTML files (*.html) - Soubory HTML (*.html) + Extra Hoppy + Výrazně hořké - New - Nový + Way Hoppy + Extra hořké + + + MainWindow - Recipe - Recept + Open + Otevřít - Equipment - Vybavení + BeerXML files (*.xml) + Soubory BeerXML (*.xml) - Fermentable - Surovina + Save + Uložit - Hop - Chmel + Equipment request + Požadavek na vybavení - Miscellaneous - Přípravky + Would you like to set the batch size, boil size and time to that requested by the equipment? + Chcete nastavit velikost várky, objeml pro chmelovar a čas podle požadavků vybavení? - Yeast - Kvasnice + HTML files (*.html) + Soubory HTML (*.html) Copy %1 @@ -873,10 +908,6 @@ SQLite (*.sqlite) - Style - Styl - - Copy Style Zkopírovat styl @@ -890,38 +921,27 @@ The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - - - MaltinessWidget - - Cloying - Nasládlé + Importovaná data obsahovala neplaté beerXML. Byla importována, ujistěte se však, že dávají smysl. - Extra malty - Extra sladové + Folder name + Název adresáře - Slightly malty - Sladové + Folder name: + Název adresáře: - Balanced - Vyvážené + Bad Name + Chybný název - Slightly hoppy - Chmelové + A folder name must have at least one non-whitespace character in it + Název adresáře musí obsahovat alespoň jeden neprázdný znak - Extra hoppy - Výrazně chmel. - - - Way hoppy - Extra chmel. + A folder name must have at least one non-/ character in it + Název adresáře musí obsahovat alespoň jeden nelomítkový znak @@ -1149,6 +1169,10 @@ Amount Type Druh množství + + Inventory + Sklad + OptionDialog @@ -1172,6 +1196,58 @@ Please restart Brewtarget. Restartujte Brewtarget. + + Catalan + Katalánština + + + Czech + Čeština + + + German + Němčina + + + English + Angličtina + + + Greek + Řečtina + + + Spanish + Španělština + + + French + Francouzština + + + Italian + Italština + + + Dutch + Holandština + + + Polish + Polština + + + Portuguese + Portugalština + + + Russian + Ruština + + + Chinese + Čínština + QObject @@ -1358,10 +1434,6 @@ "%1" nelze přečíst. - Config directory "%1" cannot be read. - Konfigurační adresář "%1" nelze přečíst. - - New Version Nová verze @@ -1581,6 +1653,14 @@ Style Styl + + Folder + Adresář + + + Failed to update the database + + Recipe @@ -1854,18 +1934,10 @@ Konečná hustota - Unknown - Neznámá - - ABV Obsah alkoholu - Bitterness - Hořkost - - Color Barva @@ -1903,7 +1975,7 @@ Yield - Využití + Výtěžnost Yes @@ -2041,6 +2113,42 @@ Print Document Vytisknout dokument + + Category + Kategorie + + + Code + Kód + + + Guide + + + + BoilTime + + + + Beta + Beta + + + Lab + Laboratoř + + + Attenuation + Prokvašení + + + Id + Id + + + Flocculation + Flokulace + RefractoDialog @@ -2069,6 +2177,13 @@ + StrikeWaterDialog + + N/A + Neznáme + + + StyleEditor Style name @@ -2225,6 +2340,10 @@ Product ID ID produktu + + Inventory + Sklad + aboutDialog @@ -2233,64 +2352,38 @@ O aplikaci Brewtarget + Donate + Zaslat dar + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> - -Copyright (GPLv3) - -Brewtarget is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Brewtarget is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. -Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -Brewtarget %1 -Brewtarget, pro vývoj pivních receptů. -Copyright 2009-2013 náleží vývojářům níže. - -Vývojáři - -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2307,24 +2400,8 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Zdrojový kód Brewtargetu si můžete stáhnout na adrese <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Zvláštní poděkování -Guido Carpi (italský překlad) -Ester (katalánský překlad) -Marc Cote (francouzský překlad) -Pawel Fiedor (polský překlad) -Admiro (polský překlad) -Edu Engler (portugalský překlad) -Jan Grmela (český překlad) -Randy Brace (alfatester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -obrázky serveru, tiskárny, upravit-kopírovat, náhledu-pro-tisk a sloučení z tématu Oxygen (licence CC) -obrázek zálohování z tématu Nuvola (LGPL)</body></html> - - - Donate - Zaslat dar +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> + @@ -2714,7 +2791,7 @@ Hop Utilization - Využití Chmele + Výtěžnost chmele Mash Tun @@ -2952,6 +3029,18 @@ Notes: Poznámky: + + Default Amount + Výchozí množství + + + Amount in Inventory + Množství na skladě + + + Amount in inventory + Množství na skladě + hopDialog @@ -3007,10 +3096,6 @@ Hmotnostní procenta alfa hořkých kyselin - Amount - Množství - - Amount Množství @@ -3130,6 +3215,18 @@ Notes: Poznámky: + + Default Amount + Výchozí množtví + + + Amount in Inventory + Množství na skladě + + + Amount in inventory + Množství na skladě + htmlViewer @@ -3639,6 +3736,18 @@ Mashes Rmutovací schémata + + 1.0 + 1.0 + + + application/x-brewtarget-ingredient + application/x-brewtarget-ingredient + + + Strike Water Calculator + Výpočet nálevu + mashDesigner @@ -3993,6 +4102,18 @@ Notes: Poznámky: + + Default Amount + Výchozí množství + + + Amount in Inventory + Množství na skladě + + + Amount in inventory + Množství na skladě + namedMashEditor @@ -4264,11 +4385,11 @@ Mash Hop - + Mash Hop (do vystírky) First Wort - + First wort (do předku) Directories @@ -4295,50 +4416,6 @@ Jazyk - Czech - Česky - - - Catalan - Katalánsky - - - German - Německy - - - English - Anglicky - - - Spanish - Španělsky - - - French - Francouzsky - - - Italian - Italština - - - Dutch - Holandsky - - - Polish - Polsky - - - Portuguese - Portugalsky - - - Russian - Ruština - - <qt> Know another language? @@ -4730,6 +4807,69 @@ + strikeWaterDialog + + Strike Water Calculator + Výpočet nálevu + + + Initial Infusion + + + + Original Grain Temperature + Teplota sladu + + + Target Mash Temperature + Cílová teplota rmutu + + + Weight of Grain + Hmožnost sladu + + + Volume of Water + Objem vody + + + Mash Infusion + + + + Total Volume of Water + Celkový objem vody + + + Grain Weight + Hmotnost sladu + + + Actual Mash Temperature + Skutečná teplota rmutu + + + Infusion Water Temperature + + + + Calculate + Vypočítat + + + Strike Water Temperature + Teplota nálevu + + + Volume to add + Množství k přidání + + + Note: This calculator assumes a preheated mash tun. + Pozn.: Tato kalkulačka uvažuje předehřátou rmutovací pánev. + + + styleEditor Style Editor @@ -5110,5 +5250,17 @@ Notes: Poznámky: + + Default Amount + Výchozí množství + + + Quanta in Inventory + + + + Quanta in inventory + + diff -Nru brewtarget-2.0.3/translations/bt_da.ts brewtarget-2.1.0/translations/bt_da.ts --- brewtarget-2.0.3/translations/bt_da.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_da.ts 2014-09-14 16:29:29.000000000 +0000 @@ -29,7 +29,7 @@ Final Volume - Endelig volumen + Endelig volumen Starting Gravity @@ -93,7 +93,7 @@ <h2>Notes</h2> - + <h2>Notater</h2> Step %1: %2 @@ -112,7 +112,7 @@ BrewDayWidget Style - + Øl type Date @@ -124,7 +124,7 @@ Preboil Gravity - Vægtfylde før urtkogning + SG før urtkogning Final Volume @@ -144,11 +144,11 @@ Predicted Efficiency - Forventet effektivitet + Forventet udnyttelsesgrad Estimated calories (per 12 oz) - Forventet antal kalorier + Forventet antal kalorier (0.33L) Instructions @@ -192,7 +192,7 @@ Notes - Sedler + Bemærkninger Step %1: %2 @@ -200,120 +200,6 @@ - BrewTargetTreeModel - - Name - Egenavn - - - Brew Date - Brygge dato - - - Style - Stil - - - Boil Time - Kogetid - - - Color - Farver - - - Type - Datatype - - - Use - Benyt - - - Form - Form - - - Category - kategori - - - Number - Tal. - - - Letter - - - - Guide - Vejled - - - - BrewTargetTreeView - - New Recipe - Ny opskrift - - - Brew It! - Bryg! - - - Brew Again - Bryg igen - - - Delete - Del - - - New Equipment - Nyt udstyr - - - New Fermentable - Tilføj gærbart - - - New Hop - Tilføj humle - - - New Misc - Tilføj assorteret - - - New Yeast - Tilføj gær - - - Copy - Kopi - - - Export - Eksporter - - - Import - Importer - - - Change date - Ændre dato - - - New Style - Ny øl type - - - Recalculate eff - Beregn eff. - - - Brewtarget Default @@ -403,6 +289,10 @@ Gallons Gallons (~3.8L) + + Unknown + + BtDigitWidget @@ -420,6 +310,148 @@ + BtTreeModel + + Name + + + + Brew Date + + + + Style + + + + Boil Time + Kogetid + + + Color + + + + Type + Type + + + Use + Brug + + + Form + Type + + + Category + + + + Number + + + + Letter + + + + Guide + + + + PATH + + + + FULLPATH + + + + + BtTreeView + + New + + + + Recipe + + + + Brew It! + + + + Brew Again + + + + Change date + + + + Recalculate eff + + + + Delete + + + + Equipment + + + + Fermentable + + + + Hop + + + + Misc + + + + Style + + + + Yeast + + + + Folder + + + + Copy + + + + Export + + + + Import + + + + Delete %1 + + + + Delete %1 %2? + + + + BrewNote + + + + Database Merge Database @@ -462,7 +494,7 @@ Hop Utilization Warning - + Humle udbyttelses advarsel The hop utilization percentage you entered is 0. This may cause problems @@ -473,11 +505,11 @@ FermentableDialog Fermentable name - + Gærbartes navn Fermentable name: - + Gærbartes navn: @@ -500,7 +532,7 @@ Adjunct - + Adjunk @@ -531,7 +563,7 @@ Bad column: %1 - Forkert kolonne: %1 + Forkert kolonne: %1 Name @@ -561,6 +593,10 @@ Color (EBC) Farve (EBC) + + Inventory + + Hop @@ -677,68 +713,67 @@ Form Type - - - MainWindow - Open - Åbn - - - BeerXML files (*.xml) - BeerXML filer (*.xml) + Inventory + + + + IbuGuSlider - Save - Gem + Cloying + - Equipment request + Extra Malty - Would you like to set the batch size, boil size and time to that requested by the equipment? + Slightly Malty - Delete %1 - Slet %1 + Balanced + - Delete %1 %2? - Fjern %1 %2? + Slightly Hoppy + - HTML files (*.html) - HTML filer (*.html) + Extra Hoppy + - New - Opret + Way Hoppy + + + + MainWindow - Recipe - Opskrift + Open + Åbn - Equipment - Udstyr + BeerXML files (*.xml) + BeerXML filer (*.xml) - Fermentable - Gærbart + Save + Gem - Hop - Humle + Equipment request + Udstyrs forespørgsel - Miscellaneous - Diverse + Would you like to set the batch size, boil size and time to that requested by the equipment? + Ønsker du at sætte batch størrelse og kogetid til det forespurgt af udstyret? - Yeast - Gær + HTML files (*.html) + HTML filer (*.html) Copy %1 @@ -774,7 +809,7 @@ You are about to update the current database with another one. This may make changes to (but will not delete) some of your ingredients. It will not modify any of your recipes. Continue? - + Du er ved at opdatere den nuværende database med en anden. Dette kan medføre ændringer (men vil ikke slette) af nogen af dine ingredienser. Det vil ikke ændre dine opskrifter. Fortsæt? Select Database File @@ -873,10 +908,6 @@ SQLite (*.sqlite) - Style - Øl type - - Copy Style Kopiér stil @@ -892,36 +923,25 @@ The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - MaltinessWidget - Cloying + Folder name - Extra malty - Ekstra malted - - - Slightly malty - Lidt malted - - - Balanced - Balanceret + Folder name: + - Slightly hoppy - Smule humlet + Bad Name + - Extra hoppy - Ekstra humlet + A folder name must have at least one non-whitespace character in it + - Way hoppy - Over humlet + A folder name must have at least one non-/ character in it + @@ -998,15 +1018,15 @@ MashWizard Mash thickness (%1/%2) - + Mæsk tykkelse (%1/%2) Bad thickness - + Forkert tykkelse You must have a positive mash thickness. - + Mæsk tykkelsen skal være positiv. No steps @@ -1123,11 +1143,11 @@ Type - + Type Use - + Brug Time @@ -1149,6 +1169,10 @@ Amount Type + + Inventory + + OptionDialog @@ -1169,8 +1193,60 @@ Start igen - Please restart Brewtarget. - Genstart Brewtarget + Please restart Brewtarget. + Genstart Brewtarget + + + Catalan + + + + Czech + + + + German + + + + English + + + + Greek + + + + Spanish + + + + French + + + + Italian + + + + Dutch + + + + Polish + + + + Portuguese + + + + Russian + + + + Chinese + @@ -1229,7 +1305,7 @@ Type - + Type Amount @@ -1249,7 +1325,7 @@ Color - Farver + Yes @@ -1275,7 +1351,7 @@ Use - + Brug Time @@ -1297,7 +1373,7 @@ Form - + Type Stage @@ -1343,10 +1419,6 @@ - Config directory "%1" cannot be read. - - - New Version @@ -1424,7 +1496,7 @@ Adjunct - + Adjunk Boil @@ -1532,7 +1604,7 @@ Equipment - Udstyr + Fermentables @@ -1544,11 +1616,11 @@ Miscellaneous - Diverse + Yeast - Gær + Efficiency: %1% @@ -1564,6 +1636,14 @@ Style + + Folder + + + + Failed to update the database + + Recipe @@ -1834,20 +1914,12 @@ - Unknown - - - ABV Alkohol per volumen - Bitterness - - - Color - Farver + Calories (per 12 oz.) @@ -1867,7 +1939,7 @@ Type - + Type Amount @@ -1903,7 +1975,7 @@ Use - + Brug Time @@ -1911,7 +1983,7 @@ Form - + Type IBU @@ -1923,7 +1995,7 @@ Yeast - Gær + Stage @@ -1951,7 +2023,7 @@ Notes - Sedler + Bemærkninger Instructions @@ -1959,7 +2031,7 @@ Brew Date - Brygge dato + Preboil @@ -2021,6 +2093,42 @@ Print Document Udskriv dokument + + Category + + + + Code + + + + Guide + + + + BoilTime + + + + Beta + + + + Lab + + + + Attenuation + + + + Id + + + + Flocculation + + RefractoDialog @@ -2049,6 +2157,13 @@ + StrikeWaterDialog + + N/A + + + + StyleEditor Style name @@ -2187,11 +2302,11 @@ Type - + Type Form - + Type Amount @@ -2205,6 +2320,10 @@ Product ID + + Inventory + + aboutDialog @@ -2213,20 +2332,38 @@ + Donate + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2243,24 +2380,7 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - - - - Donate +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> @@ -2268,7 +2388,7 @@ brewDayScrollWidget Form - + Type Generate Instructions @@ -2382,7 +2502,7 @@ brewNoteWidget Form - + Type Preboil @@ -2514,14 +2634,14 @@ Notes - Sedler + Bemærkninger btSplashScreen Form - + Type @@ -2567,7 +2687,7 @@ Equipment - Udstyr + Remove equipment @@ -2699,7 +2819,7 @@ Notes - Sedler + Bemærkninger New equipment @@ -2734,7 +2854,7 @@ New - Opret + Edit selected ingredient @@ -2761,7 +2881,7 @@ Type - + Type Grain @@ -2781,7 +2901,7 @@ Adjunct - + Adjunk Amount @@ -2887,6 +3007,18 @@ Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + hopDialog @@ -2908,7 +3040,7 @@ New - Opret + Edit @@ -2942,16 +3074,12 @@ - Amount - - - Amount Use - + Brug Mash @@ -2979,7 +3107,7 @@ Type - + Type Bittering @@ -2991,7 +3119,7 @@ Form - + Type Leaf @@ -3065,6 +3193,18 @@ Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + htmlViewer @@ -3081,7 +3221,7 @@ instructionWidget Form - + Type Show a timer @@ -3128,7 +3268,7 @@ Recipe - Opskrift + Name @@ -3180,7 +3320,7 @@ Equipment - Udstyr + Target Boil Size @@ -3208,7 +3348,7 @@ Color - Farver + IBU/GU @@ -3252,7 +3392,7 @@ Miscellaneous - Diverse + Add misc @@ -3268,7 +3408,7 @@ Yeast - Gær + Add yeast @@ -3574,6 +3714,18 @@ Mashes + + 1.0 + + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator + + mashDesigner @@ -3587,7 +3739,7 @@ Type - + Type Target temp. @@ -3678,7 +3830,7 @@ Notes - Sedler + Bemærkninger Tun @@ -3721,7 +3873,7 @@ Type - + Type Infusion @@ -3827,7 +3979,7 @@ New - Opret + Edit selected ingredient @@ -3850,7 +4002,7 @@ Type - + Type Spice @@ -3878,7 +4030,7 @@ Use - + Brug Boil @@ -3928,6 +4080,18 @@ Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + namedMashEditor @@ -3965,7 +4129,7 @@ Notes - Sedler + Bemærkninger Tun @@ -4151,7 +4315,7 @@ Color - Farver + Use SRM @@ -4230,50 +4394,6 @@ - Czech - - - - Catalan - - - - German - - - - English - - - - Spanish - - - - French - - - - Italian - - - - Dutch - - - - Polish - - - - Portuguese - - - - Russian - - - <qt> Know another language? @@ -4510,7 +4630,7 @@ Notes - Sedler + Bemærkninger Cancel @@ -4521,7 +4641,7 @@ recipeExtrasWidget Form - + Type Brewer @@ -4585,7 +4705,7 @@ Notes - Sedler + Bemærkninger @@ -4659,6 +4779,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + + + + Original Grain Temperature + + + + Target Mash Temperature + + + + Weight of Grain + + + + Volume of Water + + + + Mash Infusion + + + + Total Volume of Water + + + + Grain Weight + + + + Actual Mash Temperature + + + + Infusion Water Temperature + + + + Calculate + + + + Strike Water Temperature + + + + Volume to add + + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -4682,7 +4865,7 @@ Category - kategori + Category number @@ -4698,7 +4881,7 @@ Type - + Type Type of beverage @@ -4778,11 +4961,11 @@ Notes - Sedler + Bemærkninger New - Opret + Save @@ -4804,7 +4987,7 @@ timerWidget Form - + Type Set the timer to the specified value @@ -4847,7 +5030,7 @@ Notes - Sedler + Bemærkninger @@ -4870,7 +5053,7 @@ New - Opret + Edit selected yeast @@ -4897,7 +5080,7 @@ Type - + Type Ale @@ -4921,7 +5104,7 @@ Form - + Type Liquid @@ -5039,5 +5222,17 @@ Notes: + + Default Amount + + + + Quanta in Inventory + + + + Quanta in inventory + + diff -Nru brewtarget-2.0.3/translations/bt_de.ts brewtarget-2.1.0/translations/bt_de.ts --- brewtarget-2.0.3/translations/bt_de.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_de.ts 2014-09-14 16:29:29.000000000 +0000 @@ -17,7 +17,7 @@ Efficiency - Effizienz + Malzausbeute Boil Volume @@ -25,11 +25,11 @@ Preboil Gravity - spezifische Dichte vor dem Sud + spezifische Dichte vor dem Kochen Final Volume - Endvolumen + Ausschlagmenge Starting Gravity @@ -41,7 +41,7 @@ Final Gravity - finale spezifische Dichte + Stammwürzekonzentration ABV @@ -57,7 +57,7 @@ Completed - Fertiggestellt + Abgeschlossen Time @@ -69,7 +69,7 @@ Actual PreBoil Volume - + tatsächliches Sudvolumen zu Beginn Actual PreBoil Gravity @@ -77,7 +77,7 @@ PostBoil Volume - Volumen nach dem Kochen + Ausschlagmenge PostBoil Gravity @@ -112,7 +112,7 @@ BrewDayWidget Style - Art + Stil Date @@ -120,11 +120,11 @@ Boil Volume - Brauvolumen + Sudvolumen Preboil Gravity - Vorkochdichte + spezifische Dichte vor dem Kochen Final Volume @@ -144,7 +144,7 @@ Predicted Efficiency - Geschätzte Effiziens + geschätze Ausbeute Estimated calories (per 12 oz) @@ -200,223 +200,255 @@ - BrewTargetTreeModel + Brewtarget - Name - Name + Default + Standard - Brew Date - Braudatum + EBC + EBC - Style - Art + SRM + SRM - Boil Time - Kochzeit + Plato + Plato - Color - Farbe + Specific Gravity + Spezifische Dichte - Type - Typ + SI + SI - Use - Anwenden + US Customary + US-Standard - Form - Eingabemaske + Milligrams + Milligramm - Category - Kategorie + Grams + Gramm - Number - + Kilograms + Kilogramm - Letter - + Ounces + Unzen - Guide - + Pounds + Pfund - - - BrewTargetTreeView - New Recipe - Neues Rezept + Celsius + Celsius - Brew It! - Jetzt brauen! + Fahrenheit + Fahrenheit - Brew Again - Erneut brauen + British Imperial + Imperische Einheiten - Delete - Löschen + MilliLiters + Milliliter - New Equipment - Neues Equipment + Liters + Liter - New Fermentable - Neues Gärgut + Teaspoons + Teelöffel - New Hop - Neuer Hopfen + Tablespoons + Esslöffel - New Misc - Neue sonstige + Cups + Tassen - New Yeast - Neue Hefe + Quarts + Quarts (× 0,9464 Liter) - Copy - Kopieren + Gallons + Gallonen - Export - Exportieren + Unknown + + + + BtDigitWidget - Import - Importieren + Too low for style. + Zu niedrig für diesen Typ. - Change date + In range for style. + Im Bereich dieses Typs. + + + Too high for style. + Zu hoch für diesen Typ. + + + + BtTreeModel + + Name + Name + + + Brew Date + Tag des Braus + + + Style - New Style + Boil Time - Recalculate eff + Color + Farbe + + + Type + Typ + + + Use - - - Brewtarget - Default - Standard + Form + - EBC - EBC + Category + Kategory - SRM - SRM + Number + - Plato - Plato + Letter + - Specific Gravity - Spezifische Dichte + Guide + - SI - SI + PATH + - US Customary - US-Standard + FULLPATH + + + + BtTreeView - Milligrams - Milligramm + New + Neu - Grams - Gramm + Recipe + Rezept - Kilograms - Kilogramm + Brew It! + - Ounces - Unzen + Brew Again + - Pounds - Pfund + Change date + - Celsius - Celsius + Recalculate eff + - Fahrenheit - Fahrenheit + Delete + - British Imperial - Imperische Einheiten + Equipment + Aussattung - MilliLiters - Milliliter + Fermentable + - Liters - Liter + Hop + - Teaspoons - Teelöffel + Misc + Sonstiges - Tablespoons - Esslöffel + Style + - Cups - Tassen + Yeast + Hefe - Quarts - Quarts (× 0,9464 Liter) + Folder + - Gallons - Gallonen + Copy + - - - BtDigitWidget - Too low for style. - Zu niedrig für diesen Typ. + Export + - In range for style. - Im Bereich dieses Typs. + Import + - Too high for style. - Zu hoch für diesen Typ. + Delete %1 + + + + Delete %1 %2? + + + + BrewNote + @@ -561,6 +593,10 @@ Color (EBC) Farbe (EBC) + + Inventory + + Hop @@ -677,68 +713,67 @@ Form Eingabemaske - - - MainWindow - Open - Öffnen - - - BeerXML files (*.xml) - Bier-XML-Dateien (*.xml) + Inventory + + + + IbuGuSlider - Save - Speichern + Cloying + - Equipment request - Benötigte Gerätschaft + Extra Malty + - Would you like to set the batch size, boil size and time to that requested by the equipment? - Möchten sie die Chargengröße und das Kochvolumen an die ausgewählte Gerätschaft anpassen? + Slightly Malty + - Delete %1 - %1 löschen + Balanced + - Delete %1 %2? - Lösche %1 %2? + Slightly Hoppy + - HTML files (*.html) - HTML-Dateien (*.html) + Extra Hoppy + - New - Neu + Way Hoppy + + + + MainWindow - Recipe - Rezept + Open + Öffnen - Equipment - Equipment + BeerXML files (*.xml) + Bier-XML-Dateien (*.xml) - Fermentable - Gärgut + Save + Speichern - Hop - Hopfen + Equipment request + Benötigte Gerätschaft - Miscellaneous - Sonstiges + Would you like to set the batch size, boil size and time to that requested by the equipment? + Möchten sie die Chargengröße und das Kochvolumen an die ausgewählte Gerätschaft anpassen? - Yeast - Hefe + HTML files (*.html) + HTML-Dateien (*.html) Copy %1 @@ -774,7 +809,7 @@ You are about to update the current database with another one. This may make changes to (but will not delete) some of your ingredients. It will not modify any of your recipes. Continue? - + Sie sind dabei derzeitige Datenbank mit einer anderen zu aktualisieren. Dieses kann einige Bestandteile ändern, wird sie aber nicht löschen. Ihre Rezepte werden nicht verändert. Weiter? Select Database File @@ -810,7 +845,7 @@ This will obliterate your current set of recipes and ingredients. Do you want to continue? - + Dieses wird Ihre derzeitige Sammlung von Rezepten und Bestandteilen tilgen. Möchten Sie fortfahren? For some reason, the operation failed. @@ -826,7 +861,7 @@ Trying to add a mash step without a mash. Please create a mash first. - + Sie versuchen eine Maischeschritt hinzuzufügen ohne eine Maische zu definieren. Bitte erstellen Sie zuerst eine Maische. Copy Recipe @@ -854,7 +889,7 @@ You must select or define an equipment profile first. - + Sie müssen zuerst ein Gerätschaftsprofile auswählen oder erstellen. No style @@ -873,10 +908,6 @@ - Style - Art - - Copy Style @@ -892,36 +923,25 @@ The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - MaltinessWidget - - Cloying - Zuckersüß - - Extra malty - Extra malzig - - - Slightly malty - Leicht malzig + Folder name + - Balanced - Ausgeglichen + Folder name: + - Slightly hoppy - Leicht hopfig + Bad Name + - Extra hoppy - Extra hopfig + A folder name must have at least one non-whitespace character in it + - Way hoppy - Zu hopfig + A folder name must have at least one non-/ character in it + @@ -940,7 +960,7 @@ You have not set an equipment for this recipe. We really cannot continue without one. - + Sie haben keine Gerätschaft für dieses Rezept gewählt. Sie können nicht ohne fortfahren. Tun Temp @@ -963,7 +983,7 @@ MashStepTableModel Bad model index. row = %1 - Fehlerhafter »model index«. Zeile = %1 + Fehlerhafter »model index«. Zeile = %1 Bad column: %1 @@ -1002,11 +1022,11 @@ Bad thickness - + Falsche Dichte You must have a positive mash thickness. - + Sie benötigen eine Maischedichte über 1. No steps @@ -1014,7 +1034,7 @@ There must be at least one mash step to run the wizard. - + Sie benötigen mindestens eine Maischeschritt um die automatischen Assistenten laufen zu lassen. First step @@ -1030,7 +1050,7 @@ Your mash is too thick for desired temp. at first step. - + Ihre Maische is zu dick für die gewünschte Temperatur in ersten Schritt. Decoction error @@ -1046,7 +1066,7 @@ In order to hit your sparge temp, the sparge water must be above boiling. Lower your sparge temp, or allow for more sparge water. - + Um die Läutertemperatur zu erreichen müßte das Läuterwasser mehr als kochen. Senken Sie die Läutertemperatur oder erhöhen Sie die Menge des Läuterwassers. Too much wort @@ -1054,7 +1074,7 @@ You have too much wort from the mash for your boil size. I suggest increasing the boil size by increasing the boil time, or reducing your mash thickness. - + Sie haben zu viel Würze aus ihrer Maische für ihren Ansatz. Vergrößern Sie den Ansatz indem Sie die Kochzeit erhöhen oder reduzieren Sie die Maischedichte. @@ -1076,11 +1096,11 @@ Fining - + Schönung Water Agent - + Wasserzusatzmittel Herb @@ -1149,6 +1169,10 @@ Amount Type + + Inventory + + OptionDialog @@ -1172,16 +1196,68 @@ Please restart Brewtarget. Bitte starten Sie Brewtarget neu. + + Catalan + + + + Czech + + + + German + + + + English + + + + Greek + + + + Spanish + + + + French + + + + Italian + + + + Dutch + + + + Polish + + + + Portuguese + + + + Russian + + + + Chinese + + QObject Invalid color formula type: %1 - + Falscher Farbtyp: %1 Unrecognized IBU formula type. %1 - + Unbekannter IBU-Typ. %1 Batch Size: %1 @@ -1228,7 +1304,8 @@ Fermentables - + Gärgut + Name @@ -1357,10 +1434,6 @@ "%1" kann nicht eingelesen werden. - Config directory "%1" cannot be read. - - - New Version Neue Version @@ -1470,11 +1543,11 @@ Fining - + Schönung Water Agent - + Wasserzusatzmittel Herb @@ -1578,7 +1651,15 @@ Style - Art + + + + Folder + + + + Failed to update the database + @@ -1685,7 +1766,7 @@ You should now have %1 wort. - + Sie sollten nun %1 Würze haben. Add %1 water to the kettle, bringing pre-boil volume to %2. @@ -1850,18 +1931,10 @@ FG - Unknown - Unbekannt - - ABV ABV - Bitterness - - - Color Farbe @@ -2037,6 +2110,42 @@ Print Document Dokument ausdrucken + + Category + Kategory + + + Code + + + + Guide + + + + BoilTime + + + + Beta + + + + Lab + Labor + + + Attenuation + + + + Id + + + + Flocculation + Ausflockung + RefractoDialog @@ -2065,6 +2174,13 @@ + StrikeWaterDialog + + N/A + nicht anwendbar + + + StyleEditor Style name @@ -2221,6 +2337,10 @@ Product ID Produkt ID + + Inventory + + aboutDialog @@ -2229,20 +2349,38 @@ Über Brewtarget + Donate + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2259,24 +2397,7 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - - - - Donate +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> @@ -2903,6 +3024,18 @@ Notes: Notizen: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + hopDialog @@ -2958,10 +3091,6 @@ Alphasäuren in Prozent der Masse - Amount - Menge - - Amount Menge @@ -3081,6 +3210,18 @@ Notes: Notizen: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + htmlViewer @@ -3404,7 +3545,7 @@ Ctrl+F - Ctrl+F + Strg+F &Hops @@ -3412,7 +3553,7 @@ Ctrl+H - Ctrl+H + Strg+H &Miscs @@ -3420,7 +3561,7 @@ Ctrl+M - Ctrl+M + Strg+M &Yeasts @@ -3428,7 +3569,7 @@ Ctrl+Y - Ctrl+Y + Strg+Y &Equipments @@ -3436,7 +3577,7 @@ Ctrl+E - Ctrl+E + Strg+E &Styles @@ -3444,7 +3585,7 @@ Ctrl+T - Ctrl+T + Strg+T &Exit @@ -3452,7 +3593,7 @@ Ctrl+Q - Ctrl+Q + Strg+Q &Import Recipes @@ -3590,6 +3731,18 @@ Mashes + + 1.0 + 1.0 + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator + + mashDesigner @@ -3874,11 +4027,11 @@ Fining - + Schönung Water Agent - + Wasserzusatzmittel Herb @@ -3944,6 +4097,18 @@ Notes: Notizen: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + namedMashEditor @@ -4246,50 +4411,6 @@ Sprache - Czech - Tschechisch - - - Catalan - Katalanisch - - - German - Deutsch - - - English - Englisch - - - Spanish - Spanisch - - - French - Französisch - - - Italian - Italienisch - - - Dutch - Niederländisch - - - Polish - Polnisch - - - Portuguese - Portugisisch - - - Russian - - - <qt> Know another language? @@ -4675,6 +4796,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + + + + Original Grain Temperature + + + + Target Mash Temperature + + + + Weight of Grain + + + + Volume of Water + + + + Mash Infusion + + + + Total Volume of Water + + + + Grain Weight + + + + Actual Mash Temperature + + + + Infusion Water Temperature + + + + Calculate + Berechne + + + Strike Water Temperature + + + + Volume to add + + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -4682,7 +4866,7 @@ Style - Art + Delete selected style @@ -4901,7 +5085,7 @@ yeastEditor Yeast Editor - Hefe Editor + Hefe-Editor Required Fields @@ -5055,5 +5239,17 @@ Notes: Bemerkungen: + + Default Amount + + + + Quanta in Inventory + + + + Quanta in inventory + + diff -Nru brewtarget-2.0.3/translations/bt_el.ts brewtarget-2.1.0/translations/bt_el.ts --- brewtarget-2.0.3/translations/bt_el.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_el.ts 2014-09-14 16:29:29.000000000 +0000 @@ -105,7 +105,7 @@ Heat water - Θερμάντε το νερό + Ζεστάνετε το νερό @@ -200,223 +200,255 @@ - BrewTargetTreeModel - - Name - Όνομα - + Brewtarget - Brew Date - Ημέρα Ζυθοποίησης + Default + Προεπιλογή - Style - Στυλ + EBC + EBC - Boil Time - Χρόνος βρασμού + SRM + SRM - Color - Χρώμα + Plato + Plato - Type - Τύπος + Specific Gravity + Ειδικό Βάρος - Use - Χρήση + SI + Μετρικό σύστημα - Form - Μορφή + US Customary + Αμερικάνικο σύστημα - Category - Κατηγορία + Milligrams + Χιλ/μα - Number - Αριθμός + Grams + Γραμ. - Letter - Γράμμα + Kilograms + Κιλά - Guide - Οδηγός + Ounces + Ουγκιές - - - BrewTargetTreeView - New Recipe - Προσθήκη νέας συνταγής + Pounds + Λίβρες - Brew It! - Ζυθοποίησε το! + Celsius + Κελσίου - Brew Again - Ζυθοποιήστε πάλι + Fahrenheit + Φάρεναϊτ - Delete - Διαγραφή + British Imperial + Βρεττανικό μετρικό σύστημα - New Equipment - Προσθήκη νέου εξοπλισμού + MilliLiters + Χιλιοστόλιτρα - New Fermentable - Προσθήκη νέων ζυμώσιμων + Liters + Λίτρα - New Hop - Προσθήκη νέου λυκίσκου + Teaspoons + κουταλιές του γλυκού - New Misc - Προσθήκη στα διάφορα + Tablespoons + Κουταλιές της σούπας - New Yeast - προσθήκη νέας μαγιάς + Cups + Φλιτζάνια - Copy - Αντιγραφή + Quarts + Τέταρτα - Export - Εξαγωγή + Gallons + Γαλόνια - Import - Εισαγωγή + Unknown + Άγνωστο + + + BtDigitWidget - Change date - Αλλαγή ημερομηνίας + Too low for style. + Κάτω από τα όρια του στυλ - New Style - Νέο Στυλ + In range for style. + Στα όρια του στυλ - Recalculate eff - Επαναπροσδιορισμός απόδοσης + Too high for style. + Πάνω από τα όρια του στυλ - Brewtarget + BtTreeModel - Default - Προεπιλογή + Name + Ονομασία - EBC - EBC + Brew Date + Ημέρα Ζυθοποίησης - SRM - SRM + Style + Στυλ - Plato - Plato + Boil Time + Χρόνος βρασμού - Specific Gravity - Ειδικό Βάρος + Color + Χρώμα - SI - Μετρικό σύστημα + Type + Είδος - US Customary - Αμερικάνικο σύστημα + Use + Χρήση - Milligrams - Χιλιοστόγραμμα + Form + Μορφή - Grams - Γραμμάρια + Category + Κατηγορία - Kilograms - Κιλά + Number + Αριθμός - Ounces - Ουγκιές + Letter + Γράμμα - Pounds - Λίβρες + Guide + Οδηγός - Celsius - Κελσίου + PATH + Διαδρομή - Fahrenheit - Φάρεναϊτ + FULLPATH + Πλήρης διαδρομή + + + BtTreeView - British Imperial - Βρεττανικό μετρικό σύστημα + New + Νέα - MilliLiters - Χιλιοστόλιτρα + Recipe + Συνταγή - Liters - Λίτρα + Brew It! + Ζυθοποίησε! - Teaspoons - κουταλιές του γλυκού + Brew Again + Ζυθοποίησε πάλι - Tablespoons - Κουταλιές της σούπας + Change date + Αλλαγή ημερομηνίας - Cups - Φλιτζάνια + Recalculate eff + Επανυπολογισμός απόδ. - Quarts - Τέταρτα + Delete + Διαγραφή - Gallons - Γαλόνια + Equipment + Εξοπλισμός - - - BtDigitWidget - Too low for style. - Κάτω από τα παραδεκτά όρια για το στυλ + Fermentable + Ζυμώσιμα - In range for style. - Μέσα στα όρια του στυλ + Hop + Λυκίσκος - Too high for style. - Πάνω από τα παραδεκτά όρια για το στυλ + Misc + Διαφ. + + + Style + Στυλ + + + Yeast + Μαγιά + + + Folder + Φάκελος + + + Copy + Αντιγραφή + + + Export + Εξαγωγή + + + Import + Εισαγωγή + + + Delete %1 + Διαγραφή %1 + + + Delete %1 %2? + Διαγραφή %1 %2? + + + BrewNote + Σημείωσεις @@ -561,12 +593,16 @@ Color (EBC) Χρώμα (EBC) + + Inventory + Ευρετήριο ειδών + Hop Mash - Mash + Στο σκεύος σακχ/σης First Wort @@ -594,15 +630,15 @@ Leaf - Leaf + σε φύλλα Pellet - Pellet + Σφαιρίδια Plug - Plug + Ανθός @@ -628,7 +664,7 @@ Mash - Mash + Στο σκεύος σακχ/σης First Wort @@ -640,15 +676,15 @@ Leaf - Leaf + σε φύλλα Pellet - Pellet + Σφαιρίδια Plug - Plug + Ανθός @@ -677,68 +713,67 @@ Form Μορφή - - - MainWindow - Open - Άνοιγμα - - - BeerXML files (*.xml) - Αρχεία τύπου BeerXML (*.xml) + Inventory + Ευρετήριο ειδών + + + IbuGuSlider - Save - Αποθήκευση + Cloying + Γλυκερή - Equipment request - Επιλογή εξοπλισμού + Extra Malty + Πολύ βυνώδης - Would you like to set the batch size, boil size and time to that requested by the equipment? - Θα θέλατε να θέσετε το μέγεθος της παρτίδας το μέγεθος του όγκου βρασμού και τον χρόνο βρασμού σύμφωνα με τον εξοπλισμό; + Slightly Malty + Ελαφρά βυνώδης - Delete %1 - Διαγραφή %1 + Balanced + Κανονική - Delete %1 %2? - Διαγραφή %1 %2? + Slightly Hoppy + Ελαφρά πικρή - HTML files (*.html) - Αρχεία σε μορφή HTML (*.html) + Extra Hoppy + Πολύ πικρή - New - Νέα + Way Hoppy + Υπερβολικά πικρή + + + MainWindow - Recipe - Συνταγή + Open + Άνοιγμα - Equipment - Εξοπλισμός + BeerXML files (*.xml) + Αρχεία τύπου BeerXML (*.xml) - Fermentable - Ζυμώσιμα + Save + Αποθήκευση - Hop - Λυκίσκος + Equipment request + Επιλογή εξοπλισμού - Miscellaneous - Διάφορα + Would you like to set the batch size, boil size and time to that requested by the equipment? + Θα θέλατε να ορίσετε το μέγεθος της παρτίδας τον όγκο του βρασμού και τον χρόνο βρασμού σύμφωνα με τον εξοπλισμό; - Yeast - Μαγιά + HTML files (*.html) + Αρχεία σε μορφή HTML (*.html) Copy %1 @@ -774,7 +809,7 @@ You are about to update the current database with another one. This may make changes to (but will not delete) some of your ingredients. It will not modify any of your recipes. Continue? - Πρόκειται να ενημερώσετε την υπάρχουσα βάση δεδομένων με μια άλλη. Αυτό πιθανόν να επιφέρει ( χωρίς να τα διαγράψει) αλλαγές σε κάποια από τα υλικά σας. Δεν πρόκειται να αλλάξει τις συνταγές σας. Να συνεχίσω; + Πρόκειται να ενημερώσετε την υπάρχουσα βάση δεδομένων με μια άλλη. Αυτό πιθανόν να επιφέρει ( χωρίς να τα διαγράψει) αλλαγές σε κάποια από τα υλικά σας. Δεν πρόκειται να αλλάξουν οι συνταγές σας. Να συνεχίσω; Select Database File @@ -790,7 +825,7 @@ Recipe name: - Όνομα συνταγής + Όνομα συνταγής: Backup Database @@ -826,7 +861,7 @@ Trying to add a mash step without a mash. Please create a mash first. - Προσπαθείτε να προσθέσετε ένα βήμα στην διαδικασίας σακχαροποίησης δίχως να έχετε ορίσει διαδικασία. Παρακαλώ δημιουργείστε διαδικασία σακχαροποίησης πρώτα. + Προσπαθείτε να προσθέσετε ένα βήμα στην διαδικασίας σακχαροποίησης (mash) δίχως να έχετε ορίσει διαδικασία. Παρακαλώ δημιουργείστε διαδικασία σακχαροποίησης πρώτα. Copy Recipe @@ -873,10 +908,6 @@ SQLite (*.sqlite) - Style - Στυλ - - Copy Style Αντιγραφή στυλ @@ -890,38 +921,27 @@ The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - - - MaltinessWidget - - Cloying - Cloying - - - Extra malty - Πολύ βυνώδης + Η εισαγωγή αρχείου εμπεριείχε ένα λανθασμένο τύπο beerXML. Έχει εισαχθεί, αλλά βεβαιωθείτε ότι το αρχείο είναι σωστό. - Slightly malty - Ελαφρά βυνώδης + Folder name + Όνομα φακέλου - Balanced - Σε αρμονία + Folder name: + Όνομα φακέλου: - Slightly hoppy - Slightly hoppy + Bad Name + Λάθος ονομασία - Extra hoppy - Extra hoppy + A folder name must have at least one non-whitespace character in it + Το όνομα του φακέλου θα πρέπει να έχει τουλάχιστον ένα χαρακτήρα δίχως κενά - Way hoppy - Way hoppy + A folder name must have at least one non-/ character in it + Ονόματα φακέλων θα πρέπει να περιέχουν τουλάχιστον ένα μή -/ χαρακτήρα @@ -932,7 +952,7 @@ Your recipe must have fermentables to design a mash. - Η συνταγή σας θα πρέπει να έχει ζυμώσιμα για να υπολογίσετε την διαδικασία σακχαροποίησης + Η συνταγή σας θα πρέπει να έχει ζυμώσιμα για να σχεδιάσετε την διαδικασία σακχαροποίησης (mashing) No Equipment @@ -1002,11 +1022,11 @@ Bad thickness - λανυασμένη πυκνότητα + Λανθασμένη πυκνότητα You must have a positive mash thickness. - + Πρέπει να έχετε θετική πυκνότητα. No steps @@ -1046,7 +1066,7 @@ In order to hit your sparge temp, the sparge water must be above boiling. Lower your sparge temp, or allow for more sparge water. - Για να επιτύχετε την επιθυμητή θερμοκρασία ψεκάσματος, το νερό θα πρέπει να έχει βράσει. Μειώστε την θερμοκρασία του νερού ή αυξήστε τον όγκο του νερού με το οποίο θα ψεκάσετε + Για να επιτύχετε την επιθυμητή θερμοκρασία ψεκάσματος, το νερό θα πρέπει να είναι πάνω από τα επίπεδα βρασμού. Μειώστε την θερμοκρασία του νερού ή αυξήστε τον όγκο του νερού με το οποίο θα ψεκάσετε Too much wort @@ -1149,6 +1169,10 @@ Amount Type Μονάδα μέτρησης + + Inventory + Ευρετήριο ειδών + OptionDialog @@ -1172,6 +1196,58 @@ Please restart Brewtarget. Παρακαλώ επανεκκινήστε το πρόγραμμα + + Catalan + Καταλανικά + + + Czech + Τσεχική + + + German + Γερμανικά + + + English + Αγγλικά + + + Greek + Ελληνικά + + + Spanish + ισπανικά + + + French + Γαλλικά + + + Italian + Ιταλικά + + + Dutch + Ολλανδικά + + + Polish + Πολωνικά + + + Portuguese + Πορτογαλικά + + + Russian + Ρωσικά + + + Chinese + Κινέζικα + QObject @@ -1358,10 +1434,6 @@ "%1" δεν μπορεί να διαβαστεί. - Config directory "%1" cannot be read. - Config directory "%1" cannot be read. - - New Version Νέα έκδοση @@ -1451,7 +1523,7 @@ Infusion - Infusion + Έγχυση Temperature @@ -1519,7 +1591,7 @@ Slant - Slant + επικλινής Culture @@ -1581,6 +1653,14 @@ Style Στυλ + + Folder + Φάκελος + + + Failed to update the database + + Recipe @@ -1594,11 +1674,11 @@ to the mash tun. - Στο σκεύος σακχαροποίσης + Στο σκεύος σακχαροποίησης Heat water - Θερμάντε το νερό + Ζεστάνετε το νερό Bring @@ -1714,7 +1794,7 @@ You should have %1 wort post-boil. - Θα πρέπει να έχετε %1 γλεύκος μετά το βράσιμο. + Θα πρέπει να έχετε %1 γλεύκους μετά το βράσιμο. @@ -1772,7 +1852,7 @@ to the primary. - στον πρώτο κάδο ζήμωσης + στον πρώτο κάδο ζύμωσης Pitch yeast @@ -1784,7 +1864,7 @@ Ferment - Ζήμωση + Ζύμωση Transfer beer to secondary. @@ -1815,7 +1895,7 @@ RecipeFormatter unknown style - Άγνωστο είδος/τύπος + Άγνωστο είδος/στυλ N/A @@ -1854,24 +1934,16 @@ FG - Unknown - Άγνωστο - - ABV ABV - Bitterness - Πικράδα - - Color Χρώμα Calories (per 12 oz.) - Θερμίδες + Θερμίδες ( ανά 12 ουγκιές) Fermentables @@ -1939,7 +2011,7 @@ Misc - Διάφορα + Διαφ. Yeast @@ -1959,15 +2031,15 @@ Mash - Mash + Στο σκεύος σακχ/σης Temp - Θερμοκρασία + Θερμ. Target Temp - Ζητούμενη θερμοκρασία + Ζητούμενη θερμ. Notes @@ -1995,7 +2067,7 @@ Strike Temp - + Strike Temp Final Temp @@ -2003,11 +2075,11 @@ Eff into BK - απόδοση στην μαρμίτα + απόδ. στην μαρμίτα Projected OG - Προβλεπόμενη Αρχική πυκνότητα + Προβλεπόμενη OG Postboil @@ -2023,7 +2095,7 @@ Brewhouse Eff - Απόδοση εξοπλισμού + Απόδ. εξοπλισμού Projected ABV @@ -2041,12 +2113,48 @@ Print Document Εκτύπωση εγγράφου + + Category + Κατηγορία + + + Code + Κωδικός + + + Guide + Οδηγός + + + BoilTime + Χρόνος βρασμού + + + Beta + Beta + + + Lab + Εργαστήριο + + + Attenuation + αραίωση + + + Id + Id + + + Flocculation + κροκίδωση + RefractoDialog OG Mismatch - Αναντιστοιχία αρχικής πυκνότητας + Αναντιστοιχία OG Based on the given original plato, the OG should be %1, but you have entered %2. Continuing with the calculated OG. @@ -2057,7 +2165,7 @@ ScaleRecipeTool Recipe Scaled - + Αναπροσαρμογή συνταγής The mash has been reset due to the fact that mash temperatures do not scale easily. Please re-run the mash wizard. @@ -2069,6 +2177,13 @@ + StrikeWaterDialog + + N/A + Μη διαθέσιμο + + + StyleEditor Style name @@ -2184,7 +2299,7 @@ Slant - Slant + επικλινής Culture @@ -2219,12 +2334,16 @@ Laboratory - Εργαστήριο + Εργαστήριο/Εταιρία Product ID Κωδικός προιόντος + + Inventory + Ευρετήριο ειδών + aboutDialog @@ -2233,20 +2352,38 @@ Σχετικά με το Brewtarget + Donate + Δωρεά + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2263,34 +2400,35 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2307,24 +2445,7 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - - - Donate - Δωρεά +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> @@ -2469,7 +2590,7 @@ Strike Temp - + Strike Temp Temperature of mash after dough in @@ -2517,7 +2638,7 @@ Temperature of wort when yeast is pitched - Θερμοκρασία του γλέυκος κατά την ρίψη της μαγιάς + Θερμοκρασία του γλέυκους κατά την ρίψη της μαγιάς Postferment @@ -2541,7 +2662,7 @@ Eff into BK - απόδοση στην μαρμίτα + απόδ. στην μαρμίτα Expected OG, based on measure fg @@ -2549,7 +2670,7 @@ Projected OG - Προβλεπόμενη Αρχική πυκνότητα + Προβλεπόμενη OG Brewhouse efficiency @@ -2557,7 +2678,7 @@ Brewhouse Eff - Απόδοση εξοπλισμού + Απόδ. εξοπλισμού Expected ABV based on OG @@ -2607,15 +2728,15 @@ Unit you want to convert to - Μοναδες που θελετε να μετατραπούν + Μονάδες που θέλετε να μετατραπούν Output - Μετατροπή + Αποτέλεσμα Output conversion - + Μετατροπή αποτελέσματος Convert @@ -2638,11 +2759,11 @@ Set as Default - Ορισμός ως προκαθορισμένο + Ορισμός ως Προεπιλογή Required Fields - Απαιτούμενα πεδία + Υποχρεωτικά πεδία Name @@ -2662,7 +2783,7 @@ Automatically fill in pre-boil volume - Αυτόματη πήρωση όγκου πριν το βρασμό + Αυτόματη πλήρωση όγκου πριν το βρασμό Batch size @@ -2694,7 +2815,7 @@ Final top-up water - τελική πλήρωση νερού + τελική προσθήκη νερού Water added to fermenter @@ -2781,7 +2902,7 @@ fermentableDialog Fermentable Database - Βάση δεδομένων ζυμώσιμων + Αρχείο ζυμώσιμων Add selected ingredient to recipe @@ -2816,7 +2937,7 @@ Required Fields - Απαιτούμενα πεδία + Υποχρεωτικά πεδία Name @@ -2856,7 +2977,7 @@ Yield as compared to glucose - Απόδοση σε σύγκριση με την γλυκόζη + Απόδοση σε σύγκριση με γλυκόζη Lovibond @@ -2864,7 +2985,7 @@ Lovibond rating - Lovibond rating + Βαθμοί Lovibond Add After Boil @@ -2888,7 +3009,7 @@ Yield difference between coarse and fine grind - Διαφορλά απόδοσης μεταξύ χοντροαλεσμένου και ψιλοαλεσμένου + Διαφορά απόδοσης μεταξύ χοντροαλεσμένου και ψιλοαλεσμένου Moisture (%) @@ -2950,12 +3071,24 @@ Notes: Σημειώσεις: + + Default Amount + προεπιλεγμένη ποσότητα + + + Amount in Inventory + Ποσότητα στο ευρετήριο + + + Amount in inventory + Ποσότητα στο ευρετήριο + hopDialog Hop Database - Βάση δεδομένων λυκίσκου + Κατάλογος λυκίσκων Add selected ingredient to recipe @@ -2990,7 +3123,7 @@ Required Fields - Απαιτούμενα πεδία + Υποχρεωτικά πεδία Name @@ -3005,10 +3138,6 @@ Alpha οξέα σε ποσοστό επί της μάζας - Amount - Ποσότητα - - Amount Ποσότητα @@ -3066,7 +3195,7 @@ Plug - Plug + Ανθός Beta (%) @@ -3074,7 +3203,7 @@ Beta acids as percent by mass - Beta acids ως πσοστό επι της μάζας + Οξέα Beta ως πσοστό επι της μάζας HSI @@ -3128,6 +3257,18 @@ Notes: Σημειώσεις: + + Default Amount + προεπιλεγμένη ποσότητα + + + Amount in Inventory + Ποσότητα στο ευρετήριο + + + Amount in inventory + Ποσότητα στο ευρετήριο + htmlViewer @@ -3179,7 +3320,7 @@ Hops - Λυκίσκος + Λυκίσκοι Miscs @@ -3355,11 +3496,11 @@ Remove selected mash step - Αφαιρέστε το επιλεγμένο βήμα σακχαροποίησης + Αφαιρέστε το επιλεγμένο βήμα σακχ/σης Edit selected mash step - Επεξεργαστέιτε το επιλεγμένο βήμα σακχαροποίησης + Επεξεργαστέιτε το επιλεγμένο βήμα mash Edit mash properties @@ -3371,7 +3512,7 @@ Mash Des - Mash Des + Περιγραφή Invoke the mash wizard @@ -3387,15 +3528,15 @@ Mash step up - Mash step up + Βήμα σακχ/σης πάνω Mash step down - Mash step down + βήμα σακχ/σης κάτω Save this mash profile - Αποθήκευση αυτού του προφιλ mash + Αποθήκευση αυτού του προφιλ σακχ/σης Save Mash @@ -3403,7 +3544,7 @@ &About - &Περί + &Σχετικά &File @@ -3515,11 +3656,11 @@ &Scale Recipe - &Αλλαγή μεγέθους συνταγής + &Μετατροπή συνταγής Recipe to Clipboard as &Text - Συνταγή στην επικόλληση ως &Text + Συνταγή στην επικόλληση ως αρχείο &Text &OG Correction Help @@ -3547,11 +3688,11 @@ &Refractometer Tools - Εργαλεία Διαθλασίμετρου + &Διαθλασίμετρο &Pitch Rate Calculator - Υπολογισμός starter + &Υπολογισμός starter Merge Databases @@ -3567,7 +3708,7 @@ Print Pre&view - Προεκτύπωση + Print Pre&view &Export To HTML @@ -3611,7 +3752,7 @@ Show timers - Εμφάνισε χρονόμετρα + Εμφάνιση χρονόμετρων Save @@ -3637,12 +3778,24 @@ Mashes Mashes + + 1.0 + 1.0 + + + application/x-brewtarget-ingredient + application/x-brewtarget-ingredient + + + Strike Water Calculator + Υπολογισμός Θερμοκρασίας νερού + mashDesigner Mash Designer - Σχεδιασμός σακχαροποίησης + Σχεδιασμός σακχ/σης Name @@ -3654,7 +3807,7 @@ Target temp. - Επιθυμούμενη θερμοκρασία + Επιθυμητή θερμ. Time @@ -3662,7 +3815,7 @@ Batch Sparge - Batch Sparge + τμηματικός ψεκασμός Next @@ -3674,11 +3827,11 @@ Infusion/Decoction Amount - Infusion/Decoction Amount + Ποσότητα έγχυσης/decoction min - ελ. + ελαχ. max @@ -3729,15 +3882,15 @@ Sparge temp - Θερμοκρασία έκπλυσης + Θερμοκρασία ψεκασμού Sparge temp target - Επιθυμητή θερμοκρασία + Επιθυμητή θερμοκρασία ψεκασμού Sparge pH - PH έκπλυσης + PH ψεκασμού Notes @@ -3745,7 +3898,7 @@ Tun - σκεύος σακχαροποίησης + σκεύος σακχ/σης Initial tun temp @@ -3776,7 +3929,7 @@ mashStepEditor Mash Step Editor - επεξεργασία βήματος σακχαροποίησης + επεξεργασία βήματος σακχ/σης Name @@ -3800,11 +3953,11 @@ Target temp. - Επιθυμητή θερμοκρασία + Επιθυμητή θερμ. Target temp. of this step - Επιθυμητή θερμοκρασία αυτού του βήματος + Επιθυμητή θερμ. αυτού του βήματος Infuse Amount @@ -3828,7 +3981,7 @@ Amount of mash to decoct - + Ποσότητα γλεύκους για decoction Time @@ -3836,7 +3989,7 @@ Time to conduct the step - Χρόνος που απαιτήται για το βήμα αυτό + Ώρα για την διεξαγωγή του βήματος Temp. lag time @@ -3859,11 +4012,11 @@ mashWizard Mash Wizard - Mash wizard + Οδηγός Σακχαροποίησης Mash thickness (L/kg) - Mash thickness (L/kg) + Πυκνότητα σακχαροποίησης (L/kg) Mash thickness (do not enter any units) @@ -3949,7 +4102,7 @@ Mash - Στο σκεύος σακχαροποίησης + Στο σκεύος σακχ/σης Primary @@ -3977,7 +4130,7 @@ Amount is weight? - Το ποσό αναφέρεται σε βάρος + Το ποσό αναφέρεται σε βάρος; Checked if the given amount is weight instead of volume @@ -3991,16 +4144,28 @@ Notes: Σημειώσεις: + + Default Amount + προεπιλεγμένη ποσότητα + + + Amount in Inventory + Ποσότητα στο ευρετήριο + + + Amount in inventory + Ποσότητα στο ευρετήριο + namedMashEditor Named Mash Editor - + Named Mash Editor Mash - Mash + Σακχαροποίηση Delete selected style @@ -4016,15 +4181,15 @@ Sparge temp - Θερμοκρασία έκπλυσης + Θερμοκρασία ψεκασμού Sparge temp target - Επιθυμητή θερμοκρασία + Επιθυμητή θερμοκρασία ψεκασμού Sparge pH - PH έκπλυσης + PH ψεκασμού Notes @@ -4032,7 +4197,7 @@ Tun - σκεύος σακχαροποίησης + σκεύος σακχ/σης Initial tun temp @@ -4048,7 +4213,7 @@ Tun sp. heat - Tun sp. heat + Συγκ. Θερμ. σκ. Tun specific heat (cal/(g*K)) @@ -4056,26 +4221,26 @@ Add mash step - Νέο βήμα σακχαροποίησης + Νέο βήμα σακχ/σης Remove selected mash step - Αφαιρέστε το επιλεγμένο βήμα σακχαροποίησης + Αφαιρέστε το επιλεγμένο βήμα σακχ/σης Mash step up - Mash step up + Βήμα σακχ/σης πάνω Mash step down - Mash step down + βήμα σακχ/σης κάτω ogAdjuster Adjust Volume to Hit OG - Ρύθμιση λογκου για να συμπέσει με την OG + Ρύθμιση όγκου για να συμπέσει με την OG Input @@ -4091,7 +4256,7 @@ Temp - Θερμοκρασία + Θερμ. Temperature of SG reading @@ -4115,7 +4280,7 @@ Plato (percent by mass of equivalent sucrose) - + Plato (percent by mass of equivalent sucrose) Pre-Boil Volume @@ -4139,7 +4304,7 @@ Add to Boil - προσθήκη κατά το βράσιμο + προσθήκη στο βράσιμο Amount of water you need to add to hit planned OG (or boil off if negative) @@ -4147,7 +4312,7 @@ Final Batch Size - Τελικός όγκος γλεύκους + Τελικός όγκος παρτίδας Estimated batch size after correction @@ -4162,11 +4327,11 @@ optionsDialog Options - Προτιμήσεις + Επιλογές Units - Μετρικό σύστημα + Μονάδες Weight @@ -4202,7 +4367,7 @@ Gravity - Βαρύτητα + Πυκνότητα 20C/20C Specific Gravity @@ -4258,11 +4423,11 @@ % IBU adjustment - Προσαρμογή IBU + % Προσαρμογή IBU Mash Hop - + Mash Hop First Wort @@ -4293,50 +4458,6 @@ Γλώσσα - Czech - Τσεχικά - - - Catalan - Καταλανικά - - - German - Γερμανικά - - - English - Αγγλική - - - Spanish - Ισπανικά - - - French - Γαλλικά - - - Italian - Ιταλικά - - - Dutch - Ολλανδικά - - - Polish - Πολωνικά - - - Portuguese - Πορτογαλικά - - - Russian - Ρώσικα - - <qt> Know another language? @@ -4385,7 +4506,7 @@ Yeast Production Date - Ημερομηνία παραγωγής της μαγιάς + Ημερομηνία παραγωγής μαγιάς Yeast Viability @@ -4401,7 +4522,7 @@ Stir Plate - Stir Plate + συσκευή ανάδευσης MM/dd/yyyy @@ -4413,7 +4534,7 @@ TextLabel - TextLabel + Ετικέτα Calculate Viability From Date @@ -4429,7 +4550,7 @@ Billions of Yeast Cells Required - Δισεκατομύρια κυττάρων μαγιάς που χρειάζονται + Δισ. κυττάρων μαγιάς που χρειάζονται # Vials/Smack Packs w/o Starter @@ -4448,7 +4569,7 @@ primingDialog Priming Calculator - Υπολογισμός ανθρακικού + Υπολογισμός CO2 Input @@ -4460,7 +4581,7 @@ Amount of beer to prime - Ποσότητα μπύρας στον κάδο ζύμωσης + Ποσότητα μπύρας για γόμωση Beer Temperature @@ -4472,11 +4593,11 @@ Desired Volumes - Επιθυμητή όγκος ανθρακικού + Επιθυμητή ποσότητα CO2 How many volumes of CO2 you want (1 L CO2 @ STP per L beer) - Πόσος όγκος CO2 θέλετε; (1 L CO2 @ STP ανά L μπύρας) + Πόσο όγκο CO2 θέλετε; (1 L CO2 @ STP ανά L μπύρας) Glucose Monohydrate (corn sugar) @@ -4484,7 +4605,7 @@ Anhydrous Glucose - Anhydrous Glucose + Άνυδρη γλυκόζη Sucrose (table sugar) @@ -4500,7 +4621,7 @@ Prime with - Γόμμωση με + Γόμωση με How much priming ingredient to use @@ -4531,7 +4652,7 @@ Primary Age (days) - Χρόνος ωρίμασης στον αρχικό κάδο ζήμωσης (ημέρες) + Ωρίμανση στον αρχικό κάδο ζήμωσης (ημέρες) Primary Temp @@ -4539,7 +4660,7 @@ Secondary Age (days) - Χρόνος ωρίμασης στον δεύτερο κάδο ζήμωσης (ημέρες) + Ωρίμανση στον δεύτευρο κάδο (ημέρες) Secondary Temp @@ -4547,7 +4668,7 @@ Tertiary Age (days) - Χρόνος ωρίμανσης στον τρίτο κάδο ζήμωσης (ημέρες) + Ωρίμανση στον τρίτο κάδο (ημέρες) Tertiary Temp @@ -4571,11 +4692,11 @@ Carbonation Volumes - Βαθμοί Ανθράκωσης + Βαθμοί CO2 Taste Notes - Γεύση - Σημειώσεις + σημειώσεις σχετικά με την γεύση Notes @@ -4606,7 +4727,7 @@ Primary Age (days) - Χρόνος ωρίμασης στον αρχικό κάδο ζήμωσης (ημέρες) + Ωρίμανση στον αρχικό κάδο ζήμωσης (ημέρες) Primary Temp @@ -4614,7 +4735,7 @@ Secondary Age (days) - Χρόνος ωρίμασης στον δεύτερο κάδο ζήμωσης (ημέρες) + Ωρίμανση στον δεύτευρο κάδο (ημέρες) Secondary Temp @@ -4622,7 +4743,7 @@ Tertiary Age (days) - Χρόνος ωρίμανσης στον τρίτο κάδο ζήμωσης (ημέρες) + Ωρίμανση στον τρίτο κάδο (ημέρες) Tertiary Temp @@ -4646,11 +4767,11 @@ Carbonation Volumes - Βαθμοί Ανθράκωσης + Βαθμοί CO2 Taste Notes - Γεύση - Σημειώσεις + σημειώσεις σχετικά με την γεύση Notes @@ -4701,7 +4822,7 @@ Refractive Index - Refractive Index + δείκτης διάθλασης Real Extract (Plato) @@ -4716,11 +4837,11 @@ scaleRecipeTool Scale Recipe - + Μετατροπή Συνταγής New batch size - Μέγεθος νέας παρτίδας + Νέο μέγεθος παρτίδας New efficiency (pct) @@ -4728,6 +4849,69 @@ + strikeWaterDialog + + Strike Water Calculator + Υπολογισμός Θερμοκρασίας νερού + + + Initial Infusion + Αρχική έγχυση + + + Original Grain Temperature + Αρχική θερμοκρασία σιτηρών + + + Target Mash Temperature + Επιθυμητή θερμοκρασία χυλού + + + Weight of Grain + Βαρός σιτηρών + + + Volume of Water + Όγκος νερού + + + Mash Infusion + έγχυση του χυλού + + + Total Volume of Water + Ολικός όγκος νερού + + + Grain Weight + Βάρος σιτηρών + + + Actual Mash Temperature + Ακριβής θερμοκρασία χυλού + + + Infusion Water Temperature + Θερμοκρασία νερού έγχυσης + + + Calculate + Υπολογισμός + + + Strike Water Temperature + Θερμοκρασία της αρχικής ποσότητας νερού + + + Volume to add + Ποσότητα για προσθήκη + + + Note: This calculator assumes a preheated mash tun. + Σημείωση: Το πρόγραμμα θεωρεί ότι το σκεύος σακχαροποίησης έχει προθερμανθεί + + + styleEditor Style Editor @@ -4787,7 +4971,7 @@ Wheat - Wheat + Σιτάρι Mixed @@ -4803,11 +4987,11 @@ Max - Μέγιστο + Μεγ. Min - Ελάχιστο + Ελαχ. OG @@ -4827,7 +5011,7 @@ Carb (vols) - Ανθρακικό (όγκος) + Ανθρακ. (ατμ) ABV (pct) @@ -4877,7 +5061,7 @@ Set the timer to the specified value - Δώσε συγκεκριμένη τιμή στο χρονόμετρο + Ρύθμισε το χρονόμετρο στην επιλεγμένη τιμή Set @@ -4889,7 +5073,7 @@ Start/Stop timer - Εκκίνηση/Τέλος χρονόμετρου + Έναρξη/Τέλος χρονόμετρου Start @@ -4943,7 +5127,7 @@ Edit selected yeast - Επεξεργαστείτε την επιλεγμένη μαγιά + Επεξεργασία επιλεγμένης μαγιάς Remove selected yeast @@ -4958,7 +5142,7 @@ Required Fields - Απαιτούμενα πεδία + Υποχρεωτικά πεδία Name @@ -4978,7 +5162,7 @@ Wheat - Wheat + Σταρένια Wine @@ -5002,7 +5186,7 @@ Slant - Slant + επικλινής Culture @@ -5014,19 +5198,19 @@ Check it if the amount given is in kg instead of L. - Έλεγχος εάν η ποσότητα είναι σε κιλά ή λιτρα + Έλεγχος εάν η ποσότητα είναι σε κιλά αντί για λίτρα Amount is weight? - Το ποσό αναφέρεται σε βάρος + Το ποσό αναφέρεται σε βάρος; Checked if the given amount is weight instead of volume - Τσέκαρε το εαν το αναφερόμενο ποσό είναι βάρος αντί για όγκος + Τσέκαρε εάν το νούμερο αναφέρεται σε βάρος αντί για όγκο Lab - Εργαστήριο + Εργαστήριο/Εταιρία Product ID @@ -5050,7 +5234,7 @@ Flocculation - Flocculation + κροκίδωση Low @@ -5074,7 +5258,7 @@ Apparent attenuation as percentage of OG points - Φαινομενική ελάττωση ως πσοστό επί OG βαθμών + Φαινομενική ελάττωση πυκνότητας ως πσοστό επί OG βαθμών Times Recultured @@ -5098,7 +5282,7 @@ Checked means add this yeast to secondary instead of primary - + Σε περίπτωση τσεκαρίσματος η μαγιά προστίθεται στο δεύτερο κάδο Best For: @@ -5108,5 +5292,17 @@ Notes: Σημειώσεις: + + Default Amount + προεπιλεγμένη ποσότητα + + + Quanta in Inventory + Ποσότητα στο ευρετήριο + + + Quanta in inventory + Ποσότητα στο ευρετήριο + diff -Nru brewtarget-2.0.3/translations/bt_en.ts brewtarget-2.1.0/translations/bt_en.ts --- brewtarget-2.0.3/translations/bt_en.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_en.ts 2014-09-14 16:29:29.000000000 +0000 @@ -200,222 +200,254 @@ - BrewTargetTreeModel + Brewtarget - Name + Default - Brew Date + EBC - Style + SRM - Boil Time + Plato - Color + Specific Gravity - Type + SI - Use + US Customary - Form + Milligrams - Category + Grams - Number + Kilograms - Letter + Ounces - Guide + Pounds - - - BrewTargetTreeView - New Recipe + Celsius - Brew It! + Fahrenheit - Brew Again + British Imperial - Delete + MilliLiters - New Equipment + Liters - New Fermentable + Teaspoons - New Hop + Tablespoons - New Misc + Cups - New Yeast + Quarts - Copy + Gallons - Export + Unknown + + + BtDigitWidget - Import + Too low for style. - Change date + In range for style. - New Style + Too high for style. + + + BtTreeModel - Recalculate eff + Name - - - Brewtarget - Default + Brew Date - EBC + Style - SRM + Boil Time - Plato + Color - Specific Gravity + Type - SI + Use - US Customary + Form - Milligrams + Category - Grams + Number - Kilograms + Letter - Ounces + Guide - Pounds + PATH - Celsius + FULLPATH + + + BtTreeView - Fahrenheit + New - British Imperial + Recipe - MilliLiters + Brew It! - Liters + Brew Again - Teaspoons + Change date - Tablespoons + Recalculate eff - Cups + Delete - Quarts + Equipment - Gallons + Fermentable - - - BtDigitWidget - Too low for style. + Hop - In range for style. + Misc - Too high for style. + Style + + + + Yeast + + + + Folder + + + + Copy + + + + Export + + + + Import + + + + Delete %1 + + + + Delete %1 %2? + + + + BrewNote @@ -561,6 +593,10 @@ Color (EBC) + + Inventory + + Hop @@ -677,67 +713,66 @@ Form - - - MainWindow - - Open - - - BeerXML files (*.xml) + Inventory + + + IbuGuSlider - Save + Cloying - Equipment request + Extra Malty - Would you like to set the batch size, boil size and time to that requested by the equipment? + Slightly Malty - Delete %1 + Balanced - Delete %1 %2? + Slightly Hoppy - HTML files (*.html) + Extra Hoppy - New + Way Hoppy + + + MainWindow - Recipe + Open - Equipment + BeerXML files (*.xml) - Fermentable + Save - Hop + Equipment request - Miscellaneous + Would you like to set the batch size, boil size and time to that requested by the equipment? - Yeast + HTML files (*.html) @@ -873,10 +908,6 @@ - Style - - - Copy Style @@ -892,35 +923,24 @@ The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - MaltinessWidget - - Cloying - - - Extra malty + Folder name - Slightly malty + Folder name: - Balanced + Bad Name - Slightly hoppy + A folder name must have at least one non-whitespace character in it - Extra hoppy - - - - Way hoppy + A folder name must have at least one non-/ character in it @@ -1149,6 +1169,10 @@ Amount Type + + Inventory + + OptionDialog @@ -1172,6 +1196,58 @@ Please restart Brewtarget. + + Catalan + + + + Czech + + + + German + + + + English + + + + Greek + + + + Spanish + + + + French + + + + Italian + + + + Dutch + + + + Polish + + + + Portuguese + + + + Russian + + + + Chinese + + QObject @@ -1343,10 +1419,6 @@ - Config directory "%1" cannot be read. - - - New Version @@ -1564,6 +1636,14 @@ Style + + Folder + + + + Failed to update the database + + Recipe @@ -1834,18 +1914,10 @@ - Unknown - - - ABV - Bitterness - - - Color @@ -2021,6 +2093,42 @@ Print Document + + Category + + + + Code + + + + Guide + + + + BoilTime + + + + Beta + + + + Lab + + + + Attenuation + + + + Id + + + + Flocculation + + RefractoDialog @@ -2049,6 +2157,13 @@ + StrikeWaterDialog + + N/A + + + + StyleEditor Style name @@ -2205,6 +2320,10 @@ Product ID + + Inventory + + aboutDialog @@ -2213,20 +2332,38 @@ + Donate + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2243,24 +2380,7 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - - - - Donate +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> @@ -2887,6 +3007,18 @@ Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + hopDialog @@ -2942,10 +3074,6 @@ - Amount - - - Amount @@ -3065,6 +3193,18 @@ Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + htmlViewer @@ -3574,6 +3714,18 @@ Mashes + + 1.0 + + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator + + mashDesigner @@ -3928,6 +4080,18 @@ Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + namedMashEditor @@ -4230,50 +4394,6 @@ - Czech - - - - Catalan - - - - German - - - - English - - - - Spanish - - - - French - - - - Italian - - - - Dutch - - - - Polish - - - - Portuguese - - - - Russian - - - <qt> Know another language? @@ -4659,6 +4779,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + + + + Original Grain Temperature + + + + Target Mash Temperature + + + + Weight of Grain + + + + Volume of Water + + + + Mash Infusion + + + + Total Volume of Water + + + + Grain Weight + + + + Actual Mash Temperature + + + + Infusion Water Temperature + + + + Calculate + + + + Strike Water Temperature + + + + Volume to add + + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -5039,5 +5222,17 @@ Notes: + + Default Amount + + + + Quanta in Inventory + + + + Quanta in inventory + + diff -Nru brewtarget-2.0.3/translations/bt_es.ts brewtarget-2.1.0/translations/bt_es.ts --- brewtarget-2.0.3/translations/bt_es.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_es.ts 2014-09-14 16:29:29.000000000 +0000 @@ -13,7 +13,7 @@ Boil Time - Tiempo de Ebullición + Tiempo de ebullición Efficiency @@ -29,7 +29,7 @@ Final Volume - Volumen Final + Volumen final Starting Gravity @@ -200,120 +200,6 @@ - BrewTargetTreeModel - - Name - Nombre - - - Brew Date - Fecha de Cocción - - - Style - Estilo - - - Boil Time - Tiempo de hervido - - - Color - Color - - - Type - Tipo - - - Use - Uso - - - Form - Forma - - - Category - Categoría - - - Number - Número - - - Letter - Letra - - - Guide - Guía - - - - BrewTargetTreeView - - New Recipe - Receta Nueva - - - Brew It! - ¡Hazlo! - - - Brew Again - Hacer de Nuevo - - - Delete - Borrar - - - New Equipment - Equipo Nuevo - - - New Fermentable - Fermentable Nuevo - - - New Hop - Lúpulo Nuevo - - - New Misc - Misc Nuevo - - - New Yeast - Levadura Nueva - - - Copy - Copiar - - - Export - Exportar - - - Import - Importar - - - Change date - Cambiar fecha - - - New Style - Estilo nuevo - - - Recalculate eff - Recalcular eficiencias - - - Brewtarget Default @@ -403,6 +289,10 @@ Gallons Galones + + Unknown + Desconocido + BtDigitWidget @@ -420,6 +310,148 @@ + BtTreeModel + + Name + Nombre + + + Brew Date + Fecha de Preparación + + + Style + Estilo + + + Boil Time + Tiempo cocción + + + Color + Color + + + Type + Tipo + + + Use + Usar + + + Form + Formulario + + + Category + Categoría + + + Number + Número + + + Letter + Carta + + + Guide + Guía + + + PATH + RUTA + + + FULLPATH + RUTA ABSOLUTA + + + + BtTreeView + + New + Nuevo + + + Recipe + Receta + + + Brew It! + ¡Elaborar cerveza! + + + Brew Again + + + + Change date + Cambiar la fecha + + + Recalculate eff + + + + Delete + Eliminar + + + Equipment + Equipamiento + + + Fermentable + Tabla de fermentación + + + Hop + + + + Misc + Varios + + + Style + Estilo + + + Yeast + Levadura + + + Folder + Carpeta + + + Copy + Copiar + + + Export + Exportar + + + Import + Importar + + + Delete %1 + Borrar %1 + + + Delete %1 %2? + Borrar %1 %2? + + + BrewNote + + + + Database Merge Database @@ -561,6 +593,10 @@ Color (EBC) Color (EBC) + + Inventory + Inventario + Hop @@ -677,68 +713,67 @@ Form Forma + + Inventory + Inventario + - MainWindow + IbuGuSlider - Open - Abrir + Cloying + - BeerXML files (*.xml) - Archivos BeerXML (*.xml) + Extra Malty + Extra de Malta - Save - Guardar + Slightly Malty + Ligera de Malta - Equipment request - Solicitud de equipo + Balanced + Balanceada - Would you like to set the batch size, boil size and time to that requested by the equipment? - ¿Quieres cambiar las cantidades de lote, tamaño de hervido y tiempo a las que pide el equipaje? - - - Delete %1 - Borrar %1 - - - Delete %1 %2? - Borrar %1 %2? + Slightly Hoppy + - HTML files (*.html) - Archivos HTML (*.html) + Extra Hoppy + - New - Nuevo + Way Hoppy + + + + MainWindow - Recipe - Receta + Open + Abrir - Equipment - Equipo + BeerXML files (*.xml) + Archivos BeerXML (*.xml) - Fermentable - Fermentable + Save + Guardar - Hop - Lúpulo + Equipment request + Solicitud de equipo - Miscellaneous - Misc + Would you like to set the batch size, boil size and time to that requested by the equipment? + ¿Quieres cambiar las cantidades de lote, tamaño de hervido y tiempo a las que pide el equipaje? - Yeast - Levadura + HTML files (*.html) + Archivos HTML (*.html) Copy %1 @@ -873,16 +908,12 @@ SQLite (*.sqlite) - Style - Estilo - - Copy Style - Copiar Estilo + Copiar estilo The database has been converted/upgraded. - La base de datos ha sido convertida/actualizada. + Se ha convertido/actualizado la base de datos. The original XML files can be found in @@ -890,38 +921,27 @@ The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - - - MaltinessWidget - - Cloying - Empalagosa - - - Extra malty - Extra maltosa + La importación contenía inválido beerXML . Se ha importado, pero por favor, asegúrese de que tiene sentido. - Slightly malty - Ligeramente maltosa + Folder name + Nombre de la carpeta - Balanced - En equilibrio + Folder name: + Nombre de la carpeta: - Slightly hoppy - Ligeramente amarga + Bad Name + Nombre incorrecto - Extra hoppy - Extra amarga + A folder name must have at least one non-whitespace character in it + Un nombre de carpeta debe tener al menos un carácter no espacio en blanco en ella - Way hoppy - Muy amarga + A folder name must have at least one non-/ character in it + Un nombre de carpeta debe tener al menos un caracter que no sea / en ella @@ -1149,6 +1169,10 @@ Amount Type Tipo de Cantidad + + Inventory + Inventario + OptionDialog @@ -1172,6 +1196,58 @@ Please restart Brewtarget. Por favor reinicia Brewtarget + + Catalan + Catalán + + + Czech + Checoslovaco + + + German + Alemán + + + English + Inglés + + + Greek + Griego + + + Spanish + Español + + + French + Francés + + + Italian + Italiano + + + Dutch + Holandés + + + Polish + Polaco + + + Portuguese + Portugués + + + Russian + Ruso + + + Chinese + Chino + QObject @@ -1358,10 +1434,6 @@ "%1" no se puede leer. - Config directory "%1" cannot be read. - Carpeta de configuración "%1% no se puede leer. - - New Version Versión Nueva @@ -1581,6 +1653,14 @@ Style Estilo + + Folder + Carpeta + + + Failed to update the database + + Recipe @@ -1854,18 +1934,10 @@ DF - Unknown - Desconocido - - ABV APV - Bitterness - Amargor - - Color Color @@ -2041,6 +2113,42 @@ Print Document Imprimir Documento + + Category + Categoría + + + Code + Código + + + Guide + Guía + + + BoilTime + Tiempo de cocción + + + Beta + Beta + + + Lab + Laboratorio + + + Attenuation + + + + Id + Id + + + Flocculation + Precipitado + RefractoDialog @@ -2069,6 +2177,13 @@ + StrikeWaterDialog + + N/A + No disponible + + + StyleEditor Style name @@ -2225,6 +2340,10 @@ Product ID No. ID + + Inventory + Inventario + aboutDialog @@ -2233,20 +2352,38 @@ Sobre Brewtarget + Donate + Donar + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2263,68 +2400,8 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -Brewtarget %1 -Brewtarget, para desarrollar recetas de cerveza. -Copyright 2009-2013 por los desarolladores aqui debajo. - -Desarrolladores - -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> - -Copyright (GPLv3) - -Brewtarget es software libre: podes redistribuirlo y/o modificarlo -bajo los terminos de la GNU General Public License publicada por -la Free Software Foundation, ya sea la version 3, o -(a su eleccion) cualquier version posterior. - -Brewtarget se distribuye con la esperanza de que sea util, -pero SIN NINGUNA GARANTIA; ni siquiera la garantia implicita de -COMERCIALIZACION or ADECUACION PARA UN PROPOSITO PARTICULAR. Consulte la -GNU General Public License para mas detalles. - -Usted deberia haber recibido una copia de la licencia GNU General Public License -junto con Brewtarget. Si no es asi, visite <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. -Source Code -El codigo fuente de Brewtarget puede ser descargado de <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Agradecimientos Especiales -Guido Carpi (Traduccion al Italiano) -Ester (Traduccion al Catalan) -Marc Cote (Traduccion al Frances) -Pawel Fiedor (Traduccion al Polaco) -Admiro (Traduccion al Polaco) -Edu Engler (Traduccion al Portugues) -Jan Grmela (Traduccion al Checo ) -Randy Brace (Probador de version alfa) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - - - Donate - Donar +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> + @@ -2950,6 +3027,18 @@ Notes: Notas: + + Default Amount + Cantidad por defecto + + + Amount in Inventory + Cantidad en inventario + + + Amount in inventory + Cantidad en inventario + hopDialog @@ -3005,10 +3094,6 @@ Porcentaje de ácidos alfas por masa - Amount - Cantidad - - Amount Cantidad @@ -3128,6 +3213,18 @@ Notes: Notas: + + Default Amount + Cantidad por defecto + + + Amount in Inventory + Cantidad en inventario + + + Amount in inventory + Cantidad en inventario + htmlViewer @@ -3527,7 +3624,7 @@ &Convert Units - &Convertar Unidades + &Convertir unidades Backup Database @@ -3637,6 +3734,18 @@ Mashes Macerados + + 1.0 + 1.0 + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator + + mashDesigner @@ -3991,6 +4100,18 @@ Notes: Notas + + Default Amount + Cantidad por defecto + + + Amount in Inventory + Cantidad en inventario + + + Amount in inventory + Cantidad en inventario + namedMashEditor @@ -4293,50 +4414,6 @@ Lenguaje - Czech - Checo - - - Catalan - Catalán - - - German - Alemán - - - English - Inglés - - - Spanish - Español - - - French - Francés - - - Italian - Italiano - - - Dutch - Holandés - - - Polish - Polaco - - - Portuguese - Portugués - - - Russian - Ruso - - <qt> Know another language? @@ -4728,6 +4805,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + + + + Original Grain Temperature + + + + Target Mash Temperature + + + + Weight of Grain + Peso del Grano + + + Volume of Water + Volumen de Agua + + + Mash Infusion + + + + Total Volume of Water + Volumen Total del Agua + + + Grain Weight + Peso del Grano + + + Actual Mash Temperature + + + + Infusion Water Temperature + + + + Calculate + Calcular + + + Strike Water Temperature + Golpe de temperatura del agua + + + Volume to add + Volumen a añadir + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -5108,5 +5248,17 @@ Notes: Notas: + + Default Amount + Cantidad por defecto + + + Quanta in Inventory + + + + Quanta in inventory + + diff -Nru brewtarget-2.0.3/translations/bt_fr.ts brewtarget-2.1.0/translations/bt_fr.ts --- brewtarget-2.0.3/translations/bt_fr.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_fr.ts 2014-09-14 16:29:29.000000000 +0000 @@ -200,120 +200,6 @@ - BrewTargetTreeModel - - Name - Nom - - - Brew Date - Date de brassage - - - Style - Style - - - Boil Time - Durée d'ébullition - - - Color - Couleur - - - Type - Type - - - Use - Utilisation - - - Form - Format - - - Category - Catégorie - - - Number - Nombre - - - Letter - Lettre - - - Guide - Guide - - - - BrewTargetTreeView - - New Recipe - Nouvelle recette - - - Brew It! - Brasser! - - - Brew Again - Brasser à nouveau - - - Delete - Effacer - - - New Equipment - Nouvel équipement - - - New Fermentable - Nouvel ingrédient fermentescible - - - New Hop - Nouveau houblon - - - New Misc - Nouveau autres - - - New Yeast - Nouvelle levure - - - Copy - Copier - - - Export - Exporter - - - Import - Importer - - - Change date - Changer la date - - - New Style - Nouveau style - - - Recalculate eff - - - - Brewtarget Default @@ -403,6 +289,10 @@ Gallons Gallons + + Unknown + Inconnu + BtDigitWidget @@ -420,6 +310,148 @@ + BtTreeModel + + Name + Nom + + + Brew Date + Date de brassage + + + Style + Style + + + Boil Time + Durée d'ébullition + + + Color + Couleur + + + Type + Type + + + Use + Utilisation + + + Form + Formulaire + + + Category + Catégorie + + + Number + Nombre + + + Letter + Lettre + + + Guide + Guide + + + PATH + CHEMIN + + + FULLPATH + CHEMIN COMPLET + + + + BtTreeView + + New + Nouveau + + + Recipe + Recette + + + Brew It! + Brassons! + + + Brew Again + + + + Change date + Changer la date + + + Recalculate eff + Recalculer eff + + + Delete + Effacer + + + Equipment + Équipement + + + Fermentable + Fermentescible + + + Hop + Houblon + + + Misc + Autres + + + Style + Style + + + Yeast + Levure + + + Folder + Dossier + + + Copy + Copier + + + Export + Exporter + + + Import + Importer + + + Delete %1 + Supprimer %1 + + + Delete %1 %2? + Effacer %1 %2? + + + BrewNote + + + + Database Merge Database @@ -458,7 +490,7 @@ The batch size you entered is 0. This may cause problems - + La taille du brassin entrée est de 0. Cela peut poser problème Hop Utilization Warning @@ -466,7 +498,7 @@ The hop utilization percentage you entered is 0. This may cause problems - + Le pourcentage du seuil d'utilisation est de 0. Celà peut poser problème. @@ -561,6 +593,10 @@ Color (EBC) Couleur (EBC) + + Inventory + Inventaire + Hop @@ -677,68 +713,67 @@ Form Format - - - MainWindow - Open - Ouvrir - - - BeerXML files (*.xml) - Fichiers BeerXML (*.xml) + Inventory + Inventaire + + + IbuGuSlider - Save - Sauvegardez + Cloying + - Equipment request - Requête d'équipement + Extra Malty + Très malté - Would you like to set the batch size, boil size and time to that requested by the equipment? - Voulez-vous régler la taille du lot, la taille ébullition et l'heure à celui demandé par l'équipement? + Slightly Malty + Légèrement malté - Delete %1 - Effacer %1 + Balanced + Equilibré - Delete %1 %2? - Effacer %1 %2 ? + Slightly Hoppy + Légèrement houblonné - HTML files (*.html) - Fichier HTML (*.html) + Extra Hoppy + Très houblonné - New - Nouveau + Way Hoppy + + + + MainWindow - Recipe - Recette + Open + Ouvrir - Equipment - Équipement + BeerXML files (*.xml) + Fichiers BeerXML (*.xml) - Fermentable - Ingrédient fermentescible + Save + Sauvegardez - - Hop - Houblon + + Equipment request + Requête d'équipement - Miscellaneous - Autres + Would you like to set the batch size, boil size and time to that requested by the equipment? + Voulez-vous régler la taille du lot, la taille ébullition et l'heure à celui demandé par l'équipement? - Yeast - Levures + HTML files (*.html) + Fichier HTML (*.html) Copy %1 @@ -873,10 +908,6 @@ SQLite (*.sqlite) - Style - Style - - Copy Style Copier style @@ -892,36 +923,25 @@ The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - MaltinessWidget - - Cloying - Mielleux - - - Extra malty - Très malté - - Slightly malty - Légrement malté + Folder name + Nom du dossier - Balanced - Équilibré + Folder name: + Nom du dossier : - Slightly hoppy - Légèrement houblonné + Bad Name + Nom incorrect - Extra hoppy - Très houblonné + A folder name must have at least one non-whitespace character in it + - Way hoppy - Super houblonné + A folder name must have at least one non-/ character in it + @@ -1149,6 +1169,10 @@ Amount Type + + Inventory + Inventaire + OptionDialog @@ -1172,6 +1196,58 @@ Please restart Brewtarget. Reprendre Brewtarget. + + Catalan + Catalan + + + Czech + Tchèque + + + German + Allemand + + + English + Anglais + + + Greek + Grec + + + Spanish + Espagnol + + + French + Français + + + Italian + Italien + + + Dutch + Néérlandais + + + Polish + Polonais + + + Portuguese + Portugais + + + Russian + Russe + + + Chinese + Chinois + QObject @@ -1358,10 +1434,6 @@ "%1" ne peut être lu. - Config directory "%1" cannot be read. - Le répertoire de configuration "%1" ne peut être lu. - - New Version Nouvelle version @@ -1581,6 +1653,14 @@ Style Style + + Folder + Dossier + + + Failed to update the database + + Recipe @@ -1854,18 +1934,10 @@ DF - Unknown - Inconnu - - ABV ABV - Bitterness - Amertume - - Color Couleur @@ -2041,6 +2113,42 @@ Print Document Imprimer le document + + Category + Catégorie + + + Code + Code + + + Guide + Guide + + + BoilTime + Temps d'ébullition + + + Beta + Bêta + + + Lab + Lab + + + Attenuation + + + + Id + Id + + + Flocculation + Floculation + RefractoDialog @@ -2069,6 +2177,13 @@ + StrikeWaterDialog + + N/A + N/A + + + StyleEditor Style name @@ -2225,6 +2340,10 @@ Product ID ID du produit + + Inventory + Inventaire + aboutDialog @@ -2233,20 +2352,38 @@ À propos de Brewtarget + Donate + Don + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2263,26 +2400,9 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> - - Donate - Don - brewDayScrollWidget @@ -2907,6 +3027,18 @@ Notes: Notes: + + Default Amount + Quantité par défaut + + + Amount in Inventory + + + + Amount in inventory + + hopDialog @@ -2962,10 +3094,6 @@ Acides alpha en fonction du pourcentage par masse - Amount - Quantité - - Amount Quantité @@ -3085,6 +3213,18 @@ Notes: Notes: + + Default Amount + Quantité par défaut + + + Amount in Inventory + + + + Amount in inventory + + htmlViewer @@ -3588,10 +3728,22 @@ &Mashs - + moût Mashes + moûts + + + 1.0 + 1.0 + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator @@ -3948,6 +4100,18 @@ Notes: Notes: + + Default Amount + Quantité par défaut + + + Amount in Inventory + + + + Amount in inventory + + namedMashEditor @@ -3957,7 +4121,7 @@ Mash - Empâtage + Empâtage Delete selected style @@ -3997,7 +4161,7 @@ From Equipment - De l'équipement + De l'équipement Tun mass @@ -4250,50 +4414,6 @@ Langue - Czech - Tchèque - - - Catalan - Catalan - - - German - Allemand - - - English - Anglais - - - Spanish - Espagnole - - - French - Française - - - Italian - Italien - - - Dutch - Néérlandais - - - Polish - Polonaise - - - Portuguese - Portugaise - - - Russian - Russe - - <qt> Know another language? @@ -4685,6 +4805,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + Infusion initiale + + + Original Grain Temperature + + + + Target Mash Temperature + + + + Weight of Grain + + + + Volume of Water + Volume d'eau + + + Mash Infusion + + + + Total Volume of Water + Volume total d'eau + + + Grain Weight + + + + Actual Mash Temperature + + + + Infusion Water Temperature + + + + Calculate + Calculer + + + Strike Water Temperature + + + + Volume to add + Volume à ajouter + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -4776,7 +4959,7 @@ IBUs - + IBUs Color (SRM) @@ -5065,5 +5248,17 @@ Notes: Notes: + + Default Amount + Quantité par défaut + + + Quanta in Inventory + + + + Quanta in inventory + + diff -Nru brewtarget-2.0.3/translations/bt_hu.ts brewtarget-2.1.0/translations/bt_hu.ts --- brewtarget-2.0.3/translations/bt_hu.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_hu.ts 2014-09-14 16:29:29.000000000 +0000 @@ -5,417 +5,449 @@ BrewDayScrollWidget Style - + Stílus Date - + Időpont Boil Time - + Forralási idő Efficiency - + Kihozatali arány Boil Volume - + Mennyiség (forraláskor) Preboil Gravity - + Fajsúly (kicefrézés után) Final Volume - + Mennyiség (végleges) Starting Gravity - + Fajsúly (kezdeti) IBU - + Keserűség (IBU) Final Gravity - + Fajsúly (végleges) ABV - + alkoholfok (v/v%) Estimated calories(per 12 oz) - + kalóriatartalom (354ml) Instructions - + Útmutatás Completed - + Befejezve Time - + Idõ Step - + Lépés Actual PreBoil Volume - + Mennyiség (forralás előtt) Actual PreBoil Gravity - + Fajsúly (forralás előtt) PostBoil Volume - + Mennyiség (forralás után) PostBoil Gravity - + Fajsúly (forralás után) Volume into fermenter - + Mennyiség (erjesztőbe fejtéskor) Print Document - + Dokumentum nyomtatása <h2>Notes</h2> - + <h2>Megjegyzések</h2> Step %1: %2 - + Lépés %1: %2 Add grains - + Gabona adagolás Heat water - + Vízforralás BrewDayWidget Style - + Stílus Date - + Időpont Boil Volume - + Mennyiség (forraláskor) Preboil Gravity - + Fajsúly (kicefrézés után) Final Volume - + Mennyiség (végleges) Starting Gravity - + Fajsúly (kezdeti) Boil Time - + Forralási idő IBU - + Keserűség (IBU) Predicted Efficiency - + Várható kihozatali arány Estimated calories (per 12 oz) - + Becsült kalóriatartalom (354ml) Instructions - + Útmutatás Completed - + Befejezve Time - + Idõ Step - + Lépés Actual Pre-boil Volume: - + Valós mennyiség (kicefrézéskor) Actual Pre-boil Gravity: - + Valós fajsúly (kicefrézéskor) Post-boil Volume: - + Mennyiség (forralás után) Post-boil Gravity: - + Fajsúly (forralás után) Volume in fermenter: - + Mennyiség (erjesztőedényben) Print Document - + Dokumentum nyomtatása Notes - + Megjegyzések Step %1: %2 - + Lépés %1: %2 - BrewTargetTreeModel - - Name - - + Brewtarget - Brew Date - + Default + Alapértelmezett - Style - + EBC + Szín (EBC) - Boil Time - + SRM + Szín (SRM) - Color - + Plato + °B - Type - + Specific Gravity + Fajsúly - Use - + SI + SI mértékegységek - Form - + US Customary + US mértékegységek - Category - + Milligrams + Milligramm - Number - + Grams + Gramm - Letter - + Kilograms + Kilogramm - Guide - + Ounces + Uncia - - - BrewTargetTreeView - New Recipe - + Pounds + Font - Brew It! - + Celsius + Celsius - Brew Again - + Fahrenheit + Fahrenheit - Delete - + British Imperial + Brit imperial mértékegységek - New Equipment - + MilliLiters + Mililiter - New Fermentable - + Liters + Liter - New Hop - + Teaspoons + Teáskanál (5 ml) - New Misc - + Tablespoons + Evőkanál (15 ml) - New Yeast - + Cups + Bögre (240 ml) - Copy - + Quarts + US Quart (950 ml) - Export - + Gallons + US gallon (3,8 l) - Import + Unknown + + + BtDigitWidget - Change date - + Too low for style. + Stílus szerint kevés - New Style - + In range for style. + Stílusnak megfelelő - Recalculate eff - + Too high for style. + Stílus szerint sok - Brewtarget + BtTreeModel - Default - + Name + Név - EBC - + Brew Date + Sörfőzés ideje - SRM - + Style + Stílus - Plato + Boil Time + Forralási idő + + + Color + Szín + + + Type + Típus + + + Use + Felhasználás + + + Form + Forma + + + Category - Specific Gravity + Number - SI + Letter - US Customary + Guide - Milligrams + PATH - Grams + FULLPATH + + + BtTreeView - Kilograms + New - Ounces + Recipe - Pounds + Brew It! - Celsius + Brew Again - Fahrenheit + Change date - British Imperial + Recalculate eff - MilliLiters + Delete - Liters + Equipment + Felszerelés + + + Fermentable - Teaspoons + Hop - Tablespoons + Misc + Egyéb + + + Style + Stílus + + + Yeast + Élesztőtörzs + + + Folder - Cups + Copy - Quarts + Export - Gallons + Import - - - BtDigitWidget - Too low for style. + Delete %1 - In range for style. + Delete %1 %2? - Too high for style. + BrewNote @@ -423,142 +455,146 @@ Database Merge Database - + Adatbázis összefésülése There may be new ingredients and recipes available. Would you like to add these to your database? - + Új alkotóelemek és receptek elérhetőek. Szeretné ezeket az adatbázisba illeszteni? EquipmentEditor Grain absorption (%1/%2) - + Törköly folyadékelvonása (%1/%2) Tun Volume Warning - + Figyelmeztetés - edény méret Batch Size Warning - + Figyelmeztetés - adag mennyiség Equipment name - + Felszerelés neve Equipment name: - + Felszerelés neve: The tun volume you entered is 0. This may cause problems - + Az edény megadott űrtartalma 0. Ez az érték számítási problémát okozhat. The batch size you entered is 0. This may cause problems - + Az adag megadott mennyisége 0. Ez az érték számítási problémát okozhat. Hop Utilization Warning - + Figyelmeztetés - komló használat The hop utilization percentage you entered is 0. This may cause problems - + A felhasznált komló megadott mennyisége 0%. Ez az érték számítási problémát okozhat. FermentableDialog Fermentable name - + Erjeszthető anyag neve Fermentable name: - + Erjeszthető anyag neve: FermentableItemDelegate Grain - + Gabona Sugar - + Cukor Extract - + Folyékony malátasűrítmény (LME) Dry Extract - + Szárított malátasűrítmény (DME) Adjunct - + Adalék FermentableTableModel Bad model index. row = %1 - + Bad model index. row = %1 Mashed - + Cefrézve Steeped - + Áztatott Not mashed - + Nem cefrézett Late - + Később hozzáadott Normal - + Normál Bad column: %1 - + Bad column: %1 Name - + Név Type - + Típus Amount - + Mennyiség Late Addition - + Később adagolt Yield % - + Süllyedés % Color (SRM) - + Szín (SRM) Color (EBC) + Szín (EBC) + + + Inventory @@ -566,361 +602,345 @@ Hop Mash - + Cefre First Wort - + Cefrézve komlózás Boil - + Forralás Aroma - + Aroma Dry Hop - + Hidegkomló Bittering - + Keserűkomló Both - + Mindkettő Leaf - + leveles Pellet - + Pellet Plug - + Nagy pellet (komlódugó) HopDialog Hop name - + Komló neve Hop name: - + Komló neve: HopItemDelegate Boil - + Forralás Dry Hop - + Hidegkomló Mash - + Cefre First Wort - + Színlé Aroma - + Aroma Leaf - + leveles Pellet - + Pellet Plug - + Nagy pellet (komlódugó) HopTableModel Name - + Név Alpha % - + Alfasav % Amount - + Mennyiség Use - + Felhasználás Time - + Idõ Form - - - - - MainWindow - - Open - + Forma - BeerXML files (*.xml) + Inventory + + + IbuGuSlider - Save + Cloying - Equipment request + Extra Malty - Would you like to set the batch size, boil size and time to that requested by the equipment? + Slightly Malty - Delete %1 + Balanced - Delete %1 %2? + Slightly Hoppy - HTML files (*.html) + Extra Hoppy - New + Way Hoppy + + + MainWindow - Recipe - + Open + Megnyitás - Equipment - + BeerXML files (*.xml) + BeerXML fájlok (*.xml) - Fermentable - + Save + Mentés - Hop - + Equipment request + Felszerelés bevitele - Miscellaneous - + Would you like to set the batch size, boil size and time to that requested by the equipment? + Meg akarod változtatni a felszereléshez kapcsolódó alapadatokat (forralás utáni mennyiség, forralási mennyiség, idő)? - Yeast - + HTML files (*.html) + HTML files (*.html) Copy %1 - + Másolás %1 Enter a unique name for the copy of %1. - + A következő fájl másolatának adj egyedi nevet %1 Copy Equipment - + felszerelés máslolás Copy Fermentable - + Erjeszthető anyag másolás Copy Hop - + Komló másolás Copy Miscellaneous - + Egyebek másolás Copy Yeast - + Élesztő másolás Database Update - + Adatbázis frissítés You are about to update the current database with another one. This may make changes to (but will not delete) some of your ingredients. It will not modify any of your recipes. Continue? - + Ezzel a paranccsal felül fogod írni a jelenlegi adatbázist egy másikkal. Ez megváltoztathatja egyes összetevők tulajdonságait (de nem törli azokat). A recepteken nem változtat a felülírás. Folytatod? Select Database File - + Adatbázis fájl kiválasztás Brewtarget Database (*.sqlite) - + Brewtarget adatbázis (*.sqlite) Recipe name - + Recept név Recipe name: - + Recept név: Backup Database - + Adatbázis mentése Oops! - + Hoppá! Could not copy the files for some reason. - + A fájlok nem másolhatók. A Warning - + Figyelmeztetés This will obliterate your current set of recipes and ingredients. Do you want to continue? - + Ez az utasítás felülírja a recepteket és az összetevőket. Valóban folytatod? For some reason, the operation failed. - + A művelet sikertelen. Import %1? - + Importálás %1? No mash - + Nincs cefrézési művelet Trying to add a mash step without a mash. Please create a mash first. - + Cefrézési lépés hozzáadása cefrézés nélkül. Előbb hozz létre egy cefrézési műveletet. Copy Recipe - + Recept másolás Enter a unique name for the copy. - + A másolatnak adj egyedi nevet. Please give your mash a name before saving. - + Kérlek adj nevet a cefrézési műveletnek mentés előtt. Restart - + Újrakezdés Please restart Brewtarget. - + Kérlek indítsd újra az alkalmazást. No equipment - + Nincs felszerelés You must select or define an equipment profile first. - + Ki kell választani vagy definiálni egy felszerelés profilt No style - + Nincs kiválasztott stílus You must select a style first. - + Először válassz stílust Choose File - + Fájl kiválasztása SQLite (*.sqlite) - - - - Style - + SQLite (*.sqlite) Copy Style - + Stílus másolás The database has been converted/upgraded. - + Az adatbázis felülíródott. The original XML files can be found in - + Az eredeti XML fájlok itt találhatók: The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - - - MaltinessWidget - - Cloying - - - - Extra malty - + Az importálás érvénytelen beerXML fájlt tartalmaz. Importálható, de a tartalma felülvizsgálandó. - Slightly malty + Folder name - Balanced + Folder name: - Slightly hoppy + Bad Name - Extra hoppy + A folder name must have at least one non-whitespace character in it - Way hoppy + A folder name must have at least one non-/ character in it @@ -928,225 +948,229 @@ MashDesigner No Fermentables - + Nincs erjeszthető anyag Your recipe must have fermentables to design a mash. - + A cefrézési művelet tervezéséhez a receptednek erjeszthető anyagot is kell tartalmaznia No Equipment - + Nincs felszerelés You have not set an equipment for this recipe. We really cannot continue without one. - + Felszerelés nélkül nem méretezhető a sörfőzés. Válassz egyet. Tun Temp - + Cefréző edény hőmérséklete Enter the temperature of the tun before your first infusion. - + Add meg a cefréző edény hőmérsékletét az összetevők összekeverése előtt. Decoction error - + Dekokciós hiba The first mash step cannot be a decoction. - + Az első lépés nem lehet dekokció MashStepTableModel Bad model index. row = %1 - + Bad model index. row = %1 Bad column: %1 - + Bad column: %1 Name - + Név Type - + Típus Amount - + Mennyiség Infusion Temp - + Beáztatási hőmérséklet Target Temp - + Célhőmérséklet Time - + Idõ MashWizard Mash thickness (%1/%2) - + Cefre sűrűség (%1/%2) Bad thickness - + Nem megfelelő sűrűség You must have a positive mash thickness. - + A cefre sűrűség értéke csak pozitív lehet. No steps - + Nincs cefrézési lépés There must be at least one mash step to run the wizard. - + Legalább egy cefrézési lépést meg kell adni a varázsló futtatásához. First step - + Első lépés Your first mash step must be an infusion. - + Az első cefrézési lépcsőnek beáztatást kell megadni. Mash too thick - + Túl sűrű a cefre Your mash is too thick for desired temp. at first step. - + A cefre túl sűrű az első cefrézési lépcsőhöz tartozó hőmérsékleten Decoction error - + Dekokciós hiba Something went wrong in decoction calculation. - + Pontatlan dekokciós számítás Sparge temp. - + Máslási hőmérséklet In order to hit your sparge temp, the sparge water must be above boiling. Lower your sparge temp, or allow for more sparge water. - + A máslási hőmérséklet eléréséhez a máslóvíz hőmérsékletének 100°C felettinek kellenek lenni. Csökkents a máslás hőmérsékletén, vagy növeld a máslóvíz mennyiségét. Too much wort - + Túl sok színlé. You have too much wort from the mash for your boil size. I suggest increasing the boil size by increasing the boil time, or reducing your mash thickness. - + Tún nagy a színlé mennyisége a várt forralási mennyiséghez képest. Vagy növeld a forralási időt, vagy csökkentsd a cefre sűrűségét. MiscDialog Misc name - + Egyéb név Misc name: - + Egyéb név: MiscItemDelegate Spice - + Fűszer Fining - + Derítőszer Water Agent - + Vízkezelő anyag Herb - + Gyógynövény Flavor - + Ízanyag Other - + Egyéb anyag Boil - + Forralás Mash - + Cefre Primary - + Elsődleges Secondary - + Másodlagos Bottling - + Palackozás MiscTableModel Name - + Név Type - + Típus Use - + Felhasználás Time - + Idõ Amount - + Mennyiség Weight - + Súly Volume - + Mennyiség Amount Type + Mennyiségi egység + + + Inventory @@ -1154,22 +1178,74 @@ OptionDialog Open Directory - + Mappa nyitása Copy Data - + Adat másolás There do not seem to be any data files in this directory, so we will copy your old data here. - + Nincs adatfájl a mappában, a régi adatokat ide másolom. Restart - + Újrakezdés Please restart Brewtarget. + Kérlek indítsd újra az alkalmazást. + + + Catalan + + + + Czech + + + + German + + + + English + + + + Greek + + + + Spanish + + + + French + + + + Italian + + + + Dutch + + + + Polish + + + + Portuguese + + + + Russian + + + + Chinese @@ -1177,391 +1253,412 @@ QObject Invalid color formula type: %1 - + Érvénytelen szín formula: %1 Unrecognized IBU formula type. %1 - + Beazonosíthatatlan keserűség formula. %1 Batch Size: %1 - + Kész sörlé mennyisége: %1 + Boil Size: %1 - + Mennyiség (forraláskor): %1 + Boil Time: %1 - + Forralási idő: %1 + OG: %1 - + Eredeti fajsúly (OG): %1 + FG: %1 - + Végleges fajsúly (FG): %1 + Bitterness: %1 IBUs (%2) - + Keserűség: %1 IBU (%2) + Color: %1 SRM (%2) - + Szín: %1 SRM (%2) + Fermentables - + Erjeszthető anyag + Name - + Név Type - + Típus Amount - + Mennyiség Mashed - + Cefrézve Late - + Később hozzáadott Yield - + Süllyedés Color - + Szín Yes - + Igen No - + Nem Total grain: %1 - + Összes gabona mennyiség: %1 + Hops - + KOmló + Alpha - + Alfasav Use - + Felhasználás Time - + Idõ IBU - + Keserűség (IBU) Misc - + Egyéb + Yeast - + Élesztő + Form - + Forma Stage - + Szakasz Secondary - + Másodlagos Primary - + Elsődleges Mash - + Cefre + Temp - + Hőmérséklet Target - + Cél Notes - + Megjegyzés + Instructions - + Útmutatás + Directory Problem - + Mappa hiba "%1" cannot be read. - - - - Config directory "%1" cannot be read. - + "%1" nem olvasható New Version - + Új verzió Version %1 is now available. Download it? - + %1 verzió elérhető. Eltöltöd? Stop bothering you about new versions? - + Kikapcsoljam az értesítést a verziófrissítésről? Database Failure - + Adatbázis hiba Failed to open the database '%1'. - + '%1' adatbázis nem megnyitható Save Database Changes - + Adatbázis változások mentése Would you like to save the changes you made? - + El akarod menteni a változásokat? Multiple Databases Found - + Több adatbázist találtam. Multiple databases were found. Do you want to restore the changes you made during your last Brewtarget session, or rollback to before last session's changes? - + Több adatbázist találtam. Szeretnéd visszaállítani a változásokat, amelyeket a legutóbb használtál, vagy az utolsó előtti használat idején aktuális állapotot állítsam vissza (visszagörgetés)? Restore - + Visszaállítás Rollback - + Visszagörgetés Failed to remove the temporary backup database. Navigate to '%1' and remove 'tempBackupDatabase.sqlite'. - + Az ideiglenes biztonsági adatbázis visszaállítása nem sikerült. Navigálj a következő helyre: '%1' és töröld a 'tempBackupDatabase.sqlite'. Failed to rollback to the backup database. Navigate to '%1', remove 'database.sqlite' if it exists, and rename 'tempBackupDatabase.sqlite' to 'database.sqlite'. - + Nem sikerült az adatbázist visszaállítani. Navigálj a következő címre: '%1', távolítsd el a 'database.sqlite' fájlt ha létezik és nevezd át a 'tempBackupDatabase.sqlite' fájlt 'database.sqlite'-ra. Database Restore Failure - + Adatbázis helyreállítási hiba Failed to restore the backup database. Navigate to '%1' and rename 'tempBackupDatabase.sqlite' to 'database.sqlite'. - + Nem sikerült az adatbázist visszaállítani. Navigálj a következő címre: '%1' és nevezd át a 'tempBackupDatabase.sqlite' fájlt 'database.sqlite'-ra. Grain - + Gabona Sugar - + Cukor Extract - + Folyékony malátasűrítmény (LME) Dry Extract - + Szárított malátasűrítmény (DME) Adjunct - + Adalék Boil - + Forralás Mash - + Cefre Infusion - + Áztatás Temperature - + Hőmérséklet Decoction - + Dekokció Bottling - + Palackozás Spice - + Fűszer Fining - + Derítőszer Water Agent - + Vízkezelő anyag Herb - + Gyógynövény Flavor - + Ízanyag Other - + Egyéb anyag Ale - + Ale Lager - + Ászoksör Wheat - + Búza Wine - + Bor Champagne - + Pezsgőélesztő Liquid - + Folyékony élesztő Dry - + Szárított élesztő Slant - + slant kultúra Culture - + élesztőkultúra Low - + Alacsony Medium - + Közepes High - + Magas Very High - + Nagyon magas Recipes - + Receptek Equipment - + Felszerelés Fermentables - + Erjesztető anyagok Hops - + Komló Miscellaneous - + Egyebek Yeast - + Élesztőtörzs Efficiency: %1% - + Kihozatali arány: %1% + ABV: %1% - + alkoholfok (v/v): %1% + Style + Stílus + + + Folder + + + + Failed to update the database @@ -1569,456 +1666,487 @@ Recipe Add grains - + Gabona adagolás Add - + Hozzáadás to the mash tun. - + cefréző edénybe Heat water - + Vízforralás Bring - + hőmérséklet módosul %1 water to %2, - + %1 víz %2. for upcoming infusions. - + a következő áztatáshoz Add %1 water at %2 to mash to bring it to %3. - + Adj %1 vizet %2 hőmérsékleten, hogy a cefre hőmérséklete %3 legyen. Heat mash to %1. - + Melegítsd a cefrét %1 hőmérsékletre Bring %1 of the mash to a boil and return to the mash tun to bring it to %2. - + Forrald fel a cefre %1 részét, majd öntsd vissza a cefréző edénybe, így a cefre hőmérséklete a következő értékre módosul: %2. Hold for %1. - + Tartsd %1. Put %1 %2 into boil for %3. - + Öntsd össze %1 és %2 részeket, majd forrald %3 Put %1 %2 into fermenter for %3. - + Erjesztő edénybe fejteni %1 %2 elérendő érték %3 Put %1 %2 into first wort for %3. - + Színlébe önteni %1 %2 elérendő érték %3 Put %1 %2 into mash for %3. - + Cefrébe önteni %1 %2 elérendő érték %3 Steep %1 %2 in wort for %3. - + Máslani %1 %2 elérendő érték %3 Use %1 %2 for %3 - + Használni %1 %2 elérendő érték %3 Hop addition - + Komlózás Use %1 %2 at bottling for %3. - + Használni %1 %2 palackozni %3 értéken Put %1 %2 into primary for %3. - + Hozzáadni %1 %2 az elsődleges erjesztőbe, elérendő érték %3 Put %1 %2 into secondary for %3. - + Hozzáadni %1 %2 a másodlagos erjesztőbe, elérendő érték %3 Use %1 %2 for %3. - + Használni %1 %2 elérendő érték %3 Misc addition - + Egyéb összetevő adagolása Do first wort hopping with - + Cefrézve komlózás a köv. komlóval: First wort hopping - + Cefrézve komlózás You should now have %1 wort. - + Színlé mennyiség: %1 Add %1 water to the kettle, bringing pre-boil volume to %2. - + Adj %1 vizet az edénybe, a forralás előtti mennyiséget a következő értékre állítva: %2 Pre-boil - + Forralás előtt Boil or steep - + Forralás vagy máslás Boil/steep fermentables - + Erjeszthető anyagok forralása/máslása to the boil at knockout. - + forralás végén Knockout additions - + forralás végén adagolva You should have %1 wort post-boil. - + Forralás utáni sörlé mennyiség %1 You anticipate losing %1 to trub and chiller loss. - + +Szűrési veszteség %1 Add %1 top up water into primary. - + +%1 mennyiségű víz hozzáadása az elsődleges erjesztőbe The final volume in the primary is %1. - + +Végleges mennyiség az elsődleges erjesztőben: %1 Post boil - + Forralás után Boil time - + Forralási idő You did not configure an equipment (which you really should), so tell me the boil time. - + Add meg a forralási időt (nincs beállítva a felszerelésnél) Bring the wort to a boil and hold for %1. - + Forrald fel a színlevet és forrald tovább %1 időtartam hosszat. Start boil - + Forralás kezdete Flameout - + Forralás befejezése Stop boiling the wort. - + A színlé forralását be kell fejezni. Cool wort and pitch - + Sörlé hűtés és beoltás élesztővel %1 %2 yeast, - + %1 %2 élesztő, to the primary. - + elsődleges erjesztőbe Pitch yeast - + Élesztővel beoltani Let ferment until FG is %1. - + A végleges fajsúly (FG) %1 értékig erjeszteni. Ferment - + Erjeszteni Transfer beer to secondary. - + Másodlagos erjeszőbe fejteni Transfer to secondary - + Másodlagos erjeszőbe fejteni Add %1 %2 to boil at %3. - + %1 %2 forralni %3 értéken Raise water to boil and then remove from heat. Stir in - + Forralj vizet és keverd hozzá Add Extracts to water - + Add a malátakivonatot a vízhez %1 water to %2 - + %1 vizet a %2 RecipeFormatter unknown style - + ismeretlen stílus N/A - + N/A Brewer - + Sörfőző Date - + Időpont Batch Size - + Főzet méret Boil Size - + Forralási mennyiség Boil Time - + Forralási idő Efficiency - + Kihozatali arány OG - + kezdeti fajsúly (OG) FG - - - - Unknown - + végleges fajsúly (FG) ABV - - - - Bitterness - + alkoholfok (v/v%) Color - + Szín Calories (per 12 oz.) - + Kalóriatartalom (345ml) Fermentables - + Erjesztető anyagok Total grain: - + Összes gabona: Name - + Név Type - + Típus Amount - + Mennyiség Mashed - + Cefrézve Late - + Később hozzáadott Yield - + Süllyedés Yes - + Igen No - + Nem Hops - + Komló Alpha - + Alfasav Use - + Felhasználás Time - + Idõ Form - + Forma IBU - + Keserűség (IBU) Misc - + Egyéb Yeast - + Élesztőtörzs Stage - + Szakasz Secondary - + Másodlagos Primary - + Elsődleges Mash - + Cefre Temp - + Hőmérséklet Target Temp - + Célhőmérséklet Notes - + Megjegyzések Instructions - + Útmutatás Brew Date - + Sörfőzés ideje Preboil - + Forralást megelőző SG - + fajsúly (SG) Volume into BK - + Forraló edénybe kerülő mennyiség Strike Temp - + Felöntővíz hőmérséklet Final Temp - + Végleges hőmérséklet Eff into BK - + Forralóbe kerülő színlé kihozatali aránya Projected OG - + Várható kezdeti fajsúly Postboil - + Forralást követő Postboil Volume - + Forralást követő mennyiség Volume Into Fermenter - + Erjesztőedénybe kerülő mennyiség Brewhouse Eff - + Teljes folyamatra vetített kihozatali arány Projected ABV - + Tervezett alkoholfok (v/v%) Postferment - + Erjedést követő Volume - + Mennyiség Print Document + Dokumentum nyomtatása + + + Category + + + + Code + + + + Guide + + + + BoilTime + + + + Beta + + + + Lab + + + + Attenuation + + + + Id + + + + Flocculation @@ -2026,7 +2154,7 @@ RefractoDialog OG Mismatch - + Nem egyező kezdeti fajsúly Based on the given original plato, the OG should be %1, but you have entered %2. Continuing with the calculated OG. @@ -2037,22 +2165,29 @@ ScaleRecipeTool Recipe Scaled - + Arányított recept The mash has been reset due to the fact that mash temperatures do not scale easily. Please re-run the mash wizard. - + Nem arányítható hőmérsékleti adatok. Indítsd újra a varázslót! The equipment and mash have been reset due to the fact that mash temperatures do not scale easily. Please re-run the mash wizard. - + Nem arányítható felszerelés és hőmérsékleti adatok. Indítsd újra a varázslót! + + + + StrikeWaterDialog + + N/A + N/A StyleEditor Style name - + Stílus neve Style name: @@ -2082,19 +2217,19 @@ WaterTableModel Bad model index. row = %1 - + Bad model index. row = %1 Bad column: %1 - + Bad column: %1 Name - + Név Amount - + Mennyiség Calcium (ppm) @@ -2136,66 +2271,66 @@ YeastItemDelegate Ale - + Ale Lager - + Ászoksör Wheat - + Búza Wine - + Bor Champagne - + Pezsgőélesztő Liquid - + Folyékony élesztő Dry - + Szárított élesztő Slant - + slant kultúra Culture - + élesztőkultúra YeastTableModel Bad model index. row = %1 - + Bad model index. row = %1 Bad column: %1 - + Bad column: %1 Name - + Név Type - + Típus Form - + Forma Amount - + Mennyiség Laboratory @@ -2205,6 +2340,10 @@ Product ID + + Inventory + + aboutDialog @@ -2213,20 +2352,38 @@ + Donate + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2243,24 +2400,7 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - - - - Donate +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> @@ -2268,7 +2408,7 @@ brewDayScrollWidget Form - + Forma Generate Instructions @@ -2280,7 +2420,7 @@ Name - + Név Name of new step @@ -2323,7 +2463,7 @@ Instructions - + Útmutatás Move currently selected step up @@ -2355,7 +2495,7 @@ Name - + Név Name of new step @@ -2382,15 +2522,15 @@ brewNoteWidget Form - + Forma Preboil - + Forralást megelőző SG - + fajsúly (SG) Preboil gravity @@ -2398,7 +2538,7 @@ Volume - + Mennyiség Volume of wort collected @@ -2406,7 +2546,7 @@ Strike Temp - + Felöntővíz hőmérséklet Temperature of mash after dough in @@ -2414,7 +2554,7 @@ Final Temp - + Végleges hőmérséklet Temperature of mash before mash out @@ -2422,11 +2562,11 @@ Postboil - + Forralást követő OG - + kezdeti fajsúly (OG) Post boil gravity @@ -2434,7 +2574,7 @@ Postboil Volume - + Forralást követő mennyiség Volume of wort in BK after boil @@ -2446,7 +2586,7 @@ Volume into fermenter - + Mennyiség (erjesztőbe fejtéskor) Pitch Temp @@ -2458,7 +2598,7 @@ Postferment - + Erjedést követő Final gravity @@ -2478,7 +2618,7 @@ Eff into BK - + Forralóbe kerülő színlé kihozatali aránya Expected OG, based on measure fg @@ -2486,7 +2626,7 @@ Projected OG - + Várható kezdeti fajsúly Brewhouse efficiency @@ -2494,7 +2634,7 @@ Brewhouse Eff - + Teljes folyamatra vetített kihozatali arány Expected ABV based on OG @@ -2502,7 +2642,7 @@ Projected ABV - + Tervezett alkoholfok (v/v%) ABV based on FG @@ -2510,18 +2650,18 @@ ABV - + alkoholfok (v/v%) Notes - + Megjegyzések btSplashScreen Form - + Forma @@ -2567,7 +2707,7 @@ Equipment - + Felszerelés Remove equipment @@ -2583,7 +2723,7 @@ Name - + Név Pre-boil volume @@ -2611,7 +2751,7 @@ Boil time - + Forralási idő Evaporation rate (per hr) @@ -2659,7 +2799,7 @@ Volume - + Mennyiség Volume of mash tun @@ -2699,7 +2839,7 @@ Notes - + Megjegyzések New equipment @@ -2707,7 +2847,7 @@ Save - + Mentés Cancel @@ -2757,35 +2897,35 @@ Name - + Név Type - + Típus Grain - + Gabona Sugar - + Cukor Extract - + Folyékony malátasűrítmény (LME) Dry Extract - + Szárított malátasűrítmény (DME) Adjunct - + Adalék Amount - + Mennyiség Yield (%) @@ -2887,6 +3027,18 @@ Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + hopDialog @@ -2931,7 +3083,7 @@ Name - + Név Alpha (%) @@ -2942,20 +3094,16 @@ - Amount - - - Amount - + Mennyiség Use - + Felhasználás Mash - + Cefre First Wort @@ -2963,47 +3111,47 @@ Boil - + Forralás Aroma - + Aroma Dry Hop - + Hidegkomló Time - + Idõ Type - + Típus Bittering - + Keserűkomló Both - + Mindkettő Form - + Forma Leaf - + leveles Pellet - + Pellet Plug - + Nagy pellet (komlódugó) Beta (%) @@ -3065,6 +3213,18 @@ Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + htmlViewer @@ -3081,7 +3241,7 @@ instructionWidget Form - + Forma Show a timer @@ -3104,7 +3264,7 @@ mainWindow Recipes - + Receptek Styles @@ -3112,11 +3272,11 @@ Fermentables - + Erjesztető anyagok Hops - + Komló Miscs @@ -3132,7 +3292,7 @@ Name - + Név Name of recipe @@ -3164,11 +3324,11 @@ Style - + Stílus Boil Time - + Forralási idő Target batch size @@ -3180,7 +3340,7 @@ Equipment - + Felszerelés Target Boil Size @@ -3188,7 +3348,7 @@ OG - + kezdeti fajsúly (OG) Boil SG @@ -3196,11 +3356,11 @@ FG - + végleges fajsúly (FG) ABV - + alkoholfok (v/v%) Bitterness (IBU) @@ -3208,7 +3368,7 @@ Color - + Szín IBU/GU @@ -3252,7 +3412,7 @@ Miscellaneous - + Egyebek Add misc @@ -3268,7 +3428,7 @@ Yeast - + Élesztőtörzs Add yeast @@ -3284,7 +3444,7 @@ Mash - + Cefre Add mash step @@ -3468,7 +3628,7 @@ Backup Database - + Adatbázis mentése Restore Database @@ -3552,7 +3712,7 @@ Save - + Mentés Delete selected @@ -3574,6 +3734,18 @@ Mashes + + 1.0 + + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator + + mashDesigner @@ -3583,11 +3755,11 @@ Name - + Név Type - + Típus Target temp. @@ -3595,7 +3767,7 @@ Time - + Idõ Batch Sparge @@ -3627,7 +3799,7 @@ Infusion Temp - + Beáztatási hőmérséklet Total Collected Wort @@ -3658,7 +3830,7 @@ Name - + Név Initial grain temp @@ -3678,7 +3850,7 @@ Notes - + Megjegyzések Tun @@ -3717,23 +3889,23 @@ Name - + Név Type - + Típus Infusion - + Áztatás Temperature - + Hőmérséklet Decoction - + Dekokció Target temp. @@ -3769,7 +3941,7 @@ Time - + Idõ Time to conduct the step @@ -3846,67 +4018,67 @@ Name - + Név Type - + Típus Spice - + Fűszer Fining - + Derítőszer Water Agent - + Vízkezelő anyag Herb - + Gyógynövény Flavor - + Ízanyag Other - + Egyéb anyag Use - + Felhasználás Boil - + Forralás Mash - + Cefre Primary - + Elsődleges Secondary - + Másodlagos Bottling - + Palackozás Time - + Idõ Amount - + Mennyiség Check it if the amount listed is in kg instead of L. @@ -3928,6 +4100,18 @@ Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + namedMashEditor @@ -3937,7 +4121,7 @@ Mash - + Cefre Delete selected style @@ -3945,7 +4129,7 @@ Name - + Név Initial grain temp @@ -3965,7 +4149,7 @@ Notes - + Megjegyzések Tun @@ -4020,7 +4204,7 @@ SG - + fajsúly (SG) Measured gravity pre-boil @@ -4028,7 +4212,7 @@ Temp - + Hőmérséklet Temperature of SG reading @@ -4048,7 +4232,7 @@ Plato - + °B Plato (percent by mass of equivalent sucrose) @@ -4107,7 +4291,7 @@ Weight - + Súly Use SI units @@ -4123,19 +4307,19 @@ Temperature - + Hőmérséklet Celsius - + Celsius Fahrenheit - + Fahrenheit Volume - + Mennyiség Gravity @@ -4151,7 +4335,7 @@ Color - + Szín Use SRM @@ -4179,7 +4363,7 @@ IBU - + Keserűség (IBU) Tinseth's approximation @@ -4223,57 +4407,13 @@ Default - + Alapértelmezett Language - Czech - - - - Catalan - - - - German - - - - English - - - - Spanish - - - - French - - - - Italian - - - - Dutch - - - - Polish - - - - Portuguese - - - - Russian - - - <qt> Know another language? @@ -4300,7 +4440,7 @@ OG - + kezdeti fajsúly (OG) For ales, 0.75-1. For lagers, 1.5-2. @@ -4450,7 +4590,7 @@ Brewer - + Sörfőző Asst. Brewer @@ -4510,7 +4650,7 @@ Notes - + Megjegyzések Cancel @@ -4521,11 +4661,11 @@ recipeExtrasWidget Form - + Forma Brewer - + Sörfőző Asst. Brewer @@ -4585,7 +4725,7 @@ Notes - + Megjegyzések @@ -4624,7 +4764,7 @@ ABV - + alkoholfok (v/v%) ABW @@ -4659,6 +4799,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + + + + Original Grain Temperature + + + + Target Mash Temperature + + + + Weight of Grain + + + + Volume of Water + + + + Mash Infusion + + + + Total Volume of Water + + + + Grain Weight + + + + Actual Mash Temperature + + + + Infusion Water Temperature + + + + Calculate + + + + Strike Water Temperature + + + + Volume to add + + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -4666,7 +4869,7 @@ Style - + Stílus Delete selected style @@ -4678,7 +4881,7 @@ Name - + Név Category @@ -4698,7 +4901,7 @@ Type - + Típus Type of beverage @@ -4706,11 +4909,11 @@ Lager - + Ászoksör Ale - + Ale Mead @@ -4718,7 +4921,7 @@ Wheat - + Búza Mixed @@ -4742,11 +4945,11 @@ OG - + kezdeti fajsúly (OG) FG - + végleges fajsúly (FG) IBUs @@ -4754,7 +4957,7 @@ Color (SRM) - + Szín (SRM) Carb (vols) @@ -4778,7 +4981,7 @@ Notes - + Megjegyzések New @@ -4786,7 +4989,7 @@ Save - + Mentés Cancel @@ -4804,7 +5007,7 @@ timerWidget Form - + Forma Set the timer to the specified value @@ -4843,11 +5046,11 @@ Name - + Név Notes - + Megjegyzések @@ -4893,55 +5096,55 @@ Name - + Név Type - + Típus Ale - + Ale Lager - + Ászoksör Wheat - + Búza Wine - + Bor Champagne - + Pezsgőélesztő Form - + Forma Liquid - + Folyékony élesztő Dry - + Szárított élesztő Slant - + slant kultúra Culture - + élesztőkultúra Amount - + Mennyiség Check it if the amount given is in kg instead of L. @@ -4985,19 +5188,19 @@ Low - + Alacsony Medium - + Közepes High - + Magas Very High - + Nagyon magas Attenuation (%) @@ -5039,5 +5242,17 @@ Notes: + + Default Amount + + + + Quanta in Inventory + + + + Quanta in inventory + + diff -Nru brewtarget-2.0.3/translations/bt_it.ts brewtarget-2.1.0/translations/bt_it.ts --- brewtarget-2.0.3/translations/bt_it.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_it.ts 2014-09-14 16:29:29.000000000 +0000 @@ -208,120 +208,6 @@ - BrewTargetTreeModel - - Name - Nome - - - Brew Date - Data di birrificazione - - - Style - Stile - - - Boil Time - Tempo di bollitura - - - Color - Colore - - - Type - Tipologia - - - Use - Usa - - - Form - Forma - - - Category - Categoria - - - Number - - - - Letter - - - - Guide - - - - - BrewTargetTreeView - - New Recipe - Nuova Ricetta - - - Brew It! - Birrifica! - - - Brew Again - Birrifica ancora - - - Delete - Cancella - - - New Equipment - Nuovi Ingredienti - - - New Fermentable - Nuovo fermentabile - - - New Hop - Nuovo Luppolo - - - New Misc - Nuova Aggiunta - - - New Yeast - Nuovo Lievito - - - Copy - Copia - - - Export - Esporta - - - Import - Importa - - - Change date - - - - New Style - - - - Recalculate eff - - - - Brewtarget Default @@ -329,7 +215,7 @@ EBC - + EBC SRM @@ -385,7 +271,7 @@ British Imperial - + Imperiali Britanniche MilliLiters @@ -415,6 +301,10 @@ Gallons Galloni + + Unknown + + BtDigitWidget @@ -432,6 +322,148 @@ + BtTreeModel + + Name + Nome + + + Brew Date + Data di birrificazione + + + Style + Stile + + + Boil Time + Tempo di bollitura + + + Color + Colore + + + Type + Tipologia + + + Use + Usa + + + Form + Forma + + + Category + Categoria + + + Number + + + + Letter + + + + Guide + + + + PATH + + + + FULLPATH + + + + + BtTreeView + + New + Nuovo + + + Recipe + Ricetta + + + Brew It! + + + + Brew Again + + + + Change date + + + + Recalculate eff + + + + Delete + + + + Equipment + Attrezzatura + + + Fermentable + + + + Hop + + + + Misc + Aggiunta + + + Style + Stile + + + Yeast + Lievito + + + Folder + + + + Copy + + + + Export + + + + Import + + + + Delete %1 + + + + Delete %1 %2? + + + + BrewNote + + + + Database Merge Database @@ -466,19 +498,19 @@ The tun volume you entered is 0. This may cause problems - + Il volume della botte che hai inserito è 0. Ciò potrebbe causare problemi. The batch size you entered is 0. This may cause problems - + La quantità inserita è 0. Ciò potrebbe causare problemi Hop Utilization Warning - + Avviso Utilizzo del Luppolo The hop utilization percentage you entered is 0. This may cause problems - + La percentuale di luppolo che hai inserito è 0. Ciò potrebbe causare problemi @@ -573,6 +605,10 @@ Color (EBC) Colore (EBC) + + Inventory + + Hop @@ -598,7 +634,7 @@ Bittering - Amarezza + Amarezza Both @@ -689,68 +725,67 @@ Form Forma - - - MainWindow - Open - Apri - - - BeerXML files (*.xml) - BeerXML files (*.xml) + Inventory + + + + IbuGuSlider - Save - Salva + Cloying + - Equipment request - Attrezzatura richiesta + Extra Malty + - Would you like to set the batch size, boil size and time to that requested by the equipment? - Volete impostare la partita , la quantità di bollitura e il tempo che è richiesto dalle apparecchiature? + Slightly Malty + - Delete %1 - Cancella %1 + Balanced + - Delete %1 %2? - Cancella %1 %2? + Slightly Hoppy + - HTML files (*.html) - HTML files (*.html) + Extra Hoppy + - New - Nuovo + Way Hoppy + + + + MainWindow - Recipe - Ricetta + Open + Apri - Equipment - Attrezzatura + BeerXML files (*.xml) + BeerXML files (*.xml) - Fermentable - Fermentabile + Save + Salva - Hop - Luppolo + Equipment request + Attrezzatura richiesta - Miscellaneous - Aggiunta + Would you like to set the batch size, boil size and time to that requested by the equipment? + Volete impostare la partita , la quantità di bollitura e il tempo che è richiesto dalle apparecchiature? - Yeast - Lievito + HTML files (*.html) + HTML files (*.html) Copy %1 @@ -878,62 +913,47 @@ Choose File - + Scegli File SQLite (*.sqlite) - - - - Style - Stile + SQLite (*.sqlite) Copy Style - + Copia Stile The database has been converted/upgraded. - + Il database è stato convertito/aggiornato. The original XML files can be found in - + I file XML originali si trovano in The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - - - MaltinessWidget - - Cloying - Stucchevole - - - Extra malty - Molto maltato + L'importazione conteneva dati beerXML non validi. Sono stati importati, ma si prega di assicurarsi che abbiano senso. - Slightly malty - Leggermente maltato + Folder name + - Balanced - Bilanciato + Folder name: + - Slightly hoppy - Leggermente Luppolato + Bad Name + - Extra hoppy - Moltp Luppolato + A folder name must have at least one non-whitespace character in it + - Way hoppy - Modo luppolato + A folder name must have at least one non-/ character in it + @@ -1124,7 +1144,7 @@ Bottling - Imbottigliamento + Imbottigliamento @@ -1151,38 +1171,94 @@ Weight - peso + Peso Volume - Volume + Volume Amount Type + Tipo di Quantità + + + Inventory OptionDialog - Open Directory - Apri directory + Open Directory + Apri directory + + + Copy Data + Copia Dta + + + There do not seem to be any data files in this directory, so we will copy your old data here. + Non sembrano esserci qualsiasi file di dati in questa directory, quindi dovremo copiare i vostri vecchi dati qui. + + + Restart + Riavviare + + + Please restart Brewtarget. + Si prega di riavviare Brewtarget. + + + Catalan + + + + Czech + + + + German + + + + English + + + + Greek + + + + Spanish + + + + French + + + + Italian + + + + Dutch + - Copy Data - Copia Dta + Polish + - There do not seem to be any data files in this directory, so we will copy your old data here. - Non sembrano esserci qualsiasi file di dati in questa directory, quindi dovremo copiare i vostri vecchi dati qui. + Portuguese + - Restart - Riavviare + Russian + - Please restart Brewtarget. - Si prega di riavviare Brewtarget. + Chinese + @@ -1370,10 +1446,6 @@ "%1" Non può essere letto. - Config directory "%1" cannot be read. - Configura Directory %1" non può essere letto. - - New Version Nuova versione @@ -1383,7 +1455,7 @@ Stop bothering you about new versions? - + Vuoi non essere più avvisato del rilascio delle nuove versioni? Database Failure @@ -1591,7 +1663,15 @@ Style - Stile + Stile + + + Folder + + + + Failed to update the database + @@ -1866,18 +1946,10 @@ FG - Unknown - Sconosciuto - - ABV ABV - Bitterness - Amarezza - - Color Colore @@ -2053,6 +2125,42 @@ Print Document stampa documento + + Category + Categoria + + + Code + + + + Guide + + + + BoilTime + + + + Beta + + + + Lab + Laboratorio + + + Attenuation + + + + Id + + + + Flocculation + Flocculazione + RefractoDialog @@ -2081,6 +2189,13 @@ + StrikeWaterDialog + + N/A + N/A + + + StyleEditor Style name @@ -2237,6 +2352,10 @@ Product ID ID Prodotto + + Inventory + + aboutDialog @@ -2245,20 +2364,38 @@ Chi è Brewtaget + Donate + Dona + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2275,26 +2412,9 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> - - Donate - Dona - brewDayScrollWidget @@ -2774,7 +2894,7 @@ Remove selected ingredient - Rimuovi ingerdiente selezionato + Rimuovi ingerdiente selezionato @@ -2919,6 +3039,18 @@ Notes: Note: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + hopDialog @@ -2974,10 +3106,6 @@ Alpha Acidi come percentuale in massa - Amount - Ammontare - - Amount Ammontare @@ -3079,7 +3207,7 @@ Cohumulone - + Coumulone Myrcene (%) @@ -3097,6 +3225,18 @@ Notes: Note: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + htmlViewer @@ -3140,7 +3280,7 @@ Styles - + Stili Fermentables @@ -3276,7 +3416,7 @@ Remove selected hop - + Rimuovi luppolo selezionato Edit selected hop @@ -3400,7 +3540,7 @@ toolBar - + Barra degli strumenti About &BrewTarget @@ -3420,67 +3560,67 @@ Ctrl+F - + Ctrl+F &Hops - + &Luppoli Ctrl+H - + Ctrl+H &Miscs - + &Miscellanea Ctrl+M - + Ctrl+M &Yeasts - + L&ieviti Ctrl+Y - + Ctrl+Y &Equipments - + Strum&enti Ctrl+E - + Ctrl+E &Styles - + &Stili Ctrl+T - + Ctrl+T &Exit - + &Esci Ctrl+Q - + Ctrl+Q &Import Recipes - + &Importa Ricette &Options - + &Opzioni &Manual - + &Manuale &Scale Recipe @@ -3488,19 +3628,19 @@ Recipe to Clipboard as &Text - + Ricetta negli Appunti come &Testo &OG Correction Help - + Aiuto Correzione Gravità &Originale &Convert Units - + &Converti Unità Backup Database - Backup Database + Backup del Database Restore Database @@ -3508,7 +3648,7 @@ &Copy Recipe - + &Copia Ricetta Pr&iming Calculator @@ -3516,7 +3656,7 @@ &Refractometer Tools - + Strumenti &Refrattometro &Pitch Rate Calculator @@ -3532,23 +3672,23 @@ &Print - + &Stampa Print Pre&view - + Antepri&ma di Stampa &Export To HTML - + &Esporta In HTML &Export to HTML - + &Esporta in HTML &Backup - + &Backup Save all recipes, ingredients, etc. to a backup folder @@ -3556,7 +3696,7 @@ &Restore - + &Ripristina Restore recipes, ingredients, etc. from a previous backup @@ -3564,7 +3704,7 @@ &Merge - + &Unisci Merge another set of recipes, ingredients, etc. into the current set @@ -3572,7 +3712,7 @@ &New Recipe - + &Nuova Ricetta Timers @@ -3600,10 +3740,22 @@ &Mashs - + A&mmosta Mashes + Ammostamenti + + + 1.0 + 1.0 + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator @@ -3611,7 +3763,7 @@ mashDesigner Mash Designer - + Progettazione Ammostamenti Name @@ -3647,15 +3799,15 @@ min - + min max - + max 0 - + 0 Infusion Temp @@ -3675,7 +3827,7 @@ tunVol - + VolBotte thickness @@ -3686,7 +3838,7 @@ mashEditor Mash Editor - + Editor Ammostamenti Name @@ -3718,7 +3870,7 @@ Initial tun temp - + Temp iniziale botte Get following parameters from the recipe's equipment. @@ -3960,6 +4112,18 @@ Notes: Note: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + namedMashEditor @@ -3969,23 +4133,23 @@ Mash - Mash + Ammostatura Delete selected style - Cancella stile selezionato + Elimina stile selezionato Name - Nome + Nome Initial grain temp - Temperatura iniziale del Grano + Temp iniziale chicchi Sparge temp - Temperatura di Sparge + Temperatura di Sparge Sparge temp target @@ -3993,27 +4157,27 @@ Sparge pH - PH Sparge + pH di Sparge Notes - Note + Note Tun - Tun + Botte Initial tun temp - + Temp iniziale botte From Equipment - Da attrezzatura + Dall'attrezzatura Tun mass - Massa Tun + Massa Botte Tun sp. heat @@ -4021,7 +4185,7 @@ Tun specific heat (cal/(g*K)) - Calore specifico di tun (Cal/(g*K)) + Calore specifico botte (cal/g*K)) Add mash step @@ -4262,50 +4426,6 @@ Lingua - Czech - Ceca - - - Catalan - Catalana - - - German - Tedesca - - - English - Inglese - - - Spanish - Spagnola - - - French - Francese - - - Italian - Italiano - - - Dutch - Olandese - - - Polish - Polacca - - - Portuguese - Portoghese - - - Russian - - - <qt> Know another language? @@ -4699,6 +4819,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + + + + Original Grain Temperature + + + + Target Mash Temperature + + + + Weight of Grain + + + + Volume of Water + + + + Mash Infusion + + + + Total Volume of Water + + + + Grain Weight + + + + Actual Mash Temperature + + + + Infusion Water Temperature + + + + Calculate + Calcola + + + Strike Water Temperature + + + + Volume to add + + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -5079,5 +5262,17 @@ Notes: Note: + + Default Amount + + + + Quanta in Inventory + + + + Quanta in inventory + + diff -Nru brewtarget-2.0.3/translations/bt_nb.ts brewtarget-2.1.0/translations/bt_nb.ts --- brewtarget-2.0.3/translations/bt_nb.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_nb.ts 2014-09-14 16:29:29.000000000 +0000 @@ -69,7 +69,7 @@ Actual PreBoil Volume - Kokevolum start + Reelt kokevolum ved start Actual PreBoil Gravity @@ -200,120 +200,6 @@ - BrewTargetTreeModel - - Name - Navn - - - Brew Date - Bryggedato - - - Style - Øltype - - - Boil Time - Koketid - - - Color - Farge - - - Type - Type - - - Use - Bruk - - - Form - Skjema - - - Category - Kategori - - - Number - Nummer. - - - Letter - Brev - - - Guide - Veiledning - - - - BrewTargetTreeView - - New Recipe - Ny oppskrift - - - Brew It! - Brygg nå - - - Brew Again - Brygg igjen - - - Delete - Slett - - - New Equipment - Nytt utstyr - - - New Fermentable - Ny gjærbar råvare - - - New Hop - Ny humle - - - New Misc - Ny diverse indegriens - - - New Yeast - Ny gjær - - - Copy - Kopier - - - Export - Eksporter - - - Import - Importer - - - Change date - Endre dato - - - New Style - Ny øltype - - - Recalculate eff - Rekalkuler eff - - - Brewtarget Default @@ -403,6 +289,10 @@ Gallons Gallons + + Unknown + + BtDigitWidget @@ -420,6 +310,148 @@ + BtTreeModel + + Name + Navn + + + Brew Date + + + + Style + Øltype + + + Boil Time + Koketid + + + Color + Farge + + + Type + Type + + + Use + Bruk + + + Form + Form + + + Category + + + + Number + + + + Letter + + + + Guide + + + + PATH + + + + FULLPATH + + + + + BtTreeView + + New + + + + Recipe + + + + Brew It! + + + + Brew Again + + + + Change date + + + + Recalculate eff + + + + Delete + + + + Equipment + Utstyr + + + Fermentable + + + + Hop + + + + Misc + + + + Style + Øltype + + + Yeast + Gjær + + + Folder + + + + Copy + + + + Export + + + + Import + + + + Delete %1 + + + + Delete %1 %2? + + + + BrewNote + + + + Database Merge Database @@ -561,6 +593,10 @@ Color (EBC) Farge (EBC) + + Inventory + + Hop @@ -677,68 +713,67 @@ Form Form - - - MainWindow - - Open - Åpne - - BeerXML files (*.xml) - BeerXML-filer (*.xml) + Inventory + + + + IbuGuSlider - Save - Lagre + Cloying + - Equipment request + Extra Malty - Would you like to set the batch size, boil size and time to that requested by the equipment? + Slightly Malty - Delete %1 - Slett %1 + Balanced + - Delete %1 %2? - Slett %1 %2? + Slightly Hoppy + - HTML files (*.html) - HTML-filer (*.html) + Extra Hoppy + - New - Ny + Way Hoppy + + + + MainWindow - Recipe - Oppskrift + Open + Åpne - Equipment - Utstyr + BeerXML files (*.xml) + BeerXML-filer (*.xml) - Fermentable - Gjærbar råvare + Save + Lagre - Hop - Humle + Equipment request + - Miscellaneous - Diverse + Would you like to set the batch size, boil size and time to that requested by the equipment? + - Yeast - Gjær + HTML files (*.html) + HTML-filer (*.html) Copy %1 @@ -794,7 +829,7 @@ Backup Database - + Sikkerhetskopier database Oops! @@ -873,10 +908,6 @@ SQLite (*.sqlite) - Style - Øltype - - Copy Style Kopier øltype @@ -892,36 +923,25 @@ The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - MaltinessWidget - - Cloying - Kvalmende søt - - Extra malty - Ekstra maltpreget - - - Slightly malty - Noe maltpreget + Folder name + - Balanced - Balansert + Folder name: + - Slightly hoppy - Noe humlepreget + Bad Name + - Extra hoppy - Ekstra humlepreget + A folder name must have at least one non-whitespace character in it + - Way hoppy - Voldsomt humlepreget + A folder name must have at least one non-/ character in it + @@ -1142,35 +1162,91 @@ Vekt - Volume - Volum + Volume + Volum + + + Amount Type + + + + Inventory + + + + + OptionDialog + + Open Directory + Åpne mappe + + + Copy Data + Kopier data + + + There do not seem to be any data files in this directory, so we will copy your old data here. + Det later ikke til å være noen datafiler i denne mappen, så vi kopierer dine gamle data hit. + + + Restart + Start på nytt + + + Please restart Brewtarget. + Vennligst start Brewtarget på nytt. + + + Catalan + + + + Czech + + + + German + + + + English + + + + Greek + + + + Spanish + + + + French + - Amount Type + Italian - - - OptionDialog - Open Directory - Åpne mappe + Dutch + - Copy Data - Kopier data + Polish + - There do not seem to be any data files in this directory, so we will copy your old data here. - Det later ikke til å være noen datafiler i denne mappen, så vi kopierer dine gamle data hit. + Portuguese + - Restart - Start på nytt + Russian + - Please restart Brewtarget. - Vennligst start Brewtarget på nytt. + Chinese + @@ -1309,7 +1385,7 @@ Form - + Form Stage @@ -1358,10 +1434,6 @@ "%1" kan ikke leses. - Config directory "%1" cannot be read. - - - New Version Ny versjon @@ -1581,6 +1653,14 @@ Style Øltype + + Folder + + + + Failed to update the database + + Recipe @@ -1725,7 +1805,8 @@ Add %1 top up water into primary. - + +Etterfyll %1 vann i primærgjæringskaret. @@ -1755,7 +1836,7 @@ Flameout - + Kokeslutt Stop boiling the wort. @@ -1783,7 +1864,7 @@ Ferment - + Gjære Transfer beer to secondary. @@ -1853,24 +1934,16 @@ FG - Unknown - Ukjent - - ABV ABV - Bitterness - Bitterhet - - Color Farge Calories (per 12 oz.) - + Kalorier (i 12 oz. = 340g) Fermentables @@ -1930,7 +2003,7 @@ Form - + Form IBU @@ -1978,7 +2051,7 @@ Brew Date - Bryggedato + Preboil @@ -2040,6 +2113,42 @@ Print Document Skriv ut dokument + + Category + + + + Code + + + + Guide + + + + BoilTime + + + + Beta + + + + Lab + + + + Attenuation + + + + Id + + + + Flocculation + + RefractoDialog @@ -2068,6 +2177,13 @@ + StrikeWaterDialog + + N/A + Ikke tilgjengelig + + + StyleEditor Style name @@ -2210,7 +2326,7 @@ Form - + Form Amount @@ -2224,6 +2340,10 @@ Product ID + + Inventory + + aboutDialog @@ -2232,20 +2352,38 @@ + Donate + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2262,24 +2400,7 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - - - - Donate +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> @@ -2287,7 +2408,7 @@ brewDayScrollWidget Form - + Form Generate Instructions @@ -2401,7 +2522,7 @@ brewNoteWidget Form - + Form Preboil @@ -2540,7 +2661,7 @@ btSplashScreen Form - + Form @@ -2753,7 +2874,7 @@ New - Ny + Edit selected ingredient @@ -2906,6 +3027,18 @@ Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + hopDialog @@ -2927,7 +3060,7 @@ New - Ny + Edit @@ -2961,10 +3094,6 @@ - Amount - - - Amount Mengde @@ -3010,7 +3139,7 @@ Form - + Form Leaf @@ -3084,6 +3213,18 @@ Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + htmlViewer @@ -3100,7 +3241,7 @@ instructionWidget Form - + Form Show a timer @@ -3147,7 +3288,7 @@ Recipe - Oppskrift + Name @@ -3487,7 +3628,7 @@ Backup Database - + Sikkerhetskopier database Restore Database @@ -3593,6 +3734,18 @@ Mashes + + 1.0 + + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator + + mashDesigner @@ -3846,7 +3999,7 @@ New - Ny + Edit selected ingredient @@ -3947,6 +4100,18 @@ Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + namedMashEditor @@ -4249,50 +4414,6 @@ - Czech - - - - Catalan - - - - German - - - - English - - - - Spanish - - - - French - - - - Italian - - - - Dutch - - - - Polish - - - - Portuguese - - - - Russian - - - <qt> Know another language? @@ -4540,7 +4661,7 @@ recipeExtrasWidget Form - + Form Brewer @@ -4678,6 +4799,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + + + + Original Grain Temperature + + + + Target Mash Temperature + + + + Weight of Grain + + + + Volume of Water + + + + Mash Infusion + + + + Total Volume of Water + + + + Grain Weight + + + + Actual Mash Temperature + + + + Infusion Water Temperature + + + + Calculate + + + + Strike Water Temperature + + + + Volume to add + + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -4701,7 +4885,7 @@ Category - Kategori + Category number @@ -4801,7 +4985,7 @@ New - Ny + Save @@ -4823,7 +5007,7 @@ timerWidget Form - + Form Set the timer to the specified value @@ -4889,7 +5073,7 @@ New - Ny + Edit selected yeast @@ -4940,7 +5124,7 @@ Form - + Form Liquid @@ -5058,5 +5242,17 @@ Notes: + + Default Amount + + + + Quanta in Inventory + + + + Quanta in inventory + + diff -Nru brewtarget-2.0.3/translations/bt_nl.ts brewtarget-2.1.0/translations/bt_nl.ts --- brewtarget-2.0.3/translations/bt_nl.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_nl.ts 2014-09-14 16:29:29.000000000 +0000 @@ -200,223 +200,255 @@ - BrewTargetTreeModel + Brewtarget - Name - Naam + Default + Standaard - Brew Date + EBC - Style - Stijl - - - Boil Time + SRM - Color - Kleur + Plato + Plato - Type - Type + Specific Gravity + - Use - Gebruik + SI + - Form - Vorm + US Customary + - Category - Categorie + Milligrams + - Number + Grams - Letter + Kilograms - Guide + Ounces - - - BrewTargetTreeView - New Recipe - Nieuw Recept + Pounds + - Brew It! - + Celsius + Celsius - Brew Again - + Fahrenheit + Fahrenheit - Delete + British Imperial - New Equipment + MilliLiters - New Fermentable + Liters - New Hop + Teaspoons - New Misc + Tablespoons - New Yeast + Cups - Copy + Quarts - Export + Gallons - Import + Unknown + + + BtDigitWidget - Change date - + Too low for style. + Te laag voor deze stijl - New Style - + In range for style. + Conform stijl - Recalculate eff - + Too high for style. + Te hoog voor deze stijl - Brewtarget + BtTreeModel - Default - Standaard + Name + Naam - EBC + Brew Date - SRM + Style + Stijl + + + Boil Time - Plato - Plato + Color + Kleur - Specific Gravity - + Type + Type - SI - + Use + Gebruik - US Customary + Form + Vorm + + + Category + Categorie + + + Number - Milligrams + Letter - Grams + Guide - Kilograms + PATH - Ounces + FULLPATH + + + BtTreeView - Pounds + New + Nieuw + + + Recipe + Recept + + + Brew It! - Celsius - Celsius + Brew Again + - Fahrenheit - Fahrenheit + Change date + - British Imperial + Recalculate eff - MilliLiters + Delete - Liters + Equipment + Apparatuur + + + Fermentable - Teaspoons + Hop - Tablespoons + Misc + Diversen + + + Style + Stijl + + + Yeast + Gist + + + Folder - Cups + Copy - Quarts + Export - Gallons + Import - - - BtDigitWidget - Too low for style. - Te laag voor deze stijl + Delete %1 + - In range for style. - Conform stijl + Delete %1 %2? + - Too high for style. - Te hoog voor deze stijl + BrewNote + @@ -561,6 +593,10 @@ Color (EBC) + + Inventory + + Hop @@ -677,68 +713,67 @@ Form Vorm - - - MainWindow - Open - Open + Inventory + + + + IbuGuSlider - BeerXML files (*.xml) - BeerXML bestanden (*.xml) + Cloying + - Save - Opslaan + Extra Malty + - Equipment request - Apparatuur verzoek + Slightly Malty + - Would you like to set the batch size, boil size and time to that requested by the equipment? + Balanced - Delete %1 + Slightly Hoppy - Delete %1 %2? + Extra Hoppy - HTML files (*.html) + Way Hoppy + + + MainWindow - New - Nieuw + Open + Open - Recipe - Recept + BeerXML files (*.xml) + BeerXML bestanden (*.xml) - Equipment - Apparatuur + Save + Opslaan - Fermentable - + Equipment request + Apparatuur verzoek - Hop + Would you like to set the batch size, boil size and time to that requested by the equipment? - Miscellaneous - Diversen - - - Yeast - Gist + HTML files (*.html) + Copy %1 @@ -873,10 +908,6 @@ - Style - Stijl - - Copy Style @@ -892,36 +923,25 @@ The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - MaltinessWidget - - Cloying - Stroperig - - Extra malty - Extra moutig - - - Slightly malty - Licht moutig + Folder name + - Balanced - Uitgebalanceerd + Folder name: + - Slightly hoppy - Licht hoppig + Bad Name + - Extra hoppy - Extra hoppig + A folder name must have at least one non-whitespace character in it + - Way hoppy - Veel te hoppig + A folder name must have at least one non-/ character in it + @@ -1149,6 +1169,10 @@ Amount Type + + Inventory + + OptionDialog @@ -1172,6 +1196,58 @@ Please restart Brewtarget. + + Catalan + + + + Czech + + + + German + + + + English + + + + Greek + + + + Spanish + + + + French + + + + Italian + + + + Dutch + + + + Polish + + + + Portuguese + + + + Russian + + + + Chinese + + QObject @@ -1357,10 +1433,6 @@ "%1" kan niet gelezen worden. - Config directory "%1" cannot be read. - Configuratie directory "%1" kan niet gelezen worden. - - New Version Nieuwe Versie @@ -1578,6 +1650,14 @@ Style Stijl + + Folder + + + + Failed to update the database + + Recipe @@ -1851,18 +1931,10 @@ eind SG - Unknown - Onbekend - - ABV Alc (vol%) - Bitterness - Bitterheid - - Color Kleur @@ -2038,6 +2110,42 @@ Print Document Print Document + + Category + Categorie + + + Code + + + + Guide + + + + BoilTime + + + + Beta + + + + Lab + Lab + + + Attenuation + + + + Id + + + + Flocculation + Flocculatie + RefractoDialog @@ -2066,6 +2174,13 @@ + StrikeWaterDialog + + N/A + Niet beschikbaar + + + StyleEditor Style name @@ -2222,6 +2337,10 @@ Product ID Product ID + + Inventory + + aboutDialog @@ -2230,20 +2349,38 @@ Over Brewtarget + Donate + Donatie + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2260,26 +2397,9 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> - - Donate - Donatie - brewDayScrollWidget @@ -2904,6 +3024,18 @@ Notes: Aantekeningen: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + hopDialog @@ -2959,10 +3091,6 @@ Alpha ziir als percentage van de massa - Amount - Hoeveelheid - - Amount Hoeveelheid @@ -3082,6 +3210,18 @@ Notes: Aantekeningen: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + htmlViewer @@ -3591,6 +3731,18 @@ Mashes + + 1.0 + 1.0 + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator + + mashDesigner @@ -3945,6 +4097,18 @@ Notes: Aantekeningen: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + namedMashEditor @@ -4247,50 +4411,6 @@ Taal - Czech - - - - Catalan - - - - German - Duits - - - English - Engels - - - Spanish - Spaans - - - French - Frans - - - Italian - - - - Dutch - - - - Polish - Pools - - - Portuguese - Portugees - - - Russian - - - <qt> Know another language? @@ -4682,6 +4802,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + + + + Original Grain Temperature + + + + Target Mash Temperature + + + + Weight of Grain + + + + Volume of Water + + + + Mash Infusion + + + + Total Volume of Water + + + + Grain Weight + + + + Actual Mash Temperature + + + + Infusion Water Temperature + + + + Calculate + Bereken + + + Strike Water Temperature + + + + Volume to add + + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -5062,5 +5245,17 @@ Notes: Aantekeningen: + + Default Amount + + + + Quanta in Inventory + + + + Quanta in inventory + + diff -Nru brewtarget-2.0.3/translations/bt_pl.ts brewtarget-2.1.0/translations/bt_pl.ts --- brewtarget-2.0.3/translations/bt_pl.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_pl.ts 2014-09-14 16:29:29.000000000 +0000 @@ -200,120 +200,6 @@ - BrewTargetTreeModel - - Name - Nazwa - - - Brew Date - Data warzenia - - - Style - Styl - - - Boil Time - Czas gotowania - - - Color - Barwa - - - Type - Typ - - - Use - Użycie - - - Form - Postać - - - Category - Kategoria - - - Number - - - - Letter - - - - Guide - - - - - BrewTargetTreeView - - New Recipe - Nowa receptura - - - Brew It! - Uwarz to piwo! - - - Brew Again - Uwarz ponownie - - - Delete - Kasuj - - - New Equipment - Nowy sprzęt - - - New Fermentable - Nowy składnik fermentacji - - - New Hop - Nowy chmiel - - - New Misc - Nowy dodatek - - - New Yeast - Nowe drożdże - - - Copy - Kopiuj - - - Export - Eksport - - - Import - Import - - - Change date - - - - New Style - Nowy styl - - - Recalculate eff - - - - Brewtarget Default @@ -403,6 +289,10 @@ Gallons Galony + + Unknown + Nieznane + BtDigitWidget @@ -420,6 +310,148 @@ + BtTreeModel + + Name + Nazwa + + + Brew Date + Data warzenia + + + Style + Styl + + + Boil Time + Czas gotowania + + + Color + Kolor + + + Type + Rodzaj + + + Use + Zastosuj + + + Form + Formularz + + + Category + Kategoria + + + Number + Ilość + + + Letter + Litera + + + Guide + Poradnik + + + PATH + Ścieżka + + + FULLPATH + Pełna Ścieżka + + + + BtTreeView + + New + Nowy + + + Recipe + Przepis + + + Brew It! + Uwarz! + + + Brew Again + Warz ponownie + + + Change date + Zmień datę + + + Recalculate eff + Przelicz wydajność + + + Delete + Usuń + + + Equipment + Wyposażenie + + + Fermentable + Fermentujące + + + Hop + Chmiel + + + Misc + Różne + + + Style + Styl + + + Yeast + Drożdże + + + Folder + Folder + + + Copy + Kopiuj + + + Export + Eksport + + + Import + Import + + + Delete %1 + Usuń %1 + + + Delete %1 %2? + Usuń %1 %2? + + + BrewNote + Notatka + + + Database Merge Database @@ -458,15 +490,15 @@ The batch size you entered is 0. This may cause problems - + Wielkość warki wynosi 0. To może powodować problemy. Hop Utilization Warning - + Ostrzeżenie utylizacji chmielu The hop utilization percentage you entered is 0. This may cause problems - + Procentu utylizacji chmielu wynosi 0. To może powodować problemy. @@ -561,6 +593,10 @@ Color (EBC) Barwa (EBC) + + Inventory + Magazyn + Hop @@ -677,68 +713,67 @@ Form Postać - - - MainWindow - - Open - Otwórz - - BeerXML files (*.xml) - Plik BeerXML (*.xml) + Inventory + Magazyn + + + IbuGuSlider - Save - Zapisz + Cloying + Słodko-mdły - Equipment request - Potrzebny sprzęt + Extra Malty + Mocno słodowe - Would you like to set the batch size, boil size and time to that requested by the equipment? - Chcesz, aby ustawić objętość brzeczki, objętość do gotowanie i czas do wymaganych przez wyposażenie? + Slightly Malty + Lekko słodowe - Delete %1 - Kasuj %1 + Balanced + Zbalansowane - Delete %1 %2? - Skasować %1 %2? + Slightly Hoppy + Lekka goryczka - HTML files (*.html) - Pliki HTML (*.html) + Extra Hoppy + Mocna goryczka - New - Nowy + Way Hoppy + Super goryczka + + + MainWindow - Recipe - Receptura + Open + Otwórz - Equipment - Sprzęt + BeerXML files (*.xml) + Plik BeerXML (*.xml) - Fermentable - Składnik fermentacji + Save + Zapisz - Hop - Chmiel + Equipment request + Potrzebny sprzęt - Miscellaneous - Dodatek + Would you like to set the batch size, boil size and time to that requested by the equipment? + Chcesz, aby ustawić objętość brzeczki, objętość do gotowanie i czas do wymaganych przez wyposażenie? - Yeast - Drożdże + HTML files (*.html) + Pliki HTML (*.html) Copy %1 @@ -866,62 +901,47 @@ Choose File - + Wybierz plik SQLite (*.sqlite) - - - - Style - Styl + SQLite (*.sqlite) Copy Style - + Skopiuj Styl The database has been converted/upgraded. - + Baza danych została skonwertowana/zaktualizowana. The original XML files can be found in - + Oryginalne pliki XML znajdują się w The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - - - MaltinessWidget - - Cloying - Mdląco słodkie + Import zawierał nieprawidłowy beerXML. Został przywieziony, ale proszę się upewnić, że ma sens. - Extra malty - Mocno słodowe + Folder name + Nazwa folderu - Slightly malty - Lekko słodowe + Folder name: + Nazwa folderu: - Balanced - Zbalansowane + Bad Name + Błędna nazwa - Slightly hoppy - Lekka goryczka + A folder name must have at least one non-whitespace character in it + Nazwa folderu musi zawierać przynajmniej jeden znak - Extra hoppy - Mocna goryczka - - - Way hoppy - Super goryczka + A folder name must have at least one non-/ character in it + Nazwa folderu musi mieć co najmniej jeden znak w niebędący "/" @@ -1139,15 +1159,19 @@ Weight - Waga + Grubość Volume - + Objętość + + + Amount Type + Rodzaj kwoty - Amount Type - + Inventory + Magazyn @@ -1172,6 +1196,58 @@ Please restart Brewtarget. Proszę ponownie uruchomić program. + + Catalan + Kataloński + + + Czech + Czeski + + + German + Niemiecki + + + English + Angielski + + + Greek + Grecki + + + Spanish + Hiszpański + + + French + Francuski + + + Italian + Włoski + + + Dutch + Duński + + + Polish + Polski + + + Portuguese + Portugalski + + + Russian + Rosyjski + + + Chinese + Chiński + QObject @@ -1358,10 +1434,6 @@ "%1" nie może zostać odczytany. - Config directory "%1" cannot be read. - Katalog konfiguracyjny "%1" nie może zostać odczytany. - - New Version Nowa Wersja @@ -1407,11 +1479,11 @@ Failed to remove the temporary backup database. Navigate to '%1' and remove 'tempBackupDatabase.sqlite'. - + Nie udało się usunąć tymczasowej bazy danych kopii zapasowej. Przejdź do '%1' i usuń.'tempBackupDatabase.sqlite'. Failed to rollback to the backup database. Navigate to '%1', remove 'database.sqlite' if it exists, and rename 'tempBackupDatabase.sqlite' to 'database.sqlite'. - + Nie udało się wycofać do kopii zapasowej bazy danych. Przejdź do '%1', usuń 'database.sqlite' jeżeli istnieje, i zmień nazwę 'tempBackupDatabase.sqlite' na 'database.sqlite'. Database Restore Failure @@ -1579,7 +1651,15 @@ Style - Styl + Styl + + + Folder + Folder + + + Failed to update the database + @@ -1854,18 +1934,10 @@ Gęstość końcowa - Unknown - Nieznany - - ABV Alkohol (ABV) - Bitterness - Goryczka - - Color Barwa @@ -2041,6 +2113,42 @@ Print Document Wydrukuj dokument + + Category + Kategoria + + + Code + Kod + + + Guide + Poradnik + + + BoilTime + Czas gotowania + + + Beta + Beta + + + Lab + Laboratorium + + + Attenuation + Rozcieńczenie + + + Id + ID + + + Flocculation + Flokulacja + RefractoDialog @@ -2069,6 +2177,13 @@ + StrikeWaterDialog + + N/A + Nie dotyczy + + + StyleEditor Style name @@ -2225,6 +2340,10 @@ Product ID ID produktu + + Inventory + Magazyn + aboutDialog @@ -2233,20 +2352,38 @@ O Brewtarget + Donate + Dotacja + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2263,25 +2400,53 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - - - - Donate - Dotacja +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> + Copy text +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +Brewtarget %1 +Brewtarget: tworzenie receptur piwnych. +Prawa zastrzeżone 2009-2014 dla następujących developerów. + +Developers + +Philip G. Lee <rocketman768@gmail.com> - Główny developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> + +Na licencji (GPLv3) + +Brewtarget jest wolnym oprogramowaniem: możesz je rozpowszechniać i/lub modyfikować +na zasadach licencji GNU General Public License opublikowanej przez +the Free Software Foundation, wersja 3 Licencji, lub +(jeśli chcesz) dowolna późniejsza wersja. + +Brewtarget jest rozprowadzany w nadziei, że będzie użyteczny, +lecz BEZ ŻADNEJ GWARANCJI; nawet bez domniemanej gwarancji +lub PRZYDATNOŚCI DO KONKRETNEGO CELU. Zobacz +GNU tekst licencji General Public License dla dalszych szczegółów. + +Powinieneś otrzymać kopię GNU General Public License +along łacznie z Brewtarget. Jeżeli nie, sprawdź tu <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. +Kod źródłowy +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> @@ -2907,6 +3072,18 @@ Notes: Notatki: + + Default Amount + Domyślna ilość + + + Amount in Inventory + Ilość w magazynie + + + Amount in inventory + Ilość w magazynie + hopDialog @@ -2962,10 +3139,6 @@ Procent alfa-kwasów w masie - Amount - Ilość - - Amount Ilość @@ -3085,6 +3258,18 @@ Notes: Notatki: + + Default Amount + Domyślna ilość + + + Amount in Inventory + Ilość w magazynie + + + Amount in inventory + Ilość w magazynie + htmlViewer @@ -3128,7 +3313,7 @@ Styles - + Style Fermentables @@ -3164,7 +3349,7 @@ Target boil size - Docelowa ilość brzeczki przed gotowaniem + Docelowa objętość brzeczki przed gotowaniem Efficiency (%) @@ -3172,11 +3357,11 @@ Calculated Boil Size - Obliczona ilość brzeczki przed gotowaniem + Wyliczona objętość brzeczki przed gotowaniem Calculated Batch Size - Obliczona wielkość warki + Wyliczona wielkość warki The extraction efficiency you expect @@ -3588,11 +3773,23 @@ &Mashs - + Schematy &zacierania Mashes - + Zacierania + + + 1.0 + 1.0 + + + application/x-brewtarget-ingredient + application/x-brewtarget-ingredient + + + Strike Water Calculator + Kalkulator wody do infuzji @@ -3655,7 +3852,7 @@ vol - + obj. Tun Fullness @@ -3663,11 +3860,11 @@ tunVol - + obj. kadzi thickness - + grubość @@ -3948,84 +4145,96 @@ Notes: Notatki: + + Default Amount + Domyślna ilość + + + Amount in Inventory + Ilość w magazynie + + + Amount in inventory + Ilość w magazynie + namedMashEditor Named Mash Editor - + Edytor schematów zacierania Mash - + Zacieranie Delete selected style - Usuń wybrany styl + Usuń wybrany styl Name - + Nazwa Initial grain temp - Pocz. temertatura słodu + Początkowa temperatura słodu Sparge temp - Temperatura wysładzania + Temperatura wysładzania Sparge temp target - Temperatura wysładzania + Docelowa temperatura wysładzania Sparge pH - pH wysładzania + pH wysładzania Notes - Notatki + Notatki Tun - Kadź zacierna + Kadź zacierna Initial tun temp - Pocz. temperatura + Początkowa temperatura kadzi From Equipment - Pobierz z ustawień sprzętu + Pobierz z ustawień sprzętu Tun mass - Masa kadzi + Masa kadzi Tun sp. heat - Ciepło wł. kadzi + Ciepło właściwe kadzi Tun specific heat (cal/(g*K)) - Ciepło właściwe kadzi (cal/(g*K)) + Ciepło właściwe kadzi (cal/(g*K)) Add mash step - Dodaj krok zacierania + Dodaj krok zacierania Remove selected mash step - Usuń wybrany krok zacierania + Usuń wybrany krok zacierania Mash step up - Nastepna przerwa + Nastepna przerwa Mash step down - Poprzednia przerwa + Poprzednia przerwa @@ -4211,19 +4420,19 @@ IBU Adjustments - + Dostosowanie IBU % IBU adjustment - + Dostosowanie % IBU Mash Hop - + Chmielenie zacieru First Wort - Chmielenie przedniej brzeczki + Chmielenie przedniej brzeczki Directories @@ -4250,50 +4459,6 @@ Język - Czech - Czeski - - - Catalan - Kataloński - - - German - Niemiecki - - - English - Angielski - - - Spanish - Hiszpański - - - French - Francuski - - - Italian - Włoski - - - Dutch - Duński - - - Polish - Polski - - - Portuguese - Portugalski - - - Russian - - - <qt> Know another language? @@ -4304,9 +4469,9 @@ <qt> Używasz innego języka? - Albo chciałbyć udoskonalić tlumaczenie? Pomóż nam i + Chciałbyś udoskonalić tłumaczenie? Pomóż nam i <a href="https://sourceforge.net/sendmessage.php?touser=938941"> - zaproponuj tłumaczenie</a> aby twoi przjaciele mogli używać brewtarget! + zaproponuj tłumaczenie</a> aby twoi przyjaciele mogli używać Brewtarget! </qt> @@ -4370,7 +4535,7 @@ TextLabel - + Etykieta Calculate Viability From Date @@ -4685,6 +4850,69 @@ + strikeWaterDialog + + Strike Water Calculator + Kalkulator wody do infuzji + + + Initial Infusion + Pierwsza infuzja + + + Original Grain Temperature + Pierwotna temperatura słodów + + + Target Mash Temperature + Docelowa temperatura zacieru + + + Weight of Grain + Waga ziarna + + + Volume of Water + Objętość wody + + + Mash Infusion + Zacieranie infuzyjne + + + Total Volume of Water + Całkowita objętość wody + + + Grain Weight + Waga ziarna + + + Actual Mash Temperature + Obecna temperatura zacieru + + + Infusion Water Temperature + Temperatura wody do infuzji + + + Calculate + Oblicz + + + Strike Water Temperature + Temperatura wody do pierwszej infuzji + + + Volume to add + Objętość do dodania + + + Note: This calculator assumes a preheated mash tun. + Uwaga: kalkulator zakłada podgrzaną kadź zacierną + + + styleEditor Style Editor @@ -5059,11 +5287,23 @@ Best For: - Ważność: + Data ważności: Notes: Notatki: + + Default Amount + Domyślna ilość + + + Quanta in Inventory + Ilość w magazynie + + + Quanta in inventory + Ilość w magazynie + diff -Nru brewtarget-2.0.3/translations/bt_pt.ts brewtarget-2.1.0/translations/bt_pt.ts --- brewtarget-2.0.3/translations/bt_pt.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_pt.ts 2014-09-14 16:29:29.000000000 +0000 @@ -1,6 +1,6 @@ - + BrewDayScrollWidget @@ -200,120 +200,6 @@ - BrewTargetTreeModel - - Name - Nome - - - Brew Date - Data da Brassagem - - - Style - Estilo - - - Boil Time - Tempo de Fervura - - - Color - Cor - - - Type - Tipo - - - Use - Uso - - - Form - Forma - - - Category - Category - - - Number - Número - - - Letter - Carta - - - Guide - Guia - - - - BrewTargetTreeView - - New Recipe - Nova Receita - - - Brew It! - Fazer Cerveja! - - - Brew Again - Fazer Receita de Cerveja Novamente - - - Delete - Excluir - - - New Equipment - Novo Equipamento - - - New Fermentable - Novo Fermentável - - - New Hop - Novo Lúpulo - - - New Misc - Novo Adjunto - - - New Yeast - Nova Levedura - - - Copy - Copiar - - - Export - Exportar - - - Import - Importar - - - Change date - Mudar Data - - - New Style - Novo Estilo - - - Recalculate eff - Recalcular eff - - - Brewtarget Default @@ -403,6 +289,10 @@ Gallons Galão(ões) + + Unknown + Desconhecido + BtDigitWidget @@ -420,6 +310,148 @@ + BtTreeModel + + Name + Nome + + + Brew Date + Data da brassagem + + + Style + Estilo + + + Boil Time + Tempo de Fervura + + + Color + Cor + + + Type + Tipo + + + Use + Use + + + Form + Formulário + + + Category + Categoria + + + Number + Número + + + Letter + Letra + + + Guide + Guia + + + PATH + + + + FULLPATH + FULLPATH + + + + BtTreeView + + New + Novo + + + Recipe + Receita + + + Brew It! + Inicie Produção de Cerveja! + + + Brew Again + Fazer cerveja novamente + + + Change date + Alterar a data + + + Recalculate eff + + + + Delete + Excluir + + + Equipment + Equipamento + + + Fermentable + Fermentescível + + + Hop + Lúpulo + + + Misc + Diversos + + + Style + Estilo + + + Yeast + Levedura + + + Folder + Pasta + + + Copy + Copiar + + + Export + Exportar + + + Import + Importar + + + Delete %1 + Excluir %1 + + + Delete %1 %2? + Excluir %1 %2? + + + BrewNote + + + + Database Merge Database @@ -561,6 +593,10 @@ Color (EBC) Cor (EBC) + + Inventory + Inventário + Hop @@ -677,68 +713,67 @@ Form Formulário - - - MainWindow - Open - Abrir - - - BeerXML files (*.xml) - Arquivos BeerXML (*.xml) + Inventory + Inventário + + + IbuGuSlider - Save - Salvar + Cloying + Enjoativo - Equipment request - Solicitação de Equipamento + Extra Malty + - Would you like to set the batch size, boil size and time to that requested by the equipment? - Gostaria de ajustar o tamanho da fornada, tamanho e tempo de fervura requeridos pelo equipamento? + Slightly Malty + Ligeiramente Maltado - Delete %1 - Excluir %1 + Balanced + Equilibrado - Delete %1 %2? - Excluir %1 %2? + Slightly Hoppy + - HTML files (*.html) - Arquivos HTML (*.html) + Extra Hoppy + - New - Novo + Way Hoppy + + + + MainWindow - Recipe - Receita + Open + Abrir - Equipment - Equipamento + BeerXML files (*.xml) + Arquivos BeerXML (*.xml) - Fermentable - Fermentável + Save + Salvar - Hop - Lúpulo + Equipment request + Solicitação de Equipamento - Miscellaneous - Adjuntos + Would you like to set the batch size, boil size and time to that requested by the equipment? + Gostaria de ajustar o tamanho da fornada, tamanho e tempo de fervura requeridos pelo equipamento? - Yeast - Levedura + HTML files (*.html) + Arquivos HTML (*.html) Copy %1 @@ -873,10 +908,6 @@ SQLite - Style - Estilo - - Copy Style Copiar Estilo @@ -892,36 +923,25 @@ The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - MaltinessWidget - - Cloying - Enjoativo </> - - - Extra malty - Maltado Extra - - Slightly malty - Ligeiramente Maltado + Folder name + Nome da pasta - Balanced - Balanceado + Folder name: + Nome da pasta: - Slightly hoppy - Ligeiramente Lupulado + Bad Name + Nome Inválido - Extra hoppy - Extra Lúpulado + A folder name must have at least one non-whitespace character in it + O nome da pasta deve possuir pelo menos um caractere diferente de espaço - Way hoppy - Pra lá de lupulado + A folder name must have at least one non-/ character in it + O nome da pasta deve possuir pelo menos um caractere diferente de / @@ -1149,6 +1169,10 @@ Amount Type Tipo Quantidade + + Inventory + Inventário + OptionDialog @@ -1172,6 +1196,58 @@ Please restart Brewtarget. Favor reiniciar o Brewtarget. + + Catalan + Catalão + + + Czech + Tcheco + + + German + Alemão + + + English + Inglês + + + Greek + Grego + + + Spanish + Espanhol + + + French + Francês + + + Italian + Italiano + + + Dutch + Holandês + + + Polish + Polonês + + + Portuguese + Português (Portugal) + + + Russian + Russo + + + Chinese + Chinês + QObject @@ -1358,10 +1434,6 @@ "%1" não pode ser lido. - Config directory "%1" cannot be read. - Diretório de Configurações "%1" não pode ser lido. - - New Version Nova Versão @@ -1581,6 +1653,14 @@ Style Estilo + + Folder + Pasta + + + Failed to update the database + + Recipe @@ -1854,18 +1934,10 @@ FG - Unknown - Desconhecido - - ABV ABV - Bitterness - Amargor - - Color Cor @@ -2041,6 +2113,42 @@ Print Document Imprimir Documento + + Category + Categoria + + + Code + Código + + + Guide + Guia + + + BoilTime + Tempo de Fervura + + + Beta + Beta + + + Lab + Laboratório + + + Attenuation + Atenuação + + + Id + Id + + + Flocculation + Floculação + RefractoDialog @@ -2069,6 +2177,13 @@ + StrikeWaterDialog + + N/A + N/A + + + StyleEditor Style name @@ -2225,6 +2340,10 @@ Product ID ID do Produto + + Inventory + Inventário + aboutDialog @@ -2233,20 +2352,38 @@ Sobre o Brewtarget + Donate + Contribuir + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2263,68 +2400,8 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -Brewtarget %1 -Brewtarget, para o desenvolvimento de receitas de cerveja. -Copyright 2009-2013 pelos desenvolvedores abaixo. - -Desenvolvedores - -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> - -Copyright (GPLv3) - -Brewtarget é um software livre: pode ser redistribuído e/ou modificado -dentro dos termos de GNU (General Public License), como publicado pela -Free Software Foundation, tanto na 3ª versão da licensa, ou -(a ser informada) qualquer versão posterior. - -Brewtarget é distribuiído na esperança de ser útil, -mas SEM QUALQUER GARANTIA; sem sequer garantia implícita de -COMERCIALIZAÇÃO ou APTIDÃO PARA USO PARTICULAR. Veja a Licensa -GNU (General Public License) para maior detalhes. - -Uma cópia da licensa GNU (General Public License) -deve ser distribuída juntamento com Brewtarget. Senão, veja <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. -Código Fonte -O código fonte do Brewtarget pode ser baixado em <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Agradecimentos -Guido Carpi (tradução italiana) -Ester (tradução catalã) -Marc Cote (tradução francesa) -Pawel Fiedor (tradução polonesa) -Admiro (tradução polonesa) -Edu Engler (tradução portuguesa) -Jan Grmela (tradução tcheca) -Randy Brace (Testador Alfa) -<a href="http://finalgravitypodcast.com">Considerações Finais</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -imagens de servidor, impressora, editar-copiar, visualização de impressão de documentos e diversas do tema Oxygen (CC license) -imagem de cópia de segurança do tema Nuvola theme (LGPL)</body></html> - - - Donate - Contribuir +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> + @@ -2950,6 +3027,18 @@ Notes: Notas: + + Default Amount + Quantidade Padrão + + + Amount in Inventory + Quantidade no inventário + + + Amount in inventory + Quantidade no inventário + hopDialog @@ -3005,10 +3094,6 @@ Ácidos alfa em porcentagem de massa - Amount - Quantidade - - Amount Quantidade @@ -3128,6 +3213,18 @@ Notes: Notas: + + Default Amount + Quantidade Padrão + + + Amount in Inventory + Quantidade no inventário + + + Amount in inventory + Quantidade no inventário + htmlViewer @@ -3637,6 +3734,18 @@ Mashes Mosturas + + 1.0 + 1.0 + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator + + mashDesigner @@ -3991,6 +4100,18 @@ Notes: Notas: + + Default Amount + Quantidade Padrão + + + Amount in Inventory + Quantidade no inventário + + + Amount in inventory + Quantidade no inventário + namedMashEditor @@ -4293,50 +4414,6 @@ Línguas - Czech - Tcheco - - - Catalan - Catalão - - - German - Alemão - - - English - Inglês - - - Spanish - Espanhol - - - French - Francês - - - Italian - Italiano - - - Dutch - Holandês - - - Polish - Polonês - - - Portuguese - Português - - - Russian - Russo - - <qt> Know another language? @@ -4728,6 +4805,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + Infusão Inicial + + + Original Grain Temperature + Temperatura Original dos Grãos + + + Target Mash Temperature + Temperatura Alvo do Mosto + + + Weight of Grain + Peso dos Grãos + + + Volume of Water + Volume de Água + + + Mash Infusion + Infusão do Mosto + + + Total Volume of Water + Volume Total de Água + + + Grain Weight + Peso dos Grãos + + + Actual Mash Temperature + Temperatura Atual do Mosto + + + Infusion Water Temperature + Temperatura de Infusão da Água + + + Calculate + Calcular + + + Strike Water Temperature + + + + Volume to add + Volume a ser adicionado + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -5108,5 +5248,17 @@ Notes: Notas: + + Default Amount + Quantidade Padrão + + + Quanta in Inventory + Quantidade em estoque + + + Quanta in inventory + Quantidade em estoque + diff -Nru brewtarget-2.0.3/translations/bt_ru.ts brewtarget-2.1.0/translations/bt_ru.ts --- brewtarget-2.0.3/translations/bt_ru.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_ru.ts 2014-09-14 16:29:29.000000000 +0000 @@ -200,223 +200,255 @@ - BrewTargetTreeModel + Brewtarget - Name - Название + Default + По умолчанию - Brew Date - Дата варки + EBC + Цвет пива по EBC - Style - Стиль + SRM + Цвет пива по SRM - Boil Time - Время кипячения + Plato + Плато - Color - Цвет + Specific Gravity + Плотность SG - Type - Тип + SI + Международные единицы - Use - Использование + US Customary + Американские единицы - Form - Форма + Milligrams + Миллиграммы - Category - Категория + Grams + Граммы - Number - + Kilograms + Килограммы - Letter - + Ounces + Унции - Guide - + Pounds + Фунты - - - BrewTargetTreeView - New Recipe - Новый рецепт + Celsius + ° Цельсия - Brew It! - Вари + Fahrenheit + ° Фаренгейта - Brew Again - Сварить снова + British Imperial + Британские имперские - Delete - Удалить + MilliLiters + Миллилитры - New Equipment - Новое оборудование + Liters + Литры - New Fermentable - Новые сбраживаемые + Teaspoons + Чайные ложки - New Hop - Новый хмель + Tablespoons + Столовые ложки - New Misc - Новые прочие + Cups + Чашки - New Yeast - Новые дрожжи + Quarts + Кварты - Copy - Копировать + Gallons + Галлоны - Export - Экспортировать + Unknown + + + + BtDigitWidget - Import - Импортировать + Too low for style. + Слишком низко для стиля - Change date - + In range for style. + В пределах стиля - New Style - + Too high for style. + Слишком высоко для стиля + + + BtTreeModel - Recalculate eff + Name - - - Brewtarget - Default - По умолчанию + Brew Date + Дата варки - EBC - Цвет пива по EBC + Style + Сорт - SRM - Цвет пива по SRM + Boil Time + Время кипячения - Plato - Плато + Color + Цвет - Specific Gravity - Плотность SG + Type + Тип - SI - Международные единицы + Use + Использование - US Customary - Американские единицы + Form + Форма - Milligrams - Миллиграммы + Category + Категория - Grams - Граммы + Number + - Kilograms - Килограммы + Letter + - Ounces - Унции + Guide + - Pounds - Фунты + PATH + - Celsius - ° Цельсия + FULLPATH + + + + BtTreeView - Fahrenheit - ° Фаренгейта + New + - British Imperial - Британские имперские + Recipe + Рецепт - MilliLiters - Миллилитры + Brew It! + - Liters - Литры + Brew Again + - Teaspoons - Чайные ложки + Change date + - Tablespoons - Столовые ложки + Recalculate eff + - Cups - Чашки + Delete + - Quarts - Кварты + Equipment + Оборудование - Gallons - Галлоны + Fermentable + - - - BtDigitWidget - Too low for style. - Слишком низко для стиля + Hop + - In range for style. - В пределах стиля + Misc + Разное - Too high for style. - Слишком высоко для стиля + Style + Сорт + + + Yeast + Дрожжи + + + Folder + + + + Copy + + + + Export + + + + Import + + + + Delete %1 + + + + Delete %1 %2? + + + + BrewNote + @@ -561,6 +593,10 @@ Color (EBC) Цвет (EBC) + + Inventory + + Hop @@ -677,68 +713,67 @@ Form Форма - - - MainWindow - Open - Открыть - - - BeerXML files (*.xml) - Файлы BeerXML (*.xml) + Inventory + + + + IbuGuSlider - Save - Сохранить + Cloying + - Equipment request - Запрос оборудования + Extra Malty + - Would you like to set the batch size, boil size and time to that requested by the equipment? - Желаете приравнять размер затора, размер кипячения и время к размеру запрошеного оборудования? + Slightly Malty + - Delete %1 - Удаление %1 + Balanced + - Delete %1 %2? - Удалить %1 %2? + Slightly Hoppy + - HTML files (*.html) - Файлы HTML (*.html) + Extra Hoppy + - New - Новый + Way Hoppy + + + + MainWindow - Recipe - Рецепт + Open + Открыть - Equipment - Оборудование + BeerXML files (*.xml) + Файлы BeerXML (*.xml) - Fermentable - Сбраживаемое + Save + Сохранить - Hop - Хмель + Equipment request + Запрос оборудования - Miscellaneous - Прочее + Would you like to set the batch size, boil size and time to that requested by the equipment? + Желаете приравнять размер затора, размер кипячения и время к размеру запрошеного оборудования? - - Yeast - Дрожжи + + HTML files (*.html) + Файлы HTML (*.html) Copy %1 @@ -873,10 +908,6 @@ SQLite (*.sqlite) - Style - - - Copy Style @@ -892,36 +923,25 @@ The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - MaltinessWidget - - Cloying - Надоедливый - - - Extra malty - Перенасыщенное сусло - - Slightly malty - Ненасыщенное сусло + Folder name + - Balanced - Сбалансировано + Folder name: + - Slightly hoppy - Немного охмелено + Bad Name + - Extra hoppy - Слишком охмелено + A folder name must have at least one non-whitespace character in it + - Way hoppy - Правильно охмелено + A folder name must have at least one non-/ character in it + @@ -1149,6 +1169,10 @@ Amount Type + + Inventory + + OptionDialog @@ -1172,6 +1196,58 @@ Please restart Brewtarget. Пожалуйста, перезапустите Brewtarget. + + Catalan + + + + Czech + + + + German + + + + English + + + + Greek + + + + Spanish + + + + French + + + + Italian + + + + Dutch + + + + Polish + + + + Portuguese + + + + Russian + + + + Chinese + + QObject @@ -1358,10 +1434,6 @@ Не удаётся выполнить чтение "%1". - Config directory "%1" cannot be read. - Не удаётся выполнить чтение конфигурационного каталога "%1". - - New Version Новая версия @@ -1579,6 +1651,14 @@ Style + Сорт + + + Folder + + + + Failed to update the database @@ -1854,18 +1934,10 @@ Конечная плотность (FG) - Unknown - Неизвестный - - ABV Объём алкоголя - Bitterness - Горечь - - Color Цвет @@ -2041,6 +2113,42 @@ Print Document Печать документа + + Category + Категория + + + Code + + + + Guide + + + + BoilTime + + + + Beta + + + + Lab + Лаборатория + + + Attenuation + + + + Id + + + + Flocculation + Флоккуляция + RefractoDialog @@ -2069,6 +2177,13 @@ + StrikeWaterDialog + + N/A + недоступно + + + StyleEditor Style name @@ -2225,6 +2340,10 @@ Product ID ID продукта + + Inventory + + aboutDialog @@ -2233,20 +2352,38 @@ О программе Brewtarget + Donate + Пожертвовать + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2263,26 +2400,9 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> - - Donate - Пожертвовать - brewDayScrollWidget @@ -2907,6 +3027,18 @@ Notes: Примечания: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + hopDialog @@ -2962,10 +3094,6 @@ Альфа-кислот как процент по массе - Amount - Количество - - Amount Количество @@ -3085,6 +3213,18 @@ Notes: Примечания: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + htmlViewer @@ -3594,6 +3734,18 @@ Mashes + + 1.0 + 1.0 + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator + + mashDesigner @@ -3948,6 +4100,18 @@ Notes: Примечания: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + namedMashEditor @@ -4250,50 +4414,6 @@ Язык - Czech - Чешский - - - Catalan - Каталанский - - - German - Немецкий - - - English - Английский - - - Spanish - Испанский - - - French - Французский - - - Italian - Итальянский - - - Dutch - Нидерландский - - - Polish - Польский - - - Portuguese - Португальский - - - Russian - - - <qt> Know another language? @@ -4685,6 +4805,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + + + + Original Grain Temperature + + + + Target Mash Temperature + + + + Weight of Grain + + + + Volume of Water + + + + Mash Infusion + + + + Total Volume of Water + + + + Grain Weight + + + + Actual Mash Temperature + + + + Infusion Water Temperature + + + + Calculate + Расчитать + + + Strike Water Temperature + + + + Volume to add + + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -5065,5 +5248,17 @@ Notes: Примечания: + + Default Amount + + + + Quanta in Inventory + + + + Quanta in inventory + + diff -Nru brewtarget-2.0.3/translations/bt_sv.ts brewtarget-2.1.0/translations/bt_sv.ts --- brewtarget-2.0.3/translations/bt_sv.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_sv.ts 2014-09-14 16:29:29.000000000 +0000 @@ -200,223 +200,255 @@ - BrewTargetTreeModel - - Name - Namn - + Brewtarget - Brew Date - Bryggdatum + Default + Förvalt - Style - Stil + EBC + EBC - Boil Time - Koktid + SRM + SRM - Color - Färg + Plato + Plato - Type - Typ + Specific Gravity + Densitet - Use - Användning + SI + SI - Form - Form + US Customary + Vanlig i US - Category - Kategori + Milligrams + milligram - Number - Nummer + Grams + gram - Letter - Letter + Kilograms + kilogram - Guide - Guide + Ounces + Uns - - - BrewTargetTreeView - New Recipe - Nytt recept + Pounds + Pund - Brew It! - Brygg! + Celsius + Celsius - Brew Again - Brygg igen + Fahrenheit + Fahrenheit - Delete - Radera + British Imperial + brittisk standard - New Equipment - Ny utrustning + MilliLiters + milliliter - New Fermentable - Ny malt + Liters + liter - New Hop - Ny humle + Teaspoons + tesked - New Misc - Nytt övrigt + Tablespoons + matsked - New Yeast - Ny jäst + Cups + Kopp - Copy - Kopiera + Quarts + Quart - Export - Exportera + Gallons + Gallons - Import - Importera + Unknown + Okänd + + + BtDigitWidget - Change date - Ändra datum + Too low for style. + För låg för vald stil - New Style - Ny stil + In range for style. + I intervall för stilen, - Recalculate eff - Beräkna om utbyte + Too high for style. + För högt för stilen, - Brewtarget + BtTreeModel - Default - Förvalt + Name + Namn - EBC - EBC + Brew Date + Bryggdatum - SRM - SRM + Style + Stil - Plato - Plato + Boil Time + Koktid - Specific Gravity - Densitet + Color + Färg - SI - SI + Type + Stil - US Customary - Vanlig i US + Use + Använd - Milligrams - milligram + Form + Formulär - Grams - gram + Category + Kategori - Kilograms - kilogram + Number + Nummer - Ounces - Uns + Letter + Bokstav - Pounds - Pund + Guide + Guide - Celsius - Celsius + PATH + SÖKVÄG - Fahrenheit - Fahrenheit + FULLPATH + Hela sökvägen + + + BtTreeView - British Imperial - brittisk standard + New + Ny - MilliLiters - milliliter + Recipe + Recept - Liters - liter + Brew It! + Brygg den! - Teaspoons - tesked + Brew Again + Brygg den igen - Tablespoons - matsked + Change date + Byt datum - Cups - Kopp + Recalculate eff + Räkna om effektivitet - Quarts - Quart + Delete + Ta bort - Gallons - Gallons + Equipment + Utrustning - - - BtDigitWidget - Too low for style. - För lågt för stilen. + Fermentable + Jäsbar - In range for style. - I intervall för stilen, + Hop + Humle - Too high for style. - För högt för stilen, + Misc + Övrigt + + + Style + Stil + + + Yeast + Jäst + + + Folder + Mapp + + + Copy + Kopiera + + + Export + Exportera + + + Import + Importera + + + Delete %1 + Ta bort %1 + + + Delete %1 %2? + Ta bort %1 %2 + + + BrewNote + Brygganteckning @@ -438,7 +470,7 @@ Tun Volume Warning - + Tunnvolyms-varning Batch Size Warning @@ -507,7 +539,7 @@ FermentableTableModel Bad model index. row = %1 - + Dåligt modellindex. rad = %1 Mashed @@ -519,7 +551,7 @@ Not mashed - + Omäskat Late @@ -539,7 +571,7 @@ Type - Typ + Sort Amount @@ -547,11 +579,11 @@ Late Addition - + Sen tillsats Yield % - + Ge % Color (SRM) @@ -561,6 +593,10 @@ Color (EBC) Färg (EBC) + + Inventory + Lager + Hop @@ -570,7 +606,7 @@ First Wort - Första Vörten + Första Vörten Boil @@ -677,68 +713,67 @@ Form Formulär - - - MainWindow - Open - Öppna - - - BeerXML files (*.xml) - BeerXML-fil (*.xml) + Inventory + Lager + + + IbuGuSlider - Save - Spara + Cloying + - Equipment request - + Extra Malty + Extra maltig - Would you like to set the batch size, boil size and time to that requested by the equipment? - Vill du ändra batch-volym, kokvolym och tid baserat på de värden som angivits för utrustningen? + Slightly Malty + Lätt maltig - Delete %1 - Ta bort %1 + Balanced + Balanserad - Delete %1 %2? - Ta bort %1 %2? + Slightly Hoppy + Lätt humlearomatisk - HTML files (*.html) - HTML-fil (*.html) + Extra Hoppy + Extra humlearomatisk - New - Ny + Way Hoppy + Extremt humlearomatisk + + + MainWindow - Recipe - Recept + Open + Öppna - Equipment - Utrustning + BeerXML files (*.xml) + BeerXML-fil (*.xml) - Fermentable - Jäsbart + Save + Spara - Hop - Humle + Equipment request + Utrustningsbegäran - Miscellaneous - Övrigt + Would you like to set the batch size, boil size and time to that requested by the equipment? + Vill du ändra batch-volym, kokvolym och tid baserat på de värden som angivits för utrustningen? - Yeast - Jäst + HTML files (*.html) + HTML-fil (*.html) Copy %1 @@ -754,7 +789,7 @@ Copy Fermentable - + Kopiera jästbar Copy Hop @@ -810,7 +845,7 @@ This will obliterate your current set of recipes and ingredients. Do you want to continue? - + Detta kommer att RADERA din nuvarande samling av recept och ingredienser. Vill du fortsätta? For some reason, the operation failed. @@ -822,11 +857,11 @@ No mash - + Ingen mäskning Trying to add a mash step without a mash. Please create a mash first. - + Du försöker lägga till ett mäskningssteg utan ha angett en mäskning. Skapa en mäskning först. Copy Recipe @@ -838,7 +873,7 @@ Please give your mash a name before saving. - + Namnge din mäsk innan du sparar. Restart @@ -873,10 +908,6 @@ SQLite (*.sqlite) - Style - Stil - - Copy Style Kopiera stil @@ -890,38 +921,27 @@ The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - + Importen innehåller felaktig beerXML-data. Importen slutfördes men bör kontrolleras så den är korrekt. - - - MaltinessWidget - Cloying - Kladdig + Folder name + Katalognamn - Extra malty - Mycket maltig + Folder name: + Katalognamn: - Slightly malty - Lite maltig + Bad Name + Felaktigt namn - Balanced - Balanserad + A folder name must have at least one non-whitespace character in it + Ett katalognamn måste innehålla minst ett icke blankstegs-tecken. - Slightly hoppy - Ganska humlig - - - Extra hoppy - Mycket humlig - - - Way hoppy - Extremt humlig + A folder name must have at least one non-/ character in it + Ett katalognamn måste innehålla något annat än bara specialtecken. @@ -963,7 +983,7 @@ MashStepTableModel Bad model index. row = %1 - + Dåligt modellindex. rad = %1 Bad column: %1 @@ -1014,7 +1034,7 @@ There must be at least one mash step to run the wizard. - + Det måste finnas minst ett mäskningssteg för att kunna köra guiden First step @@ -1030,7 +1050,7 @@ Your mash is too thick for desired temp. at first step. - + Din mäsk är för tjock för den valda temperaturen i första steget. Decoction error @@ -1046,7 +1066,7 @@ In order to hit your sparge temp, the sparge water must be above boiling. Lower your sparge temp, or allow for more sparge water. - + För att träffa din sköljtemperatur så måste sköljvattnet ha en temperatur över kokpunkten. Sänk din sköljtemperatur eller öka på mängden vatten. Too much wort @@ -1061,7 +1081,7 @@ MiscDialog Misc name - + Övriga namn Misc name: @@ -1096,7 +1116,7 @@ Boil - Kokning + Kokning Mash @@ -1147,14 +1167,18 @@ Amount Type - + Mängdbeteckning + + + Inventory + Lager OptionDialog Open Directory - + Öppna katalog Copy Data @@ -1172,6 +1196,58 @@ Please restart Brewtarget. Vänligen starta om Brewtarget. + + Catalan + Katalanska + + + Czech + Tjeckiska + + + German + Tyska + + + English + Engelska + + + Greek + Grekiska + + + Spanish + Spanska + + + French + Franska + + + Italian + Italienska + + + Dutch + Holländska + + + Polish + Polska + + + Portuguese + Portugisiska + + + Russian + Ryska + + + Chinese + Kinesiska + QObject @@ -1216,12 +1292,14 @@ Bitterness: %1 IBUs (%2) - + Bitterhet: %1 IBUs (%2) + Color: %1 SRM (%2) - + Färg: %1 SRM (%2) + Fermentables @@ -1231,7 +1309,7 @@ Name - Namn + Namn Type @@ -1247,28 +1325,29 @@ Late - Sen + Sen Yield - + Avkastning Color - Färg + Färg Yes - + Ja No - + Nej Total grain: %1 - + Total kornmängd: %1 + Hops @@ -1295,7 +1374,8 @@ Misc - + Övrigt + Yeast @@ -1305,11 +1385,11 @@ Form - + Formulär Stage - + Steg Secondary @@ -1327,7 +1407,7 @@ Temp - + Temperatur Target @@ -1354,16 +1434,12 @@ "%1" kan ej läsas. - Config directory "%1" cannot be read. - - - New Version Ny Version Version %1 is now available. Download it? - + Version %1 är nu tillgänglig. Ladda ner? Stop bothering you about new versions? @@ -1375,7 +1451,7 @@ Failed to open the database '%1'. - + Kunde inte öppna databasen '%1'. Save Database Changes @@ -1391,228 +1467,238 @@ Multiple databases were found. Do you want to restore the changes you made during your last Brewtarget session, or rollback to before last session's changes? - + Flera databaser hittades. Vill du återskapa ändringarna som gjordes under din förra session eller vill du återställa till före förra sessionens ändringar? Restore - + Återskapa Rollback - + Återställ Failed to remove the temporary backup database. Navigate to '%1' and remove 'tempBackupDatabase.sqlite'. - + Kunde inte ta bort den temporära databasbackupen. Öppna '%1' och ta bort 'tempBackupDatabase.sqlite'. Failed to rollback to the backup database. Navigate to '%1', remove 'database.sqlite' if it exists, and rename 'tempBackupDatabase.sqlite' to 'database.sqlite'. - + Kunde inte återställa till föregående backup. Öppna '%1' och ta bort 'database.sqlite' Döp sedan om 'tempBackupDatabase.sqlite' till 'database.sqlite'. Database Restore Failure - + Databasåterställning misslyckades Failed to restore the backup database. Navigate to '%1' and rename 'tempBackupDatabase.sqlite' to 'database.sqlite'. - + Kunde inte återskapa föregående backup. Öppna '%1' och ta bort 'database.sqlite' Döp sedan om 'tempBackupDatabase.sqlite' till 'database.sqlite'. Grain - Malt + Korn Sugar - Socker + Socker Extract - Extrakt + Extrakt Dry Extract - torrextrakt + torrextrakt Adjunct - Tillsats + Tillsats Boil - Kokning + Kokning Mash - Mäsk + Mäsk Infusion - + avkok Temperature - + Temperatur Decoction - + Avkok Bottling - Flasktappning + Flasktappning Spice - Krydda + Krydda Fining - Klarningsmedel + Klarningsmedel Water Agent - Vattenbehandling + Vattenbehandling Herb - Örtkrydda + Ört Flavor - Smak + Smak Other - Övrigt + Annan Ale - + Ale Lager - + Lager Wheat - + Vete Wine - + Vin Champagne - + Champagne Liquid - + Vätska Dry - + Torrt Slant - + Lutning Culture - + Kultur Low - + Låg Medium - + Medel High - + Hög Very High - + Mycket hög Recipes - + Recept Equipment - Utrustning + Utrustning Fermentables - + Jäsbart Hops - + Humle Miscellaneous - Övrigt + Övrigt Yeast - Jäst + Jäst Efficiency: %1% - + Effektivitet: %1 % + ABV: %1% - + Volymprocent alkohol: %1 % + Style - Stil + Stil + + + Folder + Katalog + + + Failed to update the database + Recipe Add grains - Tillsätt malt + Tillsätt malt Add - + Lägg till to the mash tun. - + till mäsktunnan Heat water - Värm vatten + Värm vatten Bring - + Värm %1 water to %2, - + %1 vatten till %2, for upcoming infusions. - + för kommande avkok Add %1 water at %2 to mash to bring it to %3. - + Addera %1 vatten vid %2 till mäsken för att få den till %3 Heat mash to %1. - + Värm mäsken till %1. Bring %1 of the mash to a boil and return to the mash tun to bring it to %2. @@ -1620,7 +1706,7 @@ Hold for %1. - + Håll den här för %1 Put %1 %2 into boil for %3. @@ -1628,27 +1714,27 @@ Put %1 %2 into fermenter for %3. - + Lägg i %1 %2 i jäskaret vid %3 Put %1 %2 into first wort for %3. - + Lägg i %1 %2 i primären vid %3 Put %1 %2 into mash for %3. - + Lägg i %1 %2 i mäsken vid %3 Steep %1 %2 in wort for %3. - + Stöp %1 %2 in mäsken vid %3. Use %1 %2 for %3 - + Använd %1 %2 till %3 Hop addition - + Addera humle Use %1 %2 at bottling for %3. @@ -1656,47 +1742,47 @@ Put %1 %2 into primary for %3. - + Tillsätt %1 %2 till primären vid %3 Put %1 %2 into secondary for %3. - + Tillsätt %1 %2 till sekundären vid %3 Use %1 %2 for %3. - + Använd %1 %2 till %3 Misc addition - + Övrig tillsats Do first wort hopping with - + Humla den okokta mäsken med First wort hopping - + Humling av okokt mäsk You should now have %1 wort. - + Du borde nu ha %1 mäsk Add %1 water to the kettle, bringing pre-boil volume to %2. - + Tillsätt %1 vatten till grytan så att volymen för kokning blir %2. Pre-boil - + Före kokning Boil or steep - + Koka eller stöp Boil/steep fermentables - + Koka/stöp de jäsbara to the boil at knockout. @@ -1708,7 +1794,7 @@ You should have %1 wort post-boil. - + Du bör ha %1 vört efter kokning. @@ -1723,262 +1809,255 @@ The final volume in the primary is %1. - + +Primärens slutgiltiga volym är %1 Post boil - + Efter kokning Boil time - + Koktid You did not configure an equipment (which you really should), so tell me the boil time. - + Du har inte ställt in din utrustning (vilket du bör göra), så ange din koktid Bring the wort to a boil and hold for %1. - + Koka upp vörten och låt den koka i %1 Start boil - + Starta kokningen Flameout - + Flameout Stop boiling the wort. - + Stoppa vörtens kokning Cool wort and pitch - + Kyl vörten och tillsätt %1 %2 yeast, - + %1 %2 jäst, to the primary. - + till primären Pitch yeast - + Tillsätt jäst Let ferment until FG is %1. - + Lät det jäsa till slutdensiteten är %1 Ferment - + Jäs Transfer beer to secondary. - + Överför ölen till sekundären Transfer to secondary - + Överför ill sekundären Add %1 %2 to boil at %3. - + Tillsätt %1 %2 till koket vid %3 Raise water to boil and then remove from heat. Stir in - + Värm vattnet tills det kokar och ta sedan bort det från värmekällan. Rör i Add Extracts to water - + Tillsätt extraktet till vattnet %1 water to %2 - + %1 vatten till %2 RecipeFormatter unknown style - + Okänd stil N/A - + Ej tillämplig Brewer - + Bryggare Date - Datum + Datum Batch Size - + Satsstorlek Boil Size - + Kokmängd Boil Time - Koktid + Koktid Efficiency - Effektivitet + Effektivitet OG - + OG FG - - - - Unknown - + FG ABV - Alkoholhalt - - - Bitterness - + Volymprocent alkohol Color - Färg + Färg Calories (per 12 oz.) - + Kalorier (per 12 oz). Fermentables - + Jäsbart Total grain: - + Total kornmängd: Name - Namn + Namn Type - Typ + Stil Amount - Mängd + Mängd Mashed - Mäskat + Mäskat Late - Sen + Sent Yield - + Avkastning Yes - + Ja No - + Nej Hops - + Humle Alpha - Alfa + Alfa Use - Användning + Använd Time - Tid + Tid Form - + Formulär IBU - IBU + IBU Misc - + Övrigt Yeast - Jäst + Jäst Stage - + Steg Secondary - Sekundär + Sekundär Primary - Primär + Primär Mash - Mäsk + Mäsk Temp - + Temperatur Target Temp - Måltemperatur + Måltemperatur Notes - Anteckningar + Anteckningar Instructions - Instruktioner + Instruktioner Brew Date - Bryggdatum + Bryggdatum Preboil - + Före kokning SG - + SG Volume into BK @@ -1990,7 +2069,7 @@ Final Temp - + Slutgiltig temperatur Eff into BK @@ -1998,57 +2077,93 @@ Projected OG - + Beräknad OG Postboil - + Efter kokning Postboil Volume - + Volym efter kokning Volume Into Fermenter - + Volym som överförs till jäskaret Brewhouse Eff - + Brygghusets effektivitt Projected ABV - + Beräknad volymprocent alkohol Postferment - + Efter jäsning Volume - Volym + Volym Print Document - Skriv ut dokument + Skriv ut dokument + + + Category + Kategori + + + Code + Kod + + + Guide + Guide + + + BoilTime + Koktid + + + Beta + Beta + + + Lab + Lab + + + Attenuation + + + + Id + Id + + + Flocculation + Flockulering RefractoDialog OG Mismatch - + Missat OG Based on the given original plato, the OG should be %1, but you have entered %2. Continuing with the calculated OG. - + Baserat på angiven plato så bör OG vara minst %1, men det inmatade värdet är %2. Fortsätter med det beräknad OG. ScaleRecipeTool Recipe Scaled - + Receptet är skalat The mash has been reset due to the fact that mash temperatures do not scale easily. Please re-run the mash wizard. @@ -2060,14 +2175,21 @@ + StrikeWaterDialog + + N/A + Inte tillgänglig + + + StyleEditor Style name - + Stilnamn Style name: - + Stil: @@ -2078,149 +2200,157 @@ Audio Files (*.wav *.ogg *.mp3 *.aiff) - + Ljudfiler (*.wav *.ogg *.mp3 *.aiff) Stop - + Stopp Start - + Start WaterTableModel Bad model index. row = %1 - + Felaktigt modellindex. rad = %1 Bad column: %1 - Felaktig kolumn:%1 + Felaktig kolumn:%1 Name - Namn + Namn Amount - Mängd + Mängd Calcium (ppm) - + Kalcium (ppm) Bicarbonate (ppm) - + Bikarbonat (ppm) Sulfate (ppm) - + Sulfater (ppm) Chloride (ppm) - + Klor (ppm) Sodium (ppm) - + Natrium (ppm) Magnesium (ppm) - + Magnesium (ppm) YeastDialog Yeast name - + Jästnamn Yeast name: - + Jästnamn: YeastItemDelegate Ale - + Ale Lager - + Lager Wheat - + Vete Wine - + Vin Champagne - + Champagne Liquid - + Vätska Dry - + Torr Slant - + Lutning Culture - + Kultur YeastTableModel Bad model index. row = %1 - + Felaktigt modellindex. rad = %1 Bad column: %1 - Felaktig kolumn:%1 + Felaktig kolumn:%1 Name - Namn + Namn Type - Typ + Sort Form - + Formulär Amount - Mängd + Mängd Laboratory - + Laboratorium Product ID - + Produkt-ID + + + Inventory + Inventarium aboutDialog About Brewtarget + Om Brewtarget + + + Donate @@ -2229,15 +2359,29 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2254,76 +2398,103 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - - - - Donate - +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +Brewtarget %1 +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. + +Developers + +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> + +Copyright (GPLv3) + +Brewtarget is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +Brewtarget is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. +Source Code +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> brewDayScrollWidget Form - + Formulär Generate Instructions - + Generera instruktioner Insert step - + Lägg till steg Name - Namn + Namn Name of new step - + Namn för nytt steg Step # - + Steg # The number where the new step should be placed - + Numret för det nya steget Insert the new step - + Lägg till det nya steget Move steps - + Fler steg Move currently selected step up - + Flytta valt steg uppåt Move currently selected step down - + Flytta valt steg nedåt Remove currently selected step - + Ta bort valt steg @@ -2334,86 +2505,86 @@ Instructions - Instruktioner + Instruktioner Move currently selected step up - + Flytta vald utrustning Up - + Uppåt Move currently selected step down - + Flytta valt steg nedåt Down - + Ned Remove currently selected step - + Ta bort valt steg Remove - + Ta bort Insert step - + Lägg till steg Name - Namn + Namn Name of new step - + Namn för nytt steg Step # - + Steg # The number where the new step should be placed - + Numret för det nya steget Insert the new step - + Lägg till det nya steget Insert - + Infoga brewNoteWidget Form - + Formulär Preboil - + Före kokning SG - + SG Preboil gravity - + Densitet före kok Volume - Volym + Volym Volume of wort collected - + Volym på vörten Strike Temp @@ -2425,27 +2596,27 @@ Final Temp - + Slutgiltig temperatur Temperature of mash before mash out - + Mäskens temperatur innan "Mash out" Postboil - + Efter kokning OG - + OG Post boil gravity - + Densitet efter kokning Postboil Volume - + Volym efter kokning Volume of wort in BK after boil @@ -2453,7 +2624,7 @@ Volume of wort transferred to fermenter - + Mängden vört som överförts till jäskaret Volume into fermenter @@ -2465,15 +2636,15 @@ Temperature of wort when yeast is pitched - + Vörtens temperatur när jästen tillsätts. Postferment - + Efter jäsning Final gravity - + Slutgiltig densitet Volume of beer into serving keg/bottles @@ -2497,23 +2668,23 @@ Projected OG - + Beräknad OG Brewhouse efficiency - + Brygghusets effektivitet Brewhouse Eff - + Brygghusets effektivitet Expected ABV based on OG - + Beräknad volymprocent alkohol beräknad på OG Projected ABV - + Beräknad volymprocent alkohol ABV based on FG @@ -2521,7 +2692,7 @@ ABV - Alkoholhalt + Notes @@ -2532,7 +2703,7 @@ btSplashScreen Form - + Formulär @@ -2590,7 +2761,7 @@ Required Fields - + Obligatoriska fält Name @@ -2622,7 +2793,7 @@ Boil time - + Koktid Evaporation rate (per hr) @@ -2764,7 +2935,7 @@ Required Fields - + Obligatoriska fält Name @@ -2772,11 +2943,11 @@ Type - Typ + Grain - Malt + Sugar @@ -2896,6 +3067,18 @@ Notes: + Anteckningar: + + + Default Amount + Standardmängd + + + Amount in Inventory + + + + Amount in inventory @@ -2927,7 +3110,7 @@ Remove - + Ta bort @@ -2938,7 +3121,7 @@ Required Fields - + Obligatoriska fält Name @@ -2953,16 +3136,12 @@ - Amount - - - Amount Mängd Use - Användning + Mash @@ -2990,7 +3169,7 @@ Type - Typ + Bittering @@ -3002,7 +3181,7 @@ Form - + Formulär Leaf @@ -3074,6 +3253,18 @@ Notes: + Anteckningar: + + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory @@ -3092,7 +3283,7 @@ instructionWidget Form - + Formulär Show a timer @@ -3115,7 +3306,7 @@ mainWindow Recipes - + Recept Styles @@ -3123,11 +3314,11 @@ Fermentables - + Jäsbart Hops - + Humle Miscs @@ -3199,7 +3390,7 @@ OG - + OG Boil SG @@ -3207,11 +3398,11 @@ FG - + FG ABV - Alkoholhalt + Bitterness (IBU) @@ -3287,11 +3478,11 @@ Remove selected yeast - + Ta bort vald jäst Edit selected yeast - + Editera vald jäst Mash @@ -3387,7 +3578,7 @@ About Brewtarget - + Om Brewtarget &Export Recipe @@ -3585,6 +3776,18 @@ Mashes + + 1.0 + + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator + + mashDesigner @@ -3598,7 +3801,7 @@ Type - Typ + Target temp. @@ -3732,19 +3935,19 @@ Type - Typ + Infusion - + avkok Temperature - + Temperatur Decoction - + Avkok Target temp. @@ -3861,7 +4064,7 @@ Type - Typ + Spice @@ -3877,7 +4080,7 @@ Herb - Örtkrydda + Flavor @@ -3885,11 +4088,11 @@ Other - Övrigt + Use - Användning + Boil @@ -3929,7 +4132,7 @@ Checked if the given amount is weight instead of volume - + Markera denna om värdet indikerar vikt istället för volym Use for: @@ -3937,6 +4140,18 @@ Notes: + Anteckningar: + + + Default Amount + Standardmängd + + + Amount in Inventory + + + + Amount in inventory @@ -4031,7 +4246,7 @@ SG - + SG Measured gravity pre-boil @@ -4039,7 +4254,7 @@ Temp - + Temperatur Temperature of SG reading @@ -4134,7 +4349,7 @@ Temperature - + Temperatur Celsius @@ -4241,50 +4456,6 @@ - Czech - - - - Catalan - - - - German - - - - English - - - - Spanish - - - - French - - - - Italian - - - - Dutch - - - - Polish - - - - Portuguese - - - - Russian - - - <qt> Know another language? @@ -4311,7 +4482,7 @@ OG - + OG For ales, 0.75-1. For lagers, 1.5-2. @@ -4461,7 +4632,7 @@ Brewer - + Bryggare Asst. Brewer @@ -4532,11 +4703,11 @@ recipeExtrasWidget Form - + Formulär Brewer - + Bryggare Asst. Brewer @@ -4635,7 +4806,7 @@ ABV - Alkoholhalt + ABW @@ -4670,6 +4841,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + + + + Original Grain Temperature + + + + Target Mash Temperature + + + + Weight of Grain + + + + Volume of Water + + + + Mash Infusion + + + + Total Volume of Water + + + + Grain Weight + + + + Actual Mash Temperature + + + + Infusion Water Temperature + + + + Calculate + + + + Strike Water Temperature + + + + Volume to add + + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -4709,7 +4943,7 @@ Type - Typ + Type of beverage @@ -4717,11 +4951,11 @@ Lager - + Lager Ale - + Ale Mead @@ -4729,7 +4963,7 @@ Wheat - + Vete Mixed @@ -4753,11 +4987,11 @@ OG - + OG FG - + FG IBUs @@ -4815,7 +5049,7 @@ timerWidget Form - + Formulär Set the timer to the specified value @@ -4835,7 +5069,7 @@ Start - + Start Set a sound as the alarm @@ -4877,82 +5111,82 @@ Create new yeast - + Skapa ny jäst New - Ny + Ny Edit selected yeast - + Editera vald jäst Remove selected yeast - + Ta bort vald jäst yeastEditor Yeast Editor - + Jästeditor Required Fields - + Obligatoriska fält Name - Namn + Namn Type - Typ + Typ Ale - + Ale Lager - + Lager Wheat - + Vete Wine - + Vin Champagne - + Champagne Form - + Formulär Liquid - + Vätska Dry - + Torrt Slant - + Lutning Culture - + Kultur Amount - Mängd + Mängd Check it if the amount given is in kg instead of L. @@ -4964,51 +5198,51 @@ Checked if the given amount is weight instead of volume - + Markera denna om värdet indikerar vikt istället för volym Lab - + Lab Product ID - + Produkt-ID Min Temp - + Min temp Min temp - + Min temp Max Temp - + Max temp Max temp - + Max temp Flocculation - + flockulering Low - + Låg Medium - + Mellan High - + Hög Very High - + Mycket hög Attenuation (%) @@ -5020,11 +5254,11 @@ Times Recultured - + Antal omodlingar Times this yeast has been recultured - + Antal gånger denna jäst har blivit omodlad Max Recultures @@ -5036,19 +5270,31 @@ Add to Secondary - + Tillsätt i sekundären Checked means add this yeast to secondary instead of primary - + Markering betyder att den här jästen ska tillsättas i sekundären istället för i primären Best For: - + Passar till: Notes: + Anteckningar: + + + Default Amount + Standardmängd + + + Quanta in Inventory + + Quanta in inventory + Mängd i lager + diff -Nru brewtarget-2.0.3/translations/bt_zh.ts brewtarget-2.1.0/translations/bt_zh.ts --- brewtarget-2.0.3/translations/bt_zh.ts 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/bt_zh.ts 2014-09-14 16:29:29.000000000 +0000 @@ -200,120 +200,6 @@ - BrewTargetTreeModel - - Name - 名稱 - - - Brew Date - 酿造日期 - - - Style - 样式Style - - - Boil Time - 煮沸时间Boil Time - - - Color - 颜色Color - - - Type - 类型Type - - - Use - 使用Use - - - Form - 形式Form - - - Category - 类别 - - - Number - 编号 - - - Letter - Letter信 - - - Guide - 指南 - - - - BrewTargetTreeView - - New Recipe - 新配方 - - - Brew It! - 酿造它! - - - Brew Again - 再次酿造 - - - Delete - 删除 - - - New Equipment - 新设备 - - - New Fermentable - New Fermentable - - - New Hop - New Hop跳 - - - New Misc - New Misc杂项 - - - New Yeast - 酵母 - - - Copy - 复制 - - - Export - 出口 - - - Import - 进口 - - - Change date - 更改日期 - - - New Style - 新风格 - - - Recalculate eff - 重新计算EFF - - - Brewtarget Default @@ -403,6 +289,10 @@ Gallons 加仑 + + Unknown + 未知 + BtDigitWidget @@ -420,6 +310,148 @@ + BtTreeModel + + Name + + + + Brew Date + 酿造日期 + + + Style + 样式Style + + + Boil Time + 煮沸时间Boil Time + + + Color + 颜色Color + + + Type + + + + Use + 使用Use + + + Form + 形式Form + + + Category + 类别 + + + Number + 编号 + + + Letter + Letter信 + + + Guide + 指南 + + + PATH + + + + FULLPATH + + + + + BtTreeView + + New + 新New + + + Recipe + 食谱 + + + Brew It! + 酿造它! + + + Brew Again + 再次酿造 + + + Change date + 更改日期 + + + Recalculate eff + 重新计算EFF + + + Delete + 删除 + + + Equipment + 设备Equipment + + + Fermentable + 发酵Fermentable + + + Hop + 跳Hop + + + Misc + 其他 + + + Style + 样式Style + + + Yeast + 酵母Yeast + + + Folder + + + + Copy + 复制 + + + Export + 出口 + + + Import + 进口 + + + Delete %1 + 删除Delete %1 + + + Delete %1 %2? + 删除Delete %1 %2? + + + BrewNote + + + + Database Merge Database @@ -561,6 +593,10 @@ Color (EBC) 颜色（EBC） + + Inventory + + Hop @@ -677,68 +713,67 @@ Form 形式Form - - - MainWindow - - Open - 打开Open - - BeerXML files (*.xml) - BeerXML文件BeerXML files (*.xml) + Inventory + + + + IbuGuSlider - Save - 节省Save + Cloying + - Equipment request - 设备的要求Equipment request + Extra Malty + - Would you like to set the batch size, boil size and time to that requested by the equipment? - 你想批量大小，熬大小和时间设置设备所要求的吗？ + Slightly Malty + - Delete %1 - 删除Delete %1 + Balanced + - Delete %1 %2? - 删除Delete %1 %2? + Slightly Hoppy + - HTML files (*.html) - HTML文件HTML files (*.html) + Extra Hoppy + - New - 新New + Way Hoppy + + + + MainWindow - Recipe - 食谱 + Open + 打开Open - Equipment - 设备Equipment + BeerXML files (*.xml) + BeerXML文件BeerXML files (*.xml) - Fermentable - 发酵Fermentable + Save + 节省Save - Hop - 跳Hop + Equipment request + 设备的要求Equipment request - Miscellaneous - 杂项Miscellaneous + Would you like to set the batch size, boil size and time to that requested by the equipment? + 你想批量大小，熬大小和时间设置设备所要求的吗？ - Yeast - 酵母Yeast + HTML files (*.html) + HTML文件HTML files (*.html) Copy %1 @@ -873,10 +908,6 @@ 数据库SQLite (*.sqlite) - Style - 风格 - - Copy Style 复制风格 @@ -886,42 +917,31 @@ The original XML files can be found in - 原始的XML文件中可以找到 - - - The import contained invalid beerXML. It has been imported, but please make certain it makes sense. - - - - - MaltinessWidget - - Cloying - 倒胃口的Cloying + 原始的XML文件中可以找到 - Extra malty - 额外喝醉了的 Extra malty + The import contained invalid beerXML. It has been imported, but please make certain it makes sense. + - Slightly malty - 略喝醉了的Slightly malty + Folder name + - Balanced - 平衡Balanced + Folder name: + - Slightly hoppy - 略微跳动的Slightly hoppy + Bad Name + - Extra hoppy - 额外跳动的Extra hoppy + A folder name must have at least one non-whitespace character in it + - Way hoppy - 啤酒花的方式Way hoppy + A folder name must have at least one non-/ character in it + @@ -1149,6 +1169,10 @@ Amount Type 金额类型MiscTableModel | + + Inventory + + OptionDialog @@ -1172,6 +1196,58 @@ Please restart Brewtarget. 请重新启动Brewtarget。 + + Catalan + 加泰罗尼亚Catalan + + + Czech + 捷克语Czech + + + German + 德国人德国 + + + English + 英语 + + + Greek + + + + Spanish + 西班牙语 + + + French + 法语 + + + Italian + 意大利的Italian + + + Dutch + 荷兰人Dutch + + + Polish + 波兰语Polish + + + Portuguese + 葡萄牙Portuguese + + + Russian + 俄语 + + + Chinese + + QObject @@ -1360,10 +1436,6 @@ “％1”不能被读取。"%1" cannot be read. - Config directory "%1" cannot be read. - 配置目录“％1”不能被读取。Config directory "%1" cannot be read. - - New Version 新版本New Version @@ -1583,6 +1655,14 @@ Style 样式Style + + Folder + + + + Failed to update the database + + Recipe @@ -1856,18 +1936,10 @@ FG - Unknown - 未知 - - ABV ABV - Bitterness - 苦Bitterness - - Color 颜色Color @@ -2043,6 +2115,42 @@ Print Document 打印文件 + + Category + 类别 + + + Code + + + + Guide + 指南 + + + BoilTime + + + + Beta + + + + Lab + 实验室Lab + + + Attenuation + + + + Id + + + + Flocculation + 絮凝Flocculation + RefractoDialog @@ -2071,6 +2179,13 @@ + StrikeWaterDialog + + N/A + N / A + + + StyleEditor Style name @@ -2227,6 +2342,10 @@ Product ID 产品IDProduct ID + + Inventory + + aboutDialog @@ -2235,64 +2354,38 @@ 关于BrewtargetAbout Brewtarget + Donate + 捐赠Donate + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. - -Developers - -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> - -Copyright (GPLv3) - -Brewtarget is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Brewtarget is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. -Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -Brewtarget %1 -Brewtarget, for developing beer recipes. -Copyright 2009-2013 by the developers below. +Brewtarget: for developing beer recipes. +Copyright 2009-2014 by the following developers. Developers -Peter Buelow -Dan Cavanagh -Mik Firestone -Philip G. Lee <rocketman768@gmail.com> +Philip G. Lee <rocketman768@gmail.com> - Lead developer +Mik Firestone <mikfire@gmail.com> +Dan Cavanagh <dan@dancavanagh.com> +Rob Taylor <robtaylor@floopily.org> +Kregg K <gigatropolis@yahoo.com> +A.J. Drobnich <aj.drobnich@gmail.com> +Ted Wright <tedwright@users.sourceforge.net> +Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Peter Buelow <goballstate@gmail.com> +Maxime Lavigne <duguigne@gmail.com> +David Grundberg <individ@acc.umu.se> +Tim Payne <swstim@gmail.com> +Luke Vincent <luke.r.vincent@gmail.com> +Eric Tamme <etamme@gmail.com> +Julein <j2bweb@gmail.com> +Jeff Bailey <skydvr38@verizon.net> +Piotr Przybyla (przybysh) <przybysh@gmail.com> +Chris Hamilton <marker5a@gmail.com> Copyright (GPLv3) @@ -2309,24 +2402,8 @@ You should have received a copy of the GNU General Public License along with Brewtarget. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. Source Code -Brewtarget's source code can be downloaded at <a href="http://brewtarget.sourceforge.net">brewtarget.sourceforge.net</a>. -Special Thanks -Guido Carpi (Italian translation) -Ester (Catalan translation) -Marc Cote (French translation) -Pawel Fiedor (Polish translation) -Admiro (Polish translation) -Edu Engler (Portuguese translation) -Jan Grmela (Czech translation) -Randy Brace (alpha tester) -<a href="http://finalgravitypodcast.com">Final Gravity Podcasts</a> -Glenn Tinseth <<a href="http://www.realbeer.com/hops">http://www.realbeer.com/hops</a>> -server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license) -backup image from Nuvola theme (LGPL)</body></html> - - - Donate - 捐赠Donate +Brewtarget's source code can be downloaded at <a href="https://www.gitorious.org/brewtarget">www.gitorious.org/brewtarget</a>.</body></html> + @@ -2952,6 +3029,18 @@ Notes: 附注：Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + hopDialog @@ -3007,10 +3096,6 @@ α-酸为质量百分比Alpha acids as percent by mass - Amount - 金额Amount - - Amount 量Amount @@ -3130,6 +3215,18 @@ Notes: 附注：Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + htmlViewer @@ -3639,6 +3736,18 @@ Mashes 捣烂Mashes + + 1.0 + 1.0 + + + application/x-brewtarget-ingredient + + + + Strike Water Calculator + + mashDesigner @@ -3993,6 +4102,18 @@ Notes: 附注：Notes: + + Default Amount + + + + Amount in Inventory + + + + Amount in inventory + + namedMashEditor @@ -4295,50 +4416,6 @@ 语言 - Czech - 捷克语Czech - - - Catalan - 加泰罗尼亚Catalan - - - German - 德国人德国 - - - English - 英语 - - - Spanish - 西班牙语 - - - French - 法语 - - - Italian - 意大利的Italian - - - Dutch - 荷兰人Dutch - - - Polish - 波兰语Polish - - - Portuguese - 葡萄牙Portuguese - - - Russian - 俄语 - - <qt> Know another language? @@ -4730,6 +4807,69 @@ + strikeWaterDialog + + Strike Water Calculator + + + + Initial Infusion + + + + Original Grain Temperature + + + + Target Mash Temperature + + + + Weight of Grain + + + + Volume of Water + + + + Mash Infusion + + + + Total Volume of Water + + + + Grain Weight + + + + Actual Mash Temperature + + + + Infusion Water Temperature + + + + Calculate + 计算Calculate + + + Strike Water Temperature + + + + Volume to add + + + + Note: This calculator assumes a preheated mash tun. + + + + styleEditor Style Editor @@ -5110,5 +5250,17 @@ Notes: 附注：Notes: + + Default Amount + + + + Quanta in Inventory + + + + Quanta in inventory + + diff -Nru brewtarget-2.0.3/translations/phrasebooks/bt_pt.qph brewtarget-2.1.0/translations/phrasebooks/bt_pt.qph --- brewtarget-2.0.3/translations/phrasebooks/bt_pt.qph 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/translations/phrasebooks/bt_pt.qph 1970-01-01 00:00:00.000000000 +0000 @@ -1,1991 +0,0 @@ - - - - (New Entry) - - - - Bad model index. row = %1 - Modelo de índice ruim. Linha = %1 - - - Hop Editor - Editor de Lúpulo - - - Required Fields - Campos requeridos - - - Fermentable Editor - Editor de fermentáveis - - - Beta (%) - Beta (%) - - - Leaf - Folha - - - Plug - Plug - - - Pellet - Pellet - - - Form - Forma - - - Both - Ambos - - - Form - Forma - - - Show a timer - Mostra um cronômetro - - - Show timer - Mostrar cronômetro - - - Mark this step completed - Marca esta etapa como completada - - - Step completed - Estapa completada - - - Bad model index. row = %1 - Modelo de índice ruim. Linha = %1 - - - Bad model index. row = %1 - Modelo de índice ruim. Linha = %1 - - - Bad column: %1 - Coluna ruim: %1 - - - Name - Nome - - - Amount - Quantidade - - - Calcium (ppm) - Cálcio (ppm) - - - Bicarbonate (ppm) - Bicarbonato (ppm) - - - Sulfate (ppm) - Sulfato (ppm) - - - Chloride (ppm) - Cloreto (ppm) - - - Sodium (ppm) - Sódio (ppm) - - - Magnesium (ppm) - Magnésio (ppm) - - - Could not find the weight_unit_system tag in the option file. - Não foi possível localizar o sistema de unidade de peso na opção.do arquivo. - - - Could not find the volume_unit_system tag in the option file. - Não foi possível localizar o sistema de unidade de volume na opção do arquivo. - - - Could not find the volume_unit_system tag in the option file. - Não foi possível localizar o sistema de unidade de volume na opção do arquivo. - - - Could not find the temperature_scale tag in the option file. - Não foi possível localizar a escale de temperatura na opção do arquivo. - - - Could not find the ibu_formula tag in the option file. - Não foi possível localizar o IBU na opção do arquivo. - - - Bad ibu_formula type: %1 - Tipo de Fórmula de IBU ruim: %1 - - - Could not find the color_formula tag in the option file. - Não foi possível localizar a cor na opção do arquivo. - - - Bad color_formula type: %1 - Tipo de fórmula de cor ruim: %1 - - - Could not find the use_plato tag in the option file. - Não foi possível localizar o uso de plato na opção do arquivo. - - - Bad use_plato type: %1 - Tipo de uso de plato ruim: %1 - - - Could not open %1 for writing - Não foi possível abrir %1 para gravação - - - Invalid color formula type: %1 - Tipo de fórmula de cor inválida:%1 - - - Could not open %1 for reading. - Não foi possível abrir %1 para leitura. - - - Bad document formatting in %1 %2:%3. %4 - Formato de documento ruim em %1 %2:%3. %4 - - - Could not open %1 for writing. - Não foi possível abrir %1 para gravação. - - - Node at line %1 is not an element. - Nó na linha %1 não é um elemento. - - - Node at line %1 is not an element. - Nó na linha %1 não é um elemento. - - - EQUIPMENT says it is not version %1. Line %2 - EQUIPMENTO diz que esta não é a versão %1. Linha %2 - - - Unsupported EQUIPMENT property: %1. Line %2 - Não suportada as propriedades do EQUIPMENTO: %1. Linha %2 - - - FERMENTABLE says it is not version %1. Line %2 - FERMENTÁVEL diz não é a versão %1. Linha %2 - - - %1 is not a valid type for FERMENTABLE. Line %2 - %1 não é um tipo válido para FERMENTÁVEL. Linha %2 - - - Unsupported FERMENTABLE property: %1. Line %2 - Propriedade do FERMENTÁVEL não suportada: %1. Line %2 - - - HOP says it is not version %1. Line %2 - LÚPULO diz não é a vesão %1. Linha %2 - - - HOP says it is not version %1. Line %2 - LÚPULO diz não é a vesão %1. Linha %2 - - - %1 is not a valid use for HOP. Line %2 - %1 não é um uso válido para o LÚPULO. Linha %2 - - - %1 is not a valid type for HOP. Line %2 - %1 não é um tipo válido para o LÚPULO. Linha %2 - - - %1 is not a valid form for HOP. Line %2 - %1 não é uma forma válida para o LÚPULO. Linha %2 - - - Unsupported HOP property: %1. Line %2 - Propriedade de LÚPULO não suportada: %1. Linha %2 - - - Unrecognized IBU formula type. %1 - Tipo de fórmula de IBU não reconhecida. %1 - - - Unsupported INSTRUCTION property: %1. Line %2 - Propriedades de INSTRUÇÃO não reconhecida: %1. Linha %2 - - - YEAST says it is not version %1. Line %2 - FERMENTO não é a versão %1. Linha %2 - - - Unsupported MASH property: %1. Line %2 - Propriedades de BRASSAGEM não suportada: %1. Line %2 - - - %1 is not a valid type for MASHSTEP. Line %2 - %1 Não é um tipo válido de ETAPA DE BRASSAGEM. Linha %2 - - - Unsupported MASHSTEP property: %1. Line %2 - Propriedade de ETAPA DE BRASSAGEM não suportada: %1. Linha %2 - - - MISC says it is not version %1. Line %2 - DIVERSOS diz não é a versão %1. Linha %2 - - - %1 is not a valid type for MISC. Line %2 - %1 não é um tipo válido para DIVERSOS. Linha %2 - - - %1 is not a valid use for MISC. Line %2 - %1 não é um uso válido para DIVERSOS. Linha %2 - - - Unsupported MISC property: %1. Line %2 - propriedade de DIVERSOS não uportada: %1. Linha %2 - - - RECIPE says it is not version %1. Line %2 - RECEITA diz não é a versão %1. Linha %2 - - - Error at line %1. - Erro na linha %1. - - - %1 is not a valid type for RECIPE. Line %2 - %1 não é um tipo valido para RECEITA. Linha %2 - - - Unsupported RECIPE property: %1. Line %2 - propriedade de RECEITA não suportada: %1. Linha %2 - - - Add grains - Adicionar grãos - - - Add - Adicionar - - - to the mash tun. - Para o recipiente de brassagem. - - - Heat water - Aquecer a água - - - Bring - Trazer - - - %1 water to %2, - %1 água para %2, - - - for upcoming infusions. - programado para infusões. - - - Add %1 water at %2 to mash to bring it to %3. - Adicionar %1 água em %2 para a brassagem para trazê-lo para %3. - - - Add %1 water at %2 to mash to bring it to %3. - Adicionar %1 água em %2 para a brassagem para trazê-lo para %3. - - - Heat mash to %1. - Aquecer a brassagem para %1. - - - Bring %1 of the mash to a boil and return to the mash tun to bring it to %2. - Trazer %1 do mosto para ferver e retornar para o recipiente de brassagem para trazê-lo para %2. - - - Hold for %1. - Manter por %1. - - - Put %1 %2 into mash for %3. - Colocar %1 %2 na brassagem por %3. - - - Bring %1 of the mash to a boil and return to the mash tun to bring it to %2. - Trazer %1 do mosto para ferver e retornar para o recipiente de brassagem para trazê-lo para %2. - - - Hold for %1. - Manter por %1. - - - Mash hop addition - Adição de lúpulo na brassagem - - - Mash misc addition - Adição de diversos na brassagem - - - Do first wort hopping with - Faça primeiro a lupulagem com - - - First wort hopping - Primeira lupulagem - - - You should now have %1 wort. - Você deve ter agora %1 de lupulagem. - - - Add %1 water to the kettle, bringing pre-boil volume to %2. - Adicione %1 de água para a caldeira, elevando o volume de pré-cozimento para %2. - - - Pre-boil - Pré-cozimento - - - Boil time - Tempo de cozimento - - - You did not configure an equipment (which you really should), so tell me the boil time. - Você não configurou um equipamento (o que você realmente deveria!), então me diga o tempo de cozimento. - - - Bring the wort to a boil and hold for %1. - Leve o mosto a cozir e segure por %1. - - - Start boil - Iniciar cozimento - - - Start boil - Iniciar cozimento - - - to the boil. - para o cozimento. - - - Boil fermentables - Cozir fermentáveis - - - Put %1 %2 into boil for %3. - Coloque %1 %2 para cozir por%3. - - - Boil hop addition - Adição de lúpulo para cozimento - - - to the boil at knockout. - a fever para nocaute. - - - Knockout additions - Adições nocaute - - - You should have %1 wort post-boil. - Você deve ter %1 do mosto pós fervura. - - - -You anticipate losing %1 to trub and chiller loss. - Você antecipa perder %1 para o trub e chiller. - - - -Add %1 top up water into primary. - Adicionar %1 de água acima no primário. - - - -The final volume in the primary is %1. - O volume final no primário é %1. - - - -The final volume in the primary is %1. - O volume final no primário é %1. - - - Post boil - Pós fervura - - - Cool wort and pitch - Esfriar o mosto e despejar o fermento - - - %1 %2 yeast, - %1 %2 fermento, - - - to the primary. - para o primário. - - - Pitch yeast - Despejar o fermento - - - to primary. - ao primário. - - - Additions to primary - Adições ao primário - - - Let ferment until FG is %1. - Deixer fermentar até a FG ser%1. - - - Ferment - Fermento - - - Transfer beer to secondary. - Transferir a cervaja para o secundário. - - - Transfer to secondary - Transferir para o secundário - - - Add %1 %2 to secondary for %3. - Adicionar %1 %2 para o secundário para %3. - - - Secondary addition - Adição secundário - - - Dry hop %1 %2 for %3. - Dry hop %1 %2 para %3. - - - Dry hop - Dry hop - - - Add %1 %2 to boil at %3. - Adicionar %1 %2 para fervura em %3. - - - Batch Size: %1 - - Tamanho do lote: %1 - - - - Boil Size: %1 - - Tamanho do cozimento: %1 - - - - Boil Size: %1 - - Tamanho do cozimento: %1 - - - - Boil Time: %1 - - Tempo de cozimento: %1 - - - - Efficiency: %1% - - Eficiência: %1 - - - - OG: %1 - - OG: %1 - - - - FG: %1 - - FG: %1 - - - - ABV: %1% - - ABV: %1% - - - - Bitterness: %1 IBUs (%2) - - Amargor: %1 IBUs (%2) - - - - Color: %1 SRM (%2) - - Cor: %1 SRM (%2) - - - - Fermentables - - Fermentáveis - - - Name - Nome - - - Type - Tipo - - - Amount - Quantidade - - - Mashed - Triturado - - - Late - Depois - - - Yield - Rendimento - - - Yield - Rendimento - - - Color - Cor - - - Yes - Sim - - - No - Não - - - Total grain: %1 - - Grãos totais: %1 - - - - Hops - - Lúpulos - - - - Alpha - Alfa - - - Use - Uso - - - Time - Tempo - - - Form - Forma - - - IBU - IBU - - - Misc - - Diversos - - - Yeast - - Fermento - - - - Stage - Estágio - - - Secondary - Secundário - - - Primary - Primário - - - Mash - - Brassagem - - - - Target - Meta - - - Notes - - Notas - - - - Instructions - - Instruções - - - - Node at line is not an element. Line %1 - Nó na linha, não é um elemento. Linha%1 - - - Unsupported STYLE property: %1. Line %2 - Propriedade de ESTILO não suportada: %1. Linha %2 - - - WATER says it is not version %1. Line %2 - ÁGUA diz não é a versão %1.Linha %2 - - - Unsupported WATER property: %1. Line %2 - Propriedade de ÁGUA não suportada: %1. Linha%2 - - - %1 is not a valid type for yeast. Line %2 - %1 nao é um tipo válido para fermento. Linha %2 - - - %1 is not a valid form for yeast. Line %2 - %1 nao é uma forma válida para fermento. Linha %2 - - - %1 is not a valid flocculation for yeast. Line %2 - %1 nao é uma floculação válida para fermento. Linha %2 - - - %1 is not a valid flocculation for yeast. Line %2 - %1 nao é uma floculação válida para fermento. Linha %2 - - - Unsupported YEAST property: %1. Line %2 - Propriedade FERMENTO não suportada: %1. Linha %2 - - - Recipes - Receitas - - - Bad model index. row = %1 - Índice de modelo Ruim. linha = %1 - - - Late - Atraso - - - Bad model index. row = %1 - Índice do modelo Ruim. linha=%1 - - - Brew day mode - Modo Brassagen do dia - - - Bad document formatting in %1 %2:%3. %4 - Formatação de documento ruim em %1 %2:%3. %4 - - - Bad model index. row = %1 - Índice do modelo ruim. linha = %1 - - - Recipes - Receitas - - - Recipe list - Lista de receitas - - - Your Recipe - Sua receita - - - Equipment to brew this with - Equipamento para produzir esta com - - - Target Batch Size - Meta do tamanho do lote - - - Equipment to brew this with - Equipamento para produzir esta com - - - Equipment - Equipamento - - - Target batch size - Meta do tamanho do lote - - - Calculated Batch Size - Tamanho do lote calculado - - - 5 gal - 5 gal - - - 5 gal - 5 gal - - - Target Boil Size - Tamanho da meta de cozimento - - - Calculated Boil Size - Tamanho do cozimento calcaulado - - - Target Boil Size - Dimensão da meta de cozimento - - - Calculated Boil Size - Dimensão de cozimento calculada - - - Efficiency (%) - Eficiência (%) - - - The extraction efficiency you expect - A eficiência de extração que você espera - - - Fermentables - Fermentáveis - - - IBU/GU - IBU/GU - - - Boil SG - Fervura SG - - - Color (SRM) - Cor (SRM) - - - Bitterness (IBU) - Amargor (IBU) - - - ABV - ABV - - - FG - FG - - - OG - OG - - - The extraction efficiency you expect - A eficiência de extração que você espera - - - Efficiency (%) - Eficiência (%) - - - Calculated Boil Size - Dimensão de cozimento calculada - - - Edit selected fermentable - Editar fermentável selecionado - - - Remove selected fermentable - Remover fermentável selecionado - - - Add a fermentable - Adicionar um fermentável - - - Hops - Lúpulos - - - Add hop - Adicionar lúpulo - - - Step %1: %2 - Etapa %1: %2 - - - Too low for style. - Muito baixo para o estilo. - - - In range for style. - No intervalo para o estilo. - - - Too low for style. - Muito baixo para o estilo. - - - Too high for style. - Muito alto para o estilo. - - - Tun Volume Warning - Aviso Volume do Recipiente - - - Tun Volume Warning - Aviso Volume do Recipiente - - - The tun volume you entered is 0. This may cause problems. - O volume do recipiente que você inseriu é 0. Isso pode causar problemas. - - - Batch Size Warning - Atenção tamanho de lote - - - The batch size you entered is 0. This may cause problems. - O tamanho do lote que você inseriu é 0. Isso pode causar problemas. - - - Equipment name - Nome do equipamento - - - Equipment name: - Nome do equipamento: - - - Fermentable name - Nome do Fermentável - - - Fermentable name - Nome do Fermentável - - - Fermentable name: - Nome do Fermentável: - - - Bad model index. row = %1 - Índice de modelo Ruim. linha = %1 - - - Bad model index. row = %1 - Índice de modelo Ruim. linha = %1 - - - Hop name - Nome do Lúpulo - - - Hop name - Nome do Lúpulo - - - Hop name: - Nome do Lúpulo: - - - Bad model index. row = %1 - Índice de modelo Ruim. linha = %1 - - - Mashed - Triturado - - - Not mashed - Não triturado - - - Late - Atraso - - - Normal - Normal - - - Bad column: %1 - Coluna Ruim: %1 - - - Name - Nome - - - Type - Tipo - - - Amount - Quantidade - - - Late Addition - Adição com atraso - - - Yield % - Rendimento % - - - Color (SRM) - Cor (SRM) - - - Bad model index. row = %1 - Índice do modelo Ruim. linha=%1 - - - Bad model index. row = %1 - Índice do modelo Ruim. linha=%1 - - - Bad column: %1 - Coluna Ruim: %1 - - - Name - Nome - - - Alpha % - Alfa % - - - Amount - Quantidade - - - Use - Uso - - - Time - Tempo - - - Brew day mode - Modo Brassagen do dia - - - Brew day mode - Modo Brassagen do dia - - - Open - Abrir - - - BeerXML files (*.xml) - Arquivos BeerXML (*.xml) - - - Save - Salvar - - - Brewday mode - Modo Brassagem do dia - - - Extras - Extras - - - New recipe - Nova receita - - - Clear recipe - Limpar receita - - - Remove recipe - Remover receita - - - Save database - Salvar banco de dados - - - View equipments - Exibir equipamentos - - - View fermentables - Exibir fermentáveis - - - View hops - Exibir lúpulos - - - View miscs - Exibir Diversos - - - View styles - Exibir estilos - - - View yeasts - Exibir fermentos - - - Timers - Cronómetros - - - Sure about that? - Você tem certeza disso? - - - You are about to obliterate the recipe. Is that ok? - Você está prestes a destruir a receita. Isto está correto? - - - Equipment request - Pedido de equipamento - - - Would you like to set the batch and boil size to that requested by the equipment? - Você gostaria de definir o tamanho do lote e fervura pelo que foi solicitado por equipamento? - - - Could not open %1 for writing. - Não foi possível abrir %1 para gravação. - - - Recipe name - Nome da receita - - - Recipe name: - Nome da receita: - - - Backup Database - Backup do banco de dados - - - Oops! - Oops! - - - Could not copy the files for some reason. - Não foi possível copiar o arquivo por alguma razão. - - - A Warning - Um Aviso - - - This will obliterate your current set of recipes and ingredients. Do you want to continue? - Isto irá destruir o suas receitas e ingredientes. Você quer continuar? - - - Restore Database - Restaurar banco de dados - - - For some reason, the operation failed. - Por alguma razão, a opração falhou. - - - Could not open %1 for reading. - Não foi possível abrir %1 para leitura. - - - Bad document formatting in %1 %2:%3. %4 - Formatação de documento ruim em %1 %2:%3. %4 - - - Found %1 recipes. - Encontradas %1 receitas. - - - Import recipe? - Importar receita? - - - Import %1? - Importar %1? - - - No mash - Sem brassagem - - - Trying to add a mash step without a mash. Please create a mash first. - Tente adicionar uma etapa de brassagem sem uma mistura. Pro favor crie uma brassagem antes. - - - New instructions? - Novas instruções? - - - Generate new instructions? - Gerar novas instruções? - - - Save database? - Salvar banco de dados? - - - Do you want to save the changes made? If not, you will lose anything you changed in this session. - Você quer salvar as alterações feitas?Caso não, você perderá qualquer mudança realizada nesta sessão. - - - Copy Recipe - Copiar receita - - - Enter a unique name for the copy. - Entre um nome exclusivo para a cópia. - - - Please give your mash a name before saving. - Por favor, dê um nome a sua brassagem antes de salvar. - - - Please give your mash a name before saving. - Por favor, dê um nome a sua brassagem antes de salvar. - - - Cloying - Enjoativo - - - Cloying - Enjoativo - - - Extra malty - Malte Extra - - - Slightly malty - Levemente Maltado - - - Balanced - Balanceado - - - Slightly hoppy - Levemente Lupulado - - - Extra hoppy - Lúpulo Extra - - - No Equipment - Sem Equipamento - - - No Equipment - Sem Equipamento - - - No Equipment - Sem Equipamento - - - You have not set an equipment for this recipe. We really cannot continue without one. - Você não definiu um equipamento para esta receita. Nós realmente não podemos continuar sem um. - - - Tun Temp - Temperatura do Recipiente - - - Enter the temperature of the tun before your first infusion. - Digite a temperatura do recipiente antes de sua primeira infusão. - - - Decoction error - Erro de Decocção - - - The first mash step cannot be a decoction. - A primeira etapa não pode ser uma decocção. - - - Bad model index. row = %1 - Índice do modelo ruim. linha = %1 - - - Bad model index. row = %1 - Índice do modelo ruim. linha = %1 - - - Bad column: %1 - Coluna ruim: %1 - - - Time - - - - Temp - Temperatura - - - Amount - Quantidade - - - Type - Tipo - - - Name - Nome - - - Mash thickness (%1/%2) - Densidade da brassagem (%1/%2) - - - Mash thickness (%1/%2) - Densidade da brassagem (%1/%2) - - - Bad thickness - Densidade ruim - - - You must have a positive mash thickness. - Você deve ter uma densidade de brassagem positiva. - - - No steps - Sem etapas - - - You must have at least one mash step to run the wizard. - Você deve ter pelo menos uma etapa de brassagem para executar o assistente. - - - First step - Primeira etapa - - - Your first mash step must be an infusion. - Sua primeira etapa de brassagem deve ser uma infusão. - - - Mash too thick - Brassagem muito densa - - - Your mash is too thick for desired temp. at first step. - Sua brassagem é demasiada densa para a temperatura da 1ª etapa. - - - Decoction - Decocção - - - Haven't tested decoction calculations yet. -Use at own risk. - Cálculos de decocção ainda não testados. -Use por sua conta e risco. - - - Decoction error - Erro de decocção - - - Something went wrong in decoction calculation. - Algo deu errado no cálculo de decocção. - - - Sparge temp. - Temperatura de lavagem. - - - In order to hit your sparge temp, the sparge water must be above boiling. Lower your sparge temp, or allow for more sparge water. - A fim de acertar a temperatura de lavagem, a água de lavagem deve estar acima do cozimento. Baixe à temperatura de lavagem, ou adicione mais água. - - - Too much wort - Muito grão - - - You have too much wort from the mash for your boil size. I suggest increasing the boil size by increasing the boil time, or reducing your mash thickness. - Você tem muitos grãos na brassagem para seu recipente de cozimento. Sugiro aumentar o tamanho do recipiente e o tempo de cozimento, ou reduzir a quantidade de grãos de seu mosto. - - - Misc name - Nome de Diversos - - - Misc name - Nome de Diversos - - - Misc name: - Nome de Diversos: - - - Could not find the weight_unit_system tag in the option file. - Não foi possível localizar o sistema de unidade de peso na opção.do arquivo. - - - Could not find the weight_unit_system tag in the option file. - Não foi possível localizar o sistema de unidade de peso na opção.do arquivo. - - - Could not find the volume_unit_system tag in the option file. - Não foi possível localizar o sistema de unidade de volume na opção do arquivo. - - - Could not find the temperature_scale tag in the option file. - Não foi possível localizar a escale de temperatura na opção do arquivo. - - - Could not find the ibu_formula tag in the option file. - Não foi possível localizar o IBU na opção do arquivo. - - - Bad ibu_formula type: %1 - Tipo de Fórmula de IBU ruim: %1 - - - Could not find the color_formula tag in the option file. - Não foi possível localizar a cor na opção do arquivo. - - - Bad color_formula type: %1 - Tipo de fórmula de cor ruim: %1 - - - Could not find the use_plato tag in the option file. - Não foi possível localizar o uso de plato na opção do arquivo. - - - Bad use_plato type: %1 - Tipo de uso de plato ruim: %1 - - - Could not open %1 for writing - Não foi possível abrir %1 para gravação - - - Invalid color formula type: %1 - Tipo de fórmula de cor inválida:%1 - - - Could not open %1 for reading. - Não foi possível abrir %1 para leitura. - - - Bad document formatting in %1 %2:%3. %4 - Formato de documento ruim em %1 %2:%3. %4 - - - Could not open %1 for writing. - Não foi possível abrir %1 para gravação. - - - Node at line %1 is not an element. - Nó na linha %1 não é um elemento. - - - EQUIPMENT says it is not version %1. Line %2 - EQUIPMENTO diz que esta não é a versão %1. Linha %2 - - - Unsupported EQUIPMENT property: %1. Line %2 - Não suportada as propriedades do EQUIPMENTO: %1. Linha %2 - - - FERMENTABLE says it is not version %1. Line %2 - FERMENTÁVEL diz não é a versão %1. Linha %2 - - - %1 is not a valid type for FERMENTABLE. Line %2 - %1 não é um tipo válido para FERMENTÁVEL. Linha %2 - - - Unsupported FERMENTABLE property: %1. Line %2 - Propriedade do FERMENTÁVEL não suportada: %1. Line %2 - - - HOP says it is not version %1. Line %2 - LÚPULO diz não é a vesão %1. Linha %2 - - - %1 is not a valid use for HOP. Line %2 - %1 não é um uso válido para o LÚPULO. Linha %2 - - - %1 is not a valid type for HOP. Line %2 - %1 não é um tipo válido para o LÚPULO. Linha %2 - - - %1 is not a valid form for HOP. Line %2 - %1 não é uma forma válida para o LÚPULO. Linha %2 - - - Unsupported HOP property: %1. Line %2 - Propriedade de LÚPULO não suportada: %1. Linha %2 - - - Unrecognized IBU formula type. %1 - Tipo de fórmula de IBU não reconhecida. %1 - - - Unsupported INSTRUCTION property: %1. Line %2 - Propriedades de INSTRUÇÃO não reconhecida: %1. Linha %2 - - - YEAST says it is not version %1. Line %2 - FERMENTO não é a versão %1. Linha %2 - - - Unsupported MASH property: %1. Line %2 - Propriedades de BRASSAGEM não suportada: %1. Line %2 - - - %1 is not a valid type for MASHSTEP. Line %2 - %1 Não é um tipo válido de ETAPA DE BRASSAGEM. Linha %2 - - - Unsupported MASHSTEP property: %1. Line %2 - Propriedade de ETAPA DE BRASSAGEM não suportada: %1. Linha %2 - - - MISC says it is not version %1. Line %2 - DIVERSOS diz não é a versão %1. Linha %2 - - - %1 is not a valid type for MISC. Line %2 - %1 não é um tipo válido para DIVERSOS. Linha %2 - - - %1 is not a valid use for MISC. Line %2 - %1 não é um uso válido para DIVERSOS. Linha %2 - - - Unsupported MISC property: %1. Line %2 - propriedade de DIVERSOS não uportada: %1. Linha %2 - - - RECIPE says it is not version %1. Line %2 - RECEITA diz não é a versão %1. Linha %2 - - - Error at line %1. - Erro na linha %1. - - - Error at line %1. - Erro na linha %1. - - - %1 is not a valid type for RECIPE. Line %2 - %1 não é um tipo valido para RECEITA. Linha %2 - - - Unsupported RECIPE property: %1. Line %2 - propriedade de RECEITA não suportada: %1. Linha %2 - - - Add grains - Adicionar grãos - - - Add - Adicionar - - - to the mash tun. - Para o recipiente de brassagem. - - - Heat water - Aquecer a água - - - Bring - Trazer - - - %1 water to %2, - %1 água para %2, - - - for upcoming infusions. - programado para infusões. - - - Add %1 water at %2 to mash to bring it to %3. - Adicionar %1 água em %2 para a brassagem para trazê-lo para %3. - - - Heat mash to %1. - Aquecer a brassagem para %1. - - - Bring %1 of the mash to a boil and return to the mash tun to bring it to %2. - Trazer %1 do mosto para ferver e retornar para o recipiente de brassagem para trazê-lo para %2. - - - Hold for %1. - Manter por %1. - - - Put %1 %2 into mash for %3. - Colocar %1 %2 na brassagem por %3. - - - Mash hop addition - Adição de lúpulo na brassagem - - - Mash misc addition - Adição de diversos na brassagem - - - Do first wort hopping with - Faça primeiro a lupulagem com - - - First wort hopping - Primeira lupulagem - - - You should now have %1 wort. - Você deve ter agora %1 de lupulagem. - - - Add %1 water to the kettle, bringing pre-boil volume to %2. - Adicione %1 de água para a caldeira, elevando o volume de pré-cozimento para %2. - - - Pre-boil - Pré-cozimento - - - Boil time - Tempo de cozimento - - - You did not configure an equipment (which you really should), so tell me the boil time. - Você não configurou um equipamento (o que você realmente deveria!), então me diga o tempo de cozimento. - - - Bring the wort to a boil and hold for %1. - Leve o mosto a cozir e segure por %1. - - - Start boil - Iniciar cozimento - - - to the boil. - para o cozimento. - - - Boil fermentables - Cozir fermentáveis - - - Put %1 %2 into boil for %3. - Coloque %1 %2 para cozir por%3. - - - Boil hop addition - Adição de lúpulo para cozimento - - - to the boil at knockout. - a fever para nocaute. - - - Knockout additions - Adições nocaute - - - You should have %1 wort post-boil. - Você deve ter %1 do mosto pós fervura. - - - -You anticipate losing %1 to trub and chiller loss. - Você antecipa perder %1 para o trub e chiller. - - - You should have %1 wort post-boil. - Você deve ter %1 do mosto pós fervura. - - - -You anticipate losing %1 to trub and chiller loss. - Você antecipa perder %1 para o trub e chiller. - - - -Add %1 top up water into primary. - Adicionar %1 de água acima no primário. - - - -The final volume in the primary is %1. - O volume final no primário é %1. - - - Post boil - Pós fervura - - - Cool wort and pitch - Esfriar o mosto e despejar o fermento - - - %1 %2 yeast, - %1 %2 fermento, - - - %1 %2 yeast, - %1 %2 fermento, - - - to the primary. - para o primário. - - - to the primary. - para o primário. - - - Pitch yeast - Despejar o fermento - - - Pitch yeast - Despejar o fermento - - - to primary. - ao primário. - - - Additions to primary - Adições ao primário - - - Let ferment until FG is %1. - Deixer fermentar até a FG ser%1. - - - Ferment - Fermento - - - Transfer beer to secondary. - Transferir a cervaja para o secundário. - - - Transfer to secondary - Transferir para o secundário - - - Add %1 %2 to secondary for %3. - Adicionar %1 %2 para o secundário para %3. - - - Secondary addition - Adição secundário - - - Dry hop %1 %2 for %3. - Dry hop %1 %2 para %3. - - - Dry hop - Dry hop - - - Add %1 %2 to boil at %3. - Adicionar %1 %2 para fervura em %3. - - - Batch Size: %1 - - Tamanho do lote: %1 - - - - Boil Size: %1 - - Tamanho do cozimento: %1 - - - - Boil Time: %1 - - Tempo de cozimento: %1 - - - - Efficiency: %1% - - Eficiência: %1 - - - - OG: %1 - - OG: %1 - - - - FG: %1 - - FG: %1 - - - - ABV: %1% - - ABV: %1% - - - - Bitterness: %1 IBUs (%2) - - Amargor: %1 IBUs (%2) - - - - Color: %1 SRM (%2) - - Cor: %1 SRM (%2) - - - - Fermentables - - Fermentáveis - - - Name - Nome - - - Type - Tipo - - - Amount - Quantidade - - - Mashed - Triturado - - - Late - Depois - - - Yield - Rendimento - - - Color - Cor - - - Yes - Sim - - - No - Não - - - Total grain: %1 - - Grãos totais: %1 - - - - Hops - - Lúpulos - - - - Alpha - Alfa - - - Use - Uso - - - Time - Tempo - - - Form - Forma - - - IBU - IBU - - - Misc - - Diversos - - - Yeast - - Fermento - - - - Stage - Estágio - - - Secondary - Secundário - - - Primary - Primário - - - Mash - - Brassagem - - - - Target - Meta - - - Notes - - Notas - - - - Instructions - - Instruções - - - - Node at line is not an element. Line %1 - Nó na linha, não é um elemento. Linha%1 - - - Unsupported STYLE property: %1. Line %2 - Propriedade de ESTILO não suportada: %1. Linha %2 - - - WATER says it is not version %1. Line %2 - ÁGUA diz não é a versão %1.Linha %2 - - - Unsupported WATER property: %1. Line %2 - Propriedade de ÁGUA não suportada: %1. Linha%2 - - - %1 is not a valid type for yeast. Line %2 - %1 nao é um tipo válido para fermento. Linha %2 - - - %1 is not a valid form for yeast. Line %2 - %1 nao é uma forma válida para fermento. Linha %2 - - - %1 is not a valid flocculation for yeast. Line %2 - %1 nao é uma floculação válida para fermento. Linha %2 - - - Unsupported YEAST property: %1. Line %2 - Propriedade FERMENTO não suportada: %1. Linha %2 - - diff -Nru brewtarget-2.0.3/ui/aboutDialog.ui brewtarget-2.1.0/ui/aboutDialog.ui --- brewtarget-2.0.3/ui/aboutDialog.ui 2014-05-03 14:43:24.000000000 +0000 +++ brewtarget-2.1.0/ui/aboutDialog.ui 2014-09-14 17:13:20.000000000 +0000 @@ -25,14 +25,14 @@ 0 0 665 - 572 + 598 - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> @@ -44,16 +44,18 @@ Philip G. Lee <rocketman768@gmail.com> - Lead developer Mik Firestone <mikfire@gmail.com> +Maxime Lavigne <duguigne@gmail.com> Dan Cavanagh <dan@dancavanagh.com> Rob Taylor <robtaylor@floopily.org> Kregg K <gigatropolis@yahoo.com> A.J. Drobnich <aj.drobnich@gmail.com> Ted Wright <tedwright@users.sourceforge.net> Charles Fourneau (plut0nium) <charles.fourneau@gmail.com> +Maxime Lavigne (malavv) <duguigne@gmail.com> Peter Buelow <goballstate@gmail.com> -Maxime Lavigne <duguigne@gmail.com> David Grundberg <individ@acc.umu.se> Tim Payne <swstim@gmail.com> +Samuel Östling <MrOstling@gmail.com> Luke Vincent <luke.r.vincent@gmail.com> Eric Tamme <etamme@gmail.com> Julein <j2bweb@gmail.com> diff -Nru brewtarget-2.0.3/ui/btSplashScreen.ui brewtarget-2.1.0/ui/btSplashScreen.ui --- brewtarget-2.0.3/ui/btSplashScreen.ui 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/ui/btSplashScreen.ui 2014-08-02 20:52:22.000000000 +0000 @@ -91,7 +91,7 @@ - :/images/brewtarget_icon.svg + :/images/brewtarget.svg diff -Nru brewtarget-2.0.3/ui/fermentableDialog.ui brewtarget-2.1.0/ui/fermentableDialog.ui --- brewtarget-2.0.3/ui/fermentableDialog.ui 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/ui/fermentableDialog.ui 2014-08-02 20:52:22.000000000 +0000 @@ -6,7 +6,7 @@ 0 0 - 400 + 800 300 diff -Nru brewtarget-2.0.3/ui/fermentableEditor.ui brewtarget-2.1.0/ui/fermentableEditor.ui --- brewtarget-2.0.3/ui/fermentableEditor.ui 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/ui/fermentableEditor.ui 2014-08-03 19:52:49.000000000 +0000 @@ -6,14 +6,14 @@ 0 0 - 505 - 326 + 500 + 351 Fermentable Editor - + @@ -112,7 +112,7 @@ - Amount + Default Amount @@ -211,7 +211,7 @@ 20 - 10 + 13 @@ -250,6 +250,36 @@ + + + + + Amount in Inventory + + + + + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Amount in inventory + + + + + + @@ -339,22 +369,6 @@ - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 20 - - - - diff -Nru brewtarget-2.0.3/ui/hopDialog.ui brewtarget-2.1.0/ui/hopDialog.ui --- brewtarget-2.0.3/ui/hopDialog.ui 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/ui/hopDialog.ui 2014-08-02 20:52:22.000000000 +0000 @@ -6,7 +6,7 @@ 0 0 - 400 + 763 300 diff -Nru brewtarget-2.0.3/ui/hopEditor.ui brewtarget-2.1.0/ui/hopEditor.ui --- brewtarget-2.0.3/ui/hopEditor.ui 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/ui/hopEditor.ui 2014-08-02 20:52:22.000000000 +0000 @@ -6,8 +6,8 @@ 0 0 - 470 - 407 + 515 + 390 @@ -19,747 +19,755 @@ Hop Editor - - - - - 0 - - - - - Required Fields - - - - 0 - - - QLayout::SetMinimumSize - - - 2 - - - 0 - - - 2 - - - 3 - - - - - 0 + + + + 0 + 2 + 515 + 389 + + + + + + + 0 + + + + + Required Fields + + + + 0 + + + QLayout::SetMinimumSize + + + 2 + + + 0 + + + 2 + + + 3 + + + + + 0 + + + QLayout::SetNoConstraint + + + 0 + + + + + + 0 + 0 + + + + Name + + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Name + + + + + + + + + + + + 0 + 0 + + + + Alpha (%) + + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Alpha acids as percent by mass + + + + + + + + + + + + 0 + 0 + + + + Default Amount + + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Amount + + + + + + + + + + + + 0 + 0 + + + + Use + + + + + + + Use + + + + Mash + + + + + First Wort + + + + + Boil + + + + + Aroma + + + + + Dry Hop + + + + + + + + + + + + + 0 + 0 + + + + Time + + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Time + + + + + + + + + + + + + + Amount in Inventory - - QLayout::SetNoConstraint + + + + + + + 0 + 0 + - - 0 + + + 100 + 16777215 + - - - - - 0 - 0 - - - - Name - - - - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Name - - - - + + Amount in inventory + + + + + + - - - - - - 0 - 0 - - - - Alpha (%) - - - - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Alpha acids as percent by mass - - - - + + + + 0 + 0 + + + + Type + + - + + + Type + - - - - 0 - 0 - - - - Amount - - + + Bittering + - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Amount - - + + Aroma + - - - - - - - - 0 - 0 - - - - Use - - + + Both + - - - - Use - - - - Mash - - - - - First Wort - - - - - Boil - - - - - Aroma - - - - - Dry Hop - - - - - + + + + + + + + + + + 0 + 0 + + + + Form + + - + + + Form + + + + Leaf + + - - - - 0 - 0 - - - - Time - - + + Pellet + - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Time - - + + Plug + - + - - - - - - - - - 0 - 0 - - - - Type - - - - - - - Type - - + + + + + + + + 0 + 0 + + - Bittering + Beta (%) + + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Beta acids as percent by mass + + + + + + + + + + + + 0 + 0 + - - - Aroma + HSI + + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Hop Stability/Storage index + + + + + + + + + + + + 0 + 0 + - - - Both + Origin + + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Origin + + + + + + + + + + + 0 + + + + + + + + 0 + 0 + - - - - - - - - - - - - 0 - 0 - - - - Form - - - - - - - Form - - - Leaf + Humulene (%) + + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Humulene + + + + + + + + + + + + 0 + 0 + - - - Pellet + Caryophyllene (%) + + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Caryophyllene + + + + + + + + + + + + 0 + 0 + - - - Plug + Cohumulone (%) - - - - - - - - - - - - 0 - 0 - - - - Beta (%) - - - - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Beta acids as percent by mass - - - - - - - - - - - - 0 - 0 - - - - HSI - - - - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Hop Stability/Storage index - - - - - - - - - - - - 0 - 0 - - - - Origin - - - - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Origin - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - - - 0 - - - - - - - - 0 - 0 - - - - Humulene (%) - - - - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Humulene - - - - - - - - - - - - 0 - 0 - - - - Caryophyllene (%) - - - - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Caryophyllene - - - - - - - - - - - - 0 - 0 - - - - Cohumulone (%) - - - - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Cohumulone - - - - - - - - - - - - 0 - 0 - - - - Myrcene (%) - - - - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Myrcene - - - - - - - - - Substitutes: - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 1000 - 100 - - - - - - - - Notes: - - - - - - - - 0 - 0 - - - - - 100 - 100 - - - - - 1000 - 100 - - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 10 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Cohumulone + + + + + + + + + + + + 0 + 0 + + + + Myrcene (%) + + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Myrcene + + + + + + + + + Substitutes: + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 1000 + 100 + + + + + + + + Notes: + + + + + + + + 0 + 0 + + + + + 100 + 100 + + + + + 1000 + 100 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + diff -Nru brewtarget-2.0.3/ui/mainWindow.ui brewtarget-2.1.0/ui/mainWindow.ui --- brewtarget-2.0.3/ui/mainWindow.ui 2014-03-09 16:36:31.000000000 +0000 +++ brewtarget-2.1.0/ui/mainWindow.ui 2014-08-02 20:52:22.000000000 +0000 @@ -6,7 +6,7 @@ 0 0 - 1048 + 1050 829 @@ -23,14 +23,14 @@ - true + false Brewtarget - $VERSIONSTRING - :/images/brewtarget_icon.svg:/images/brewtarget_icon.svg + :/images/brewtarget.svg:/images/brewtarget.svg @@ -65,6 +65,9 @@ 0 + + true + QTabWidget::West @@ -78,12 +81,15 @@ + + true + Recipes - :/images/brewtarget_icon.svg:/images/brewtarget_icon.svg + :/images/brewtarget.svg:/images/brewtarget.svg @@ -93,11 +99,18 @@ - + + + true + + + + true + Styles @@ -110,7 +123,11 @@ - + + + true + + @@ -216,17 +233,26 @@ 0 0 - 644 + 645 403 - + + + true + 0 + + application/x-brewtarget-recipe + + + true + Recipe @@ -282,7 +308,65 @@ - + + + + + 0 + 0 + + + + Qt::CustomContextMenu + + + Target Boil Size + + + boilSize_l + + + + + + + 0 + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + + + 0 + 0 + + + + + 30 + 16777215 + + + + + + + 5 gal @@ -292,7 +376,7 @@ - + @@ -323,7 +407,7 @@ - + @@ -336,7 +420,7 @@ - + @@ -355,7 +439,7 @@ - + @@ -374,7 +458,7 @@ - + @@ -402,7 +486,7 @@ - + 5 gal @@ -412,7 +496,7 @@ - + @@ -425,7 +509,7 @@ - + @@ -438,7 +522,7 @@ - + @@ -466,7 +550,7 @@ - + @@ -491,7 +575,7 @@ - + @@ -510,7 +594,7 @@ - + @@ -523,65 +607,7 @@ - - - - - 0 - 0 - - - - Qt::CustomContextMenu - - - Target Boil Size - - - boilSize_l - - - - - - 0 - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - - - 0 - 0 - - - - - 30 - 16777215 - - - - - - - @@ -626,136 +652,7 @@ - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::Vertical - - - - - - - 1 - - - - - QLayout::SetDefaultConstraint - - - 4 - - - 5 - - - - - Qt::CustomContextMenu - - - OG - - - og - - - - - - - - 0 - 0 - - - - - DejaVu Sans Mono - 75 - true - - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 70 - 30 - - - - - DejaVu Sans Mono - 12 - 75 - true - - - - QFrame::Box - - - QFrame::Raised - - - Qt::AlignCenter - - - gravity - - - - - - - - 0 - 0 - - - - - DejaVu Sans Mono - 75 - true - - - - Qt::AlignCenter - - - - + Qt::CustomContextMenu @@ -768,386 +665,112 @@ - - - - - 0 - 20 - - - - - 70 - 30 - - - - - DejaVu Sans Mono - 12 - 75 - true - - - - QFrame::Box - - - QFrame::Raised - - - Qt::AlignCenter - - - gravity - - - - - - - Qt::CustomContextMenu - - - FG - - - fg - - - - - - - - 0 - 0 - - - - - DejaVu Sans Mono - 75 - true - - - - Qt::AlignCenter - - - - - - - - 0 - 20 - - - - - 70 - 30 - - - - - DejaVu Sans Mono - 12 - 75 - true - - - - QFrame::Box - - - QFrame::Raised - - - Qt::AlignCenter - - - gravity - - - - - - - - 0 - 0 - - - - - - - - - 0 - 128 - 0 - - - - - - - 0 - 128 - 0 - - - - - - - 0 - 128 - 0 - - - - - - - - - 0 - 128 - 0 - - - - - - - 0 - 128 - 0 - - - - - - - 0 - 128 - 0 - - - - - - - - - 0 - 128 - 0 - - - - - - - 0 - 128 - 0 - - - - - - - 0 - 128 - 0 - - - - - - - - - DejaVu Sans Mono - 75 - true - - - - Qt::AlignCenter - - - - - - - ABV - - - - - - - - 0 - 0 - - - - - DejaVu Sans Mono - 75 - true - - - - Qt::AlignCenter - - - - - - - - 0 - 20 - - - - - 70 - 30 - - - - - DejaVu Sans Mono - 12 - 75 - true - - - - QFrame::Box - - - QFrame::Raised - - - Qt::AlignCenter - - - alcohol - - - - - - - - 0 - 0 - - - - - DejaVu Sans Mono - 75 - true - - - - Qt::AlignCenter - - - - - + + - Bitterness (IBU) + Calories/12oz - - - - - 0 - 0 - - + + - DejaVu Sans Mono + Sans Serif + 12 75 true + true - - Qt::AlignCenter + + 1.0 - - - - - 0 - 20 - - - - - 70 - 30 - - + + - DejaVu Sans Mono + Sans Serif 12 75 true + true - - QFrame::Box - - - QFrame::Raised - - - Qt::AlignCenter + + 1.0 - - + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Qt::Vertical + + + + + + + + + 4 + + + 5 + + + 0 + + + - + 0 0 - - - DejaVu Sans Mono - 75 - true - + + + 128 + 0 + - - Qt::AlignCenter + + + 512 + 16777215 + - + + + + ABV + + + + Qt::CustomContextMenu @@ -1160,157 +783,153 @@ - - - - - 0 - 0 - - - - - DejaVu Sans Mono - 75 - true - - - - Qt::AlignCenter + + + + Bitterness (IBU) - - + + - + 0 - 20 + 0 - 70 - 30 + 128 + 0 - - - DejaVu Sans Mono - 12 - 75 - true - + + + 512 + 16777215 + - - QFrame::Box + + + + + + Qt::CustomContextMenu - - QFrame::Raised + + OG - - Qt::AlignCenter + + og - - - - - 0 - 0 - + + + + Qt::CustomContextMenu - - - DejaVu Sans Mono - 75 - true - + + FG - - Qt::AlignCenter + + fg - + IBU/GU - - + + - + 0 - 20 + 0 - 70 - 30 + 128 + 0 - - - DejaVu Sans Mono - 12 - 75 - true - - - - QFrame::Box - - - QFrame::Raised - - - Qt::AlignCenter + + + 512 + 16777215 + - - - - Calories/12oz + + + + + 0 + 0 + + + + + 128 + 0 + + + + + 512 + 16777215 + - - + + - + 0 - 20 + 0 - 70 - 30 + 128 + 0 - - - DejaVu Sans Mono [unknown] - 12 - - - - QFrame::Box + + + 512 + 16777215 + - - QFrame::Raised + + + + + + + 0 + 0 + - - + + + 128 + 0 + - - Qt::AlignCenter + + + 512 + 16777215 + @@ -1321,86 +940,19 @@ Qt::Vertical - - - 214 - 13 - - - - - - - - - - Qt::Vertical - - - - - - - QLayout::SetNoConstraint - - - 0 - - - - - - 0 - 0 - - - - - 0 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - - - - - - Qt::Vertical + + QSizePolicy::Expanding - 20 - 40 + 40 + 20 - - - - Qt::Horizontal - - - - 181 - 20 - - - - @@ -1411,7 +963,7 @@ - + @@ -1421,7 +973,7 @@ - + @@ -1439,13 +991,13 @@ 0 0 - 644 + 645 334 - + 0 @@ -1461,9 +1013,15 @@ Qt::CustomContextMenu + + true + 0 + + application/x-brewtarget-ingredient + Fermentables @@ -1985,7 +1543,7 @@ 0 0 - 1048 + 1050 20 @@ -2067,6 +1625,7 @@ + @@ -2078,6 +1637,12 @@ + + + 75 + true + + toolBar @@ -2516,12 +2081,22 @@ Mashes + + + Strike Water Calculator + + - BeerColorWidget + IbuGuSlider QWidget -

BeerColorWidget.h

IbuGuSlider.h

+ + + StyleRangeWidget + QWidget +

StyleRangeWidget.h

BrewDayScrollWidget @@ -2534,11 +2109,6 @@

RecipeExtrasWidget.h

- BtDigitWidget - QLabel -

BtDigitWidget.h

- - BtVolumeLabel QLabel

BtLabel.h

@@ -2561,32 +2131,32 @@ RecipeTreeView QTreeView -

BrewTargetTreeView.h

BtTreeView.h

EquipmentTreeView QTreeView -

BrewTargetTreeView.h

BtTreeView.h

FermentableTreeView QTreeView -

BrewTargetTreeView.h

BtTreeView.h

HopTreeView QTreeView -

BrewTargetTreeView.h

BtTreeView.h

MiscTreeView QTreeView -

BrewTargetTreeView.h

BtTreeView.h

YeastTreeView QTreeView -

BrewTargetTreeView.h

BtTreeView.h

BtColorLabel @@ -2606,7 +2176,13 @@ StyleTreeView QTreeView -

BrewTargetTreeView.h

BtTreeView.h

+ + + BtTabWidget + QTabWidget +

BtTabWidget.h

+ 1 @@ -2630,7 +2206,7 @@ lineEdit_efficiency lineEdit_boilTime scrollArea - tabWidget + tabWidget_ingredients fermentableTable pushButton_addFerm pushButton_removeFerm diff -Nru brewtarget-2.0.3/ui/miscDialog.ui brewtarget-2.1.0/ui/miscDialog.ui --- brewtarget-2.0.3/ui/miscDialog.ui 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/ui/miscDialog.ui 2014-08-02 20:52:22.000000000 +0000 @@ -6,7 +6,7 @@ 0 0 - 400 + 847 300 diff -Nru brewtarget-2.0.3/ui/miscEditor.ui brewtarget-2.1.0/ui/miscEditor.ui --- brewtarget-2.0.3/ui/miscEditor.ui 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/ui/miscEditor.ui 2014-08-02 20:52:22.000000000 +0000 @@ -6,386 +6,417 @@ 0 0 - 378 - 196 + 504 + 215 Misc Editor - - - 6 + + + + 0 + 0 + 501 + 211 + - - - - 0 - - - QLayout::SetMaximumSize - - - 0 - - - - - - - - 0 - 0 - - - - Name - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Name - - - - - - - - - 6 - - - - - - 0 - 0 - - - - Type - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Type - - - - Spice - - - - - Fining - - - - - Water Agent - - - - - Herb - - - - - Flavor - - - - - Other - - - - - - - - - - - - - 0 - 0 - - - - Use - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Use - - - - Boil - - - - - Mash - - - - - Primary - - - - - Secondary - - - - - Bottling - - - - - - - - - - - - - 0 - 0 - - - - Time - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Time - - - - - - - - - 6 - - - - - - 0 - 0 - - - - Amount - - - - - - - - 100 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Amount - - - - - - - - - - - - 0 - 0 - - - - Check it if the amount listed is in kg instead of L. - - - Amount is weight? - - - - - - - - 0 - 0 - - - - Checked if the given amount is weight instead of volume - - - - - - - - - - - - - - 2 - - - QLayout::SetFixedSize - - - - - Use for: - - - - - - - - 200 - 50 - - - - - 1000 - 50 - - - - - - - - Notes: - - - - - - - - 200 - 50 - - - - - 200 - 50 - - - - - 1000 - 1000 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - + + + + + 0 + + + + + + + + 0 + 0 + + + + Name + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Name + + + + + + + + + 6 + + + + + + 0 + 0 + + + + Type + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Type + + + + Spice + + + + + Fining + + + + + Water Agent + + + + + Herb + + + + + Flavor + + + + + Other + + + + + + + + + + + + + 0 + 0 + + + + Use + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Use + + + + Boil + + + + + Mash + + + + + Primary + + + + + Secondary + + + + + Bottling + + + + + + + + + + + + + 0 + 0 + + + + Time + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Time + + + + + + + + + 6 + + + + + + 0 + 0 + + + + Default Amount + + + + + + + + 100 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Amount + + + + + + + + + + + + 0 + 0 + + + + Check it if the amount listed is in kg instead of L. + + + Amount is weight? + + + + + + + + 0 + 0 + + + + Checked if the given amount is weight instead of volume + + + + + + + + + + + + + + Amount in Inventory + + + + + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Amount in inventory + + + + + + + + + + + 2 + + + QLayout::SetFixedSize + + + + + Use for: + + + + + + + + 200 + 50 + + + + + 1000 + 50 + + + + + + + + Notes: + + + + + + + + 200 + 50 + + + + + 200 + 50 + + + + + 1000 + 1000 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + diff -Nru brewtarget-2.0.3/ui/strikeWaterDialog.ui brewtarget-2.1.0/ui/strikeWaterDialog.ui --- brewtarget-2.0.3/ui/strikeWaterDialog.ui 1970-01-01 00:00:00.000000000 +0000 +++ brewtarget-2.1.0/ui/strikeWaterDialog.ui 2014-08-02 20:52:22.000000000 +0000 @@ -0,0 +1,341 @@ + + + strikeWaterDialog + + + + 0 + 0 + 702 + 341 + + + + Strike Water Calculator + + + + 25 + + + 9 + + + 25 + + + + + + + Initial Infusion + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Original Grain Temperature + + + + + + + + 0 + 0 + + + + + + + + Target Mash Temperature + + + + + + + + 0 + 0 + + + + + + + + Weight of Grain + + + + + + + + 0 + 0 + + + + 1 + + + + + + + Volume of Water + + + + + + + + 0 + 0 + + + + + + + + + + + Mash Infusion + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Total Volume of Water + + + + + + + + 0 + 0 + + + + + + + + Grain Weight + + + + + + + + 0 + 0 + + + + + + + + Actual Mash Temperature + + + + + + + + 0 + 0 + + + + + + + + Target Mash Temperature + + + + + + + + 0 + 0 + + + + + + + + Infusion Water Temperature + + + + + + + + 0 + 0 + + + + + + + + + + + + + 50 + + + 50 + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Calculate + + + Calculate + + + false + + + true + + + + + + + + + + + + + + 0 + 0 + + + + + 50 + false + + + + Strike Water Temperature + + + + + + + + 0 + 0 + + + + true + + + + + + + + + + + + 0 + 0 + + + + + 50 + false + + + + Volume to add + + + + + + + + 0 + 0 + + + + true + + + + + + + + + + + + 0 + 0 + + + + Note: This calculator assumes a preheated mash tun. + + + + + + + + diff -Nru brewtarget-2.0.3/ui/yeastDialog.ui brewtarget-2.1.0/ui/yeastDialog.ui --- brewtarget-2.0.3/ui/yeastDialog.ui 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/ui/yeastDialog.ui 2014-08-02 20:52:22.000000000 +0000 @@ -6,7 +6,7 @@ 0 0 - 400 + 800 300 diff -Nru brewtarget-2.0.3/ui/yeastEditor.ui brewtarget-2.1.0/ui/yeastEditor.ui --- brewtarget-2.0.3/ui/yeastEditor.ui 2014-01-18 22:34:47.000000000 +0000 +++ brewtarget-2.1.0/ui/yeastEditor.ui 2014-08-02 20:52:22.000000000 +0000 @@ -6,621 +6,645 @@ 0 0 - 466 - 343 + 450 + 407 Yeast Editor - - - - - 0 - - - - - Required Fields - - - - 0 + + + + 0 + 0 + 448 + 407 + + + + + + + 0 + + + + + Required Fields - - 2 - - - - - - - Name - - - - - - - - 0 - 0 - - - - - 100 - 16777215 - - - - Name - - - - - - - - - - - - 0 - 0 - - - - Type - - - - - - - Type - - + + + 0 + + + 2 + + + + + - Ale + Name - - - - Lager + + + + + + + 0 + 0 + - - - - Wheat + + + 100 + 16777215 + - - - - Wine + + Name + + + + + + + + + + + + 0 + 0 + - - - Champagne + Type + + + + + + + Type + + + + Ale + + + + + Lager + + + + + Wheat + + + + + Wine + + + + + Champagne + + + + + + + + + + + + + 0 + 0 + - - - - - - - - - - - - 0 - 0 - - - - Form - - - - - - - Form - - - Liquid + Form - - + + + + + + Form + + + + Liquid + + + + + Dry + + + + + Slant + + + + + Culture + + + + + + + + + + - Dry + Default Amount + + + + + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Amount + + + + + + + + + + + + 0 + 0 + + + + Check it if the amount given is in kg instead of L. - - - Slant + Amount is weight? + + + + + + + + 0 + 0 + + + + Checked if the given amount is weight instead of volume - - - Culture + - - - - + + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 20 + 13 + + + + + + + + + + Quanta in Inventory + + + + + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Quanta in inventory + + + + + + + + + + + Lab + + + + + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Lab + + + + + + + + + + + Product ID + + + + + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Product ID + + + + + + + + + + + Min Temp + + + + + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Min temp + + + + + + + + + + + Max Temp + + + + + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Max temp + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + 0 + + + + + + + + 0 + 0 + + + + Flocculation + + - + + + Flocculation + - - - Amount - - + + Low + - - - - 0 - 0 - - - - - 100 - 16777215 - - - - Amount - - + + Medium + - - - - - - - - 0 - 0 - - - - Check it if the amount given is in kg instead of L. - - - Amount is weight? - - + + High + - - - - 0 - 0 - - - - Checked if the given amount is weight instead of volume - - - - - + + Very High + - + - - - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 20 - 10 - - - - - - - - - - Lab - - - - - - - - 0 - 0 - - - - - 100 - 16777215 - - - - Lab - - - - - - - - - - - Product ID - - - - - - - - 0 - 0 - - - - - 100 - 16777215 - - - - Product ID - - - - - - - - - - - Min Temp - - - - - - - - 0 - 0 - - - - - 100 - 16777215 - - - - Min temp - - - - - - - - - - - Max Temp - - - - - - - - 0 - 0 - - - - - 100 - 16777215 - - - - Max temp - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - 0 - - - - - - - - 0 - 0 - - - - Flocculation - - - - - - - Flocculation - - + + + + + - Low + Attenuation (%) - - + + + + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Apparent attenuation as percentage of OG points + + + + + + + + + - Medium + Times Recultured - - + + + + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Times this yeast has been recultured + + + + + + + + + - High + Max Recultures + + + + + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Max recultures + + + + + + + + + + + + 0 + 0 + - - - Very High + Add to Secondary - - - - - - - - - - - Attenuation (%) - - - - - - - - 0 - 0 - - - - - 100 - 16777215 - - - - Apparent attenuation as percentage of OG points - - - - - - - - - - - Times Recultured - - - - - - - - 0 - 0 - - - - - 100 - 16777215 - - - - Times this yeast has been recultured - - - - - - - - - - - Max Recultures - - - - - - - - 0 - 0 - - - - - 100 - 16777215 - - - - Max recultures - - - - - - - - - - - - 0 - 0 - - - - Add to Secondary - - - - - - - - 0 - 0 - - - - Checked means add this yeast to secondary instead of primary - - - - - - - - - - - - Best For: - - - - - - - - 0 - 0 - - - - - 1000 - 100 - - - - - - - - Notes: - - - - - - - - 0 - 0 - - - - - 1000 - 100 - - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 20 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - + + + + + + + 0 + 0 + + + + Checked means add this yeast to secondary instead of primary + + + + + + + + + + + + Best For: + + + + + + + + 0 + 0 + + + + + 1000 + 100 + + + + + + + + Notes: + + + + + + + + 0 + 0 + + + + + 1000 + 100 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + +

%1 (%2%3)
%1	%2	%1	%2
%1	%2 (%3)	%1	%2 (%3)