The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 9a0f82d44141e63ff9818a9a1e4277776ea3e232 Merge: c851350 df880b8 Author: Juergen Spitzmueller <sp...@lyx.org> Date: Tue Oct 9 16:13:00 2012 +0200 Merge branch 'master' of git.lyx.org:lyx commit c85135090e230c046851603c372b3ad0fd47a788 Author: Juergen Spitzmueller <sp...@lyx.org> Date: Tue Oct 9 16:12:32 2012 +0200 Stick to bformat diff --git a/src/frontends/qt4/CategorizedCombo.cpp b/src/frontends/qt4/CategorizedCombo.cpp index d4410cf..878d277 100644 --- a/src/frontends/qt4/CategorizedCombo.cpp +++ b/src/frontends/qt4/CategorizedCombo.cpp @@ -493,7 +493,9 @@ void CategorizedCombo::addItemSort(QString const & item, QString const & guiname bool sorted, bool sortedByCat, bool sortCats, bool available) { - QString titem = available ? guiname : qt_("Unavailable: %1").arg(guiname); + QString titem = available ? guiname + : toqstr(bformat(_("Unavailable: %1$s"), + qstring_to_ucs4(guiname))); bool const uncategorized = category.isEmpty(); QString qcat = uncategorized ? qt_("Uncategorized") : category; ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/CategorizedCombo.cpp | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository