From c56671cec7147f3f2fbee4a5a93188c717eb4fe8 Mon Sep 17 00:00:00 2001
From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Tue, 7 Nov 2006 18:09:55 +0000
Subject: [PATCH] 	* src/frontends/qt4/qt_helpers.C: 	*
 src/frontends/qt4/qt_helpers.h: 	* src/frontends/qt4/ui/Makefile.am: 
 * Status.15x: 	* development/scons/qt4.py: fix localization for qt4 strings

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15786 a592a061-630c-0410-9148-cb99ea01b6c8
---
 Status.15x                       | 6 ++++--
 development/scons/qt4.py         | 2 +-
 src/frontends/qt4/qt_helpers.C   | 2 +-
 src/frontends/qt4/qt_helpers.h   | 2 +-
 src/frontends/qt4/ui/Makefile.am | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Status.15x b/Status.15x
index d76ce6e8df..1ea8141a6b 100644
--- a/Status.15x
+++ b/Status.15x
@@ -127,8 +127,6 @@ MENUS
 
 * Some English menu items don't have a '&' character. (box, date, paste...)
 
-* All label and button texts in the Qt4 dialogs are not translated.
-
 * Special handling of [[...]] in text messages is disabled in messages.C
 
 
@@ -295,3 +293,7 @@ CREDITS:
 
   WONTFIX: This happens with qt >= 4.2 only, it does not happen with 4.1.4/4.1.5!
   (or maybe try to add an updateGeonetry() call somewhere as well; JSpitzm).
+
+* All label and button texts in the Qt4 dialogs are not translated.
+
+  FIXED (MGerz 2006-11-07)
diff --git a/development/scons/qt4.py b/development/scons/qt4.py
index 05136f4971..99bda3ce6b 100644
--- a/development/scons/qt4.py
+++ b/development/scons/qt4.py
@@ -262,7 +262,7 @@ def generate(env):
 	#env['QT4_UIC4COM'] = [
 	#	CLVar('$QT4_UIC $QT4_UICDECLFLAGS -o ${TARGETS[0]} $SOURCE'),
 	#	]
-	env['QT4_UIC4COM'] = '$QT4_UIC -o $TARGET $SOURCE'
+	env['QT4_UIC4COM'] = '$QT4_UIC -tr lyx::qt_ -o $TARGET $SOURCE'
 	uic4builder = Builder(
 		action='$QT4_UIC4COM',
 		src_suffix='$QT4_UISUFFIX',
diff --git a/src/frontends/qt4/qt_helpers.C b/src/frontends/qt4/qt_helpers.C
index 56c20699b6..b1dfd2c62d 100644
--- a/src/frontends/qt4/qt_helpers.C
+++ b/src/frontends/qt4/qt_helpers.C
@@ -155,7 +155,7 @@ void qstring_to_ucs4(QString const & qstr, vector<char_type> & ucs4)
 }
 
 
-QString const qt_(char const * str)
+QString const qt_(char const * str, const char *)
 {
 	return toqstr(_(str));
 }
diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h
index 57c68f285a..29a3fbfaee 100644
--- a/src/frontends/qt4/qt_helpers.h
+++ b/src/frontends/qt4/qt_helpers.h
@@ -104,7 +104,7 @@ void qstring_to_ucs4(QString const & qstr, std::vector<char_type> & ucs4);
  *
  * Use this in qt4/ instead of qt_()
  */
-QString const qt_(char const * str);
+QString const qt_(char const * str, const char * comment);
 
 
 /**
diff --git a/src/frontends/qt4/ui/Makefile.am b/src/frontends/qt4/ui/Makefile.am
index fd99ac0e67..1dc55f0dc0 100644
--- a/src/frontends/qt4/ui/Makefile.am
+++ b/src/frontends/qt4/ui/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = $(UIFILES)
 BUILT_SOURCES = $(UIFILES:.ui=.h)
 
 # Use _() for localization instead of tr() or trUtf8()
-UICFLAGS=-tr qt_
+UIC4FLAGS=-tr lyx::qt_
 
 %.h: %.ui
 	$(UIC4) $(UIC4FLAGS) $< -o $@
-- 
2.39.2