* 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

@@ -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)

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',

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));
 }

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);
 
 
 /**

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 $@