[5314] gettext 0.18.3

[karl]

Revision: 5314
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5314
Author:   karl
Date:     2013-08-15 17:24:38 +0000 (Thu, 15 Aug 2013)
Log Message:
-----------
gettext 0.18.3

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/configure.ac
    trunk/gnulib/m4/po.m4
    trunk/po/ChangeLog
    trunk/po/Makefile.in.in
    trunk/po/Makevars
    trunk/po/Rules-quot
    trunk/util/srclist-txi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2013-08-15 16:07:06 UTC (rev 5313)
+++ trunk/ChangeLog     2013-08-15 17:24:38 UTC (rev 5314)
@@ -1,3 +1,8 @@
+2013-08-15  gettextize  <address@hidden>
+
+       * gnulib/m4/po.m4: Upgrade to gettext-0.18.3.
+       * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.18.3.
+
 2013-08-15  Karl Berry  <address@hidden>
 
        * install-info/install-info.c (ensure_dirfile_exists): do not
@@ -3,5 +8,5 @@
        translate the ^_ byte; the Italian translation missed it,
        and it makes more sense to consider it a keyword anyway.
-       Report frmo Thien-Thi Nguyen, 17 May 2013 11:16:41.
+       Report from Thien-Thi Nguyen, 17 May 2013 11:16:41.
 
 2013-08-13  Karl Berry  <address@hidden>

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2013-08-15 16:07:06 UTC (rev 5313)
+++ trunk/NEWS  2013-08-15 17:24:38 UTC (rev 5314)
@@ -22,7 +22,7 @@
   
http://www.gnu.org/software/texinfo/manual/texinfo/html_node/Document-Permissions.html
 
 -------------------------------------------------------------------------------
-* info
+* info:
   . new option -x (--debug) enables additional debugging output.
   . new option -v (--variable) assigns a value to an Info variable.
     The syntax is the same as for many other GNU utilities: -v VARIABLE=VALUE
@@ -32,7 +32,7 @@
     forward searches (}) start at the beginning of the next page, and
     backward searches ({) start at the end of the previous page.
 
-* Distribution: automake-1.14.
+* Distribution: automake-1.14, gettext-0.18.3.
 
 
 5.1 (12 March 2013)

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac  2013-08-15 16:07:06 UTC (rev 5313)
+++ trunk/configure.ac  2013-08-15 17:24:38 UTC (rev 5314)
@@ -330,7 +330,7 @@
 # i18n support.  To update to a new version of gettext, run:
 #   gettextize -f -c
 # See http://gnu.org/s/gnulib/manual/html_node/gettextize-and-autopoint.html.
-AM_GNU_GETTEXT_VERSION([0.18.2])
+AM_GNU_GETTEXT_VERSION([0.18.3])
 AM_GNU_GETTEXT([external])
 
 USE_EXTERNAL_LIBINTL=no

Modified: trunk/gnulib/m4/po.m4
===================================================================
--- trunk/gnulib/m4/po.m4       2013-08-15 16:07:06 UTC (rev 5313)
+++ trunk/gnulib/m4/po.m4       2013-08-15 17:24:38 UTC (rev 5314)
@@ -1,4 +1,4 @@
-# po.m4 serial 17c
+# po.m4 serial 21 (gettext-0.18.3)
 dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,7 @@
 dnl   Ulrich Drepper <address@hidden>, 1995-2000.
 dnl   Bruno Haible <address@hidden>, 2000-2003.
 
-AC_PREREQ([2.50])
+AC_PREREQ([2.60])
 
 dnl Checks for all prerequisites of the po subdirectory.
 AC_DEFUN([AM_PO_SUBDIRS],
@@ -25,6 +25,7 @@
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
   AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+  AC_REQUIRE([AC_PROG_SED])dnl
   AC_REQUIRE([AM_NLS])dnl
 
   dnl Release version of the gettext macros. This is used to ensure that
@@ -102,7 +103,7 @@
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -227,7 +228,7 @@
 changequote(,)dnl
   # Adjust a relative srcdir.
   ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
   ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
   # In autoconf-2.13 it is called $ac_given_srcdir.
   # In autoconf-2.50 it is called $srcdir.

Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog  2013-08-15 16:07:06 UTC (rev 5313)
+++ trunk/po/ChangeLog  2013-08-15 17:24:38 UTC (rev 5314)
@@ -1,3 +1,8 @@
+2013-08-15  gettextize  <address@hidden>
+
+       * Makefile.in.in: Upgrade to gettext-0.18.3.
+       * Rules-quot: Upgrade to gettext-0.18.3.
+
 2010-06-24  gettextize  <address@hidden>
 
        * Makefile.in.in: Upgrade to gettext-0.18.1.

Modified: trunk/po/Makefile.in.in
===================================================================
--- trunk/po/Makefile.in.in     2013-08-15 16:07:06 UTC (rev 5313)
+++ trunk/po/Makefile.in.in     2013-08-15 17:24:38 UTC (rev 5314)
@@ -8,13 +8,14 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.18.2
+# Origin: gettext-0.18.3
 GETTEXT_MACRO_VERSION = 0.18
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
+SED = @SED@
 SHELL = /bin/sh
 @SET_MAKE@
 

Modified: trunk/po/Makevars
===================================================================
--- trunk/po/Makevars   2013-08-15 16:07:06 UTC (rev 5313)
+++ trunk/po/Makevars   2013-08-15 17:24:38 UTC (rev 5314)
@@ -65,3 +65,14 @@
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =

Modified: trunk/po/Rules-quot
===================================================================
--- trunk/po/Rules-quot 2013-08-15 16:07:06 UTC (rev 5313)
+++ trunk/po/Rules-quot 2013-08-15 17:24:38 UTC (rev 5314)
@@ -20,7 +20,7 @@
        ll=`echo $$lang | sed -e 's/@.*//'`; \
        LC_ALL=C; export LC_ALL; \
        cd $(srcdir); \
-       if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 
2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | 
$(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > 
$$tmpdir/$$lang.new.po; then \
+       if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 
2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | 
$(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > 
$$tmpdir/$$lang.new.po; then \
          if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
            rm -f $$tmpdir/$$lang.new.po; \
          else \

Modified: trunk/util/srclist-txi
===================================================================
--- trunk/util/srclist-txi      2013-08-15 16:07:06 UTC (rev 5313)
+++ trunk/util/srclist-txi      2013-08-15 17:24:38 UTC (rev 5314)
@@ -17,7 +17,7 @@
 case $LOGNAME in
 karl)
   : ${EMACSSRC=/usr/local/gnu/src/emacs-24.3};      export EMACSSRC
-  : ${GETTEXT=/usr/local/gnu/src/gettext-0.18.2};   export GETTEXT
+  : ${GETTEXT=/usr/local/gnu/src/gettext-0.18.3};   export GETTEXT
   : ${AUTOMAKE=/usr/local/gnu/share/automake-1.13}; export AUTOMAKE
   : ${GSASL=$HOME/gnu/src/gsasl};                   export GSASL
   : ${GNULIB=$HOME/gnu/src/gnulib};                 export GNULIB