Author: cazfi
Date: Wed Apr 15 06:47:45 2015
New Revision: 28786
URL: http://svn.gna.org/viewcvs/freeciv?rev=28786&view=rev
Log:
Set our own xgettext options via AM_XGETTEXT_OPTION where possible.
Suggested by Louis Moureaux <louis94>
See patch #5901
Modified:
branches/S2_6/configure.ac
branches/S2_6/translations/freeciv/Makevars
branches/S2_6/translations/nations/Makevars
branches/S2_6/translations/ruledit/Makevars
Modified: branches/S2_6/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=28786&r1=28785&r2=28786&view=diff
==============================================================================
--- branches/S2_6/configure.ac (original)
+++ branches/S2_6/configure.ac Wed Apr 15 06:47:45 2015
@@ -512,6 +512,11 @@
if test "x$USE_NLS" = "xyes" ; then
AC_DEFINE([FREECIV_ENABLE_NLS], [1], [Native language support enabled])
fi
+
+AM_XGETTEXT_OPTION([--keyword=Q_])
+AM_XGETTEXT_OPTION([--keyword=PL_:1,2])
+AM_XGETTEXT_OPTION([--language=C])
+AM_XGETTEXT_OPTION([--escape])
PKG_PROG_PKG_CONFIG
if test "x$PKG_CONFIG" = "x" ; then
Modified: branches/S2_6/translations/freeciv/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/Makevars?rev=28786&r1=28785&r2=28786&view=diff
==============================================================================
--- branches/S2_6/translations/freeciv/Makevars (original)
+++ branches/S2_6/translations/freeciv/Makevars Wed Apr 15 06:47:45 2015
@@ -11,9 +11,7 @@
XGETTEXT_OPTIONS = \
--keyword=_ --flag=_:1:pass-c-format \
--keyword=N_ --flag=N_:1:pass-c-format \
- --keyword=--keyword=Q_ --keyword=PL_:1,2 \
- --flag=error:3:c-format --flag=error_at_line:5:c-format \
- --language=C --escape
+ --flag=error:3:c-format --flag=error_at_line:5:c-format
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
Modified: branches/S2_6/translations/nations/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/nations/Makevars?rev=28786&r1=28785&r2=28786&view=diff
==============================================================================
--- branches/S2_6/translations/nations/Makevars (original)
+++ branches/S2_6/translations/nations/Makevars Wed Apr 15 06:47:45 2015
@@ -11,9 +11,7 @@
XGETTEXT_OPTIONS = \
--keyword=_ --flag=_:1:pass-c-format \
--keyword=N_ --flag=N_:1:pass-c-format \
- --keyword=--keyword=Q_ --keyword=PL_:1,2 \
- --flag=error:3:c-format --flag=error_at_line:5:c-format \
- --language=C --escape
+ --flag=error:3:c-format --flag=error_at_line:5:c-format
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
Modified: branches/S2_6/translations/ruledit/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/ruledit/Makevars?rev=28786&r1=28785&r2=28786&view=diff
==============================================================================
--- branches/S2_6/translations/ruledit/Makevars (original)
+++ branches/S2_6/translations/ruledit/Makevars Wed Apr 15 06:47:45 2015
@@ -11,10 +11,8 @@
XGETTEXT_OPTIONS = \
--keyword=_ --flag=_:1:pass-c-format \
--keyword=N_ --flag=N_:1:pass-c-format \
- --keyword=--keyword=Q_ --keyword=PL_:1,2 \
--keyword=R__ --keyword=RQ_ \
- --flag=error:3:c-format --flag=error_at_line:5:c-format \
- --language=C --escape
+ --flag=error:3:c-format --flag=error_at_line:5:c-format
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
