The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 43583e3ba6f4a366a16e682e97caf57821888427
Merge: 04d39dd 51cc826
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Mon Oct 8 17:04:34 2012 +0200

    Merge branch 'master' of git.lyx.org:lyx


commit 04d39dd5be73e6b6ca83dd9487cdbc118c4a1f29
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Mon Oct 8 17:02:10 2012 +0200

    Proper string translation

diff --git a/src/frontends/qt4/LayoutBox.cpp b/src/frontends/qt4/LayoutBox.cpp
index a1514c1..9460427 100644
--- a/src/frontends/qt4/LayoutBox.cpp
+++ b/src/frontends/qt4/LayoutBox.cpp
@@ -569,9 +569,9 @@ void LayoutBox::addItemSort(docstring const & item, 
docstring const & category,
        bool sorted, bool sortedByCat, bool unknown)
 {
        QString qitem = toqstr(item);
-       // FIXME This is wrong for RTL, I'd suppose.
-       QString titem = toqstr(translateIfPossible(item) +
-                              (unknown ? _(" (unknown)") : from_ascii("")));
+       docstring const loc_item = translateIfPossible(item);
+       QString titem = unknown ? toqstr(bformat(_("%1$s (unknown)"), loc_item))
+                               : toqstr(loc_item);
        QString qcat = toqstr(translateIfPossible(category));
 
        QList<QStandardItem *> row;

-----------------------------------------------------------------------

Summary of changes:
 src/frontends/qt4/LayoutBox.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to