* src/frontends/qt4/GuiView.cpp:

	- make version string in the banner at least partially translatable.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24152 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 2a0bac0df389428f115de3ceee5ace60c5c63713..d93b932bbb6674fd263bc362d737dc72fdd0d6df 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -113,7 +113,8 @@ public:
        {
                LYXERR(Debug::GUI, "show banner: " << lyxrc.show_banner);
                /// The text to be written on top of the pixmap
-               QString const text = "version " + (lyx_version ? lyx_version : qt_("unknown version"));
+               QString const text = lyx_version ?
+                       qt_("version ") + lyx_version : qt_("unknown version");
                splash_ = QPixmap(":/images/banner.png");
 
                QPainter pain(&splash_);
@@ -300,7 +301,7 @@ GuiView::GuiView(int id)
        // We don't want to keep the window in memory if it is closed.
        setAttribute(Qt::WA_DeleteOnClose, true);
 
-#ifndef Q_WS_WIN | Q_WS_MACX
+#if (!defined(Q_WS_WIN) && !defined(Q_WS_MACX))
        // assign an icon to main form. We do not do it under Qt/Win or Qt/Mac,
        // since the icon is provided in the application bundle.
        setWindowIcon(QPixmap(":/images/lyx.png"));