The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 9e021dca6ef7f64ccd4ddac99dafd9cdc5d52099 Author: Juergen Spitzmueller <[email protected]> Date: Sat Dec 29 17:52:26 2012 +0100 Do not translate lyx font names diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index b88083a..600e4f2 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -1732,19 +1732,19 @@ void GuiDocument::updateFontlist() QString font = qt_(tex_fonts_roman_gui[n]); if (!isFontAvailable(tex_fonts_roman[n])) font += qt_(" (not installed)"); - fontModule->fontsRomanCO->addItem(font, qt_(tex_fonts_roman[n])); + fontModule->fontsRomanCO->addItem(font, toqstr(tex_fonts_roman[n])); } for (int n = 0; tex_fonts_sans[n][0]; ++n) { QString font = qt_(tex_fonts_sans_gui[n]); if (!isFontAvailable(tex_fonts_sans[n])) font += qt_(" (not installed)"); - fontModule->fontsSansCO->addItem(font, qt_(tex_fonts_sans[n])); + fontModule->fontsSansCO->addItem(font, toqstr(tex_fonts_sans[n])); } for (int n = 0; tex_fonts_monospaced[n][0]; ++n) { QString font = qt_(tex_fonts_monospaced_gui[n]); if (!isFontAvailable(tex_fonts_monospaced[n])) font += qt_(" (not installed)"); - fontModule->fontsTypewriterCO->addItem(font, qt_(tex_fonts_monospaced[n])); + fontModule->fontsTypewriterCO->addItem(font, toqstr(tex_fonts_monospaced[n])); } } diff --git a/status.20x b/status.20x index 145a358..68d5f83 100644 --- a/status.20x +++ b/status.20x @@ -68,6 +68,8 @@ What's new - Load the babel package also if the document is English-only (bug 8423). +- Fix call of nonsense font packages in some localizations. + - Do not let child document's settings override master settings (bug 5941). - Correct output of text in changed font size and with decorations (bug 8424). ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/GuiDocument.cpp | 6 +++--- status.20x | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- The LyX Source Repository
