Fix syntax of --keyword option.

diff --git a/ChangeLog b/ChangeLog
index 5dfe353..43d4986 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-19  Bruno Haible  <bruno@clisp.org>
+
+       * modules/propername (Notice, configure.ac): Put quoted "..." into
+       --keyword option.
+       * lib/propername.h: Update comments accordingly.
+       Reported by Eric Blake.
+
 2008-05-19  Martin Lambers  <marlam@marlam.de>  (tiny change)
 
        * modules/getpass-gnu (Depends-on): Add fseeko.

diff --git a/lib/propername.h b/lib/propername.h
index 1b0545b..d603b1a 100644 (file)
--- a/lib/propername.h
+++ b/lib/propername.h
@@ -72,11 +72,12 @@
      3) If you are using GNU gettext version 0.16.1 or older, in po/Makevars,
         in the definition of the XGETTEXT_OPTIONS variable, add:
 
-           --keyword=proper_name:1,"This is a proper name. See the gettext manual, section Names."
-           --keyword=proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."
+           --keyword='proper_name:1,"This is a proper name. See the gettext manual, section Names."'
+           --keyword='proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."'
 
         This specifies automatic comments for the translator. (Requires
-        xgettext >= 0.15.)
+        xgettext >= 0.15. The double-quotes inside the quoted string are on
+        purpose: they are part of the --keyword argument syntax.)
  */
 
 #ifndef _PROPERNAME_H

diff --git a/modules/propername b/modules/propername
index fb31901..e506411 100644 (file)
--- a/modules/propername
+++ b/modules/propername
@@ -4,8 +4,8 @@ Localization of proper names.
 Notice:
 If you are using GNU gettext version 0.16.1 or older, add the following options
 to XGETTEXT_OPTIONS in your po/Makevars:
-  --keyword=proper_name:1,'This is a proper name. See the gettext manual, section Names.'
-  --keyword=proper_name_utf8:1,'This is a proper name. See the gettext manual, section Names.'
+  --keyword='proper_name:1,"This is a proper name. See the gettext manual, section Names."'
+  --keyword='proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."'
 
 Files:
 lib/propername.h
@@ -26,8 +26,8 @@ gettext-h
 
 configure.ac:
 m4_ifdef([AM_XGETTEXT_OPTION],
-  [AM_XGETTEXT_OPTION([--keyword=proper_name:1,'This is a proper name. See the gettext manual, section Names.'])
-   AM_XGETTEXT_OPTION([--keyword=proper_name_utf8:1,'This is a proper name. See the gettext manual, section Names.'])])
+  [AM_XGETTEXT_OPTION([--keyword='proper_name:1,\"This is a proper name. See the gettext manual, section Names.\"'])
+   AM_XGETTEXT_OPTION([--keyword='proper_name_utf8:1,\"This is a proper name. See the gettext manual, section Names.\"'])])
 
 Makefile.am:
 lib_SOURCES += propername.h propername.c