From: Bruno Haible Date: Fri, 21 Jul 2006 21:05:01 +0000 (+0000) Subject: Regenerated for 0.15. X-Git-Tag: v0.15~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08447e7326aaa1d0dde8eb3e1b8a26daddcd70db;p=thirdparty%2Fgettext.git Regenerated for 0.15. --- diff --git a/gettext-runtime/config.h.in b/gettext-runtime/config.h.in index c4a9ca27d..575629ee0 100644 --- a/gettext-runtime/config.h.in +++ b/gettext-runtime/config.h.in @@ -28,15 +28,27 @@ */ #undef HAVE_ALLOCA_H +/* Define to 1 if you have the `argz_count' function. */ +#undef HAVE_ARGZ_COUNT + /* Define to 1 if you have the header file. */ #undef HAVE_ARGZ_H +/* Define to 1 if you have the `argz_next' function. */ +#undef HAVE_ARGZ_NEXT + +/* Define to 1 if you have the `argz_stringify' function. */ +#undef HAVE_ARGZ_STRINGIFY + /* Define to 1 if you have the `asprintf' function. */ #undef HAVE_ASPRINTF /* Define to 1 if you have the `atexit' function. */ #undef HAVE_ATEXIT +/* Define to 1 if the compiler understands __builtin_expect. */ +#undef HAVE_BUILTIN_EXPECT + /* Define to 1 if you have the `canonicalize_file_name' function. */ #undef HAVE_CANONICALIZE_FILE_NAME @@ -119,15 +131,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -#undef HAVE_DOPRNT - /* Define if you have the declaration of environ. */ #undef HAVE_ENVIRON_DECL -/* Define if you have the declaration of errno. */ -#undef HAVE_ERRNO_DECL - /* Define to 1 if you have the `fwprintf' function. */ #undef HAVE_FWPRINTF @@ -183,17 +189,14 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H - /* Define if you have the 'long double' type. */ #undef HAVE_LONG_DOUBLE /* Define if you have the 'long long' type. */ #undef HAVE_LONG_LONG -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_H +/* Define to 1 if you have the header file. */ +#undef HAVE_MACH_O_DYLD_H /* Define to 1 if you have the `memmove' function. */ #undef HAVE_MEMMOVE @@ -214,9 +217,6 @@ _GNU_SOURCE is defined. */ #undef HAVE_NL_LOCALE_NAME -/* Define to 1 if you have the header file. */ -#undef HAVE_NL_TYPES_H - /* Define if your printf() function supports format strings with positions. */ #undef HAVE_POSIX_PRINTF @@ -281,6 +281,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the `strstr' function. */ +#undef HAVE_STRSTR + /* Define to 1 if you have the `strtoul' function. */ #undef HAVE_STRTOUL @@ -312,9 +315,6 @@ declarations. */ #undef HAVE_VISIBILITY -/* Define to 1 if you have the `vprintf' function. */ -#undef HAVE_VPRINTF - /* Define if you have the 'wchar_t' type. */ #undef HAVE_WCHAR_T @@ -327,14 +327,8 @@ /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL -/* Define to 1 if you have the `__argz_count' function. */ -#undef HAVE___ARGZ_COUNT - -/* Define to 1 if you have the `__argz_next' function. */ -#undef HAVE___ARGZ_NEXT - -/* Define to 1 if you have the `__argz_stringify' function. */ -#undef HAVE___ARGZ_STRINGIFY +/* Define to 1 if you have the `_NSGetExecutablePath' function. */ +#undef HAVE__NSGETEXECUTABLEPATH /* Define to 1 if you have the `__fsetlocking' function. */ #undef HAVE___FSETLOCKING @@ -381,7 +375,7 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. + automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ @@ -459,18 +453,12 @@ used. */ #undef __GETOPT_PREFIX -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus #undef inline #endif -/* Define to `long' if does not define. */ -#undef off_t - /* Define as the type of the result of subtracting two pointers, if the system doesn't define it. */ #undef ptrdiff_t @@ -481,7 +469,7 @@ /* Define to empty if the C compiler doesn't support this keyword. */ #undef signed -/* Define to `unsigned' if does not define. */ +/* Define to `unsigned int' if does not define. */ #undef size_t /* Define as a signed type of the same size as size_t. */ @@ -498,13 +486,6 @@ #define __libc_lock_init gl_lock_init #define __libc_lock_lock gl_lock_lock #define __libc_lock_unlock gl_lock_unlock -#define __libc_rwlock_t gl_rwlock_t -#define __libc_rwlock_define gl_rwlock_define -#define __libc_rwlock_define_initialized gl_rwlock_define_initialized -#define __libc_rwlock_init gl_rwlock_init -#define __libc_rwlock_rdlock gl_rwlock_rdlock -#define __libc_rwlock_wrlock gl_rwlock_wrlock -#define __libc_rwlock_unlock gl_rwlock_unlock #define __libc_lock_recursive_t gl_recursive_lock_t #define __libc_lock_define_recursive gl_recursive_lock_define #define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized @@ -532,7 +513,7 @@ /* On Windows, variables that may be in a DLL must be marked specially. */ -#if (defined _MSC_VER && defined _DLL) || (defined __MINGW32__ && defined DLL_EXPORT) +#if (defined _MSC_VER && defined _DLL) # define DLL_VARIABLE __declspec (dllimport) #else # define DLL_VARIABLE diff --git a/gettext-runtime/intl/plural.c b/gettext-runtime/intl/plural.c index f66fb48d0..5f73b403f 100644 --- a/gettext-runtime/intl/plural.c +++ b/gettext-runtime/intl/plural.c @@ -19,7 +19,7 @@ #line 1 "plural.y" /* Expression parsing for plural form selection. - Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2003, 2005 Free Software Foundation, Inc. Written by Ulrich Drepper , 2000. This program is free software; you can redistribute it and/or modify it @@ -37,10 +37,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* The bison generated parser uses alloca. AIX 3 forces us to put this - declaration at the beginning of the file. The declaration in bison's - skeleton file comes too late. This must come before - because may include arbitrary system headers. */ +/* For bison < 2.0, the bison generated parser uses alloca. AIX 3 forces us + to put this declaration at the beginning of the file. The declaration in + bison's skeleton file comes too late. This must come before + because may include arbitrary system headers. + This can go away once the AM_INTL_SUBDIR macro requires bison >= 2.0. */ #if defined _AIX && !defined __GNUC__ #pragma alloca #endif @@ -51,6 +52,7 @@ #include #include +#include #include "plural-exp.h" /* The main function generated by the parser is called __gettextparse, @@ -62,7 +64,7 @@ #define YYLEX_PARAM &((struct parse_args *) arg)->cp #define YYPARSE_PARAM arg -#line 49 "plural.y" +#line 51 "plural.y" #ifndef YYSTYPE typedef union { unsigned long int num; @@ -72,7 +74,7 @@ typedef union { # define YYSTYPE yystype # define YYSTYPE_IS_TRIVIAL 1 #endif -#line 55 "plural.y" +#line 57 "plural.y" /* Prototypes for local functions. */ static int yylex (YYSTYPE *lval, const char **pexp); @@ -212,8 +214,8 @@ static const short yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const short yyrline[] = { - 0, 150, 158, 162, 166, 170, 174, 178, 182, 186, - 190, 194, 199 + 0, 152, 160, 164, 168, 172, 176, 180, 184, 188, + 192, 196, 201 }; #endif @@ -296,7 +298,7 @@ static const short yycheck[] = #define YYPURE 1 /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/local/share/bison/bison.simple" +#line 3 "bison.simple" /* Skeleton output parser for bison, @@ -609,7 +611,7 @@ yystpcpy (yydest, yysrc) # endif #endif -#line 315 "/usr/local/share/bison/bison.simple" +#line 315 "bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed @@ -1003,7 +1005,7 @@ yyreduce: switch (yyn) { case 1: -#line 151 "plural.y" +#line 153 "plural.y" { if (yyvsp[0].exp == NULL) YYABORT; @@ -1011,75 +1013,75 @@ case 1: } break; case 2: -#line 159 "plural.y" +#line 161 "plural.y" { yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp); } break; case 3: -#line 163 "plural.y" +#line 165 "plural.y" { yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp); } break; case 4: -#line 167 "plural.y" +#line 169 "plural.y" { yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp); } break; case 5: -#line 171 "plural.y" +#line 173 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); } break; case 6: -#line 175 "plural.y" +#line 177 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); } break; case 7: -#line 179 "plural.y" +#line 181 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); } break; case 8: -#line 183 "plural.y" +#line 185 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); } break; case 9: -#line 187 "plural.y" +#line 189 "plural.y" { yyval.exp = new_exp_1 (lnot, yyvsp[0].exp); } break; case 10: -#line 191 "plural.y" +#line 193 "plural.y" { yyval.exp = new_exp_0 (var); } break; case 11: -#line 195 "plural.y" +#line 197 "plural.y" { if ((yyval.exp = new_exp_0 (num)) != NULL) yyval.exp->val.num = yyvsp[0].num; } break; case 12: -#line 200 "plural.y" +#line 202 "plural.y" { yyval.exp = yyvsp[-1].exp; } break; } -#line 705 "/usr/local/share/bison/bison.simple" +#line 705 "bison.simple" yyvsp -= yylen; @@ -1310,7 +1312,7 @@ yyreturn: #endif return yyresult; } -#line 205 "plural.y" +#line 207 "plural.y" void diff --git a/gettext-runtime/libasprintf/autosprintf.info b/gettext-runtime/libasprintf/autosprintf.info index 7773fa4d8..9236df59a 100644 --- a/gettext-runtime/libasprintf/autosprintf.info +++ b/gettext-runtime/libasprintf/autosprintf.info @@ -1,4 +1,4 @@ -This is autosprintf.info, produced by makeinfo version 4.6 from +This is autosprintf.info, produced by makeinfo version 4.8 from autosprintf.texi. INFO-DIR-SECTION C++ libraries @@ -8,21 +8,25 @@ END-INFO-DIR-ENTRY This file provides documentation for GNU `autosprintf' library. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002-2003 Free Software Foundation, Inc. - Permission is granted to make and distribute verbatim copies of this -manual provided the copyright notice and this permission notice are -preserved on all copies. + This manual is free documentation. It is dually licensed under the +GNU FDL and the GNU GPL. This means that you can redistribute this +manual under either of these two licenses, at your choice. - Permission is granted to copy and distribute modified versions of -this manual under the conditions for verbatim copying, provided that -the entire resulting derived work is distributed under the terms of a -permission notice identical to this one. + This manual is covered by the GNU FDL. Permission is granted to +copy, distribute and/or modify this document under the terms of the GNU +Free Documentation License (FDL), either version 1.2 of the License, or +(at your option) any later version published by the Free Software +Foundation (FSF); with no Invariant Sections, with no Front-Cover Text, +and with no Back-Cover Texts. A copy of the license is at +`http://www.gnu.org/licenses/fdl.html'. - Permission is granted to copy and distribute translations of this -manual into another language, under the above conditions for modified -versions, except that this permission notice may be stated in a -translation approved by the Foundation. + This manual is covered by the GNU GPL. You can redistribute it +and/or modify it under the terms of the GNU General Public License +(GPL), either version 2 of the License, or (at your option) any later +version published by the Free Software Foundation (FSF). A copy of the +license is at `http://www.gnu.org/licenses/gpl.html'.  File: autosprintf.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) @@ -41,8 +45,8 @@ This manual documents the GNU autosprintf class, version 1.0.  File: autosprintf.info, Node: Introduction, Next: Class autosprintf, Prev: Top, Up: Top -Introduction -************ +1 Introduction +************** This package makes the C formatted output routines (`fprintf' et al.) usable in C++ programs, for use with the `' strings and the @@ -76,8 +80,8 @@ instead of  File: autosprintf.info, Node: Class autosprintf, Next: Using autosprintf, Prev: Introduction, Up: Top -The `autosprintf' class -*********************** +2 The `autosprintf' class +************************* An instance of class `autosprintf' just contains a string with the formatted output result. Such an instance is usually allocated as an @@ -98,8 +102,8 @@ the given `ostream'.  File: autosprintf.info, Node: Using autosprintf, Prev: Class autosprintf, Up: Top -Using `autosprintf' in own programs -*********************************** +3 Using `autosprintf' in own programs +************************************* To use the `autosprintf' class in your programs, you need to add @@ -119,9 +123,9 @@ variable that it provides.  Tag Table: -Node: Top1011 -Node: Introduction1371 -Node: Class autosprintf2518 -Node: Using autosprintf3286 +Node: Top1336 +Node: Introduction1696 +Node: Class autosprintf2847 +Node: Using autosprintf3619  End Tag Table diff --git a/gettext-runtime/libasprintf/autosprintf_all.html b/gettext-runtime/libasprintf/autosprintf_all.html index e35f779ed..6247b5c5d 100644 --- a/gettext-runtime/libasprintf/autosprintf_all.html +++ b/gettext-runtime/libasprintf/autosprintf_all.html @@ -1,8 +1,9 @@ - + + GNU autosprintf @@ -120,21 +121,21 @@ using gnu::autosprintf;

to your source code. The include file defines the class autosprintf, in a namespace called -gnu. The `using´ statement makes it possible to use the class +gnu. The ‘using’ statement makes it possible to use the class without the (otherwise natural) gnu:: prefix.

When linking your program, you need to link with libasprintf, because that's where the class is defined. In projects using GNU autoconf, -this means adding `AC_LIB_LINKFLAGS([asprintf])´ to configure.in +this means adding ‘AC_LIB_LINKFLAGS([asprintf])’ to configure.in or configure.ac, and using the @LIBASPRINTF@ Makefile variable that it provides.

-This document was generated on 18 January 2004 using the +This document was generated on 20 April 2006 using the texi2html -translator version 1.52a.

+translator version 1.52b.

diff --git a/gettext-runtime/libasprintf/config.h.in b/gettext-runtime/libasprintf/config.h.in index 5ef8230b0..d5eb63422 100644 --- a/gettext-runtime/libasprintf/config.h.in +++ b/gettext-runtime/libasprintf/config.h.in @@ -108,7 +108,7 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. + automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ @@ -120,9 +120,6 @@ /* Version number of package */ #undef VERSION -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus @@ -136,5 +133,5 @@ /* Define to empty if the C compiler doesn't support this keyword. */ #undef signed -/* Define to `unsigned' if does not define. */ +/* Define to `unsigned int' if does not define. */ #undef size_t diff --git a/gettext-runtime/man/bind_textdomain_codeset.3 b/gettext-runtime/man/bind_textdomain_codeset.3 index d51fa4466..2e732eaac 100644 --- a/gettext-runtime/man/bind_textdomain_codeset.3 +++ b/gettext-runtime/man/bind_textdomain_codeset.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.14.4" +.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.15" .SH NAME bind_textdomain_codeset \- set encoding of message translations .SH SYNOPSIS diff --git a/gettext-runtime/man/bindtextdomain.3 b/gettext-runtime/man/bindtextdomain.3 index 89b88f072..6c8236542 100644 --- a/gettext-runtime/man/bindtextdomain.3 +++ b/gettext-runtime/man/bindtextdomain.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.14.4" +.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.15" .SH NAME bindtextdomain \- set directory containing message catalogs .SH SYNOPSIS diff --git a/gettext-runtime/man/envsubst.1 b/gettext-runtime/man/envsubst.1 index 25122059f..925a861b1 100644 --- a/gettext-runtime/man/envsubst.1 +++ b/gettext-runtime/man/envsubst.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH ENVSUBST "1" "April 2005" "GNU gettext-runtime 0.14.3" GNU +.TH ENVSUBST "1" "July 2006" "GNU gettext-runtime 0.15" GNU .SH NAME envsubst \- substitutes environment variables in shell format strings .SH SYNOPSIS @@ -35,7 +35,7 @@ Written by Bruno Haible. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 2003-2005 Free Software Foundation, Inc. +Copyright \(co 2003-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-runtime/man/envsubst.1.html b/gettext-runtime/man/envsubst.1.html index cddeeef4c..efb093343 100644 --- a/gettext-runtime/man/envsubst.1.html +++ b/gettext-runtime/man/envsubst.1.html @@ -134,7 +134,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 2003-2005 Free Software Foundation, Inc.
+Copyright 2003-2006 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/gettext-runtime/man/gettext.1.html.in b/gettext-runtime/man/gettext.1.html.in index f82194e67..0bc6bfdd5 100644 --- a/gettext-runtime/man/gettext.1.html.in +++ b/gettext-runtime/man/gettext.1.html.in @@ -174,7 +174,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 1995-1997, 2000-2005 Free Software Foundation, +Copyright 1995-1997, 2000-2006 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO warranty; not even for diff --git a/gettext-runtime/man/gettext.1.in b/gettext-runtime/man/gettext.1.in index ec76dd8eb..0bb2df30b 100644 --- a/gettext-runtime/man/gettext.1.in +++ b/gettext-runtime/man/gettext.1.in @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH GETTEXT "1" "April 2005" "GNU gettext-runtime 0.14.3" GNU +.TH GETTEXT "1" "July 2006" "GNU gettext-runtime 0.15" GNU .SH NAME gettext \- translate message .SH SYNOPSIS @@ -50,7 +50,7 @@ Written by Ulrich Drepper. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1995-1997, 2000-2005 Free Software Foundation, Inc. +Copyright \(co 1995-1997, 2000-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-runtime/man/gettext.3 b/gettext-runtime/man/gettext.3 index e35255c96..8dfeb71fa 100644 --- a/gettext-runtime/man/gettext.3 +++ b/gettext-runtime/man/gettext.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH GETTEXT 3 "May 2001" "GNU gettext 0.14.4" +.TH GETTEXT 3 "May 2001" "GNU gettext 0.15" .SH NAME gettext, dgettext, dcgettext \- translate message .SH SYNOPSIS diff --git a/gettext-runtime/man/ngettext.1.html.in b/gettext-runtime/man/ngettext.1.html.in index b2090b2b4..3edf72723 100644 --- a/gettext-runtime/man/ngettext.1.html.in +++ b/gettext-runtime/man/ngettext.1.html.in @@ -184,7 +184,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 1995-1997, 2000-2005 Free Software Foundation, +Copyright 1995-1997, 2000-2006 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO warranty; not even for diff --git a/gettext-runtime/man/ngettext.1.in b/gettext-runtime/man/ngettext.1.in index 59a92981a..6890e021c 100644 --- a/gettext-runtime/man/ngettext.1.in +++ b/gettext-runtime/man/ngettext.1.in @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH NGETTEXT "1" "April 2005" "GNU gettext-runtime 0.14.3" GNU +.TH NGETTEXT "1" "July 2006" "GNU gettext-runtime 0.15" GNU .SH NAME ngettext \- translate message and choose plural form .SH SYNOPSIS @@ -49,7 +49,7 @@ Written by Ulrich Drepper. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1995-1997, 2000-2005 Free Software Foundation, Inc. +Copyright \(co 1995-1997, 2000-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-runtime/man/ngettext.3 b/gettext-runtime/man/ngettext.3 index ea2206510..b5ce428dc 100644 --- a/gettext-runtime/man/ngettext.3 +++ b/gettext-runtime/man/ngettext.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH NGETTEXT 3 "May 2001" "GNU gettext 0.14.4" +.TH NGETTEXT 3 "May 2001" "GNU gettext 0.15" .SH NAME ngettext, dngettext, dcngettext \- translate message and choose plural form .SH SYNOPSIS diff --git a/gettext-runtime/man/textdomain.3 b/gettext-runtime/man/textdomain.3 index 2209d2f7b..6399ef278 100644 --- a/gettext-runtime/man/textdomain.3 +++ b/gettext-runtime/man/textdomain.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.14.4" +.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.15" .SH NAME textdomain \- set domain for future gettext() calls .SH SYNOPSIS diff --git a/gettext-runtime/po/gettext-runtime.pot b/gettext-runtime/po/gettext-runtime.pot index fd4d69765..9ede7a7c2 100644 --- a/gettext-runtime/po/gettext-runtime.pot +++ b/gettext-runtime/po/gettext-runtime.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2005-01-14 13:07+0100\n" +"POT-Creation-Date: 2006-04-20 15:54+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -86,7 +86,7 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: src/envsubst.c:113 src/gettext.c:135 src/ngettext.c:125 +#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -94,62 +94,67 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130 +#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130 #, c-format msgid "Written by %s.\n" msgstr "" -#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142 +#. This is a proper name. See the gettext manual, section Names. +#: src/envsubst.c:119 +msgid "Bruno Haible" +msgstr "" + +#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142 #, c-format msgid "too many arguments" msgstr "" -#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154 +#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154 #, c-format msgid "missing arguments" msgstr "" -#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208 +#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/envsubst.c:176 +#: src/envsubst.c:177 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "" -#: src/envsubst.c:181 +#: src/envsubst.c:182 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "" -#: src/envsubst.c:185 +#: src/envsubst.c:186 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "" -#: src/envsubst.c:188 +#: src/envsubst.c:189 #, c-format, no-wrap msgid " -v, --variables output the variables occurring in SHELL-FORMAT\n" msgstr "" -#: src/envsubst.c:192 +#: src/envsubst.c:193 #, c-format, no-wrap msgid "Informative output:\n" msgstr "" -#: src/envsubst.c:195 +#: src/envsubst.c:196 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr "" -#: src/envsubst.c:198 +#: src/envsubst.c:199 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr "" -#: src/envsubst.c:202 +#: src/envsubst.c:203 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -160,26 +165,31 @@ msgid "" "standard input are substituted.\n" msgstr "" -#: src/envsubst.c:211 +#: src/envsubst.c:212 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output consists\n" "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n" msgstr "" -#: src/envsubst.c:215 src/gettext.c:276 src/ngettext.c:242 +#: src/envsubst.c:216 src/gettext.c:276 src/ngettext.c:242 msgid "Report bugs to .\n" msgstr "" -#: src/envsubst.c:438 +#: src/envsubst.c:439 #, c-format msgid "error while reading \"%s\"" msgstr "" -#: src/envsubst.c:439 +#: src/envsubst.c:440 msgid "standard input" msgstr "" +#. This is a proper name. See the gettext manual, section Names. +#: src/gettext.c:140 src/ngettext.c:130 +msgid "Ulrich Drepper" +msgstr "" + #: src/gettext.c:244 #, c-format, no-wrap msgid "" diff --git a/gettext-tools/config.h.in b/gettext-tools/config.h.in index cc5f247f6..7ceaded40 100644 --- a/gettext-tools/config.h.in +++ b/gettext-tools/config.h.in @@ -5,9 +5,6 @@ #define DEFAULT_OUTPUT_ALIGNMENT 1 -/* Define to 1 if the `closedir' function returns void instead of `int'. */ -#undef CLOSEDIR_VOID - /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ @@ -43,9 +40,18 @@ */ #undef HAVE_ALLOCA_H +/* Define to 1 if you have the `argz_count' function. */ +#undef HAVE_ARGZ_COUNT + /* Define to 1 if you have the header file. */ #undef HAVE_ARGZ_H +/* Define to 1 if you have the `argz_next' function. */ +#undef HAVE_ARGZ_NEXT + +/* Define to 1 if you have the `argz_stringify' function. */ +#undef HAVE_ARGZ_STRINGIFY + /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_INET_H @@ -61,6 +67,9 @@ /* Define to 1 if you have the `btowc' function. */ #undef HAVE_BTOWC +/* Define to 1 if the compiler understands __builtin_expect. */ +#undef HAVE_BUILTIN_EXPECT + /* Define to 1 if you have the header file. */ #undef HAVE_BYTESWAP_H @@ -162,22 +171,15 @@ don't. */ #undef HAVE_DECL__SNWPRINTF -/* Define to 1 if you have the header file, and it defines `DIR'. - */ +/* Define to 1 if you have the header file. */ #undef HAVE_DIRENT_H /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -#undef HAVE_DOPRNT - /* Define if you have the declaration of environ. */ #undef HAVE_ENVIRON_DECL -/* Define if you have the declaration of errno. */ -#undef HAVE_ERRNO_DECL - /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK @@ -263,9 +265,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H - /* Define if you have the 'long double' type. */ #undef HAVE_LONG_DOUBLE @@ -275,6 +274,9 @@ /* Define if you have the 'long long' type. */ #undef HAVE_LONG_LONG +/* Define to 1 if you have the header file. */ +#undef HAVE_MACH_O_DYLD_H + /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H @@ -314,16 +316,10 @@ /* Define to 1 if you have the `munmap' function. */ #undef HAVE_MUNMAP -/* Define to 1 if you have the header file, and it defines `DIR'. */ -#undef HAVE_NDIR_H - /* Define if you have and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined. */ #undef HAVE_NL_LOCALE_NAME -/* Define to 1 if you have the header file. */ -#undef HAVE_NL_TYPES_H - /* Define to 1 if you have the `pathconf' function. */ #undef HAVE_PATHCONF @@ -434,14 +430,6 @@ /* Define to 1 if `__names' is member of `struct __locale_struct'. */ #undef HAVE_STRUCT___LOCALE_STRUCT___NAMES -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_DIR_H - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_NDIR_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PARAM_H @@ -503,9 +491,6 @@ declarations. */ #undef HAVE_VISIBILITY -/* Define to 1 if you have the `vprintf' function. */ -#undef HAVE_VPRINTF - /* Define to 1 if you have the `waitid' function. */ #undef HAVE_WAITID @@ -548,14 +533,8 @@ /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL -/* Define to 1 if you have the `__argz_count' function. */ -#undef HAVE___ARGZ_COUNT - -/* Define to 1 if you have the `__argz_next' function. */ -#undef HAVE___ARGZ_NEXT - -/* Define to 1 if you have the `__argz_stringify' function. */ -#undef HAVE___ARGZ_STRINGIFY +/* Define to 1 if you have the `_NSGetExecutablePath' function. */ +#undef HAVE__NSGETEXECUTABLEPATH /* Define to 1 if you have the `__fsetlocking' function. */ #undef HAVE___FSETLOCKING @@ -608,7 +587,7 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. + automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ @@ -658,6 +637,12 @@ /* Define if unsetenv() returns void, not int. */ #undef VOID_UNSETENV +/* Define when --enable-shared is used on mingw or Cygwin. */ +#undef WOE32DLL + +/* Define to 1 to internationalize bison runtime messages. */ +#undef YYENABLE_NLS + /* Define to 1 if on AIX 3. System headers sometimes define this. We just want to avoid a redefinition error message. */ @@ -689,9 +674,6 @@ used. */ #undef __GETOPT_PREFIX -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - /* Define as 'access' if you don't have the eaccess() function. */ #undef eaccess @@ -701,6 +683,9 @@ /* Define to a replacement function name for getline(). */ #undef getline +/* A replacement for va_copy, if needed. */ +#define gl_va_copy(a,b) ((a) = (b)) + /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus @@ -713,9 +698,6 @@ /* Define to `int' if does not define. */ #undef mode_t -/* Define to `long' if does not define. */ -#undef off_t - /* Define to `int' if does not define. */ #undef pid_t @@ -737,7 +719,7 @@ /* Define to empty if the C compiler doesn't support this keyword. */ #undef signed -/* Define to `unsigned' if does not define. */ +/* Define to `unsigned int' if does not define. */ #undef size_t /* Define as a signed type of the same size as size_t. */ @@ -747,6 +729,9 @@ don't define. */ #undef uintmax_t +/* Define as a macro for copying va_list variables. */ +#undef va_copy + /* Define as `fork' if `vfork' does not work. */ #undef vfork @@ -757,13 +742,6 @@ #define __libc_lock_init gl_lock_init #define __libc_lock_lock gl_lock_lock #define __libc_lock_unlock gl_lock_unlock -#define __libc_rwlock_t gl_rwlock_t -#define __libc_rwlock_define gl_rwlock_define -#define __libc_rwlock_define_initialized gl_rwlock_define_initialized -#define __libc_rwlock_init gl_rwlock_init -#define __libc_rwlock_rdlock gl_rwlock_rdlock -#define __libc_rwlock_wrlock gl_rwlock_wrlock -#define __libc_rwlock_unlock gl_rwlock_unlock #define __libc_lock_recursive_t gl_recursive_lock_t #define __libc_lock_define_recursive gl_recursive_lock_define #define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized @@ -815,7 +793,7 @@ #define PAGE_WIDTH 79 /* On Windows, variables that may be in a DLL must be marked specially. */ -#if (defined _MSC_VER && defined _DLL) || (defined __MINGW32__ && defined DLL_EXPORT) +#if (defined _MSC_VER && defined _DLL) || defined WOE32DLL # define DLL_VARIABLE __declspec (dllimport) #else # define DLL_VARIABLE diff --git a/gettext-tools/doc/gettext.info b/gettext-tools/doc/gettext.info index eea287273..eaac38fde 100644 --- a/gettext-tools/doc/gettext.info +++ b/gettext-tools/doc/gettext.info @@ -30,21 +30,25 @@ END-INFO-DIR-ENTRY This file provides documentation for GNU `gettext' utilities. It also serves as a reference for the free Translation Project. - Copyright (C) 1995-1998, 2001-2005 Free Software Foundation, Inc. - - Permission is granted to make and distribute verbatim copies of this -manual provided the copyright notice and this permission notice are -preserved on all copies. - - Permission is granted to copy and distribute modified versions of -this manual under the conditions for verbatim copying, provided that -the entire resulting derived work is distributed under the terms of a -permission notice identical to this one. - - Permission is granted to copy and distribute translations of this -manual into another language, under the above conditions for modified -versions, except that this permission notice may be stated in a -translation approved by the Foundation. + Copyright (C) 1995-1998, 2001-2006 Free Software Foundation, Inc. + + This manual is free documentation. It is dually licensed under the +GNU FDL and the GNU GPL. This means that you can redistribute this +manual under either of these two licenses, at your choice. + + This manual is covered by the GNU FDL. Permission is granted to +copy, distribute and/or modify this document under the terms of the GNU +Free Documentation License (FDL), either version 1.2 of the License, or +(at your option) any later version published by the Free Software +Foundation (FSF); with no Invariant Sections, with no Front-Cover Text, +and with no Back-Cover Texts. A copy of the license is included in +*Note GNU FDL::. + + This manual is covered by the GNU GPL. You can redistribute it +and/or modify it under the terms of the GNU General Public License +(GPL), either version 2 of the License, or (at your option) any later +version published by the Free Software Foundation (FSF). A copy of the +license is included in *Note GNU GPL::.  File: gettext.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) @@ -53,27 +57,30 @@ GNU `gettext' utilities *********************** This manual documents the GNU gettext tools and the GNU libintl library, -version 0.14.4. +version 0.15. * Menu: * Introduction:: Introduction -* Basics:: PO Files and PO Mode Basics +* Users:: The User's View +* PO Files:: The Format of PO Files * Sources:: Preparing Program Sources * Template:: Making the PO Template File * Creating:: Creating a New PO File * Updating:: Updating Existing PO Files +* Editing:: Editing PO Files * Manipulating:: Manipulating PO Files * Binaries:: Producing Binary MO Files -* Users:: The User's View * Programmers:: The Programmer's View * Translators:: The Translator's View * Maintainers:: The Maintainer's View +* Installers:: The Installer's and Distributor's View * Programming Languages:: Other Programming Languages * Conclusion:: Concluding Remarks * Language Codes:: ISO 639 language codes * Country Codes:: ISO 3166 country codes +* Licenses:: Licenses * Program Index:: Index of Programs * Option Index:: Index of Command-Line Options @@ -92,16 +99,14 @@ Introduction * Files:: Files Conveying Translations * Overview:: Overview of GNU `gettext' -PO Files and PO Mode Basics +The User's View -* Installation:: Completing GNU `gettext' Installation -* PO Files:: The Format of PO Files -* Main PO Commands:: Main Commands -* Entry Positioning:: Entry Positioning -* Normalizing:: Normalizing Strings in Entries +* Matrix:: The Current `ABOUT-NLS' Matrix +* End Users:: Magic for End Users Preparing Program Sources +* Importing:: Importing the `gettext' declaration * Triggering:: Triggering `gettext' Operations * Preparing Strings:: Preparing Translatable Strings * Mark Keywords:: How Marks Appear in Sources @@ -123,6 +128,19 @@ Creating a New PO File Updating Existing PO Files * msgmerge Invocation:: Invoking the `msgmerge' Program + +Editing PO Files + +* KBabel:: KDE's PO File Editor +* Gtranslator:: GNOME's PO File Editor +* PO Mode:: Emacs's PO File Editor + +Emacs's PO File Editor + +* Installation:: Completing GNU `gettext' Installation +* Main PO Commands:: Main Commands +* Entry Positioning:: Entry Positioning +* Normalizing:: Normalizing Strings in Entries * Translated Entries:: Translated Entries * Fuzzy Entries:: Fuzzy Entries * Untranslated Entries:: Untranslated Entries @@ -159,12 +177,6 @@ Producing Binary MO Files * msgunfmt Invocation:: Invoking the `msgunfmt' Program * MO Files:: The Format of GNU MO Files -The User's View - -* Matrix:: The Current `ABOUT-NLS' Matrix -* Installers:: Magic for Installers -* End Users:: Magic for End Users - The Programmer's View * catgets:: About `catgets' @@ -185,8 +197,8 @@ About `gettext' * Ambiguities:: Solving ambiguities * Locating Catalogs:: Locating message catalog files * Charset conversion:: How to request conversion to Unicode +* Contexts:: Solving ambiguities in GUI programs * Plural forms:: Additional functions for handling plurals -* GUI program problems:: Another technique for solving ambiguities * Optimized gettext:: Optimization of the *gettext functions Temporary Notes for the Programmers Chapter @@ -231,6 +243,7 @@ Files You Must Create or Alter * po/POTFILES.in:: `POTFILES.in' in `po/' * po/LINGUAS:: `LINGUAS' in `po/' * po/Makevars:: `Makevars' in `po/' +* po/Rules-*:: Extending `Makefile' in `po/' * configure.in:: `configure.in' at top level * config.guess:: `config.guess', `config.sub' at top level * mkinstalldirs:: `mkinstalldirs' at top level @@ -284,6 +297,7 @@ The Translator's View * php-format:: PHP Format Strings * gcc-internal-format:: GCC internal Format Strings * qt-format:: Qt Format Strings +* boost-format:: Boost Format Strings Individual Programming Languages @@ -301,7 +315,7 @@ Individual Programming Languages * C#:: C# * gawk:: GNU awk * Pascal:: Pascal - Free Pascal Compiler -* wxWindows:: wxWindows library +* wxWidgets:: wxWidgets library * YCP:: YCP - YaST2 scripting language * Tcl:: Tcl - Tk's scripting language * Perl:: Perl @@ -342,16 +356,26 @@ Concluding Remarks * History:: History of GNU `gettext' * References:: Related Readings +Licenses + +* GNU GPL:: GNU General Public License +* GNU LGPL:: GNU Lesser General Public License +* GNU FDL:: GNU Free Documentation License +  -File: gettext.info, Node: Introduction, Next: Basics, Prev: Top, Up: Top +File: gettext.info, Node: Introduction, Next: Users, Prev: Top, Up: Top 1 Introduction ************** - This manual is still in _DRAFT_ state. Some sections are still - empty, or almost. We keep merging material from other sources - (essentially e-mail folders) while the proper integration of this - material is delayed. +This chapter explains the goals sought in the creation of GNU `gettext' +and the free Translation Project. Then, it explains a few broad +concepts around Native Language Support, and positions message +translation with regard to other aspects of national and cultural +variance, as they apply to programs. It also surveys those files used +to convey the translations. It explains how the various tools interact +in the initial generation of these files, and later, how the maintenance +cycle should usually operate. In this manual, we use _he_ when speaking of the programmer or maintainer, _she_ when speaking of the translator, and _they_ when @@ -362,15 +386,6 @@ males or females. Besides, as you might guess, GNU `gettext' is meant to be useful for people using computers, whatever their sex, race, religion or nationality! - This chapter explains the goals sought in the creation of GNU -`gettext' and the free Translation Project. Then, it explains a few -broad concepts around Native Language Support, and positions message -translation with regard to other aspects of national and cultural -variance, as they apply to to programs. It also surveys those files -used to convey the translations. It explains how the various tools -interact in the initial generation of these files, and later, how the -maintenance cycle should usually operate. - Please send suggestions and corrections to: Internet address: @@ -431,6 +446,9 @@ include * A few stand-alone programs to massage in various ways the sets of translatable strings, or already translated strings. + * A library supporting the parsing and creation of files containing + translated messages. + * A special mode for Emacs(1) which helps preparing these sets and bringing them up to date. @@ -686,39 +704,27 @@ an eye on the diagram. Having a clear understanding of these interrelations will surely help programmers, translators and maintainers. - Original C Sources ---> PO mode ---> Marked C Sources ---. - | - .---------<--- GNU gettext Library | - .--- make <---+ | - | `---------<--------------------+-----------' + Original C Sources ---> Preparation ---> Marked C Sources ---. + | + .---------<--- GNU gettext Library | + .--- make <---+ | + | `---------<--------------------+---------------' | | | .-----<--- PACKAGE.pot <--- xgettext <---' .---<--- PO Compendium - | | | ^ - | | `---. | - | `---. +---> PO mode ---. - | +----> msgmerge ------> LANG.po ---->--------' | - | .---' | - | | | - | `-------------<---------------. | - | +--- New LANG.po <------------------' + | | | ^ + | | `---. | + | `---. +---> PO editor ---. + | +----> msgmerge ------> LANG.po ---->--------' | + | .---' | + | | | + | `-------------<---------------. | + | +--- New LANG.po <--------------------' | .--- LANG.gmo <--- msgfmt <---' | | | `---> install ---> /.../LANG/PACKAGE.mo ---. | +---> "Hello world!" `-------> install ---> /.../bin/PROGRAM -------' - The indication `PO mode' appears in two places in this picture, and -you may safely read it as merely meaning "hand editing", using any -editor of your choice, really. However, for those of you being the -lucky users of Emacs, PO mode has been specifically created for -providing a cozy environment for editing or modifying PO files. While -editing a PO file, PO mode allows for the easy browsing of auxiliary -and compendium PO files, as well as for following references into the -set of C program sources from which PO files have been derived. It has -a few special features, among which are the interactive marking of -program strings as translatable, and the validation of PO files with -easy repositioning to PO file lines showing errors. - As a programmer, the first step to bringing GNU `gettext' into your package is identifying, right in the C sources, those strings which are meant to be translatable, and those which are untranslatable. This @@ -779,16 +785,13 @@ contact translating teams, or becoming part of them, for sharing your translating concerns with others who target the same native language. While adding the translated messages into the `LANG.po' PO file, if -you do not have Emacs handy, you are on your own for ensuring that your -efforts fully respect the PO file format, and quoting conventions -(*note PO Files::). This is surely not an impossible task, as this is -the way many people have handled PO files already for Uniforum or -Solaris. On the other hand, by using PO mode in Emacs, most details of -PO file format are taken care of for you, but you have to acquire some -familiarity with PO mode itself. Besides main PO mode commands (*note -Main PO Commands::), you should know how to move between entries (*note -Entry Positioning::), and how to handle untranslated entries (*note -Untranslated Entries::). +you are not using one of the dedicated PO file editors (*note +Editing::), you are on your own for ensuring that your efforts fully +respect the PO file format, and quoting conventions (*note PO Files::). +This is surely not an impossible task, as this is the way many people +have handled PO files around 1995. On the other hand, by using a PO +file editor, most details of PO file format are taken care of for you, +but you have to acquire some familiarity with PO file editor itself. If some common translations have already been saved into a compendium PO file, translators may use PO mode for initializing untranslated @@ -871,76 +874,89 @@ program should localize itself automatically, whenever it executes. the various steps outlined above.  -File: gettext.info, Node: Basics, Next: Sources, Prev: Introduction, Up: Top +File: gettext.info, Node: Users, Next: PO Files, Prev: Introduction, Up: Top -2 PO Files and PO Mode Basics -***************************** +2 The User's View +***************** -The GNU `gettext' toolset helps programmers and translators at -producing, updating and using translation files, mainly those PO files -which are textual, editable files. This chapter stresses the format of -PO files, and contains a PO mode starter. PO mode description is -spread throughout this manual instead of being concentrated in one -place. Here we present only the basics of PO mode. +When GNU `gettext' will truly have reached its goal, average users +should feel some kind of astonished pleasure, seeing the effect of that +strange kind of magic that just makes their own native language appear +everywhere on their screens. As for naive users, they would ideally +have no special pleasure about it, merely taking their own language for +_granted_, and becoming rather unhappy otherwise. -* Menu: + So, let's try to describe here how we would like the magic to +operate, as we want the users' view to be the simplest, among all ways +one could look at GNU `gettext'. All other software engineers: +programmers, translators, maintainers, should work together in such a +way that the magic becomes possible. This is a long and progressive +undertaking, and information is available about the progress of the +Translation Project. -* Installation:: Completing GNU `gettext' Installation -* PO Files:: The Format of PO Files -* Main PO Commands:: Main Commands -* Entry Positioning:: Entry Positioning -* Normalizing:: Normalizing Strings in Entries + When a package is distributed, there are two kinds of users: +"installers" who fetch the distribution, unpack it, configure it, +compile it and install it for themselves or others to use; and "end +users" that call programs of the package, once these have been +installed at their site. GNU `gettext' is offering magic for both +installers and end users. - -File: gettext.info, Node: Installation, Next: PO Files, Prev: Basics, Up: Basics +* Menu: -2.1 Completing GNU `gettext' Installation -========================================= +* Matrix:: The Current `ABOUT-NLS' Matrix +* End Users:: Magic for End Users -Once you have received, unpacked, configured and compiled the GNU -`gettext' distribution, the `make install' command puts in place the -programs `xgettext', `msgfmt', `gettext', and `msgmerge', as well as -their available message catalogs. To top off a comfortable -installation, you might also want to make the PO mode available to your -Emacs users. + +File: gettext.info, Node: Matrix, Next: End Users, Prev: Users, Up: Users - During the installation of the PO mode, you might want to modify your -file `.emacs', once and for all, so it contains a few lines looking -like: +2.1 The Current `ABOUT-NLS' Matrix +================================== - (setq auto-mode-alist - (cons '("\\.po\\'\\|\\.po\\." . po-mode) auto-mode-alist)) - (autoload 'po-mode "po-mode" "Major mode for translators to edit PO files" t) +Languages are not equally supported in all packages using GNU +`gettext'. To know if some package uses GNU `gettext', one may check +the distribution for the `ABOUT-NLS' information file, for some `LL.po' +files, often kept together into some `po/' directory, or for an `intl/' +directory. Internationalized packages have usually many `LL.po' files, +where LL represents the language. *Note End Users:: for a complete +description of the format for LL. - Later, whenever you edit some `.po' file, or any file having the -string `.po.' within its name, Emacs loads `po-mode.elc' (or -`po-mode.el') as needed, and automatically activates PO mode commands -for the associated buffer. The string _PO_ appears in the mode line -for any buffer for which PO mode is active. Many PO files may be -active at once in a single Emacs session. + More generally, a matrix is available for showing the current state +of the Translation Project, listing which packages are prepared for +multi-lingual messages, and which languages are supported by each. +Because this information changes often, this matrix is not kept within +this GNU `gettext' manual. This information is often found in file +`ABOUT-NLS' from various distributions, but is also as old as the +distribution itself. A recent copy of this `ABOUT-NLS' file, +containing up-to-date information, should generally be found on the +Translation Project sites, and also on most GNU archive sites. - If you are using Emacs version 20 or newer, and have already -installed the appropriate international fonts on your system, you may -also tell Emacs how to determine automatically the coding system of -every PO file. This will often (but not always) cause the necessary -fonts to be loaded and used for displaying the translations on your -Emacs screen. For this to happen, add the lines: + +File: gettext.info, Node: End Users, Prev: Matrix, Up: Users - (modify-coding-system-alist 'file "\\.po\\'\\|\\.po\\." - 'po-find-file-coding-system) - (autoload 'po-find-file-coding-system "po-mode") +2.2 Magic for End Users +======================= -to your `.emacs' file. If, with this, you still see boxes instead of -international characters, try a different font set (via Shift Mouse -button 1). +We consider here those packages using GNU `gettext' internally, and for +which the installers did not disable translation at _configure_ time. +Then, users only have to set the `LANG' environment variable to the +appropriate `LL_CC' combination prior to using the programs in the +package. *Note Matrix::. For example, let's presume a German site. +At the shell prompt, users merely have to execute `setenv LANG de_DE' +(in `csh') or `export LANG; LANG=de_DE' (in `sh'). They could even do +this from their `.login' or `.profile' file.  -File: gettext.info, Node: PO Files, Next: Main PO Commands, Prev: Installation, Up: Basics +File: gettext.info, Node: PO Files, Next: Sources, Prev: Users, Up: Top -2.2 The Format of PO Files -========================== +3 The Format of PO Files +************************ + +The GNU `gettext' toolset helps programmers and translators at +producing, updating and using translation files, mainly those PO files +which are textual, editable files. This chapter explains the format of +PO files. -A PO file is made up of many entries, each entry holding the relation + A PO file is made up of many entries, each entry holding the relation between an original untranslated string and its corresponding translation. All entries in a given PO file usually pertain to a single project, and all translations are expressed in a single target @@ -948,7 +964,7 @@ language. One PO file "entry" has the following schematic structure: WHITE-SPACE # TRANSLATOR-COMMENTS - #. AUTOMATIC-COMMENTS + #. EXTRACTED-COMMENTS #: REFERENCE... #, FLAG... msgid UNTRANSLATED-STRING @@ -968,11 +984,17 @@ format details, as PO mode takes care of them for her. generated through GNU `gettext' tools, there is exactly one blank line between entries. Then comments follow, on lines all starting with the character `#'. There are two kinds of comments: those which have some -white space immediately following the `#', which comments are created -and maintained exclusively by the translator, and those which have some -non-white character just after the `#', which comments are created and -maintained automatically by GNU `gettext' tools. All comments, of -either kind, are optional. +white space immediately following the `#' - the TRANSLATOR COMMENTS -, +which comments are created and maintained exclusively by the +translator, and those which have some non-white character just after the +`#' - the AUTOMATIC COMMENTS -, which comments are created and +maintained automatically by GNU `gettext' tools. Comment lines +starting with `#.' contain comments given by the programmer, directed +at the translator; these comments are called EXTRACTED COMMENTS because +the `xgettext' program extracts them from the program's source code. +Comment lines starting with `#:' contain references to the program's +source code. Comment lines starting with `#,' contain flags; more +about these below. All comments, of either kind, are optional. After white space and comments, entries show two strings, namely first the untranslated string as it appears in the original program @@ -1102,13 +1124,35 @@ forms of flags defined: `no-qt-format' Likewise for Qt, see *Note qt-format::. +`boost-format' +`no-boost-format' + Likewise for Boost, see *Note boost-format::. + + + It is also possible to have entries with a context specifier. They +look like this: + + WHITE-SPACE + # TRANSLATOR-COMMENTS + #. EXTRACTED-COMMENTS + #: REFERENCE... + #, FLAG... + msgctxt CONTEXT + msgid UNTRANSLATED-STRING + msgstr TRANSLATED-STRING + + The context serves to disambiguate messages with the same +UNTRANSLATED-STRING. It is possible to have several entries with the +same UNTRANSLATED-STRING in a PO file, provided that they each have a +different CONTEXT. Note that an empty CONTEXT string and an absent +`msgctxt' line do not mean the same thing. A different kind of entries is used for translations which involve plural forms. WHITE-SPACE # TRANSLATOR-COMMENTS - #. AUTOMATIC-COMMENTS + #. EXTRACTED-COMMENTS #: REFERENCE... #, FLAG... msgid UNTRANSLATED-STRING-SINGULAR @@ -1126,16 +1170,18 @@ plural forms. msgstr[0] "s'ha trobat %d error fatal" msgstr[1] "s'han trobat %d errors fatals" + Here also, a `msgctxt' context can be specified before `msgid', like +above. + It happens that some lines, usually whitespace or comments, follow the very last entry of a PO file. Such lines are not part of any entry, -and PO mode is unable to take action on those lines. By using the PO -mode function `M-x po-normalize', the translator may get rid of those -spurious lines. *Note Normalizing::. +and will be dropped when the PO file is processed by the tools, or may +disturb some PO file editors. - The remainder of this section may be safely skipped by those using -PO mode, yet it may be interesting for everybody to have a better idea -of the precise format of a PO file. On the other hand, those not -having Emacs handy should carefully continue reading on. + The remainder of this section may be safely skipped by those using a +PO file editor, yet it may be interesting for everybody to have a better +idea of the precise format of a PO file. On the other hand, those +wishing to modify PO files by hand should carefully continue reading on. Each of UNTRANSLATED-STRING and TRANSLATED-STRING respects the C syntax for a character string, including the surrounding quotes and @@ -1183,396 +1229,80 @@ be replaced unexpectedly when the PO file is given to `msgmerge'. compatibility with the `msgfmt' implementation on Solaris.  -File: gettext.info, Node: Main PO Commands, Next: Entry Positioning, Prev: PO Files, Up: Basics +File: gettext.info, Node: Sources, Next: Template, Prev: PO Files, Up: Top -2.3 Main PO mode Commands -========================= +4 Preparing Program Sources +*************************** -After setting up Emacs with something similar to the lines in *Note -Installation::, PO mode is activated for a window when Emacs finds a PO -file in that window. This puts the window read-only and establishes a -po-mode-map, which is a genuine Emacs mode, in a way that is not derived -from text mode in any way. Functions found on `po-mode-hook', if any, -will be executed. +For the programmer, changes to the C source code fall into three +categories. First, you have to make the localization functions known +to all modules needing message translation. Second, you should +properly trigger the operation of GNU `gettext' when the program +initializes, usually from the `main' function. Last, you should +identify, adjust and mark all constant strings in your program needing +translation. - When PO mode is active in a window, the letters `PO' appear in the -mode line for that window. The mode line also displays how many -entries of each kind are held in the PO file. For example, the string -`132t+3f+10u+2o' would tell the translator that the PO mode contains -132 translated entries (*note Translated Entries::, 3 fuzzy entries -(*note Fuzzy Entries::), 10 untranslated entries (*note Untranslated -Entries::) and 2 obsolete entries (*note Obsolete Entries::). -Zero-coefficients items are not shown. So, in this example, if the -fuzzy entries were unfuzzied, the untranslated entries were translated -and the obsolete entries were deleted, the mode line would merely -display `145t' for the counters. +* Menu: - The main PO commands are those which do not fit into the other -categories of subsequent sections. These allow for quitting PO mode or -for managing windows in special ways. +* Importing:: Importing the `gettext' declaration +* Triggering:: Triggering `gettext' Operations +* Preparing Strings:: Preparing Translatable Strings +* Mark Keywords:: How Marks Appear in Sources +* Marking:: Marking Translatable Strings +* c-format Flag:: Telling something about the following string +* Special cases:: Special Cases of Translatable Strings +* Names:: Marking Proper Names for Translation +* Libraries:: Preparing Library Sources -`_' - Undo last modification to the PO file (`po-undo'). + +File: gettext.info, Node: Importing, Next: Triggering, Prev: Sources, Up: Sources -`Q' - Quit processing and save the PO file (`po-quit'). +4.1 Importing the `gettext' declaration +======================================= -`q' - Quit processing, possibly after confirmation - (`po-confirm-and-quit'). +Presuming that your set of programs, or package, has been adjusted so +all needed GNU `gettext' files are available, and your `Makefile' files +are adjusted (*note Maintainers::), each C module having translated C +strings should contain the line: -`0' - Temporary leave the PO file window (`po-other-window'). + #include -`?' -`h' - Show help about PO mode (`po-help'). + Similarly, each C module containing `printf()'/`fprintf()'/... +calls with a format string that could be a translated C string (even if +the C string comes from a different C module) should contain the line: -`=' - Give some PO file statistics (`po-statistics'). + #include -`V' - Batch validate the format of the whole PO file (`po-validate'). + +File: gettext.info, Node: Triggering, Next: Preparing Strings, Prev: Importing, Up: Sources +4.2 Triggering `gettext' Operations +=================================== - The command `_' (`po-undo') interfaces to the Emacs _undo_ facility. -*Note Undoing Changes: (emacs)Undo. Each time `U' is typed, -modifications which the translator did to the PO file are undone a -little more. For the purpose of undoing, each PO mode command is -atomic. This is especially true for the `' command: the whole -edition made by using a single use of this command is undone at once, -even if the edition itself implied several actions. However, while in -the editing window, one can undo the edition work quite parsimoniously. +The initialization of locale data should be done with more or less the +same code in every program, as demonstrated below: - The commands `Q' (`po-quit') and `q' (`po-confirm-and-quit') are -used when the translator is done with the PO file. The former is a bit -less verbose than the latter. If the file has been modified, it is -saved to disk first. In both cases, and prior to all this, the -commands check if any untranslated messages remain in the PO file and, -if so, the translator is asked if she really wants to leave off working -with this PO file. This is the preferred way of getting rid of an -Emacs PO file buffer. Merely killing it through the usual command -`C-x k' (`kill-buffer') is not the tidiest way to proceed. + int + main (int argc, char *argv[]) + { + ... + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + ... + } - The command `0' (`po-other-window') is another, softer way, to leave -PO mode, temporarily. It just moves the cursor to some other Emacs -window, and pops one if necessary. For example, if the translator just -got PO mode to show some source context in some other, she might -discover some apparent bug in the program source that needs correction. -This command allows the translator to change sex, become a programmer, -and have the cursor right into the window containing the program she -(or rather _he_) wants to modify. By later getting the cursor back in -the PO file window, or by asking Emacs to edit this file once again, PO -mode is then recovered. + PACKAGE and LOCALEDIR should be provided either by `config.h' or by +the Makefile. For now consult the `gettext' or `hello' sources for +more information. - The command `h' (`po-help') displays a summary of all available PO -mode commands. The translator should then type any character to resume -normal PO mode operations. The command `?' has the same effect as `h'. - - The command `=' (`po-statistics') computes the total number of -entries in the PO file, the ordinal of the current entry (counted from -1), the number of untranslated entries, the number of obsolete entries, -and displays all these numbers. - - The command `V' (`po-validate') launches `msgfmt' in checking and -verbose mode over the current PO file. This command first offers to -save the current PO file on disk. The `msgfmt' tool, from GNU -`gettext', has the purpose of creating a MO file out of a PO file, and -PO mode uses the features of this program for checking the overall -format of a PO file, as well as all individual entries. - - The program `msgfmt' runs asynchronously with Emacs, so the -translator regains control immediately while her PO file is being -studied. Error output is collected in the Emacs `*compilation*' buffer, -displayed in another window. The regular Emacs command `C-x`' -(`next-error'), as well as other usual compile commands, allow the -translator to reposition quickly to the offending parts of the PO file. -Once the cursor is on the line in error, the translator may decide on -any PO mode action which would help correcting the error. - - -File: gettext.info, Node: Entry Positioning, Next: Normalizing, Prev: Main PO Commands, Up: Basics - -2.4 Entry Positioning -===================== - -The cursor in a PO file window is almost always part of an entry. The -only exceptions are the special case when the cursor is after the last -entry in the file, or when the PO file is empty. The entry where the -cursor is found to be is said to be the current entry. Many PO mode -commands operate on the current entry, so moving the cursor does more -than allowing the translator to browse the PO file, this also selects -on which entry commands operate. - - Some PO mode commands alter the position of the cursor in a -specialized way. A few of those special purpose positioning are -described here, the others are described in following sections (for a -complete list try `C-h m'): - -`.' - Redisplay the current entry (`po-current-entry'). - -`n' - Select the entry after the current one (`po-next-entry'). - -`p' - Select the entry before the current one (`po-previous-entry'). - -`<' - Select the first entry in the PO file (`po-first-entry'). - -`>' - Select the last entry in the PO file (`po-last-entry'). - -`m' - Record the location of the current entry for later use - (`po-push-location'). - -`r' - Return to a previously saved entry location (`po-pop-location'). - -`x' - Exchange the current entry location with the previously saved one - (`po-exchange-location'). - - - Any Emacs command able to reposition the cursor may be used to -select the current entry in PO mode, including commands which move by -characters, lines, paragraphs, screens or pages, and search commands. -However, there is a kind of standard way to display the current entry -in PO mode, which usual Emacs commands moving the cursor do not -especially try to enforce. The command `.' (`po-current-entry') has -the sole purpose of redisplaying the current entry properly, after the -current entry has been changed by means external to PO mode, or the -Emacs screen otherwise altered. - - It is yet to be decided if PO mode helps the translator, or otherwise -irritates her, by forcing a rigid window disposition while she is doing -her work. We originally had quite precise ideas about how windows -should behave, but on the other hand, anyone used to Emacs is often -happy to keep full control. Maybe a fixed window disposition might be -offered as a PO mode option that the translator might activate or -deactivate at will, so it could be offered on an experimental basis. -If nobody feels a real need for using it, or a compulsion for writing -it, we should drop this whole idea. The incentive for doing it should -come from translators rather than programmers, as opinions from an -experienced translator are surely more worth to me than opinions from -programmers _thinking_ about how _others_ should do translation. - - The commands `n' (`po-next-entry') and `p' (`po-previous-entry') -move the cursor the entry following, or preceding, the current one. If -`n' is given while the cursor is on the last entry of the PO file, or -if `p' is given while the cursor is on the first entry, no move is done. - - The commands `<' (`po-first-entry') and `>' (`po-last-entry') move -the cursor to the first entry, or last entry, of the PO file. When the -cursor is located past the last entry in a PO file, most PO mode -commands will return an error saying `After last entry'. Moreover, the -commands `<' and `>' have the special property of being able to work -even when the cursor is not into some PO file entry, and one may use -them for nicely correcting this situation. But even these commands -will fail on a truly empty PO file. There are development plans for -the PO mode for it to interactively fill an empty PO file from sources. -*Note Marking::. - - The translator may decide, before working at the translation of a -particular entry, that she needs to browse the remainder of the PO -file, maybe for finding the terminology or phraseology used in related -entries. She can of course use the standard Emacs idioms for saving -the current cursor location in some register, and use that register for -getting back, or else, use the location ring. - - PO mode offers another approach, by which cursor locations may be -saved onto a special stack. The command `m' (`po-push-location') -merely adds the location of current entry to the stack, pushing the -already saved locations under the new one. The command `r' -(`po-pop-location') consumes the top stack element and repositions the -cursor to the entry associated with that top element. This position is -then lost, for the next `r' will move the cursor to the previously -saved location, and so on until no locations remain on the stack. - - If the translator wants the position to be kept on the location -stack, maybe for taking a look at the entry associated with the top -element, then go elsewhere with the intent of getting back later, she -ought to use `m' immediately after `r'. - - The command `x' (`po-exchange-location') simultaneously repositions -the cursor to the entry associated with the top element of the stack of -saved locations, and replaces that top element with the location of the -current entry before the move. Consequently, repeating the `x' command -toggles alternatively between two entries. For achieving this, the -translator will position the cursor on the first entry, use `m', then -position to the second entry, and merely use `x' for making the switch. - - -File: gettext.info, Node: Normalizing, Prev: Entry Positioning, Up: Basics - -2.5 Normalizing Strings in Entries -================================== - -There are many different ways for encoding a particular string into a -PO file entry, because there are so many different ways to split and -quote multi-line strings, and even, to represent special characters by -backslashed escaped sequences. Some features of PO mode rely on the -ability for PO mode to scan an already existing PO file for a -particular string encoded into the `msgid' field of some entry. Even -if PO mode has internally all the built-in machinery for implementing -this recognition easily, doing it fast is technically difficult. To -facilitate a solution to this efficiency problem, we decided on a -canonical representation for strings. - - A conventional representation of strings in a PO file is currently -under discussion, and PO mode experiments with a canonical -representation. Having both `xgettext' and PO mode converging towards -a uniform way of representing equivalent strings would be useful, as -the internal normalization needed by PO mode could be automatically -satisfied when using `xgettext' from GNU `gettext'. An explicit PO -mode normalization should then be only necessary for PO files imported -from elsewhere, or for when the convention itself evolves. - - So, for achieving normalization of at least the strings of a given -PO file needing a canonical representation, the following PO mode -command is available: - -`M-x po-normalize' - Tidy the whole PO file by making entries more uniform. - - - The special command `M-x po-normalize', which has no associated -keys, revises all entries, ensuring that strings of both original and -translated entries use uniform internal quoting in the PO file. It -also removes any crumb after the last entry. This command may be -useful for PO files freshly imported from elsewhere, or if we ever -improve on the canonical quoting format we use. This canonical format -is not only meant for getting cleaner PO files, but also for greatly -speeding up `msgid' string lookup for some other PO mode commands. - - `M-x po-normalize' presently makes three passes over the entries. -The first implements heuristics for converting PO files for GNU -`gettext' 0.6 and earlier, in which `msgid' and `msgstr' fields were -using K&R style C string syntax for multi-line strings. These -heuristics may fail for comments not related to obsolete entries and -ending with a backslash; they also depend on subsequent passes for -finalizing the proper commenting of continued lines for obsolete -entries. This first pass might disappear once all oldish PO files -would have been adjusted. The second and third pass normalize all -`msgid' and `msgstr' strings respectively. They also clean out those -trailing backslashes used by XView's `msgfmt' for continued lines. - - Having such an explicit normalizing command allows for importing PO -files from other sources, but also eases the evolution of the current -convention, evolution driven mostly by aesthetic concerns, as of now. -It is easy to make suggested adjustments at a later time, as the -normalizing command and eventually, other GNU `gettext' tools should -greatly automate conformance. A description of the canonical string -format is given below, for the particular benefit of those not having -Emacs handy, and who would nevertheless want to handcraft their PO -files in nice ways. - - Right now, in PO mode, strings are single line or multi-line. A -string goes multi-line if and only if it has _embedded_ newlines, that -is, if it matches `[^\n]\n+[^\n]'. So, we would have: - - msgstr "\n\nHello, world!\n\n\n" - - but, replacing the space by a newline, this becomes: - - msgstr "" - "\n" - "\n" - "Hello,\n" - "world!\n" - "\n" - "\n" - - We are deliberately using a caricatural example, here, to make the -point clearer. Usually, multi-lines are not that bad looking. It is -probable that we will implement the following suggestion. We might -lump together all initial newlines into the empty string, and also all -newlines introducing empty lines (that is, for N > 1, the N-1'th last -newlines would go together on a separate string), so making the -previous example appear: - - msgstr "\n\n" - "Hello,\n" - "world!\n" - "\n\n" - - There are a few yet undecided little points about string -normalization, to be documented in this manual, once these questions -settle. - - -File: gettext.info, Node: Sources, Next: Template, Prev: Basics, Up: Top - -3 Preparing Program Sources -*************************** - -For the programmer, changes to the C source code fall into three -categories. First, you have to make the localization functions known -to all modules needing message translation. Second, you should -properly trigger the operation of GNU `gettext' when the program -initializes, usually from the `main' function. Last, you should -identify and especially mark all constant strings in your program -needing translation. - - Presuming that your set of programs, or package, has been adjusted -so all needed GNU `gettext' files are available, and your `Makefile' -files are adjusted (*note Maintainers::), each C module having -translated C strings should contain the line: - - #include - - Similarly, each C module containing `printf()'/`fprintf()'/... -calls with a format string that could be a translated C string (even if -the C string comes from a different C module) should contain the line: - - #include - - The remaining changes to your C sources are discussed in the further -sections of this chapter. - -* Menu: - -* Triggering:: Triggering `gettext' Operations -* Preparing Strings:: Preparing Translatable Strings -* Mark Keywords:: How Marks Appear in Sources -* Marking:: Marking Translatable Strings -* c-format Flag:: Telling something about the following string -* Special cases:: Special Cases of Translatable Strings -* Names:: Marking Proper Names for Translation -* Libraries:: Preparing Library Sources - - -File: gettext.info, Node: Triggering, Next: Preparing Strings, Prev: Sources, Up: Sources - -3.1 Triggering `gettext' Operations -=================================== - -The initialization of locale data should be done with more or less the -same code in every program, as demonstrated below: - - int - main (int argc, char *argv[]) - { - ... - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); - ... - } - - PACKAGE and LOCALEDIR should be provided either by `config.h' or by -the Makefile. For now consult the `gettext' or `hello' sources for -more information. - - The use of `LC_ALL' might not be appropriate for you. `LC_ALL' -includes all locale categories and especially `LC_CTYPE'. This later -category is responsible for determining character classes with the -`isalnum' etc. functions from `ctype.h' which could especially for -programs, which process some kind of input language, be wrong. For -example this would mean that a source code using the c, (c-cedilla -character) is runnable in France but not in the U.S. + The use of `LC_ALL' might not be appropriate for you. `LC_ALL' +includes all locale categories and especially `LC_CTYPE'. This later +category is responsible for determining character classes with the +`isalnum' etc. functions from `ctype.h' which could especially for +programs, which process some kind of input language, be wrong. For +example this would mean that a source code using the c, (c-cedilla +character) is runnable in France but not in the U.S. Some systems also have problems with parsing numbers using the `scanf' functions if an other but the `LC_ALL' locale is used. The @@ -1618,7 +1348,7 @@ multithread-safe.  File: gettext.info, Node: Preparing Strings, Next: Mark Keywords, Prev: Triggering, Up: Sources -3.2 Preparing Translatable Strings +4.3 Preparing Translatable Strings ================================== Before strings can be marked for translations, they sometimes need to @@ -1670,9 +1400,9 @@ this to filename); This way the translator will not only understand the message, she will -also be able to find the appropriate grammatical construction. The -French translator for example translates "write protected" like -"protected against writing". +also be able to find the appropriate grammatical construction. A French +translator for example translates "write protected" like "protected +against writing". Entire sentences are also important because in many languages, the declination of some word in a sentence depends on the gender or the @@ -1806,7 +1536,7 @@ into a statement involving a format string:  File: gettext.info, Node: Mark Keywords, Next: Marking, Prev: Preparing Strings, Up: Sources -3.3 How Marks Appear in Sources +4.4 How Marks Appear in Sources =============================== All strings requiring translation should be marked in the C sources. @@ -1873,7 +1603,7 @@ _not_ requiring translation!  File: gettext.info, Node: Marking, Next: c-format Flag, Prev: Mark Keywords, Up: Sources -3.4 Marking Translatable Strings +4.5 Marking Translatable Strings ================================ In PO mode, one set of features is meant more for the programmer than @@ -2018,7 +1748,7 @@ one is already built in the `M-,' command.  File: gettext.info, Node: c-format Flag, Next: Special cases, Prev: Marking, Up: Sources -3.5 Special Comments preceding Keywords +4.6 Special Comments preceding Keywords ======================================= In C programs strings are often used within calls of functions from the @@ -2098,7 +1828,7 @@ solving this problem.  File: gettext.info, Node: Special cases, Next: Names, Prev: c-format Flag, Up: Sources -3.6 Special Cases of Translatable Strings +4.7 Special Cases of Translatable Strings ========================================= The attentive reader might now point out that it is not always possible @@ -2181,7 +1911,7 @@ use this second method in this situation.  File: gettext.info, Node: Names, Next: Libraries, Prev: Special cases, Up: Sources -3.7 Marking Proper Names for Translation +4.8 Marking Proper Names for Translation ======================================== Should names of persons, cities, locations etc. be marked for @@ -2249,7 +1979,7 @@ major hassle for translators using GNU Emacs or XEmacs with po-mode.  File: gettext.info, Node: Libraries, Prev: Names, Up: Sources -3.8 Preparing Library Sources +4.9 Preparing Library Sources ============================= When you are preparing a library, not a program, for the use of @@ -2332,7 +2062,7 @@ previous sections apply without changes.)  File: gettext.info, Node: Template, Next: Creating, Prev: Sources, Up: Top -4 Making the PO Template File +5 Making the PO Template File ***************************** After preparing the sources, the programmer creates a PO template file. @@ -2352,7 +2082,7 @@ use at that time.)  File: gettext.info, Node: xgettext Invocation, Prev: Template, Up: Template -4.1 Invoking the `xgettext' Program +5.1 Invoking the `xgettext' Program =================================== xgettext [OPTION] [INPUTFILE] ... @@ -2360,7 +2090,7 @@ File: gettext.info, Node: xgettext Invocation, Prev: Template, Up: Template The `xgettext' program extracts translatable strings from given input files. -4.1.1 Input file location +5.1.1 Input file location ------------------------- `INPUTFILE ...' @@ -2380,7 +2110,7 @@ input files. If INPUTFILE is `-', standard input is read. -4.1.2 Output file location +5.1.2 Output file location -------------------------- `-d NAME' @@ -2400,7 +2130,7 @@ input files. If the output FILE is `-' or `/dev/stdout', the output is written to standard output. -4.1.3 Choice of input file language +5.1.3 Choice of input file language ----------------------------------- `-L NAME' @@ -2419,20 +2149,20 @@ standard output. By default the language is guessed depending on the input file name extension. -4.1.4 Input file interpretation +5.1.4 Input file interpretation ------------------------------- `--from-code=NAME' Specifies the encoding of the input files. This option is needed only if some untranslated message strings or their corresponding - comments contain non-ASCII characters. Note that Python, Tcl, and - Glade input files are always assumed to be in UTF-8, regardless of - this option. + comments contain non-ASCII characters. Note that Tcl and Glade + input files are always assumed to be in UTF-8, regardless of this + option. By default the input files are assumed to be in ASCII. -4.1.5 Operation mode +5.1.5 Operation mode -------------------- `-j' @@ -2450,7 +2180,7 @@ extension. output file. -4.1.6 Language specific options +5.1.6 Language specific options ------------------------------- `-a' @@ -2473,15 +2203,76 @@ extension. of the form `ID:ARGNUM1,ARGNUM2', `xgettext' looks for strings in the ARGNUM1st argument and in the ARGNUM2nd argument of the call, and treats them as singular/plural variants for a message with - plural handling. - The default keyword specifications, which are always looked for if - not explicitly disabled, are `gettext', `dgettext:2', - `dcgettext:2', `ngettext:1,2', `dngettext:2,3', `dcngettext:2,3', - and `gettext_noop'. + plural handling. Also, if KEYWORDSPEC is of the form + `ID:CONTEXTARGNUMc,ARGNUM' or `ID:ARGNUM,CONTEXTARGNUMc', + `xgettext' treats strings in the CONTEXTARGNUMth argument as a + context specifier. And, as a special-purpose support for GNOME, + if KEYWORDSPEC is of the form `ID:ARGNUMg', `xgettext' recognizes + the ARGNUMth argument as a string with context, using the GNOME + `glib' syntax `"msgctxt|msgid"'. + Furthermore, if KEYWORDSPEC is of the form `ID:...,TOTALNUMARGSt', + `xgettext' recognizes this argument specification only if the + number of actual arguments is equal to TOTALNUMARGS. This is + useful for disambiguating overloaded function calls in C++. + Finally, if KEYWORDSPEC is of the form `ID:ARGNUM...,"XCOMMENT"', + `xgettext', when extracting a message from the specified argument + strings, adds an extracted comment XCOMMENT to the message. Note + that when used through a normal shell command line, the + double-quotes around the XCOMMENT need to be escaped. + This option has an effect with most languages, namely C, C++, ObjectiveC, Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, Tcl, Perl, PHP, GCC-source, Glade. + The default keyword specifications, which are always looked for if + not explicitly disabled, are language dependent. They are: + + * For C, C++, and GCC-source: `gettext', `dgettext:2', + `dcgettext:2', `ngettext:1,2', `dngettext:2,3', + `dcngettext:2,3', `gettext_noop', and `pgettext:1c,2', + `dpgettext:2c,3', `dcpgettext:2c,3', `npgettext:1c,2,3', + `dnpgettext:2c,3,4', `dcnpgettext:2c,3,4'. + + * For Objective C: Like for C, and also `NSLocalizedString', + `_', `NSLocalizedStaticString', `__'. + + * For Shell scripts: `gettext', `ngettext:1,2', `eval_gettext', + `eval_ngettext:1,2'. + + * For Python: `gettext', `ugettext', `dgettext:2', + `ngettext:1,2', `ungettext:1,2', `dngettext:2,3', `_'. + + * For Lisp: `gettext', `ngettext:1,2', `gettext-noop'. + + * For EmacsLisp: `_'. + + * For librep: `_'. + + * For Scheme: `gettext', `ngettext:1,2', `gettext-noop'. + + * For Java: `GettextResource.gettext:2', + `GettextResource.ngettext:2,3', `gettext', `ngettext:1,2', + `getString'. + + * For C#: `GetString', `GetPluralString:1,2'. + + * For awk: `dcgettext', `dcngettext:1,2'. + + * For Tcl: `::msgcat::mc'. + + * For Perl: `gettext', `%gettext', `$gettext', `dgettext:2', + `dcgettext:2', `ngettext:1,2', `dngettext:2,3', + `dcngettext:2,3', `gettext_noop'. + + * For PHP: `_', `gettext', `dgettext:2', `dcgettext:2', + `ngettext:1,2', `dngettext:2,3', `dcngettext:2,3'. + + * For Glade 1: `label', `title', `text', `format', `copyright', + `comments', `preview_text', `tooltip'. + + To disable the default keyword specifications, the option `-k' or + `--keyword' or `--keyword=', without a KEYWORDSPEC, can be used. + `--flag=WORD:ARG:FLAG' Specifies additional flags for strings occurring as part of the ARGth argument of the function WORD. The possible flags are the @@ -2531,6 +2322,10 @@ extension. Recognize Qt format strings. This option has an effect only with the language C++. +`--boost' + Recognize Boost format strings. + This option has an effect only with the language C++. + `--debug' Use the flags `c-format' and `possible-c-format' to show who was responsible for marking a message as a format string. The latter @@ -2545,7 +2340,7 @@ extension. cases, like strings in preprocessor macros, ANSI concatenation of adjacent strings, and escaped end of lines for continued strings. -4.1.7 Output details +5.1.7 Output details -------------------- `--force-po' @@ -2663,7 +2458,7 @@ adjacent strings, and escaped end of lines for continued strings. Use STRING (or "" if not specified) as suffix for msgstr entries. -4.1.8 Informative output +5.1.8 Informative output ------------------------ `-h' @@ -2678,7 +2473,7 @@ adjacent strings, and escaped end of lines for continued strings.  File: gettext.info, Node: Creating, Next: Updating, Prev: Template, Up: Top -5 Creating a New PO File +6 Creating a New PO File ************************ When starting a new translation, the translator creates a file called @@ -2706,7 +2501,7 @@ modifies the initial comments and the header entry of this file.  File: gettext.info, Node: msginit Invocation, Next: Header Entry, Prev: Creating, Up: Creating -5.1 Invoking the `msginit' Program +6.1 Invoking the `msginit' Program ================================== msginit [OPTION] @@ -2714,7 +2509,7 @@ File: gettext.info, Node: msginit Invocation, Next: Header Entry, Prev: Creat The `msginit' program creates a new PO file, initializing the meta information with values from the user's environment. -5.1.1 Input file location +6.1.1 Input file location ------------------------- `-i INPUTFILE' @@ -2725,7 +2520,7 @@ information with values from the user's environment. If no INPUTFILE is given, the current directory is searched for the POT file. If it is `-', standard input is read. -5.1.2 Output file location +6.1.2 Output file location -------------------------- `-o FILE' @@ -2737,7 +2532,7 @@ POT file. If it is `-', standard input is read. the user's locale setting. If it is `-', the results are written to standard output. -5.1.3 Input file syntax +6.1.3 Input file syntax ----------------------- `-P' @@ -2750,7 +2545,7 @@ standard output. file in `.strings' syntax, not in PO file syntax. -5.1.4 Output details +6.1.4 Output details -------------------- `-l LL_CC' @@ -2788,7 +2583,7 @@ standard output. page width will be split. -5.1.5 Informative output +6.1.5 Informative output ------------------------ `-h' @@ -2803,7 +2598,7 @@ standard output.  File: gettext.info, Node: Header Entry, Prev: msginit Invocation, Up: Creating -5.2 Filling in the Header Entry +6.2 Filling in the Header Entry =============================== The initial comments "SOME DESCRIPTIVE TITLE", "YEAR" and "FIRST AUTHOR @@ -2843,8 +2638,8 @@ POT-Creation-Date This has already been filled in by `xgettext'. PO-Revision-Date - You don't need to fill this in. It will be filled by the Emacs PO - mode when you save the file. + You don't need to fill this in. It will be filled by the PO file + editor when you save the file. Last-Translator Fill in your name and email address (without double quotes). @@ -2871,123 +2666,371 @@ Content-Type as for users whose locale's character encoding differs from yours (see *Note Charset conversion::). - You get the character encoding of your locale by running the shell - command `locale charmap'. If the result is `C' or - `ANSI_X3.4-1968', which is equivalent to `ASCII' (= `US-ASCII'), - it means that your locale is not correctly configured. In this - case, ask your translation team which charset to use. `ASCII' is - not usable for any language except Latin. + You get the character encoding of your locale by running the shell + command `locale charmap'. If the result is `C' or + `ANSI_X3.4-1968', which is equivalent to `ASCII' (= `US-ASCII'), + it means that your locale is not correctly configured. In this + case, ask your translation team which charset to use. `ASCII' is + not usable for any language except Latin. + + Because the PO files must be portable to operating systems with + less advanced internationalization facilities, the character + encodings that can be used are limited to those supported by both + GNU `libc' and GNU `libiconv'. These are: `ASCII', `ISO-8859-1', + `ISO-8859-2', `ISO-8859-3', `ISO-8859-4', `ISO-8859-5', + `ISO-8859-6', `ISO-8859-7', `ISO-8859-8', `ISO-8859-9', + `ISO-8859-13', `ISO-8859-14', `ISO-8859-15', `KOI8-R', `KOI8-U', + `KOI8-T', `CP850', `CP866', `CP874', `CP932', `CP949', `CP950', + `CP1250', `CP1251', `CP1252', `CP1253', `CP1254', `CP1255', + `CP1256', `CP1257', `GB2312', `EUC-JP', `EUC-KR', `EUC-TW', + `BIG5', `BIG5-HKSCS', `GBK', `GB18030', `SHIFT_JIS', `JOHAB', + `TIS-620', `VISCII', `GEORGIAN-PS', `UTF-8'. + + In the GNU system, the following encodings are frequently used for + the corresponding languages. + + * `ISO-8859-1' for Afrikaans, Albanian, Basque, Breton, + Catalan, Cornish, Danish, Dutch, English, Estonian, Faroese, + Finnish, French, Galician, German, Greenlandic, Icelandic, + Indonesian, Irish, Italian, Malay, Manx, Norwegian, Occitan, + Portuguese, Spanish, Swedish, Tagalog, Uzbek, Walloon, + + * `ISO-8859-2' for Bosnian, Croatian, Czech, Hungarian, Polish, + Romanian, Serbian, Slovak, Slovenian, + + * `ISO-8859-3' for Maltese, + + * `ISO-8859-5' for Macedonian, Serbian, + + * `ISO-8859-6' for Arabic, + + * `ISO-8859-7' for Greek, + + * `ISO-8859-8' for Hebrew, + + * `ISO-8859-9' for Turkish, + + * `ISO-8859-13' for Latvian, Lithuanian, Maori, + + * `ISO-8859-14' for Welsh, + + * `ISO-8859-15' for Basque, Catalan, Dutch, English, Finnish, + French, Galician, German, Irish, Italian, Portuguese, + Spanish, Swedish, Walloon, + + * `KOI8-R' for Russian, + + * `KOI8-U' for Ukrainian, + + * `KOI8-T' for Tajik, + + * `CP1251' for Bulgarian, Byelorussian, + + * `GB2312', `GBK', `GB18030' for simplified writing of Chinese, + + * `BIG5', `BIG5-HKSCS' for traditional writing of Chinese, + + * `EUC-JP' for Japanese, + + * `EUC-KR' for Korean, + + * `TIS-620' for Thai, + + * `GEORGIAN-PS' for Georgian, + + * `UTF-8' for any language, including those listed above. + + When single quote characters or double quote characters are used in + translations for your language, and your locale's encoding is one + of the ISO-8859-* charsets, it is best if you create your PO files + in UTF-8 encoding, instead of your locale's encoding. This is + because in UTF-8 the real quote characters can be represented + (single quote characters: U+2018, U+2019, double quote characters: + U+201C, U+201D), whereas none of ISO-8859-* charsets has them all. + Users in UTF-8 locales will see the real quote characters, + whereas users in ISO-8859-* locales will see the vertical + apostrophe and the vertical double quote instead (because that's + what the character set conversion will transliterate them to). + + To enter such quote characters under X11, you can change your + keyboard mapping using the `xmodmap' program. The X11 names of + the quote characters are "leftsinglequotemark", + "rightsinglequotemark", "leftdoublequotemark", + "rightdoublequotemark", "singlelowquotemark", "doublelowquotemark". + + Note that only recent versions of GNU Emacs support the UTF-8 + encoding: Emacs 20 with Mule-UCS, and Emacs 21. As of January + 2001, XEmacs doesn't support the UTF-8 encoding. + + The character encoding name can be written in either upper or + lower case. Usually upper case is preferred. + +Content-Transfer-Encoding + Set this to `8bit'. + +Plural-Forms + This field is optional. It is only needed if the PO file has + plural forms. You can find them by searching for the + `msgid_plural' keyword. The format of the plural forms field is + described in *Note Plural forms::. + + +File: gettext.info, Node: Updating, Next: Editing, Prev: Creating, Up: Top + +7 Updating Existing PO Files +**************************** + +* Menu: + +* msgmerge Invocation:: Invoking the `msgmerge' Program + + +File: gettext.info, Node: msgmerge Invocation, Prev: Updating, Up: Updating + +7.1 Invoking the `msgmerge' Program +=================================== + + msgmerge [OPTION] DEF.po REF.pot + + The `msgmerge' program merges two Uniforum style .po files together. +The DEF.po file is an existing PO file with translations which will be +taken over to the newly created file as long as they still match; +comments will be preserved, but extracted comments and file positions +will be discarded. The REF.pot file is the last created PO file with +up-to-date source references but old translations, or a PO Template file +(generally created by `xgettext'); any translations or comments in the +file will be discarded, however dot comments and file positions will be +preserved. Where an exact match cannot be found, fuzzy matching is +used to produce better results. + +7.1.1 Input file location +------------------------- + +`DEF.po' + Translations referring to old sources. + +`REF.pot' + References to the new sources. + +`-D DIRECTORY' +`--directory=DIRECTORY' + Add DIRECTORY to the list of directories. Source files are + searched relative to this list of directories. The resulting `.po' + file will be written relative to the current directory, though. + +`-C FILE' +`--compendium=FILE' + Specify an additional library of message translations. *Note + Compendium::. This option may be specified more than once. + + +7.1.2 Operation mode +-------------------- + +`-U' +`--update' + Update DEF.po. Do nothing if DEF.po is already up to date. + + +7.1.3 Output file location +-------------------------- + +`-o FILE' +`--output-file=FILE' + Write output to specified file. + + + The results are written to standard output if no output file is +specified or if it is `-'. + +7.1.4 Output file location in update mode +----------------------------------------- + +The result is written back to DEF.po. + +`--backup=CONTROL' + Make a backup of DEF.po + +`--suffix=SUFFIX' + Override the usual backup suffix. + + + The version control method may be selected via the `--backup' option +or through the `VERSION_CONTROL' environment variable. Here are the +values: + +`none' +`off' + Never make backups (even if `--backup' is given). + +`numbered' +`t' + Make numbered backups. + +`existing' +`nil' + Make numbered backups if numbered backups for this file already + exist, otherwise make simple backups. + +`simple' +`never' + Always make simple backups. + + + The backup suffix is `~', unless set with `--suffix' or the +`SIMPLE_BACKUP_SUFFIX' environment variable. + +7.1.5 Operation modifiers +------------------------- + +`-m' +`--multi-domain' + Apply REF.pot to each of the domains in DEF.po. + +`-N' +`--no-fuzzy-matching' + Do not use fuzzy matching when an exact match is not found. This + may speed up the operation considerably. - Because the PO files must be portable to operating systems with - less advanced internationalization facilities, the character - encodings that can be used are limited to those supported by both - GNU `libc' and GNU `libiconv'. These are: `ASCII', `ISO-8859-1', - `ISO-8859-2', `ISO-8859-3', `ISO-8859-4', `ISO-8859-5', - `ISO-8859-6', `ISO-8859-7', `ISO-8859-8', `ISO-8859-9', - `ISO-8859-13', `ISO-8859-14', `ISO-8859-15', `KOI8-R', `KOI8-U', - `KOI8-T', `CP850', `CP866', `CP874', `CP932', `CP949', `CP950', - `CP1250', `CP1251', `CP1252', `CP1253', `CP1254', `CP1255', - `CP1256', `CP1257', `GB2312', `EUC-JP', `EUC-KR', `EUC-TW', - `BIG5', `BIG5-HKSCS', `GBK', `GB18030', `SHIFT_JIS', `JOHAB', - `TIS-620', `VISCII', `GEORGIAN-PS', `UTF-8'. +7.1.6 Input file syntax +----------------------- - In the GNU system, the following encodings are frequently used for - the corresponding languages. +`-P' +`--properties-input' + Assume the input files are Java ResourceBundles in Java + `.properties' syntax, not in PO file syntax. - * `ISO-8859-1' for Afrikaans, Albanian, Basque, Breton, - Catalan, Cornish, Danish, Dutch, English, Estonian, Faroese, - Finnish, French, Galician, German, Greenlandic, Icelandic, - Indonesian, Irish, Italian, Malay, Manx, Norwegian, Occitan, - Portuguese, Spanish, Swedish, Tagalog, Uzbek, Walloon, +`--stringtable-input' + Assume the input files are NeXTstep/GNUstep localized resource + files in `.strings' syntax, not in PO file syntax. - * `ISO-8859-2' for Bosnian, Croatian, Czech, Hungarian, Polish, - Romanian, Serbian, Slovak, Slovenian, - * `ISO-8859-3' for Maltese, +7.1.7 Output details +-------------------- - * `ISO-8859-5' for Macedonian, Serbian, +`--force-po' + Always write an output file even if it contains no message. - * `ISO-8859-6' for Arabic, +`-i' +`--indent' + Write the .po file using indented style. - * `ISO-8859-7' for Greek, +`--no-location' + Do not write `#: FILENAME:LINE' lines. - * `ISO-8859-8' for Hebrew, +`--add-location' + Generate `#: FILENAME:LINE' lines (default). - * `ISO-8859-9' for Turkish, +`--strict' + Write out a strict Uniforum conforming PO file. Note that this + Uniforum format should be avoided because it doesn't support the + GNU extensions. - * `ISO-8859-13' for Latvian, Lithuanian, Maori, +`-p' +`--properties-output' + Write out a Java ResourceBundle in Java `.properties' syntax. Note + that this file format doesn't support plural forms and silently + drops obsolete messages. - * `ISO-8859-14' for Welsh, +`--stringtable-output' + Write out a NeXTstep/GNUstep localized resource file in `.strings' + syntax. Note that this file format doesn't support plural forms. - * `ISO-8859-15' for Basque, Catalan, Dutch, English, Finnish, - French, Galician, German, Irish, Italian, Portuguese, - Spanish, Swedish, Walloon, +`-w NUMBER' +`--width=NUMBER' + Set the output page width. Long strings in the output files will + be split across multiple lines in order to ensure that each line's + width (= number of screen columns) is less or equal to the given + NUMBER. - * `KOI8-R' for Russian, +`--no-wrap' + Do not break long message lines. Message lines whose width + exceeds the output page width will not be split into several + lines. Only file reference lines which are wider than the output + page width will be split. - * `KOI8-U' for Ukrainian, +`-s' +`--sort-output' + Generate sorted output. Note that using this option makes it much + harder for the translator to understand each message's context. - * `KOI8-T' for Tajik, +`-F' +`--sort-by-file' + Sort output by file location. - * `CP1251' for Bulgarian, Byelorussian, - * `GB2312', `GBK', `GB18030' for simplified writing of Chinese, +7.1.8 Informative output +------------------------ - * `BIG5', `BIG5-HKSCS' for traditional writing of Chinese, +`-h' +`--help' + Display this help and exit. - * `EUC-JP' for Japanese, +`-V' +`--version' + Output version information and exit. - * `EUC-KR' for Korean, +`-v' +`--verbose' + Increase verbosity level. - * `TIS-620' for Thai, +`-q' +`--quiet' +`--silent' + Suppress progress indicators. - * `GEORGIAN-PS' for Georgian, - * `UTF-8' for any language, including those listed above. + +File: gettext.info, Node: Editing, Next: Manipulating, Prev: Updating, Up: Top - When single quote characters or double quote characters are used in - translations for your language, and your locale's encoding is one - of the ISO-8859-* charsets, it is best if you create your PO files - in UTF-8 encoding, instead of your locale's encoding. This is - because in UTF-8 the real quote characters can be represented - (single quote characters: U+2018, U+2019, double quote characters: - U+201C, U+201D), whereas none of ISO-8859-* charsets has them all. - Users in UTF-8 locales will see the real quote characters, - whereas users in ISO-8859-* locales will see the vertical - apostrophe and the vertical double quote instead (because that's - what the character set conversion will transliterate them to). +8 Editing PO Files +****************** - To enter such quote characters under X11, you can change your - keyboard mapping using the `xmodmap' program. The X11 names of - the quote characters are "leftsinglequotemark", - "rightsinglequotemark", "leftdoublequotemark", - "rightdoublequotemark", "singlelowquotemark", "doublelowquotemark". +* Menu: - Note that only recent versions of GNU Emacs support the UTF-8 - encoding: Emacs 20 with Mule-UCS, and Emacs 21. As of January - 2001, XEmacs doesn't support the UTF-8 encoding. +* KBabel:: KDE's PO File Editor +* Gtranslator:: GNOME's PO File Editor +* PO Mode:: Emacs's PO File Editor - The character encoding name can be written in either upper or - lower case. Usually upper case is preferred. + +File: gettext.info, Node: KBabel, Next: Gtranslator, Prev: Editing, Up: Editing -Content-Transfer-Encoding - Set this to `8bit'. +8.1 KDE's PO File Editor +======================== -Plural-Forms - This field is optional. It is only needed if the PO file has - plural forms. You can find them by searching for the - `msgid_plural' keyword. The format of the plural forms field is - described in *Note Plural forms::. + +File: gettext.info, Node: Gtranslator, Next: PO Mode, Prev: KBabel, Up: Editing + +8.2 GNOME's PO File Editor +==========================  -File: gettext.info, Node: Updating, Next: Manipulating, Prev: Creating, Up: Top +File: gettext.info, Node: PO Mode, Prev: Gtranslator, Up: Editing -6 Updating Existing PO Files -**************************** +8.3 Emacs's PO File Editor +========================== + +For those of you being the lucky users of Emacs, PO mode has been +specifically created for providing a cozy environment for editing or +modifying PO files. While editing a PO file, PO mode allows for the +easy browsing of auxiliary and compendium PO files, as well as for +following references into the set of C program sources from which PO +files have been derived. It has a few special features, among which +are the interactive marking of program strings as translatable, and the +validation of PO files with easy repositioning to PO file lines showing +errors. + + For the beginning, besides main PO mode commands (*note Main PO +Commands::), you should know how to move between entries (*note Entry +Positioning::), and how to handle untranslated entries (*note +Untranslated Entries::). * Menu: -* msgmerge Invocation:: Invoking the `msgmerge' Program +* Installation:: Completing GNU `gettext' Installation +* Main PO Commands:: Main Commands +* Entry Positioning:: Entry Positioning +* Normalizing:: Normalizing Strings in Entries * Translated Entries:: Translated Entries * Fuzzy Entries:: Fuzzy Entries * Untranslated Entries:: Untranslated Entries @@ -3000,206 +3043,373 @@ File: gettext.info, Node: Updating, Next: Manipulating, Prev: Creating, Up: * Compendium:: Using Translation Compendia  -File: gettext.info, Node: msgmerge Invocation, Next: Translated Entries, Prev: Updating, Up: Updating +File: gettext.info, Node: Installation, Next: Main PO Commands, Prev: PO Mode, Up: PO Mode -6.1 Invoking the `msgmerge' Program -=================================== +8.3.1 Completing GNU `gettext' Installation +------------------------------------------- - msgmerge [OPTION] DEF.po REF.pot +Once you have received, unpacked, configured and compiled the GNU +`gettext' distribution, the `make install' command puts in place the +programs `xgettext', `msgfmt', `gettext', and `msgmerge', as well as +their available message catalogs. To top off a comfortable +installation, you might also want to make the PO mode available to your +Emacs users. - The `msgmerge' program merges two Uniforum style .po files together. -The DEF.po file is an existing PO file with translations which will be -taken over to the newly created file as long as they still match; -comments will be preserved, but extracted comments and file positions -will be discarded. The REF.pot file is the last created PO file with -up-to-date source references but old translations, or a PO Template file -(generally created by `xgettext'); any translations or comments in the -file will be discarded, however dot comments and file positions will be -preserved. Where an exact match cannot be found, fuzzy matching is -used to produce better results. + During the installation of the PO mode, you might want to modify your +file `.emacs', once and for all, so it contains a few lines looking +like: -6.1.1 Input file location -------------------------- + (setq auto-mode-alist + (cons '("\\.po\\'\\|\\.po\\." . po-mode) auto-mode-alist)) + (autoload 'po-mode "po-mode" "Major mode for translators to edit PO files" t) -`DEF.po' - Translations referring to old sources. + Later, whenever you edit some `.po' file, or any file having the +string `.po.' within its name, Emacs loads `po-mode.elc' (or +`po-mode.el') as needed, and automatically activates PO mode commands +for the associated buffer. The string _PO_ appears in the mode line +for any buffer for which PO mode is active. Many PO files may be +active at once in a single Emacs session. -`REF.pot' - References to the new sources. + If you are using Emacs version 20 or newer, and have already +installed the appropriate international fonts on your system, you may +also tell Emacs how to determine automatically the coding system of +every PO file. This will often (but not always) cause the necessary +fonts to be loaded and used for displaying the translations on your +Emacs screen. For this to happen, add the lines: + + (modify-coding-system-alist 'file "\\.po\\'\\|\\.po\\." + 'po-find-file-coding-system) + (autoload 'po-find-file-coding-system "po-mode") + +to your `.emacs' file. If, with this, you still see boxes instead of +international characters, try a different font set (via Shift Mouse +button 1). + + +File: gettext.info, Node: Main PO Commands, Next: Entry Positioning, Prev: Installation, Up: PO Mode + +8.3.2 Main PO mode Commands +--------------------------- + +After setting up Emacs with something similar to the lines in *Note +Installation::, PO mode is activated for a window when Emacs finds a PO +file in that window. This puts the window read-only and establishes a +po-mode-map, which is a genuine Emacs mode, in a way that is not derived +from text mode in any way. Functions found on `po-mode-hook', if any, +will be executed. + + When PO mode is active in a window, the letters `PO' appear in the +mode line for that window. The mode line also displays how many +entries of each kind are held in the PO file. For example, the string +`132t+3f+10u+2o' would tell the translator that the PO mode contains +132 translated entries (*note Translated Entries::, 3 fuzzy entries +(*note Fuzzy Entries::), 10 untranslated entries (*note Untranslated +Entries::) and 2 obsolete entries (*note Obsolete Entries::). +Zero-coefficients items are not shown. So, in this example, if the +fuzzy entries were unfuzzied, the untranslated entries were translated +and the obsolete entries were deleted, the mode line would merely +display `145t' for the counters. + + The main PO commands are those which do not fit into the other +categories of subsequent sections. These allow for quitting PO mode or +for managing windows in special ways. + +`_' + Undo last modification to the PO file (`po-undo'). + +`Q' + Quit processing and save the PO file (`po-quit'). + +`q' + Quit processing, possibly after confirmation + (`po-confirm-and-quit'). + +`0' + Temporary leave the PO file window (`po-other-window'). + +`?' +`h' + Show help about PO mode (`po-help'). -`-D DIRECTORY' -`--directory=DIRECTORY' - Add DIRECTORY to the list of directories. Source files are - searched relative to this list of directories. The resulting `.po' - file will be written relative to the current directory, though. +`=' + Give some PO file statistics (`po-statistics'). -`-C FILE' -`--compendium=FILE' - Specify an additional library of message translations. *Note - Compendium::. This option may be specified more than once. +`V' + Batch validate the format of the whole PO file (`po-validate'). -6.1.2 Operation mode --------------------- + The command `_' (`po-undo') interfaces to the Emacs _undo_ facility. +*Note Undoing Changes: (emacs)Undo. Each time `U' is typed, +modifications which the translator did to the PO file are undone a +little more. For the purpose of undoing, each PO mode command is +atomic. This is especially true for the `' command: the whole +edition made by using a single use of this command is undone at once, +even if the edition itself implied several actions. However, while in +the editing window, one can undo the edition work quite parsimoniously. -`-U' -`--update' - Update DEF.po. Do nothing if DEF.po is already up to date. + The commands `Q' (`po-quit') and `q' (`po-confirm-and-quit') are +used when the translator is done with the PO file. The former is a bit +less verbose than the latter. If the file has been modified, it is +saved to disk first. In both cases, and prior to all this, the +commands check if any untranslated messages remain in the PO file and, +if so, the translator is asked if she really wants to leave off working +with this PO file. This is the preferred way of getting rid of an +Emacs PO file buffer. Merely killing it through the usual command +`C-x k' (`kill-buffer') is not the tidiest way to proceed. + The command `0' (`po-other-window') is another, softer way, to leave +PO mode, temporarily. It just moves the cursor to some other Emacs +window, and pops one if necessary. For example, if the translator just +got PO mode to show some source context in some other, she might +discover some apparent bug in the program source that needs correction. +This command allows the translator to change sex, become a programmer, +and have the cursor right into the window containing the program she +(or rather _he_) wants to modify. By later getting the cursor back in +the PO file window, or by asking Emacs to edit this file once again, PO +mode is then recovered. -6.1.3 Output file location --------------------------- + The command `h' (`po-help') displays a summary of all available PO +mode commands. The translator should then type any character to resume +normal PO mode operations. The command `?' has the same effect as `h'. -`-o FILE' -`--output-file=FILE' - Write output to specified file. + The command `=' (`po-statistics') computes the total number of +entries in the PO file, the ordinal of the current entry (counted from +1), the number of untranslated entries, the number of obsolete entries, +and displays all these numbers. + The command `V' (`po-validate') launches `msgfmt' in checking and +verbose mode over the current PO file. This command first offers to +save the current PO file on disk. The `msgfmt' tool, from GNU +`gettext', has the purpose of creating a MO file out of a PO file, and +PO mode uses the features of this program for checking the overall +format of a PO file, as well as all individual entries. - The results are written to standard output if no output file is -specified or if it is `-'. + The program `msgfmt' runs asynchronously with Emacs, so the +translator regains control immediately while her PO file is being +studied. Error output is collected in the Emacs `*compilation*' buffer, +displayed in another window. The regular Emacs command `C-x`' +(`next-error'), as well as other usual compile commands, allow the +translator to reposition quickly to the offending parts of the PO file. +Once the cursor is on the line in error, the translator may decide on +any PO mode action which would help correcting the error. -6.1.4 Output file location in update mode ------------------------------------------ + +File: gettext.info, Node: Entry Positioning, Next: Normalizing, Prev: Main PO Commands, Up: PO Mode -The result is written back to DEF.po. +8.3.3 Entry Positioning +----------------------- -`--backup=CONTROL' - Make a backup of DEF.po +The cursor in a PO file window is almost always part of an entry. The +only exceptions are the special case when the cursor is after the last +entry in the file, or when the PO file is empty. The entry where the +cursor is found to be is said to be the current entry. Many PO mode +commands operate on the current entry, so moving the cursor does more +than allowing the translator to browse the PO file, this also selects +on which entry commands operate. -`--suffix=SUFFIX' - Override the usual backup suffix. + Some PO mode commands alter the position of the cursor in a +specialized way. A few of those special purpose positioning are +described here, the others are described in following sections (for a +complete list try `C-h m'): +`.' + Redisplay the current entry (`po-current-entry'). - The version control method may be selected via the `--backup' option -or through the `VERSION_CONTROL' environment variable. Here are the -values: +`n' + Select the entry after the current one (`po-next-entry'). -`none' -`off' - Never make backups (even if `--backup' is given). +`p' + Select the entry before the current one (`po-previous-entry'). -`numbered' -`t' - Make numbered backups. +`<' + Select the first entry in the PO file (`po-first-entry'). -`existing' -`nil' - Make numbered backups if numbered backups for this file already - exist, otherwise make simple backups. +`>' + Select the last entry in the PO file (`po-last-entry'). -`simple' -`never' - Always make simple backups. +`m' + Record the location of the current entry for later use + (`po-push-location'). +`r' + Return to a previously saved entry location (`po-pop-location'). - The backup suffix is `~', unless set with `--suffix' or the -`SIMPLE_BACKUP_SUFFIX' environment variable. +`x' + Exchange the current entry location with the previously saved one + (`po-exchange-location'). -6.1.5 Operation modifiers -------------------------- -`-m' -`--multi-domain' - Apply REF.pot to each of the domains in DEF.po. + Any Emacs command able to reposition the cursor may be used to +select the current entry in PO mode, including commands which move by +characters, lines, paragraphs, screens or pages, and search commands. +However, there is a kind of standard way to display the current entry +in PO mode, which usual Emacs commands moving the cursor do not +especially try to enforce. The command `.' (`po-current-entry') has +the sole purpose of redisplaying the current entry properly, after the +current entry has been changed by means external to PO mode, or the +Emacs screen otherwise altered. -`-N' -`--no-fuzzy-matching' - Do not use fuzzy matching when an exact match is not found. This - may speed up the operation considerably. + It is yet to be decided if PO mode helps the translator, or otherwise +irritates her, by forcing a rigid window disposition while she is doing +her work. We originally had quite precise ideas about how windows +should behave, but on the other hand, anyone used to Emacs is often +happy to keep full control. Maybe a fixed window disposition might be +offered as a PO mode option that the translator might activate or +deactivate at will, so it could be offered on an experimental basis. +If nobody feels a real need for using it, or a compulsion for writing +it, we should drop this whole idea. The incentive for doing it should +come from translators rather than programmers, as opinions from an +experienced translator are surely more worth to me than opinions from +programmers _thinking_ about how _others_ should do translation. -6.1.6 Input file syntax ------------------------ + The commands `n' (`po-next-entry') and `p' (`po-previous-entry') +move the cursor the entry following, or preceding, the current one. If +`n' is given while the cursor is on the last entry of the PO file, or +if `p' is given while the cursor is on the first entry, no move is done. -`-P' -`--properties-input' - Assume the input files are Java ResourceBundles in Java - `.properties' syntax, not in PO file syntax. + The commands `<' (`po-first-entry') and `>' (`po-last-entry') move +the cursor to the first entry, or last entry, of the PO file. When the +cursor is located past the last entry in a PO file, most PO mode +commands will return an error saying `After last entry'. Moreover, the +commands `<' and `>' have the special property of being able to work +even when the cursor is not into some PO file entry, and one may use +them for nicely correcting this situation. But even these commands +will fail on a truly empty PO file. There are development plans for +the PO mode for it to interactively fill an empty PO file from sources. +*Note Marking::. -`--stringtable-input' - Assume the input files are NeXTstep/GNUstep localized resource - files in `.strings' syntax, not in PO file syntax. + The translator may decide, before working at the translation of a +particular entry, that she needs to browse the remainder of the PO +file, maybe for finding the terminology or phraseology used in related +entries. She can of course use the standard Emacs idioms for saving +the current cursor location in some register, and use that register for +getting back, or else, use the location ring. + PO mode offers another approach, by which cursor locations may be +saved onto a special stack. The command `m' (`po-push-location') +merely adds the location of current entry to the stack, pushing the +already saved locations under the new one. The command `r' +(`po-pop-location') consumes the top stack element and repositions the +cursor to the entry associated with that top element. This position is +then lost, for the next `r' will move the cursor to the previously +saved location, and so on until no locations remain on the stack. -6.1.7 Output details --------------------- + If the translator wants the position to be kept on the location +stack, maybe for taking a look at the entry associated with the top +element, then go elsewhere with the intent of getting back later, she +ought to use `m' immediately after `r'. -`--force-po' - Always write an output file even if it contains no message. + The command `x' (`po-exchange-location') simultaneously repositions +the cursor to the entry associated with the top element of the stack of +saved locations, and replaces that top element with the location of the +current entry before the move. Consequently, repeating the `x' command +toggles alternatively between two entries. For achieving this, the +translator will position the cursor on the first entry, use `m', then +position to the second entry, and merely use `x' for making the switch. -`-i' -`--indent' - Write the .po file using indented style. + +File: gettext.info, Node: Normalizing, Next: Translated Entries, Prev: Entry Positioning, Up: PO Mode -`--no-location' - Do not write `#: FILENAME:LINE' lines. +8.3.4 Normalizing Strings in Entries +------------------------------------ -`--add-location' - Generate `#: FILENAME:LINE' lines (default). +There are many different ways for encoding a particular string into a +PO file entry, because there are so many different ways to split and +quote multi-line strings, and even, to represent special characters by +backslashed escaped sequences. Some features of PO mode rely on the +ability for PO mode to scan an already existing PO file for a +particular string encoded into the `msgid' field of some entry. Even +if PO mode has internally all the built-in machinery for implementing +this recognition easily, doing it fast is technically difficult. To +facilitate a solution to this efficiency problem, we decided on a +canonical representation for strings. -`--strict' - Write out a strict Uniforum conforming PO file. Note that this - Uniforum format should be avoided because it doesn't support the - GNU extensions. + A conventional representation of strings in a PO file is currently +under discussion, and PO mode experiments with a canonical +representation. Having both `xgettext' and PO mode converging towards +a uniform way of representing equivalent strings would be useful, as +the internal normalization needed by PO mode could be automatically +satisfied when using `xgettext' from GNU `gettext'. An explicit PO +mode normalization should then be only necessary for PO files imported +from elsewhere, or for when the convention itself evolves. -`-p' -`--properties-output' - Write out a Java ResourceBundle in Java `.properties' syntax. Note - that this file format doesn't support plural forms and silently - drops obsolete messages. + So, for achieving normalization of at least the strings of a given +PO file needing a canonical representation, the following PO mode +command is available: -`--stringtable-output' - Write out a NeXTstep/GNUstep localized resource file in `.strings' - syntax. Note that this file format doesn't support plural forms. +`M-x po-normalize' + Tidy the whole PO file by making entries more uniform. -`-w NUMBER' -`--width=NUMBER' - Set the output page width. Long strings in the output files will - be split across multiple lines in order to ensure that each line's - width (= number of screen columns) is less or equal to the given - NUMBER. -`--no-wrap' - Do not break long message lines. Message lines whose width - exceeds the output page width will not be split into several - lines. Only file reference lines which are wider than the output - page width will be split. + The special command `M-x po-normalize', which has no associated +keys, revises all entries, ensuring that strings of both original and +translated entries use uniform internal quoting in the PO file. It +also removes any crumb after the last entry. This command may be +useful for PO files freshly imported from elsewhere, or if we ever +improve on the canonical quoting format we use. This canonical format +is not only meant for getting cleaner PO files, but also for greatly +speeding up `msgid' string lookup for some other PO mode commands. -`-s' -`--sort-output' - Generate sorted output. Note that using this option makes it much - harder for the translator to understand each message's context. + `M-x po-normalize' presently makes three passes over the entries. +The first implements heuristics for converting PO files for GNU +`gettext' 0.6 and earlier, in which `msgid' and `msgstr' fields were +using K&R style C string syntax for multi-line strings. These +heuristics may fail for comments not related to obsolete entries and +ending with a backslash; they also depend on subsequent passes for +finalizing the proper commenting of continued lines for obsolete +entries. This first pass might disappear once all oldish PO files +would have been adjusted. The second and third pass normalize all +`msgid' and `msgstr' strings respectively. They also clean out those +trailing backslashes used by XView's `msgfmt' for continued lines. -`-F' -`--sort-by-file' - Sort output by file location. + Having such an explicit normalizing command allows for importing PO +files from other sources, but also eases the evolution of the current +convention, evolution driven mostly by aesthetic concerns, as of now. +It is easy to make suggested adjustments at a later time, as the +normalizing command and eventually, other GNU `gettext' tools should +greatly automate conformance. A description of the canonical string +format is given below, for the particular benefit of those not having +Emacs handy, and who would nevertheless want to handcraft their PO +files in nice ways. + Right now, in PO mode, strings are single line or multi-line. A +string goes multi-line if and only if it has _embedded_ newlines, that +is, if it matches `[^\n]\n+[^\n]'. So, we would have: -6.1.8 Informative output ------------------------- + msgstr "\n\nHello, world!\n\n\n" -`-h' -`--help' - Display this help and exit. + but, replacing the space by a newline, this becomes: -`-V' -`--version' - Output version information and exit. + msgstr "" + "\n" + "\n" + "Hello,\n" + "world!\n" + "\n" + "\n" -`-v' -`--verbose' - Increase verbosity level. + We are deliberately using a caricatural example, here, to make the +point clearer. Usually, multi-lines are not that bad looking. It is +probable that we will implement the following suggestion. We might +lump together all initial newlines into the empty string, and also all +newlines introducing empty lines (that is, for N > 1, the N-1'th last +newlines would go together on a separate string), so making the +previous example appear: -`-q' -`--quiet' -`--silent' - Suppress progress indicators. + msgstr "\n\n" + "Hello,\n" + "world!\n" + "\n\n" + There are a few yet undecided little points about string +normalization, to be documented in this manual, once these questions +settle.  -File: gettext.info, Node: Translated Entries, Next: Fuzzy Entries, Prev: msgmerge Invocation, Up: Updating +File: gettext.info, Node: Translated Entries, Next: Fuzzy Entries, Prev: Normalizing, Up: PO Mode -6.2 Translated Entries -====================== +8.3.5 Translated Entries +------------------------ Each PO file entry for which the `msgstr' field has been filled with a translation, and which is not marked as fuzzy (*note Fuzzy Entries::), @@ -3231,10 +3441,10 @@ be later unfuzzied before becoming an official, genuine translated entry. *Note Fuzzy Entries::.  -File: gettext.info, Node: Fuzzy Entries, Next: Untranslated Entries, Prev: Translated Entries, Up: Updating +File: gettext.info, Node: Fuzzy Entries, Next: Untranslated Entries, Prev: Translated Entries, Up: PO Mode -6.3 Fuzzy Entries -================= +8.3.6 Fuzzy Entries +------------------- Each PO file entry may have a set of "attributes", which are qualities given a name and explicitly associated with the translation, using a @@ -3300,10 +3510,10 @@ working at this entry. still exists.  -File: gettext.info, Node: Untranslated Entries, Next: Obsolete Entries, Prev: Fuzzy Entries, Up: Updating +File: gettext.info, Node: Untranslated Entries, Next: Obsolete Entries, Prev: Fuzzy Entries, Up: PO Mode -6.4 Untranslated Entries -======================== +8.3.7 Untranslated Entries +-------------------------- When `xgettext' originally creates a PO file, unless told otherwise, it initializes the `msgid' field with the untranslated string, and leaves @@ -3348,10 +3558,10 @@ emptying its translation, using the command `k' (`po-kill-msgstr'). untranslated string still exists.  -File: gettext.info, Node: Obsolete Entries, Next: Modifying Translations, Prev: Untranslated Entries, Up: Updating +File: gettext.info, Node: Obsolete Entries, Next: Modifying Translations, Prev: Untranslated Entries, Up: PO Mode -6.5 Obsolete Entries -==================== +8.3.8 Obsolete Entries +---------------------- By "obsolete" PO file entries, we mean those entries which are commented out, usually by `msgmerge' when it found that the translation @@ -3418,10 +3628,10 @@ the time comes to find the adequate obsolete translation, it merely tries to provide handy tools for helping her to do so.  -File: gettext.info, Node: Modifying Translations, Next: Modifying Comments, Prev: Obsolete Entries, Up: Updating +File: gettext.info, Node: Modifying Translations, Next: Modifying Comments, Prev: Obsolete Entries, Up: PO Mode -6.6 Modifying Translations -========================== +8.3.9 Modifying Translations +---------------------------- PO mode prevents direct modification of the PO file, by the usual means Emacs gives for altering a buffer's contents. By doing so, it pretends @@ -3571,10 +3781,10 @@ capability of learning these sequences and playing them back under request. *Note Keyboard Macros: (emacs)Keyboard Macros.  -File: gettext.info, Node: Modifying Comments, Next: Subedit, Prev: Modifying Translations, Up: Updating +File: gettext.info, Node: Modifying Comments, Next: Subedit, Prev: Modifying Translations, Up: PO Mode -6.7 Modifying Comments -====================== +8.3.10 Modifying Comments +------------------------- Any translation work done seriously will raise many linguistic difficulties, for which decisions have to be made, and the choices @@ -3661,10 +3871,10 @@ Emacs commands `C-y' (`yank') and `M-y' (`yank-pop') to get the previous translation where she likes.  -File: gettext.info, Node: Subedit, Next: C Sources Context, Prev: Modifying Comments, Up: Updating +File: gettext.info, Node: Subedit, Next: C Sources Context, Prev: Modifying Comments, Up: PO Mode -6.8 Details of Sub Edition -========================== +8.3.11 Details of Sub Edition +----------------------------- The PO subedit minor mode has a few peculiarities worth being described in fuller detail. It installs a few commands over the usual editing set @@ -3740,10 +3950,10 @@ subedits are automatically resumed one at a time, so she may decide for each of them.  -File: gettext.info, Node: C Sources Context, Next: Auxiliary, Prev: Subedit, Up: Updating +File: gettext.info, Node: C Sources Context, Next: Auxiliary, Prev: Subedit, Up: PO Mode -6.9 C Sources Context -===================== +8.3.12 C Sources Context +------------------------ PO mode is particularly powerful when used with PO files created through GNU `gettext' utilities, as those utilities insert special @@ -3843,10 +4053,10 @@ directory at the front of the search path, and the command `M-S' the directories she does not want anymore on the search path.  -File: gettext.info, Node: Auxiliary, Next: Compendium, Prev: C Sources Context, Up: Updating +File: gettext.info, Node: Auxiliary, Next: Compendium, Prev: C Sources Context, Up: PO Mode -6.10 Consulting Auxiliary PO Files -================================== +8.3.13 Consulting Auxiliary PO Files +------------------------------------ PO mode is able to help the knowledgeable translator, being fluent in many languages, at taking advantage of translations already achieved in @@ -3913,10 +4123,10 @@ discrepancies between PO mode and other GNU `gettext' tools get fully resolved, the translator should stay aware of normalisation issues.  -File: gettext.info, Node: Compendium, Prev: Auxiliary, Up: Updating +File: gettext.info, Node: Compendium, Prev: Auxiliary, Up: PO Mode -6.11 Using Translation Compendia -================================ +8.3.14 Using Translation Compendia +---------------------------------- A "compendium" is a special PO file containing a set of translations recurring in many different packages. The translator can use gettext @@ -3932,15 +4142,15 @@ entries, from translations kept in the compendium.  File: gettext.info, Node: Creating Compendia, Next: Using Compendia, Prev: Compendium, Up: Compendium -6.11.1 Creating Compendia -------------------------- +8.3.14.1 Creating Compendia +........................... Basically every PO file consisting of translated entries only can be declared as a valid compendium. Often the translator wants to have special compendia; let's consider two cases: `concatenating PO files' and `extracting a message subset from a PO file'. -6.11.1.1 Concatenate PO Files +8.3.14.2 Concatenate PO Files ............................. To concatenate several valid PO files into one compendium file you can @@ -3991,7 +4201,7 @@ entries. If input files are "dirty" you must preprocess the input files or postprocess the result using `msgattrib --translated --no-fuzzy'. -6.11.1.2 Extract a Message Subset from a PO File +8.3.14.3 Extract a Message Subset from a PO File ................................................ Nobody wants to translate the same messages again and again; thus you @@ -4005,13 +4215,13 @@ existing PO file into one compendium file you can use `msggrep':  File: gettext.info, Node: Using Compendia, Prev: Creating Compendia, Up: Compendium -6.11.2 Using Compendia ----------------------- +8.3.14.4 Using Compendia +........................ You can use a compendium file to initialize a translation from scratch or to update an already existing translation. -6.11.2.1 Initialize a New Translation File +8.3.14.5 Initialize a New Translation File .......................................... Since a PO file with translations does not exist the translator can @@ -4019,7 +4229,7 @@ merely use `/dev/null' to fake the "old" translation file. msgmerge --compendium compendium.po -o file.po /dev/null file.pot -6.11.2.2 Update an Existing Translation File +8.3.14.6 Update an Existing Translation File ............................................ Concatenate the compendium file(s) and the existing PO, merge the @@ -4030,9 +4240,9 @@ here done using `sed'): msgmerge update.po file.pot | sed -e '/^#~/d' > file.po  -File: gettext.info, Node: Manipulating, Next: Binaries, Prev: Updating, Up: Top +File: gettext.info, Node: Manipulating, Next: Binaries, Prev: Editing, Up: Top -7 Manipulating PO Files +9 Manipulating PO Files *********************** Sometimes it is necessary to manipulate PO files in a way that is better @@ -4112,7 +4322,7 @@ write other specialized programs that process PO files.  File: gettext.info, Node: msgcat Invocation, Next: msgconv Invocation, Prev: Manipulating, Up: Manipulating -7.1 Invoking the `msgcat' Program +9.1 Invoking the `msgcat' Program ================================= msgcat [OPTION] [INPUTFILE]... @@ -4128,7 +4338,7 @@ that if `--use-first' is specified, they will be taken from the first PO file to define them. File positions from all PO files will be cumulated. -7.1.1 Input file location +9.1.1 Input file location ------------------------- `INPUTFILE ...' @@ -4148,7 +4358,7 @@ cumulated. If INPUTFILE is `-', standard input is read. -7.1.2 Output file location +9.1.2 Output file location -------------------------- `-o FILE' @@ -4159,7 +4369,7 @@ cumulated. The results are written to standard output if no output file is specified or if it is `-'. -7.1.3 Message selection +9.1.3 Message selection ----------------------- `-< NUMBER' @@ -4178,7 +4388,7 @@ specified or if it is `-'. be printed. -7.1.4 Input file syntax +9.1.4 Input file syntax ----------------------- `-P' @@ -4191,7 +4401,7 @@ specified or if it is `-'. files in `.strings' syntax, not in PO file syntax. -7.1.5 Output details +9.1.5 Output details -------------------- `-t' @@ -4254,7 +4464,7 @@ specified or if it is `-'. Sort output by file location. -7.1.6 Informative output +9.1.6 Informative output ------------------------ `-h' @@ -4269,7 +4479,7 @@ specified or if it is `-'.  File: gettext.info, Node: msgconv Invocation, Next: msggrep Invocation, Prev: msgcat Invocation, Up: Manipulating -7.2 Invoking the `msgconv' Program +9.2 Invoking the `msgconv' Program ================================== msgconv [OPTION] [INPUTFILE] @@ -4277,7 +4487,7 @@ File: gettext.info, Node: msgconv Invocation, Next: msggrep Invocation, Prev: The `msgconv' program converts a translation catalog to a different character encoding. -7.2.1 Input file location +9.2.1 Input file location ------------------------- `INPUTFILE' @@ -4292,7 +4502,7 @@ character encoding. If no INPUTFILE is given or if it is `-', standard input is read. -7.2.2 Output file location +9.2.2 Output file location -------------------------- `-o FILE' @@ -4303,7 +4513,7 @@ character encoding. The results are written to standard output if no output file is specified or if it is `-'. -7.2.3 Conversion target +9.2.3 Conversion target ----------------------- `-t' @@ -4313,7 +4523,7 @@ specified or if it is `-'. The default encoding is the current locale's encoding. -7.2.4 Input file syntax +9.2.4 Input file syntax ----------------------- `-P' @@ -4326,7 +4536,7 @@ specified or if it is `-'. file in `.strings' syntax, not in PO file syntax. -7.2.5 Output details +9.2.5 Output details -------------------- `--force-po' @@ -4380,7 +4590,7 @@ specified or if it is `-'. Sort output by file location. -7.2.6 Informative output +9.2.6 Informative output ------------------------ `-h' @@ -4395,7 +4605,7 @@ specified or if it is `-'.  File: gettext.info, Node: msggrep Invocation, Next: msgfilter Invocation, Prev: msgconv Invocation, Up: Manipulating -7.3 Invoking the `msggrep' Program +9.3 Invoking the `msggrep' Program ================================== msggrep [OPTION] [INPUTFILE] @@ -4403,7 +4613,7 @@ File: gettext.info, Node: msggrep Invocation, Next: msgfilter Invocation, Pre The `msggrep' program extracts all messages of a translation catalog that match a given pattern or belong to some given source files. -7.3.1 Input file location +9.3.1 Input file location ------------------------- `INPUTFILE' @@ -4418,7 +4628,7 @@ that match a given pattern or belong to some given source files. If no INPUTFILE is given or if it is `-', standard input is read. -7.3.2 Output file location +9.3.2 Output file location -------------------------- `-o FILE' @@ -4429,17 +4639,21 @@ that match a given pattern or belong to some given source files. The results are written to standard output if no output file is specified or if it is `-'. -7.3.3 Message selection +9.3.3 Message selection ----------------------- [-N SOURCEFILE]... [-M DOMAINNAME]... - [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C COMMENT-PATTERN] + [-J MSGCTXT-PATTERN [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] + [-C COMMENT-PATTERN] A message is selected if * it comes from one of the specified source files, * or if it comes from one of the specified domains, + * or if `-J' is given and its context (msgctxt) matches + MSGCTXT-PATTERN, + * or if `-K' is given and its key (msgid or msgid_plural) matches MSGID-PATTERN, @@ -4467,6 +4681,10 @@ regular expressions if -E is given, or fixed strings if -F is given. `--domain=DOMAINNAME' Select messages belonging to domain DOMAINNAME. +`-J' +`--msgctxt' + Start of patterns for the msgctxt. + `-K' `--msgid' Start of patterns for the msgid. @@ -4479,6 +4697,10 @@ regular expressions if -E is given, or fixed strings if -F is given. `--comment' Start of patterns for the translator's comment. +`-X' +`--extracted-comment' + Start of patterns for the extracted comments. + `-E' `--extended-regexp' Specify that PATTERN is an extended regular expression. @@ -4499,8 +4721,14 @@ regular expressions if -E is given, or fixed strings if -F is given. `--ignore-case' Ignore case distinctions. +`-v' +`--invert-match' + Output only the messages that do not match any selection + criterion, instead of the messages that match a selection + criterion. + -7.3.4 Input file syntax +9.3.4 Input file syntax ----------------------- `-P' @@ -4513,7 +4741,7 @@ regular expressions if -E is given, or fixed strings if -F is given. file in `.strings' syntax, not in PO file syntax. -7.3.5 Output details +9.3.5 Output details -------------------- `--force-po' @@ -4564,7 +4792,7 @@ regular expressions if -E is given, or fixed strings if -F is given. Sort output by file location. -7.3.6 Informative output +9.3.6 Informative output ------------------------ `-h' @@ -4579,7 +4807,7 @@ regular expressions if -E is given, or fixed strings if -F is given.  File: gettext.info, Node: msgfilter Invocation, Next: msguniq Invocation, Prev: msggrep Invocation, Up: Manipulating -7.4 Invoking the `msgfilter' Program +9.4 Invoking the `msgfilter' Program ==================================== msgfilter [OPTION] FILTER [FILTER-OPTION] @@ -4587,7 +4815,7 @@ File: gettext.info, Node: msgfilter Invocation, Next: msguniq Invocation, Pre The `msgfilter' program applies a filter to all translations of a translation catalog. -7.4.1 Input file location +9.4.1 Input file location ------------------------- `-i INPUTFILE' @@ -4603,7 +4831,7 @@ translation catalog. If no INPUTFILE is given or if it is `-', standard input is read. -7.4.2 Output file location +9.4.2 Output file location -------------------------- `-o FILE' @@ -4614,14 +4842,16 @@ translation catalog. The results are written to standard output if no output file is specified or if it is `-'. -7.4.3 The filter +9.4.3 The filter ---------------- The FILTER can be any program that reads a translation from standard input and writes a modified translation to standard output. A -frequently used filter is `sed'. +frequently used filter is `sed'. A few particular built-in filters are +also recognized. - Note: It is your responsibility to ensure that the FILTER can cope + Note: If the filter is not a built-in filter, you have to care about +encodings: It is your responsibility to ensure that the FILTER can cope with input encoded in the translation catalog's encoding. If the FILTER wants input in a particular encoding, you can in a first step convert the translation catalog to that encoding using the `msgconv' @@ -4639,7 +4869,7 @@ program on some platforms is known to ignore the last line of input if it is not terminated with a newline. You can use GNU `sed' instead; it does not have this limitation. -7.4.4 Useful FILTER-OPTIONs when the FILTER is `sed' +9.4.4 Useful FILTER-OPTIONs when the FILTER is `sed' ---------------------------------------------------- `-e SCRIPT' @@ -4656,7 +4886,22 @@ does not have this limitation. Suppress automatic printing of pattern space. -7.4.5 Input file syntax +9.4.5 Built-in FILTERs +---------------------- + +The filter `recode-sr-latin' is recognized as a built-in filter. The +command `recode-sr-latin' converts Serbian text, written in the +Cyrillic script, to the Latin script. The command `msgfilter +recode-sr-latin' applies this conversion to the translations of a PO +file. Thus, it can be used to convert an `sr.po' file to an +`sr@latin.po' file. + + The use of built-in filters is not sensitive to the current locale's +encoding. Moreover, when used with a built-in filter, `msgfilter' can +automatically convert the message catalog to the UTF-8 encoding when +needed. + +9.4.6 Input file syntax ----------------------- `-P' @@ -4669,7 +4914,7 @@ does not have this limitation. file in `.strings' syntax, not in PO file syntax. -7.4.6 Output details +9.4.7 Output details -------------------- `--force-po' @@ -4727,7 +4972,7 @@ does not have this limitation. Sort output by file location. -7.4.7 Informative output +9.4.8 Informative output ------------------------ `-h' @@ -4742,7 +4987,7 @@ does not have this limitation.  File: gettext.info, Node: msguniq Invocation, Next: msgcomm Invocation, Prev: msgfilter Invocation, Up: Manipulating -7.5 Invoking the `msguniq' Program +9.5 Invoking the `msguniq' Program ================================== msguniq [OPTION] [INPUTFILE] @@ -4757,7 +5002,7 @@ cumulated, except that if `--use-first' is specified, they will be taken from the first translation. File positions will be cumulated. When using the `--unique' option, duplicates are discarded. -7.5.1 Input file location +9.5.1 Input file location ------------------------- `INPUTFILE' @@ -4772,7 +5017,7 @@ When using the `--unique' option, duplicates are discarded. If no INPUTFILE is given or if it is `-', standard input is read. -7.5.2 Output file location +9.5.2 Output file location -------------------------- `-o FILE' @@ -4783,7 +5028,7 @@ When using the `--unique' option, duplicates are discarded. The results are written to standard output if no output file is specified or if it is `-'. -7.5.3 Message selection +9.5.3 Message selection ----------------------- `-d' @@ -4795,7 +5040,7 @@ specified or if it is `-'. Print only unique messages, discard duplicates. -7.5.4 Input file syntax +9.5.4 Input file syntax ----------------------- `-P' @@ -4808,7 +5053,7 @@ specified or if it is `-'. file in `.strings' syntax, not in PO file syntax. -7.5.5 Output details +9.5.5 Output details -------------------- `-t' @@ -4871,7 +5116,7 @@ specified or if it is `-'. Sort output by file location. -7.5.6 Informative output +9.5.6 Informative output ------------------------ `-h' @@ -4886,7 +5131,7 @@ specified or if it is `-'.  File: gettext.info, Node: msgcomm Invocation, Next: msgcmp Invocation, Prev: msguniq Invocation, Up: Manipulating -7.6 Invoking the `msgcomm' Program +9.6 Invoking the `msgcomm' Program ================================== msgcomm [OPTION] [INPUTFILE]... @@ -4900,7 +5145,7 @@ messages). Translations, comments and extract comments will be preserved, but only from the first PO file to define them. File positions from all PO files will be cumulated. -7.6.1 Input file location +9.6.1 Input file location ------------------------- `INPUTFILE ...' @@ -4920,7 +5165,7 @@ positions from all PO files will be cumulated. If INPUTFILE is `-', standard input is read. -7.6.2 Output file location +9.6.2 Output file location -------------------------- `-o FILE' @@ -4931,7 +5176,7 @@ positions from all PO files will be cumulated. The results are written to standard output if no output file is specified or if it is `-'. -7.6.3 Message selection +9.6.3 Message selection ----------------------- `-< NUMBER' @@ -4950,7 +5195,7 @@ specified or if it is `-'. be printed. -7.6.4 Input file syntax +9.6.4 Input file syntax ----------------------- `-P' @@ -4963,7 +5208,7 @@ specified or if it is `-'. files in `.strings' syntax, not in PO file syntax. -7.6.5 Output details +9.6.5 Output details -------------------- `--force-po' @@ -5021,7 +5266,7 @@ specified or if it is `-'. Don't write header with `msgid ""' entry. -7.6.6 Informative output +9.6.6 Informative output ------------------------ `-h' @@ -5036,7 +5281,7 @@ specified or if it is `-'.  File: gettext.info, Node: msgcmp Invocation, Next: msgattrib Invocation, Prev: msgcomm Invocation, Up: Manipulating -7.7 Invoking the `msgcmp' Program +9.7 Invoking the `msgcmp' Program ================================= msgcmp [OPTION] DEF.po REF.pot @@ -5049,7 +5294,7 @@ created PO file, or a PO Template file (generally created by and every message in your program. Where an exact match cannot be found, fuzzy matching is used to produce better diagnostics. -7.7.1 Input file location +9.7.1 Input file location ------------------------- `DEF.po' @@ -5064,7 +5309,7 @@ found, fuzzy matching is used to produce better diagnostics. searched relative to this list of directories. -7.7.2 Operation modifiers +9.7.2 Operation modifiers ------------------------- `-m' @@ -5072,7 +5317,7 @@ found, fuzzy matching is used to produce better diagnostics. Apply REF.pot to each of the domains in DEF.po. -7.7.3 Input file syntax +9.7.3 Input file syntax ----------------------- `-P' @@ -5085,7 +5330,7 @@ found, fuzzy matching is used to produce better diagnostics. files in `.strings' syntax, not in PO file syntax. -7.7.4 Informative output +9.7.4 Informative output ------------------------ `-h' @@ -5100,7 +5345,7 @@ found, fuzzy matching is used to produce better diagnostics.  File: gettext.info, Node: msgattrib Invocation, Next: msgen Invocation, Prev: msgcmp Invocation, Up: Manipulating -7.8 Invoking the `msgattrib' Program +9.8 Invoking the `msgattrib' Program ==================================== msgattrib [OPTION] [INPUTFILE] @@ -5108,7 +5353,7 @@ File: gettext.info, Node: msgattrib Invocation, Next: msgen Invocation, Prev: The `msgattrib' program filters the messages of a translation catalog according to their attributes, and manipulates the attributes. -7.8.1 Input file location +9.8.1 Input file location ------------------------- `INPUTFILE' @@ -5123,7 +5368,7 @@ according to their attributes, and manipulates the attributes. If no INPUTFILE is given or if it is `-', standard input is read. -7.8.2 Output file location +9.8.2 Output file location -------------------------- `-o FILE' @@ -5134,7 +5379,7 @@ according to their attributes, and manipulates the attributes. The results are written to standard output if no output file is specified or if it is `-'. -7.8.3 Message selection +9.8.3 Message selection ----------------------- `--translated' @@ -5156,7 +5401,7 @@ specified or if it is `-'. Keep obsolete #~ messages, remove all other messages. -7.8.4 Attribute manipulation +9.8.4 Attribute manipulation ---------------------------- Attributes are modified after the message selection/removal has been @@ -5193,7 +5438,7 @@ that are listed in the ONLY-FILE and not listed in the IGNORE-FILE. obsolete messages and makes them non-obsolete. -7.8.5 Input file syntax +9.8.5 Input file syntax ----------------------- `-P' @@ -5206,7 +5451,7 @@ that are listed in the ONLY-FILE and not listed in the IGNORE-FILE. file in `.strings' syntax, not in PO file syntax. -7.8.6 Output details +9.8.6 Output details -------------------- `--force-po' @@ -5261,7 +5506,7 @@ that are listed in the ONLY-FILE and not listed in the IGNORE-FILE. Sort output by file location. -7.8.7 Informative output +9.8.7 Informative output ------------------------ `-h' @@ -5276,7 +5521,7 @@ that are listed in the ONLY-FILE and not listed in the IGNORE-FILE.  File: gettext.info, Node: msgen Invocation, Next: msgexec Invocation, Prev: msgattrib Invocation, Up: Manipulating -7.9 Invoking the `msgen' Program +9.9 Invoking the `msgen' Program ================================ msgen [OPTION] INPUTFILE @@ -5290,7 +5535,7 @@ translation that is identical to the msgid. task. The main difference is that `msginit' cares specially about the header entry, whereas `msgen' doesn't. -7.9.1 Input file location +9.9.1 Input file location ------------------------- `INPUTFILE' @@ -5305,7 +5550,7 @@ header entry, whereas `msgen' doesn't. If INPUTFILE is `-', standard input is read. -7.9.2 Output file location +9.9.2 Output file location -------------------------- `-o FILE' @@ -5316,7 +5561,7 @@ header entry, whereas `msgen' doesn't. The results are written to standard output if no output file is specified or if it is `-'. -7.9.3 Input file syntax +9.9.3 Input file syntax ----------------------- `-P' @@ -5329,7 +5574,7 @@ specified or if it is `-'. file in `.strings' syntax, not in PO file syntax. -7.9.4 Output details +9.9.4 Output details -------------------- `--force-po' @@ -5383,7 +5628,7 @@ specified or if it is `-'. Sort output by file location. -7.9.5 Informative output +9.9.5 Informative output ------------------------ `-h' @@ -5398,7 +5643,7 @@ specified or if it is `-'.  File: gettext.info, Node: msgexec Invocation, Next: libgettextpo, Prev: msgen Invocation, Up: Manipulating -7.10 Invoking the `msgexec' Program +9.10 Invoking the `msgexec' Program =================================== msgexec [OPTION] COMMAND [COMMAND-OPTION] @@ -5416,7 +5661,9 @@ input for `xargs -0'. During each COMMAND invocation, the environment variable `MSGEXEC_MSGID' is bound to the message's msgid, and the environment variable `MSGEXEC_LOCATION' is bound to the location in the PO file of -the message. +the message. If the message has a context, the environment variable +`MSGEXEC_MSGCTXT' is bound to the message's msgctxt, otherwise it is +unbound. Note: It is your responsibility to ensure that the COMMAND can cope with input encoded in the translation catalog's encoding. If the @@ -5428,7 +5675,7 @@ you can first convert the translation catalog to UTF-8 using the `msgconv' program and then make `msgexec' work in an UTF-8 locale, by using the `LC_ALL' environment variable. -7.10.1 Input file location +9.10.1 Input file location -------------------------- `-i INPUTFILE' @@ -5444,7 +5691,7 @@ using the `LC_ALL' environment variable. If no INPUTFILE is given or if it is `-', standard input is read. -7.10.2 Input file syntax +9.10.2 Input file syntax ------------------------ `-P' @@ -5457,7 +5704,7 @@ using the `LC_ALL' environment variable. file in `.strings' syntax, not in PO file syntax. -7.10.3 Informative output +9.10.3 Informative output ------------------------- `-h' @@ -5472,7 +5719,7 @@ using the `LC_ALL' environment variable.  File: gettext.info, Node: libgettextpo, Prev: msgexec Invocation, Up: Manipulating -7.11 Writing your own programs that process PO files +9.11 Writing your own programs that process PO files ==================================================== For the tasks for which a combination of `msgattrib', `msgcat' etc. is @@ -5594,10 +5841,10 @@ that the results are valid as long as the FILE handle is valid. po_file_free (file);  -File: gettext.info, Node: Binaries, Next: Users, Prev: Manipulating, Up: Top +File: gettext.info, Node: Binaries, Next: Programmers, Prev: Manipulating, Up: Top -8 Producing Binary MO Files -*************************** +10 Producing Binary MO Files +**************************** * Menu: @@ -5608,16 +5855,16 @@ File: gettext.info, Node: Binaries, Next: Users, Prev: Manipulating, Up: Top  File: gettext.info, Node: msgfmt Invocation, Next: msgunfmt Invocation, Prev: Binaries, Up: Binaries -8.1 Invoking the `msgfmt' Program -================================= +10.1 Invoking the `msgfmt' Program +================================== msgfmt [OPTION] FILENAME.po ... The `msgfmt' programs generates a binary message catalog from a textual translation description. -8.1.1 Input file location -------------------------- +10.1.1 Input file location +-------------------------- `FILENAME.po ...' @@ -5630,8 +5877,8 @@ textual translation description. If an input file is `-', standard input is read. -8.1.2 Operation mode --------------------- +10.1.2 Operation mode +--------------------- `-j' `--java' @@ -5654,8 +5901,8 @@ textual translation description. Qt mode: generate a Qt `.qm' file. -8.1.3 Output file location --------------------------- +10.1.3 Output file location +--------------------------- `-o FILE' `--output-file=FILE' @@ -5675,8 +5922,8 @@ textual translation description. If the output FILE is `-', output is written to standard output. -8.1.4 Output file location in Java mode ---------------------------------------- +10.1.4 Output file location in Java mode +---------------------------------------- `-r RESOURCE' `--resource=RESOURCE' @@ -5696,8 +5943,8 @@ textual translation description. resource name, separated with an underscore. The `-d' option is mandatory. The class is written under the specified directory. -8.1.5 Output file location in C# mode -------------------------------------- +10.1.5 Output file location in C# mode +-------------------------------------- `-r RESOURCE' `--resource=RESOURCE' @@ -5717,8 +5964,8 @@ mandatory. The class is written under the specified directory. in a subdirectory of the specified directory whose name depends on the locale. -8.1.6 Output file location in Tcl mode --------------------------------------- +10.1.6 Output file location in Tcl mode +--------------------------------------- `-l LOCALE' `--locale=LOCALE' @@ -5733,8 +5980,8 @@ locale. The `-l' and `-d' options are mandatory. The `.msg' file is written in the specified directory. -8.1.7 Input file syntax ------------------------ +10.1.7 Input file syntax +------------------------ `-P' `--properties-input' @@ -5746,8 +5993,8 @@ in the specified directory. files in `.strings' syntax, not in PO file syntax. -8.1.8 Input file interpretation -------------------------------- +10.1.8 Input file interpretation +-------------------------------- `-c' `--check' @@ -5809,8 +6056,8 @@ in the specified directory. not been validated by a human translator. -8.1.9 Output details --------------------- +10.1.9 Output details +--------------------- `-a NUMBER' `--alignment=NUMBER' @@ -5822,8 +6069,8 @@ in the specified directory. lookup). -8.1.10 Informative output -------------------------- +10.1.10 Informative output +-------------------------- `-h' `--help' @@ -5844,16 +6091,16 @@ in the specified directory.  File: gettext.info, Node: msgunfmt Invocation, Next: MO Files, Prev: msgfmt Invocation, Up: Binaries -8.2 Invoking the `msgunfmt' Program -=================================== +10.2 Invoking the `msgunfmt' Program +==================================== msgunfmt [OPTION] [FILE]... The `msgunfmt' program converts a binary message catalog to a Uniforum style .po file. -8.2.1 Operation mode --------------------- +10.2.1 Operation mode +--------------------- `-j' `--java' @@ -5870,8 +6117,8 @@ Uniforum style .po file. Tcl mode: input is a tcl/msgcat `.msg' file. -8.2.2 Input file location -------------------------- +10.2.2 Input file location +-------------------------- `FILE ...' Input .mo files. @@ -5879,8 +6126,8 @@ Uniforum style .po file. If no input FILE is given or if it is `-', standard input is read. -8.2.3 Input file location in Java mode --------------------------------------- +10.2.3 Input file location in Java mode +--------------------------------------- `-r RESOURCE' `--resource=RESOURCE' @@ -5897,8 +6144,8 @@ Uniforum style .po file. resource name, separated with an underscore. The class is located using the `CLASSPATH'. -8.2.4 Input file location in C# mode ------------------------------------- +10.2.4 Input file location in C# mode +------------------------------------- `-r RESOURCE' `--resource=RESOURCE' @@ -5918,8 +6165,8 @@ using the `CLASSPATH'. in a subdirectory of the specified directory whose name depends on the locale. -8.2.5 Input file location in Tcl mode -------------------------------------- +10.2.5 Input file location in Tcl mode +-------------------------------------- `-l LOCALE' `--locale=LOCALE' @@ -5934,8 +6181,8 @@ locale. The `-l' and `-d' options are mandatory. The `.msg' file is located in the specified directory. -8.2.6 Output file location --------------------------- +10.2.6 Output file location +--------------------------- `-o FILE' `--output-file=FILE' @@ -5945,8 +6192,8 @@ in the specified directory. The results are written to standard output if no output file is specified or if it is `-'. -8.2.7 Output details --------------------- +10.2.7 Output details +--------------------- `--force-po' Always write an output file even if it contains no message. @@ -5989,8 +6236,8 @@ specified or if it is `-'. harder for the translator to understand each message's context. -8.2.8 Informative output ------------------------- +10.2.8 Informative output +------------------------- `-h' `--help' @@ -6008,8 +6255,8 @@ specified or if it is `-'.  File: gettext.info, Node: MO Files, Prev: msgunfmt Invocation, Up: Binaries -8.3 The Format of GNU MO Files -============================== +10.3 The Format of GNU MO Files +=============================== The format of the generated MO files is best described by a picture, which appears below. @@ -6068,6 +6315,9 @@ each string is separately aligned so it starts at an offset which is a multiple of the alignment value. On some RISC machines, a correct alignment will speed things up. + Contexts are stored by storing the concatenation of the context, a + byte, and the original string, instead of the original string. + Plural forms are stored by letting the plural of the original string follow the singular of the original string, separated through a byte. The length which appears in the string descriptor includes both. @@ -6127,122 +6377,25 @@ feel comfortable with the current approach. H | start hash table | | | | | ... ... | | | | H + S * 4 | end hash table | | | | | - | | | | | | - | NUL terminated 0th string <----------------' | | | - | | | | | - | NUL terminated 1st string <------------------' | | - | | | | - ... ... | | - | | | | - | NUL terminated 0th translation <---------------' | - | | | - | NUL terminated 1st translation <-----------------' - | | - ... ... - | | - +------------------------------------------+ - - -File: gettext.info, Node: Users, Next: Programmers, Prev: Binaries, Up: Top - -9 The User's View -***************** - -When GNU `gettext' will truly have reached its goal, average users -should feel some kind of astonished pleasure, seeing the effect of that -strange kind of magic that just makes their own native language appear -everywhere on their screens. As for naive users, they would ideally -have no special pleasure about it, merely taking their own language for -_granted_, and becoming rather unhappy otherwise. - - So, let's try to describe here how we would like the magic to -operate, as we want the users' view to be the simplest, among all ways -one could look at GNU `gettext'. All other software engineers: -programmers, translators, maintainers, should work together in such a -way that the magic becomes possible. This is a long and progressive -undertaking, and information is available about the progress of the -Translation Project. - - When a package is distributed, there are two kinds of users: -"installers" who fetch the distribution, unpack it, configure it, -compile it and install it for themselves or others to use; and "end -users" that call programs of the package, once these have been -installed at their site. GNU `gettext' is offering magic for both -installers and end users. - -* Menu: - -* Matrix:: The Current `ABOUT-NLS' Matrix -* Installers:: Magic for Installers -* End Users:: Magic for End Users - - -File: gettext.info, Node: Matrix, Next: Installers, Prev: Users, Up: Users - -9.1 The Current `ABOUT-NLS' Matrix -================================== - -Languages are not equally supported in all packages using GNU -`gettext'. To know if some package uses GNU `gettext', one may check -the distribution for the `ABOUT-NLS' information file, for some `LL.po' -files, often kept together into some `po/' directory, or for an `intl/' -directory. Internationalized packages have usually many `LL.po' files, -where LL represents the language. *Note End Users:: for a complete -description of the format for LL. - - More generally, a matrix is available for showing the current state -of the Translation Project, listing which packages are prepared for -multi-lingual messages, and which languages are supported by each. -Because this information changes often, this matrix is not kept within -this GNU `gettext' manual. This information is often found in file -`ABOUT-NLS' from various distributions, but is also as old as the -distribution itself. A recent copy of this `ABOUT-NLS' file, -containing up-to-date information, should generally be found on the -Translation Project sites, and also on most GNU archive sites. - - -File: gettext.info, Node: Installers, Next: End Users, Prev: Matrix, Up: Users - -9.2 Magic for Installers -======================== - -By default, packages fully using GNU `gettext', internally, are -installed in such a way that they to allow translation of messages. At -_configuration_ time, those packages should automatically detect -whether the underlying host system already provides the GNU `gettext' -functions. If not, the GNU `gettext' library should be automatically -prepared and used. Installers may use special options at configuration -time for changing this behavior. The command `./configure ---with-included-gettext' bypasses system `gettext' to use the included -GNU `gettext' instead, while `./configure --disable-nls' produces -programs totally unable to translate messages. - - Internationalized packages have usually many `LL.po' files. Unless -translations are disabled, all those available are installed together -with the package. However, the environment variable `LINGUAS' may be -set, prior to configuration, to limit the installed set. `LINGUAS' -should then contain a space separated list of two-letter codes, stating -which languages are allowed. - - -File: gettext.info, Node: End Users, Prev: Installers, Up: Users - -9.3 Magic for End Users -======================= - -We consider here those packages using GNU `gettext' internally, and for -which the installers did not disable translation at _configure_ time. -Then, users only have to set the `LANG' environment variable to the -appropriate `LL_CC' combination prior to using the programs in the -package. *Note Matrix::. For example, let's presume a German site. -At the shell prompt, users merely have to execute `setenv LANG de_DE' -(in `csh') or `export LANG; LANG=de_DE' (in `sh'). They could even do -this from their `.login' or `.profile' file. + | | | | | | + | NUL terminated 0th string <----------------' | | | + | | | | | + | NUL terminated 1st string <------------------' | | + | | | | + ... ... | | + | | | | + | NUL terminated 0th translation <---------------' | + | | | + | NUL terminated 1st translation <-----------------' + | | + ... ... + | | + +------------------------------------------+  -File: gettext.info, Node: Programmers, Next: Translators, Prev: Users, Up: Top +File: gettext.info, Node: Programmers, Next: Translators, Prev: Binaries, Up: Top -10 The Programmer's View +11 The Programmer's View ************************ One aim of the current message catalog implementation provided by GNU @@ -6268,7 +6421,7 @@ We'll describe them both and later explain our solution of this dilemma.  File: gettext.info, Node: catgets, Next: gettext, Prev: Programmers, Up: Programmers -10.1 About `catgets' +11.1 About `catgets' ==================== The `catgets' implementation is defined in the X/Open Portability @@ -6300,7 +6453,7 @@ the prediction that this interface will be in future Unix standards  File: gettext.info, Node: Interface to catgets, Next: Problems with catgets, Prev: catgets, Up: catgets -10.1.1 The Interface +11.1.1 The Interface -------------------- The interface to the `catgets' implementation consists of three @@ -6350,7 +6503,7 @@ The last of these functions is used and behaves as expected:  File: gettext.info, Node: Problems with catgets, Prev: Interface to catgets, Up: catgets -10.1.2 Problems with the `catgets' Interface?! +11.1.2 Problems with the `catgets' Interface?! ---------------------------------------------- Now that this description seemed to be really easy -- where are the @@ -6368,7 +6521,7 @@ more easy to manage.  File: gettext.info, Node: gettext, Next: Comparison, Prev: catgets, Up: Programmers -10.2 About `gettext' +11.2 About `gettext' ==================== The definition of the `gettext' interface comes from a Uniforum @@ -6394,14 +6547,14 @@ this library will be interested in this description. * Ambiguities:: Solving ambiguities * Locating Catalogs:: Locating message catalog files * Charset conversion:: How to request conversion to Unicode +* Contexts:: Solving ambiguities in GUI programs * Plural forms:: Additional functions for handling plurals -* GUI program problems:: Another technique for solving ambiguities * Optimized gettext:: Optimization of the *gettext functions  File: gettext.info, Node: Interface to gettext, Next: Ambiguities, Prev: gettext, Up: gettext -10.2.1 The Interface +11.2.1 The Interface -------------------- The minimal functionality an interface must have is a) to select a @@ -6451,7 +6604,7 @@ your language.  File: gettext.info, Node: Ambiguities, Next: Locating Catalogs, Prev: Interface to gettext, Up: gettext -10.2.2 Solving Ambiguities +11.2.2 Solving Ambiguities -------------------------- While this single name domain works well for most applications there @@ -6506,7 +6659,7 @@ always be avoided to avoid dependencies and unreliabilities.  File: gettext.info, Node: Locating Catalogs, Next: Charset conversion, Prev: Ambiguities, Up: gettext -10.2.3 Locating Message Catalog Files +11.2.3 Locating Message Catalog Files ------------------------------------- Because many different languages for many different packages have to be @@ -6541,9 +6694,9 @@ setting the locale values is simulated by looking at the environment variables.  -File: gettext.info, Node: Charset conversion, Next: Plural forms, Prev: Locating Catalogs, Up: gettext +File: gettext.info, Node: Charset conversion, Next: Contexts, Prev: Locating Catalogs, Up: gettext -10.2.4 How to specify the output character set `gettext' uses +11.2.4 How to specify the output character set `gettext' uses ------------------------------------------------------------- `gettext' not only looks up a translation in a message catalog. It @@ -6590,9 +6743,133 @@ MSGIDs be US-ASCII strings. global variable ERRNO is set accordingly.  -File: gettext.info, Node: Plural forms, Next: GUI program problems, Prev: Charset conversion, Up: gettext +File: gettext.info, Node: Contexts, Next: Plural forms, Prev: Charset conversion, Up: gettext + +11.2.5 Using contexts for solving ambiguities +--------------------------------------------- + +One place where the `gettext' functions, if used normally, have big +problems is within programs with graphical user interfaces (GUIs). The +problem is that many of the strings which have to be translated are very +short. They have to appear in pull-down menus which restricts the +length. But strings which are not containing entire sentences or at +least large fragments of a sentence may appear in more than one +situation in the program but might have different translations. This is +especially true for the one-word strings which are frequently used in +GUI programs. + + As a consequence many people say that the `gettext' approach is +wrong and instead `catgets' should be used which indeed does not have +this problem. But there is a very simple and powerful method to handle +this kind of problems with the `gettext' functions. + + Contexts can be added to strings to be translated. A context +dependent translation lookup is when a translation for a given string +is searched, that is limited to a given context. The translation for +the same string in a different context can be different. The different +translations of the same string in different contexts can be stored in +the in the same MO file, and can be edited by the translator in the +same PO file. + + The `gettext.h' include file contains the lookup macros for strings +with contexts. They are implemented as thin macros and inline functions +over the functions from `'. + + const char *pgettext (const char *msgctxt, const char *msgid); + + In a call of this macro, MSGCTXT and MSGID must be string literals. +The macro returns the translation of MSGID, restricted to the context +given by MSGCTXT. + + The MSGCTXT string is visible in the PO file to the translator. You +should try to make it somehow canonical and never changing. Because +every time you change an MSGCTXT, the translator will have to review +the translation of MSGID. + + Finding a canonical MSGCTXT string that doesn't change over time can +be hard. But you shouldn't use the file name or class name containing +the `pgettext' call - because it is a common development task to rename +a file or a class, and it shouldn't cause translator work. Also you +shouldn't use a comment in the form of a complete English sentence as +MSGCTXT - because orthography or grammar changes are often applied to +such sentences, and again, it shouldn't force the translator to do a +review. + + The `p' in `pgettext' stands for "particular": `pgettext' fetches a +particular translation of the MSGID. + + const char *dpgettext (const char *domain_name, + const char *msgctxt, const char *msgid); + const char *dcpgettext (const char *domain_name, + const char *msgctxt, const char *msgid, + int category); + + These are generalizations of `pgettext'. They behave similarly to +`dgettext' and `dcgettext', respectively. The DOMAIN_NAME argument +defines the translation domain. The CATEGORY argument allows to use +another locale facet than `LC_MESSAGES'. + + As as example consider the following fictional situation. A GUI +program has a menu bar with the following entries: + + +------------+------------+--------------------------------------+ + | File | Printer | | + +------------+------------+--------------------------------------+ + | Open | | Select | + | New | | Open | + +----------+ | Connect | + +----------+ + + To have the strings `File', `Printer', `Open', `New', `Select', and +`Connect' translated there has to be at some point in the code a call +to a function of the `gettext' family. But in two places the string +passed into the function would be `Open'. The translations might not +be the same and therefore we are in the dilemma described above. + + What distinguishes the two places is the menu path from the menu +root to the particular menu entries: + + Menu|File + Menu|Printer + Menu|File|Open + Menu|File|New + Menu|Printer|Select + Menu|Printer|Open + Menu|Printer|Connect + + The context is thus the menu path without its last part. So, the +calls look like this: + + pgettext ("Menu|", "File") + pgettext ("Menu|", "Printer") + pgettext ("Menu|File|", "Open") + pgettext ("Menu|File|", "New") + pgettext ("Menu|Printer|", "Select") + pgettext ("Menu|Printer|", "Open") + pgettext ("Menu|Printer|", "Connect") + + Whether or not to use the `|' character at the end of the context is +a matter of style. + + For more complex cases, where the MSGCTXT or MSGID are not string +literals, more general macros are available: + + const char *pgettext_expr (const char *msgctxt, const char *msgid); + const char *dpgettext_expr (const char *domain_name, + const char *msgctxt, const char *msgid); + const char *dcpgettext_expr (const char *domain_name, + const char *msgctxt, const char *msgid, + int category); + + Here MSGCTXT and MSGID can be arbitrary string-valued expressions. +These macros are more general. But in the case that both argument +expressions are string literals, the macros without the `_expr' suffix +are more efficient. + + +File: gettext.info, Node: Plural forms, Next: Optimized gettext, Prev: Contexts, Up: gettext -10.2.5 Additional functions for plural forms +11.2.6 Additional functions for plural forms -------------------------------------------- The functions of the `gettext' family described so far (and all the @@ -6727,12 +7004,15 @@ The plural form information looks like this: many different plural forms exist for this language. The string following `plural' is an expression which is using the C language syntax. Exceptions are that no negative numbers are allowed, numbers -must be decimal, and the only variable allowed is `n'. This expression -will be evaluated whenever one of the functions `ngettext', -`dngettext', or `dcngettext' is called. The numeric value passed to -these functions is then substituted for all uses of the variable `n' in -the expression. The resulting value then must be greater or equal to -zero and smaller than the value given as the value of `nplurals'. +must be decimal, and the only variable allowed is `n'. Spaces are +allowed in the expression, but backslash-newlines are not; in the +examples below the backslash-newlines are present for formatting +purposes only. This expression will be evaluated whenever one of the +functions `ngettext', `dngettext', or `dcngettext' is called. The +numeric value passed to these functions is then substituted for all uses +of the variable `n' in the expression. The resulting value then must +be greater or equal to zero and smaller than the value given as the +value of `nplurals'. The following rules are known at this point. The language with families are listed. But this does not necessarily mean the information can be @@ -6817,6 +7097,17 @@ Three forms, special cases for one and two Celtic Gaeilge (Irish) +Three forms, special case for numbers ending in 00 or [2-9][0-9] + The header entry would be: + + Plural-Forms: nplurals=3; \ + plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2; + + Languages with this property include: + + Romanic family + Romanian + Three forms, special case for numbers ending in 1[2-9] The header entry would look like this: @@ -6881,123 +7172,9 @@ Four forms, special case for one and all numbers ending in 02, 03, or 04 .  -File: gettext.info, Node: GUI program problems, Next: Optimized gettext, Prev: Plural forms, Up: gettext - -10.2.6 How to use `gettext' in GUI programs -------------------------------------------- - -One place where the `gettext' functions, if used normally, have big -problems is within programs with graphical user interfaces (GUIs). The -problem is that many of the strings which have to be translated are very -short. They have to appear in pull-down menus which restricts the -length. But strings which are not containing entire sentences or at -least large fragments of a sentence may appear in more than one -situation in the program but might have different translations. This is -especially true for the one-word strings which are frequently used in -GUI programs. - - As a consequence many people say that the `gettext' approach is -wrong and instead `catgets' should be used which indeed does not have -this problem. But there is a very simple and powerful method to handle -these kind of problems with the `gettext' functions. - -As as example consider the following fictional situation. A GUI program -has a menu bar with the following entries: - - +------------+------------+--------------------------------------+ - | File | Printer | | - +------------+------------+--------------------------------------+ - | Open | | Select | - | New | | Open | - +----------+ | Connect | - +----------+ - - To have the strings `File', `Printer', `Open', `New', `Select', and -`Connect' translated there has to be at some point in the code a call -to a function of the `gettext' family. But in two places the string -passed into the function would be `Open'. The translations might not -be the same and therefore we are in the dilemma described above. - - One solution to this problem is to artificially enlengthen the -strings to make them unambiguous. But what would the program do if no -translation is available? The enlengthened string is not what should be -printed. So we should use a little bit modified version of the -functions. - - To enlengthen the strings a uniform method should be used. E.g., in -the example above the strings could be chosen as - - Menu|File - Menu|Printer - Menu|File|Open - Menu|File|New - Menu|Printer|Select - Menu|Printer|Open - Menu|Printer|Connect +File: gettext.info, Node: Optimized gettext, Prev: Plural forms, Up: gettext - Now all the strings are different and if now instead of `gettext' -the following little wrapper function is used, everything works just -fine: - - char * - sgettext (const char *msgid) - { - char *msgval = gettext (msgid); - if (msgval == msgid) - msgval = strrchr (msgid, '|') + 1; - return msgval; - } - - What this little function does is to recognize the case when no -translation is available. This can be done very efficiently by a -pointer comparison since the return value is the input value. If there -is no translation we know that the input string is in the format we used -for the Menu entries and therefore contains a `|' character. We simply -search for the last occurrence of this character and return a pointer -to the character following it. That's it! - - If one now consistently uses the enlengthened string form and -replaces the `gettext' calls with calls to `sgettext' (this is normally -limited to very few places in the GUI implementation) then it is -possible to produce a program which can be internationalized. - - The other `gettext' functions (`dgettext', `dcgettext' and the -`ngettext' equivalents) can and should have corresponding functions as -well which look almost identical, except for the parameters and the -call to the underlying function. - - Now there is of course the question why such functions do not exist -in the GNU gettext package? There are two parts of the answer to this -question. - - * They are easy to write and therefore can be provided by the - project they are used in. This is not an answer by itself and - must be seen together with the second part which is: - - * There is no way the gettext package can contain a version which - can work everywhere. The problem is the selection of the - character to separate the prefix from the actual string in the - enlenghtened string. The examples above used `|' which is a quite - good choice because it resembles a notation frequently used in - this context and it also is a character not often used in message - strings. - - But what if the character is used in message strings? Or if the - chose character is not available in the character set on the - machine one compiles (e.g., `|' is not required to exist for - ISO C; this is why the `iso646.h' file exists in ISO C programming - environments). - - There is only one more comment to be said. The wrapper function -above requires that the translations strings are not enlengthened -themselves. This is only logical. There is no need to disambiguate -the strings (since they are never used as keys for a search) and one -also saves quite some memory and disk space by doing this. - - -File: gettext.info, Node: Optimized gettext, Prev: GUI program problems, Up: gettext - -10.2.7 Optimization of the *gettext functions +11.2.7 Optimization of the *gettext functions --------------------------------------------- At this point of the discussion we should talk about an advantage of the @@ -7037,7 +7214,7 @@ the result through a single cache lookup.  File: gettext.info, Node: Comparison, Next: Using libintl.a, Prev: gettext, Up: Programmers -10.3 Comparing the Two Interfaces +11.3 Comparing the Two Interfaces ================================= The following discussion is perhaps a little bit colored. As said @@ -7134,7 +7311,7 @@ this kind: *Note Ambiguities::.  File: gettext.info, Node: Using libintl.a, Next: gettext grok, Prev: Comparison, Up: Programmers -10.4 Using libintl.a in own programs +11.4 Using libintl.a in own programs ==================================== Starting with version 0.9.4 the library `libintl.h' should be @@ -7145,11 +7322,14 @@ the library in directories selected using the `$(prefix)'.  File: gettext.info, Node: gettext grok, Next: Temp Programmers, Prev: Using libintl.a, Up: Programmers -10.5 Being a `gettext' grok +11.5 Being a `gettext' grok =========================== -To fully exploit the functionality of the GNU `gettext' library it is -surely helpful to read the source code. But for those who don't want +* NOTE: * This documentation section is outdated and needs to be +revised. + + To fully exploit the functionality of the GNU `gettext' library it +is surely helpful to read the source code. But for those who don't want to spend that much time in reading the (sometimes complicated) code here is a list comments: @@ -7210,9 +7390,12 @@ is a list comments:  File: gettext.info, Node: Temp Programmers, Prev: gettext grok, Up: Programmers -10.6 Temporary Notes for the Programmers Chapter +11.6 Temporary Notes for the Programmers Chapter ================================================ +* NOTE: * This documentation section is outdated and needs to be +revised. + * Menu: * Temp Implementations:: Temporary - Two Possible Implementations @@ -7223,7 +7406,7 @@ File: gettext.info, Node: Temp Programmers, Prev: gettext grok, Up: Programme  File: gettext.info, Node: Temp Implementations, Next: Temp catgets, Prev: Temp Programmers, Up: Temp Programmers -10.6.1 Temporary - Two Possible Implementations +11.6.1 Temporary - Two Possible Implementations ----------------------------------------------- There are two competing methods for language independent messages: the @@ -7250,7 +7433,7 @@ the Programming for Internationalization FAQ.  File: gettext.info, Node: Temp catgets, Next: Temp WSI, Prev: Temp Implementations, Up: Temp Programmers -10.6.2 Temporary - About `catgets' +11.6.2 Temporary - About `catgets' ---------------------------------- There have been a few discussions of late on the use of `catgets' as a @@ -7285,7 +7468,7 @@ systems.  File: gettext.info, Node: Temp WSI, Next: Temp Notes, Prev: Temp catgets, Up: Temp Programmers -10.6.3 Temporary - Why a single implementation +11.6.3 Temporary - Why a single implementation ---------------------------------------------- Now it seems kind of wasteful to me to have two different systems @@ -7323,7 +7506,7 @@ innovations for the future.  File: gettext.info, Node: Temp Notes, Prev: Temp WSI, Up: Temp Programmers -10.6.4 Temporary - Notes +11.6.4 Temporary - Notes ------------------------ X/Open agreed very late on the standard form so that many @@ -7337,7 +7520,7 @@ Solaris is not the only system having `gettext'.  File: gettext.info, Node: Translators, Next: Maintainers, Prev: Programmers, Up: Top -11 The Translator's View +12 The Translator's View ************************ * Menu: @@ -7352,12 +7535,15 @@ File: gettext.info, Node: Translators, Next: Maintainers, Prev: Programmers,  File: gettext.info, Node: Trans Intro 0, Next: Trans Intro 1, Prev: Translators, Up: Translators -11.1 Introduction 0 +12.1 Introduction 0 =================== -Free software is going international! The Translation Project is a way -to get maintainers, translators and users all together, so free software -will gradually become able to speak many native languages. +* NOTE: * This documentation section is outdated and needs to be +revised. + + Free software is going international! The Translation Project is a +way to get maintainers, translators and users all together, so free +software will gradually become able to speak many native languages. The GNU `gettext' tool set contains _everything_ maintainers need for internationalizing their packages for messages. It also contains @@ -7409,10 +7595,13 @@ on.  File: gettext.info, Node: Trans Intro 1, Next: Discussions, Prev: Trans Intro 0, Up: Translators -11.2 Introduction 1 +12.2 Introduction 1 =================== -This is now official, GNU is going international! Here is the +* NOTE: * This documentation section is outdated and needs to be +revised. + + This is now official, GNU is going international! Here is the announcement submitted for the January 1995 GNU Bulletin: A handful of GNU packages have already been adapted and provided @@ -7448,10 +7637,13 @@ document, please e-mail to `translation@iro.umontreal.ca'.  File: gettext.info, Node: Discussions, Next: Organization, Prev: Trans Intro 1, Up: Translators -11.3 Discussions +12.3 Discussions ================ -Facing this internationalization effort, a few users expressed their +* NOTE: * This documentation section is outdated and needs to be +revised. + + Facing this internationalization effort, a few users expressed their concerns. Some of these doubts are presented and discussed, here. * Smaller groups @@ -7525,11 +7717,14 @@ concerns. Some of these doubts are presented and discussed, here.  File: gettext.info, Node: Organization, Next: Information Flow, Prev: Discussions, Up: Translators -11.4 Organization +12.4 Organization ================= -On a larger scale, the true solution would be to organize some kind of -fairly precise set up in which volunteers could participate. I gave +* NOTE: * This documentation section is outdated and needs to be +revised. + + On a larger scale, the true solution would be to organize some kind +of fairly precise set up in which volunteers could participate. I gave some thought to this idea lately, and realize there will be some touchy points. I thought of writing to Richard Stallman to launch such a project, but feel it might be good to shake out the ideas between @@ -7567,7 +7762,7 @@ the Translation Project coordinator.  File: gettext.info, Node: Central Coordination, Next: National Teams, Prev: Organization, Up: Organization -11.4.1 Central Coordination +12.4.1 Central Coordination --------------------------- I also think GNU will need sooner than it thinks, that someone setup a @@ -7590,7 +7785,7 @@ in place.  File: gettext.info, Node: National Teams, Next: Mailing Lists, Prev: Central Coordination, Up: Organization -11.4.2 National Teams +12.4.2 National Teams --------------------- I suggest we look for volunteer coordinators/editors for individual @@ -7645,7 +7840,7 @@ consistent.  File: gettext.info, Node: Sub-Cultures, Next: Organizational Ideas, Prev: National Teams, Up: National Teams -11.4.2.1 Sub-Cultures +12.4.2.1 Sub-Cultures ..................... Taking French for example, there are a few sub-cultures around computers @@ -7665,7 +7860,7 @@ soon!  File: gettext.info, Node: Organizational Ideas, Prev: Sub-Cultures, Up: National Teams -11.4.2.2 Organizational Ideas +12.4.2.2 Organizational Ideas ............................. I expect the next big changes after the official release. Please note @@ -7691,7 +7886,7 @@ the free software community. Here are a few points to discuss:  File: gettext.info, Node: Mailing Lists, Prev: National Teams, Up: Organization -11.4.3 Mailing Lists +12.4.3 Mailing Lists -------------------- If we get any inquiries about GNU `gettext', send them on to: @@ -7731,10 +7926,13 @@ they see fit, as long as each team is represented in it.  File: gettext.info, Node: Information Flow, Next: Prioritizing messages, Prev: Organization, Up: Translators -11.5 Information Flow +12.5 Information Flow ===================== -There will surely be some discussion about this messages after the +* NOTE: * This documentation section is outdated and needs to be +revised. + + There will surely be some discussion about this messages after the packages are finally released. If people now send you some proposals for better messages, how do you proceed? Jim, please note that right now, as I put forward nearly a dozen of localizable programs, I receive @@ -7772,7 +7970,7 @@ have more information about this.  File: gettext.info, Node: Prioritizing messages, Prev: Information Flow, Up: Translators -11.6 Prioritizing messages: How to determine which messages to translate first +12.6 Prioritizing messages: How to determine which messages to translate first ============================================================================== A translator sometimes has only a limited amount of time per week to @@ -7826,11 +8024,11 @@ the environment variables: $ msguniq $HOME/gettextlogused > missing.po - The result is a PO file, but needs some preprocessing before the -Emacs PO mode can be used with it. First, it is a multi-domain PO -file, containing messages from many translation domains. Second, it -lacks all translator comments and source references. Here is how to -get a list of the affected translation domains: + The result is a PO file, but needs some preprocessing before a PO +file editor can be used with it. First, it is a multi-domain PO file, +containing messages from many translation domains. Second, it lacks +all translator comments and source references. Here is how to get a +list of the affected translation domains: $ sed -n -e 's,^domain "\(.*\)"$,\1,p' < missing.po | sort | uniq @@ -7847,19 +8045,20 @@ or from the package (in most cases, `$package/po/$lang.po'), or creates a fresh one if she's the first translator (see *Note Creating::). She then uses the following commands to mark the not urgent messages as "obsolete". (This doesn't mean that these messages - translated and -untranslated ones - will go away. It simply means that Emacs PO mode -will ignore them in the following editing session.) +untranslated ones - will go away. It simply means that the PO file +editor will ignore them in the following editing session.) $ msggrep --domain=$domain missing.po | grep -v '^domain' \ > $domain-missing.po $ msgattrib --set-obsolete --ignore-file $domain-missing.po $domain.$lang.po \ > $domain.$lang-urgent.po - The she translates `$domain.$lang-urgent.po' by use of Emacs PO mode. -(FIXME: I don't know whether `KBabel' and `gtranslator' also preserve -obsolete messages, as they should.) Finally she restores the not -urgent messages (with their earlier translations, for those which were -already translated) through this command: + The she translates `$domain.$lang-urgent.po' by use of a PO file +editor (*note Editing::). (FIXME: I don't know whether `KBabel' and +`gtranslator' also preserve obsolete messages, as they should.) +Finally she restores the not urgent messages (with their earlier +translations, for those which were already translated) through this +command: $ msgmerge --no-fuzzy-matching $domain.$lang-urgent.po $package/po/$domain.pot \ > $domain.$lang.po @@ -7868,9 +8067,9 @@ already translated) through this command: domain.  -File: gettext.info, Node: Maintainers, Next: Programming Languages, Prev: Translators, Up: Top +File: gettext.info, Node: Maintainers, Next: Installers, Prev: Translators, Up: Top -12 The Maintainer's View +13 The Maintainer's View ************************ The maintainer of a package has many responsibilities. One of them is @@ -7911,7 +8110,7 @@ ideally revise this chapter in subsequent releases, looking for changes.  File: gettext.info, Node: Flat and Non-Flat, Next: Prerequisites, Prev: Maintainers, Up: Maintainers -12.1 Flat or Non-Flat Directory Structures +13.1 Flat or Non-Flat Directory Structures ========================================== Some free software packages are distributed as `tar' files which unpack @@ -7940,7 +8139,7 @@ an opportunity to unflatten their package structure.  File: gettext.info, Node: Prerequisites, Next: gettextize Invocation, Prev: Flat and Non-Flat, Up: Maintainers -12.2 Prerequisite Works +13.2 Prerequisite Works ======================= There are some works which are required for using GNU `gettext' in one @@ -8018,7 +8217,7 @@ never try to _solve_ a team's problem on your own.  File: gettext.info, Node: gettextize Invocation, Next: Adjusting Files, Prev: Prerequisites, Up: Maintainers -12.3 Invoking the `gettextize' Program +13.3 Invoking the `gettextize' Program ====================================== The `gettextize' program is an interactive tool that helps the @@ -8122,9 +8321,9 @@ specified. option `--force' (`-f') is given, the `intl/' directory is emptied first. - 4. The files `config.rpath' and `mkinstalldirs' are copied into the - directory containing configuration support files. It is needed by - the `AM_GNU_GETTEXT' autoconf macro. + 4. The file `config.rpath' is copied into the directory containing + configuration support files. It is needed by the `AM_GNU_GETTEXT' + autoconf macro. 5. Only if the project is using GNU `automake': A set of `autoconf' macro files is copied into the package's `autoconf' macro @@ -8162,6 +8361,11 @@ of remaining work depends on whether the package uses GNU `automake' or not. But in any case, the maintainer should still read the section *Note Adjusting Files:: after invoking `gettextize'. + In particular, if after using `gettexize', you get an error +`AC_COMPILE_IFELSE was called before AC_GNU_SOURCE' or `AC_RUN_IFELSE +was called before AC_GNU_SOURCE', you can fix it by modifying +`configure.ac', as described in *Note configure.in::. + It is also important to understand that `gettextize' is not part of the GNU build system, in the sense that it should not be invoked automatically, and not be invoked by someone who doesn't assume the @@ -8171,7 +8375,7 @@ separate tool is provided, see *Note autopoint Invocation::.  File: gettext.info, Node: Adjusting Files, Next: autoconf macros, Prev: gettextize Invocation, Up: Maintainers -12.4 Files You Must Create or Alter +13.4 Files You Must Create or Alter =================================== Besides files which are automatically added through `gettextize', there @@ -8183,7 +8387,7 @@ each. So, here comes a list of files, each one followed by a description of all alterations it needs. Many examples are taken out from the GNU -`gettext' 0.14.4 distribution itself, or from the GNU `hello' +`gettext' 0.15 distribution itself, or from the GNU `hello' distribution (`http://www.franken.de/users/gnu/ke/hello' or `http://www.gnu.franken.de/ke/hello/') You may indeed refer to the source code of the GNU `gettext' and GNU `hello' packages, as they are @@ -8194,6 +8398,7 @@ intended to be good examples for using GNU gettext functionality. * po/POTFILES.in:: `POTFILES.in' in `po/' * po/LINGUAS:: `LINGUAS' in `po/' * po/Makevars:: `Makevars' in `po/' +* po/Rules-*:: Extending `Makefile' in `po/' * configure.in:: `configure.in' at top level * config.guess:: `config.guess', `config.sub' at top level * mkinstalldirs:: `mkinstalldirs' at top level @@ -8207,7 +8412,7 @@ intended to be good examples for using GNU gettext functionality.  File: gettext.info, Node: po/POTFILES.in, Next: po/LINGUAS, Prev: Adjusting Files, Up: Adjusting Files -12.4.1 `POTFILES.in' in `po/' +13.4.1 `POTFILES.in' in `po/' ----------------------------- The `po/' directory should receive a file named `POTFILES.in'. This @@ -8241,7 +8446,7 @@ generated C file.  File: gettext.info, Node: po/LINGUAS, Next: po/Makevars, Prev: po/POTFILES.in, Up: Adjusting Files -12.4.2 `LINGUAS' in `po/' +13.4.2 `LINGUAS' in `po/' ------------------------- The `po/' directory should also receive a file named `LINGUAS'. This @@ -8275,22 +8480,33 @@ need the files `Rules-quot', `quot.sed', `boldquot.sed', they are also installed by running `gettextize'.  -File: gettext.info, Node: po/Makevars, Next: configure.in, Prev: po/LINGUAS, Up: Adjusting Files +File: gettext.info, Node: po/Makevars, Next: po/Rules-*, Prev: po/LINGUAS, Up: Adjusting Files -12.4.3 `Makevars' in `po/' +13.4.3 `Makevars' in `po/' -------------------------- -The `po/' directory also has a file named `Makevars'. It can be left -unmodified if your package has a single message domain and, -accordingly, a single `po/' directory. Only packages which have -multiple `po/' directories at different locations need to adjust the -three variables defined in `Makevars'. +The `po/' directory also has a file named `Makevars'. It contains +variables that are specific to your project. `po/Makevars' gets +inserted into the `po/Makefile' when the latter is created. The +variables thus take effect when the POT file is created or updated, and +when the message catalogs get installed. + + The first three variables can be left unmodified if your package has +a single message domain and, accordingly, a single `po/' directory. +Only packages which have multiple `po/' directories at different +locations need to adjust the three first variables defined in +`Makevars'. + + +File: gettext.info, Node: po/Rules-*, Next: configure.in, Prev: po/Makevars, Up: Adjusting Files + +13.4.4 Extending `Makefile' in `po/' +------------------------------------ - `po/Makevars' gets inserted into the `po/Makefile' when the latter -is created. At the same time, all files called `Rules-*' in the `po/' -directory get appended to the `po/Makefile'. They present an -opportunity to add rules for special PO files to the Makefile, without -needing to mess with `po/Makefile.in.in'. +All files called `Rules-*' in the `po/' directory get appended to the +`po/Makefile' when it is created. They present an opportunity to add +rules for special PO files to the Makefile, without needing to mess +with `po/Makefile.in.in'. GNU gettext comes with a `Rules-quot' file, containing rules for building catalogs `en@quot.po' and `en@boldquot.po'. The effect of @@ -8305,10 +8521,15 @@ be shown in a bold font on terminals and consoles. This catalog is useful only for command-line programs, not GUI programs. To enable it, similarly add `en@boldquot' to the `po/LINGUAS' file. + Similarly, you can create rules for building message catalogs for the +`sr@latin' locale - Serbian written with the Latin alphabet - from +those for the `sr' locale - Serbian written with Cyrillic letters. See +*Note msgfilter Invocation::. +  -File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Makevars, Up: Adjusting Files +File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Rules-*, Up: Adjusting Files -12.4.4 `configure.in' at top level +13.4.5 `configure.in' at top level ---------------------------------- `configure.in' or `configure.ac' - this is the source from which @@ -8319,7 +8540,7 @@ File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Makevars This is done by a set of lines like these: PACKAGE=gettext - VERSION=0.14.4 + VERSION=0.15 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -8327,12 +8548,12 @@ File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Makevars or, if you are using GNU `automake', by a line like this: - AM_INIT_AUTOMAKE(gettext, 0.14.4) + AM_INIT_AUTOMAKE(gettext, 0.15) Of course, you replace `gettext' with the name of your package, - and `0.14.4' by its version numbers, exactly as they should appear + and `0.15' by its version numbers, exactly as they should appear in the packaged `tar' file name of your distribution - (`gettext-0.14.4.tar.gz', here). + (`gettext-0.15.tar.gz', here). 2. Check for internationalization support. @@ -8367,10 +8588,28 @@ File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Makevars `intl/Makefile' to the `AC_OUTPUT' line. + If, after doing the recommended modifications, a command like +`aclocal -I m4' or `autoconf' or `autoreconf' fails with a trace +similar to this: + + configure.ac:44: warning: AC_COMPILE_IFELSE was called before AC_GNU_SOURCE + ../../lib/autoconf/specific.m4:335: AC_GNU_SOURCE is expanded from... + m4/lock.m4:224: gl_LOCK is expanded from... + m4/gettext.m4:571: gt_INTL_SUBDIR_CORE is expanded from... + m4/gettext.m4:472: AM_INTL_SUBDIR is expanded from... + m4/gettext.m4:347: AM_GNU_GETTEXT is expanded from... + configure.ac:44: the top level + configure.ac:44: warning: AC_RUN_IFELSE was called before AC_GNU_SOURCE + +you need to add an explicit invocation of `AC_GNU_SOURCE' in the +`configure.ac' file - after `AC_PROG_CC' but before `AM_GNU_GETTEXT', +most likely very close to the `AC_PROG_CC' invocation. This is +necessary because of ordering restrictions imposed by GNU autoconf. +  File: gettext.info, Node: config.guess, Next: mkinstalldirs, Prev: configure.in, Up: Adjusting Files -12.4.5 `config.guess', `config.sub' at top level +13.4.6 `config.guess', `config.sub' at top level ------------------------------------------------ If you haven't suppressed the `intl/' subdirectory, you need to add the @@ -8390,48 +8629,41 @@ GNU `libtool' packages. Normally, `config.guess' and `config.sub' are put at the top level of a distribution. But it is also possible to put them in a subdirectory, altogether with other configuration support files like -`install-sh', `ltconfig', `ltmain.sh', `mkinstalldirs' or `missing'. -All you need to do, other than moving the files, is to add the -following line to your `configure.in'. +`install-sh', `ltconfig', `ltmain.sh' or `missing'. All you need to +do, other than moving the files, is to add the following line to your +`configure.in'. AC_CONFIG_AUX_DIR([SUBDIR])  File: gettext.info, Node: mkinstalldirs, Next: aclocal, Prev: config.guess, Up: Adjusting Files -12.4.6 `mkinstalldirs' at top level +13.4.7 `mkinstalldirs' at top level ----------------------------------- -If `gettextize' has not already done it, you need to add the GNU -`mkinstalldirs' script to your distribution. It is needed because -`mkdir -p' is not portable enough. You find this script in the GNU -`automake' distribution. - - Normally, `mkinstalldirs' is put at the top level of a distribution. -But it is also possible to put it in a subdirectory, altogether with -other configuration support files like `install-sh', `ltconfig', -`ltmain.sh' or `missing'. All you need to do, other than moving the -files, is to add the following line to your `configure.in'. - - AC_CONFIG_AUX_DIR([SUBDIR]) +With earlier versions of GNU gettext, you needed to add the GNU +`mkinstalldirs' script to your distribution. This is not needed any +more. You can remove it if you not also using an automake version +older than automake 1.9.  File: gettext.info, Node: aclocal, Next: acconfig, Prev: mkinstalldirs, Up: Adjusting Files -12.4.7 `aclocal.m4' at top level +13.4.8 `aclocal.m4' at top level -------------------------------- If you do not have an `aclocal.m4' file in your distribution, the simplest is to concatenate the files `codeset.m4', `gettext.m4', `glibc2.m4', `glibc21.m4', `iconv.m4', `intdiv0.m4', `intmax.m4', -`inttypes.m4', `inttypes_h.m4', `inttypes-pri.m4', `isc-posix.m4', -`lcmessage.m4', `lib-ld.m4', `lib-link.m4', `lib-prefix.m4', +`inttypes_h.m4', `inttypes-h.m4', `inttypes-pri.m4', `lcmessage.m4', +`lib-ld.m4', `lib-link.m4', `lib-prefix.m4', `lock.m4', `longdouble.m4', `longlong.m4', `printf-posix.m4', `progtest.m4', `signed.m4', `size_max.m4', `stdint_h.m4', `uintmax_t.m4', -`ulonglong.m4', `wchar_t.m4', `wint_t.m4', `xsize.m4' from GNU -`gettext''s `m4/' directory into a single file. If you have suppressed -the `intl/' directory, only `gettext.m4', `iconv.m4', `lib-ld.m4', -`lib-link.m4', `lib-prefix.m4', `progtest.m4' need to be concatenated. +`ulonglong.m4', `visibility.m4', `wchar_t.m4', `wint_t.m4', `xsize.m4' +from GNU `gettext''s `m4/' directory into a single file. If you have +suppressed the `intl/' directory, only `gettext.m4', `iconv.m4', +`lib-ld.m4', `lib-link.m4', `lib-prefix.m4', `progtest.m4' need to be +concatenated. If you already have an `aclocal.m4' file, then you will have to merge the said macro files into your `aclocal.m4'. Note that if you @@ -8456,7 +8688,7 @@ might be integrated in the standard Autoconf set, because this piece of  File: gettext.info, Node: acconfig, Next: config.h.in, Prev: aclocal, Up: Adjusting Files -12.4.8 `acconfig.h' at top level +13.4.9 `acconfig.h' at top level -------------------------------- Earlier GNU `gettext' releases required to put definitions for @@ -8468,8 +8700,8 @@ package uses them independently from the `intl/' directory.  File: gettext.info, Node: config.h.in, Next: Makefile, Prev: acconfig, Up: Adjusting Files -12.4.9 `config.h.in' at top level ---------------------------------- +13.4.10 `config.h.in' at top level +---------------------------------- The include file template that holds the C macros to be defined by `configure' is usually called `config.h.in' and may be maintained @@ -8503,7 +8735,7 @@ suppressed the `intl/' directory by calling `gettextize' without  File: gettext.info, Node: Makefile, Next: src/Makefile, Prev: config.h.in, Up: Adjusting Files -12.4.10 `Makefile.in' at top level +13.4.11 `Makefile.in' at top level ---------------------------------- Here are a few modifications you need to make to your main, top-level @@ -8569,7 +8801,7 @@ automatically generated from `Makefile.am', and all needed changes to  File: gettext.info, Node: src/Makefile, Next: lib/gettext.h, Prev: Makefile, Up: Adjusting Files -12.4.11 `Makefile.in' in `src/' +13.4.12 `Makefile.in' in `src/' ------------------------------- Some of the modifications made in the main `Makefile.in' will also be @@ -8688,7 +8920,7 @@ and the last change are not necessary. The remaining needed  File: gettext.info, Node: lib/gettext.h, Prev: src/Makefile, Up: Adjusting Files -12.4.12 `gettext.h' in `lib/' +13.4.13 `gettext.h' in `lib/' ----------------------------- Internationalization of packages, as provided by GNU `gettext', is @@ -8739,7 +8971,7 @@ package that needs it should contain a copy of it on its own.  File: gettext.info, Node: autoconf macros, Next: CVS Issues, Prev: Adjusting Files, Up: Maintainers -12.5 Autoconf macros for use in `configure.in' +13.5 Autoconf macros for use in `configure.in' ============================================== GNU `gettext' installs macros for use in a package's `configure.in' or @@ -8756,7 +8988,7 @@ is, of course, `AM_GNU_GETTEXT'.  File: gettext.info, Node: AM_GNU_GETTEXT, Next: AM_GNU_GETTEXT_VERSION, Prev: autoconf macros, Up: autoconf macros -12.5.1 AM_GNU_GETTEXT in `gettext.m4' +13.5.1 AM_GNU_GETTEXT in `gettext.m4' ------------------------------------- The `AM_GNU_GETTEXT' macro tests for the presence of the GNU gettext @@ -8830,7 +9062,7 @@ empty and doesn't change `CPPFLAGS'.  File: gettext.info, Node: AM_GNU_GETTEXT_VERSION, Next: AM_PO_SUBDIRS, Prev: AM_GNU_GETTEXT, Up: autoconf macros -12.5.2 AM_GNU_GETTEXT_VERSION in `gettext.m4' +13.5.2 AM_GNU_GETTEXT_VERSION in `gettext.m4' --------------------------------------------- The `AM_GNU_GETTEXT_VERSION' macro declares the version number of the @@ -8842,7 +9074,7 @@ use of it (*note CVS Issues::).  File: gettext.info, Node: AM_PO_SUBDIRS, Next: AM_ICONV, Prev: AM_GNU_GETTEXT_VERSION, Up: autoconf macros -12.5.3 AM_PO_SUBDIRS in `po.m4' +13.5.3 AM_PO_SUBDIRS in `po.m4' ------------------------------- The `AM_PO_SUBDIRS' macro prepares the `po/' directories of the package @@ -8860,7 +9092,7 @@ variables in each `po/' directory.  File: gettext.info, Node: AM_ICONV, Prev: AM_PO_SUBDIRS, Up: autoconf macros -12.5.4 AM_ICONV in `iconv.m4' +13.5.4 AM_ICONV in `iconv.m4' ----------------------------- The `AM_ICONV' macro tests for the presence of the POSIX/XSI `iconv' @@ -8906,7 +9138,7 @@ found, it sets `LIBICONV' and `LTLIBICONV' to empty and doesn't change  File: gettext.info, Node: CVS Issues, Next: Release Management, Prev: autoconf macros, Up: Maintainers -12.6 Integrating with CVS +13.6 Integrating with CVS ========================= Many projects use CVS for distributed development, version control and @@ -8922,7 +9154,7 @@ of `cvs', `gettextize', `autopoint' and `autoconf'.  File: gettext.info, Node: Distributed CVS, Next: Files under CVS, Prev: CVS Issues, Up: CVS Issues -12.6.1 Avoiding version mismatch in distributed development +13.6.1 Avoiding version mismatch in distributed development ----------------------------------------------------------- In a project development with multiple developers, using CVS, there @@ -8959,7 +9191,7 @@ Otherwise the following damages will likely occur:  File: gettext.info, Node: Files under CVS, Next: autopoint Invocation, Prev: Distributed CVS, Up: CVS Issues -12.6.2 Files to put under CVS version control +13.6.2 Files to put under CVS version control --------------------------------------------- There are basically three ways to deal with generated files in the @@ -9006,7 +9238,7 @@ repository all the files that `gettextize' mentions as "copy". Instead, he adds to the `configure.in' or `configure.ac' a line of the form - AM_GNU_GETTEXT_VERSION(0.14.4) + AM_GNU_GETTEXT_VERSION(0.15) and adds to the package's pre-build script an invocation of `autopoint'. For everyone who checks out the CVS, this `autopoint' @@ -9028,7 +9260,7 @@ newer installed.  File: gettext.info, Node: autopoint Invocation, Prev: Files under CVS, Up: CVS Issues -12.6.3 Invoking the `autopoint' Program +13.6.3 Invoking the `autopoint' Program --------------------------------------- autopoint [OPTION]... @@ -9040,7 +9272,7 @@ into a source package. It extracts from a macro call of the form package, and copies the infrastructure files belonging to this version into the package. -12.6.3.1 Options +13.6.3.1 Options ................ `-f' @@ -9054,7 +9286,7 @@ into the package. instead only listed on standard output. -12.6.3.2 Informative output +13.6.3.2 Informative output ........................... `--help' @@ -9065,8 +9297,8 @@ into the package. `autopoint' supports the GNU `gettext' versions from 0.10.35 to the -current one, 0.14.4. In order to apply `autopoint' to a package using -a `gettext' version newer than 0.14.4, you need to install this same +current one, 0.15. In order to apply `autopoint' to a package using a +`gettext' version newer than 0.15, you need to install this same version of GNU `gettext' at least. In packages using GNU `automake', an invocation of `autopoint' @@ -9084,7 +9316,7 @@ directories.  File: gettext.info, Node: Release Management, Prev: CVS Issues, Up: Maintainers -12.7 Creating a Distribution Tarball +13.7 Creating a Distribution Tarball ==================================== In projects that use GNU `automake', the usual commands for creating a @@ -9099,9 +9331,33 @@ update before making a release: $ make distclean  -File: gettext.info, Node: Programming Languages, Next: Conclusion, Prev: Maintainers, Up: Top +File: gettext.info, Node: Installers, Next: Programming Languages, Prev: Maintainers, Up: Top + +14 The Installer's and Distributor's View +***************************************** + +By default, packages fully using GNU `gettext', internally, are +installed in such a way that they to allow translation of messages. At +_configuration_ time, those packages should automatically detect +whether the underlying host system already provides the GNU `gettext' +functions. If not, the GNU `gettext' library should be automatically +prepared and used. Installers may use special options at configuration +time for changing this behavior. The command `./configure +--with-included-gettext' bypasses system `gettext' to use the included +GNU `gettext' instead, while `./configure --disable-nls' produces +programs totally unable to translate messages. + + Internationalized packages have usually many `LL.po' files. Unless +translations are disabled, all those available are installed together +with the package. However, the environment variable `LINGUAS' may be +set, prior to configuration, to limit the installed set. `LINGUAS' +should then contain a space separated list of two-letter codes, stating +which languages are allowed. + + +File: gettext.info, Node: Programming Languages, Next: Conclusion, Prev: Installers, Up: Top -13 Other Programming Languages +15 Other Programming Languages ****************************** While the presentation of `gettext' focuses mostly on C and implicitly @@ -9122,7 +9378,7 @@ approach.  File: gettext.info, Node: Language Implementors, Next: Programmers for other Languages, Prev: Programming Languages, Up: Programming Languages -13.1 The Language Implementor's View +15.1 The Language Implementor's View ==================================== All programming and scripting languages that have the notion of strings @@ -9183,9 +9439,10 @@ following: written for yours, without actually translating the strings. 9. To help the programmer in the task of marking translatable strings, - which is usually performed using the Emacs PO mode, you are - welcome to contact the GNU `gettext' maintainers, so they can add - support for your language to `po-mode.el'. + which is sometimes performed using the Emacs PO mode (*note + Marking::), you are welcome to contact the GNU `gettext' + maintainers, so they can add support for your language to + `po-mode.el'. On the implementation side, three approaches are possible, with different effects on portability and copyright: @@ -9213,12 +9470,12 @@ different effects on portability and copyright:  File: gettext.info, Node: Programmers for other Languages, Next: Translators for other Languages, Prev: Language Implementors, Up: Programming Languages -13.2 The Programmer's View +15.2 The Programmer's View ========================== For the programmer, the general procedure is the same as for the C -language. The Emacs PO mode supports other languages, and the GNU -`xgettext' string extractor recognizes other languages based on the +language. The Emacs PO mode marking supports other languages, and the +GNU `xgettext' string extractor recognizes other languages based on the file extension or a command-line option. In some languages, `setlocale' is not needed because it is already performed by the underlying language runtime. @@ -9226,7 +9483,7 @@ underlying language runtime.  File: gettext.info, Node: Translators for other Languages, Next: Maintainers for other Languages, Prev: Programmers for other Languages, Up: Programming Languages -13.3 The Translator's View +15.3 The Translator's View ========================== The translator works exactly as in the C language case. The only @@ -9255,17 +9512,18 @@ strings. * php-format:: PHP Format Strings * gcc-internal-format:: GCC internal Format Strings * qt-format:: Qt Format Strings +* boost-format:: Boost Format Strings  File: gettext.info, Node: c-format, Next: objc-format, Prev: Translators for other Languages, Up: Translators for other Languages -13.3.1 C Format Strings +15.3.1 C Format Strings ----------------------- C format strings are described in POSIX (IEEE P1003.1 2001), section XSH 3 fprintf(), `http://www.opengroup.org/onlinepubs/007904975/functions/fprintf.html'. -See also the fprintf(3) manual page, +See also the fprintf() manual page, `http://www.linuxvalley.it/encyclopedia/ldp/manpage/man3/printf.3.php', `http://informatik.fh-wuerzburg.de/student/i510/man/printf.html'. @@ -9300,7 +9558,7 @@ glibc when NLS is disabled.)  File: gettext.info, Node: objc-format, Next: sh-format, Prev: c-format, Up: Translators for other Languages -13.3.2 Objective C Format Strings +15.3.2 Objective C Format Strings --------------------------------- Objective C format strings are like C format strings. They support an @@ -9310,7 +9568,7 @@ argument of type `Object *'.  File: gettext.info, Node: sh-format, Next: python-format, Prev: objc-format, Up: Translators for other Languages -13.3.3 Shell Format Strings +15.3.3 Shell Format Strings --------------------------- Shell format strings, as supported by GNU gettext and the `envsubst' @@ -9327,7 +9585,7 @@ otherwise such a variable reference is ignored.  File: gettext.info, Node: python-format, Next: lisp-format, Prev: sh-format, Up: Translators for other Languages -13.3.4 Python Format Strings +15.3.4 Python Format Strings ---------------------------- Python format strings are described in Python Library reference / @@ -9338,7 +9596,7 @@ Python format strings are described in Python Library reference /  File: gettext.info, Node: lisp-format, Next: elisp-format, Prev: python-format, Up: Translators for other Languages -13.3.5 Lisp Format Strings +15.3.5 Lisp Format Strings -------------------------- Lisp format strings are described in the Common Lisp HyperSpec, chapter @@ -9348,7 +9606,7 @@ Lisp format strings are described in the Common Lisp HyperSpec, chapter  File: gettext.info, Node: elisp-format, Next: librep-format, Prev: lisp-format, Up: Translators for other Languages -13.3.6 Emacs Lisp Format Strings +15.3.6 Emacs Lisp Format Strings -------------------------------- Emacs Lisp format strings are documented in the Emacs Lisp reference, @@ -9360,7 +9618,7 @@ specifications in format strings while FSF Emacs doesn't.  File: gettext.info, Node: librep-format, Next: scheme-format, Prev: elisp-format, Up: Translators for other Languages -13.3.7 librep Format Strings +15.3.7 librep Format Strings ---------------------------- librep format strings are documented in the librep manual, section @@ -9371,7 +9629,7 @@ Formatted Output,  File: gettext.info, Node: scheme-format, Next: smalltalk-format, Prev: librep-format, Up: Translators for other Languages -13.3.8 Scheme Format Strings +15.3.8 Scheme Format Strings ---------------------------- Scheme format strings are documented in the SLIB manual, section @@ -9380,7 +9638,7 @@ Format Specification.  File: gettext.info, Node: smalltalk-format, Next: java-format, Prev: scheme-format, Up: Translators for other Languages -13.3.9 Smalltalk Format Strings +15.3.9 Smalltalk Format Strings ------------------------------- Smalltalk format strings are described in the GNU Smalltalk @@ -9393,7 +9651,7 @@ nonzero digit (`1' to `9').  File: gettext.info, Node: java-format, Next: csharp-format, Prev: smalltalk-format, Up: Translators for other Languages -13.3.10 Java Format Strings +15.3.10 Java Format Strings --------------------------- Java format strings are described in the JDK documentation for class @@ -9405,7 +9663,7 @@ See also the ICU documentation  File: gettext.info, Node: csharp-format, Next: awk-format, Prev: java-format, Up: Translators for other Languages -13.3.11 C# Format Strings +15.3.11 C# Format Strings ------------------------- C# format strings are described in the .NET documentation for class @@ -9415,7 +9673,7 @@ C# format strings are described in the .NET documentation for class  File: gettext.info, Node: awk-format, Next: object-pascal-format, Prev: csharp-format, Up: Translators for other Languages -13.3.12 awk Format Strings +15.3.12 awk Format Strings -------------------------- awk format strings are described in the gawk documentation, section @@ -9424,7 +9682,7 @@ Printf, `http://www.gnu.org/manual/gawk/html_node/Printf.html#Printf'.  File: gettext.info, Node: object-pascal-format, Next: ycp-format, Prev: awk-format, Up: Translators for other Languages -13.3.13 Object Pascal Format Strings +15.3.13 Object Pascal Format Strings ------------------------------------ Where is this documented? @@ -9432,7 +9690,7 @@ Where is this documented?  File: gettext.info, Node: ycp-format, Next: tcl-format, Prev: object-pascal-format, Up: Translators for other Languages -13.3.14 YCP Format Strings +15.3.14 YCP Format Strings -------------------------- YCP sformat strings are described in the libycp documentation @@ -9443,7 +9701,7 @@ directive starts with `%' and is followed by `%' or a nonzero digit  File: gettext.info, Node: tcl-format, Next: perl-format, Prev: ycp-format, Up: Translators for other Languages -13.3.15 Tcl Format Strings +15.3.15 Tcl Format Strings -------------------------- Tcl format strings are described in the `format.n' manual page, @@ -9452,7 +9710,7 @@ Tcl format strings are described in the `format.n' manual page,  File: gettext.info, Node: perl-format, Next: php-format, Prev: tcl-format, Up: Translators for other Languages -13.3.16 Perl Format Strings +15.3.16 Perl Format Strings --------------------------- There are two kinds format strings in Perl: those acceptable to the @@ -9471,7 +9729,7 @@ In brief, Perl format uses placeholders put between braces (`{' and  File: gettext.info, Node: php-format, Next: gcc-internal-format, Prev: perl-format, Up: Translators for other Languages -13.3.17 PHP Format Strings +15.3.17 PHP Format Strings -------------------------- PHP format strings are described in the documentation of the PHP @@ -9481,7 +9739,7 @@ function `sprintf', in `phpdoc/manual/function.sprintf.html' or  File: gettext.info, Node: gcc-internal-format, Next: qt-format, Prev: php-format, Up: Translators for other Languages -13.3.18 GCC internal Format Strings +15.3.18 GCC internal Format Strings ----------------------------------- These format strings are used inside the GCC sources. In such a format @@ -9499,9 +9757,9 @@ function parameter, `Q' denotes an assignment operator, `V' denotes a const/volatile qualifier.  -File: gettext.info, Node: qt-format, Prev: gcc-internal-format, Up: Translators for other Languages +File: gettext.info, Node: qt-format, Next: boost-format, Prev: gcc-internal-format, Up: Translators for other Languages -13.3.19 Qt Format Strings +15.3.19 Qt Format Strings ------------------------- Qt format strings are described in the documentation of the QString @@ -9509,10 +9767,24 @@ class `file:/usr/lib/qt-3.0.5/doc/html/qstring.html'. In summary, a directive consists of a `%' followed by a digit. The same directive cannot occur more than once in a format string. + +File: gettext.info, Node: boost-format, Prev: qt-format, Up: Translators for other Languages + +15.3.20 Boost Format Strings +---------------------------- + +Boost format strings are described in the documentation of the +`boost::format' class, at +`http://www.boost.org/libs/format/doc/format.html'. In summary, a +directive has either the same syntax as in a C format string, such as +`%1$+5d', or may be surrounded by vertical bars, such as `%|1$+5d|' or +`%|1$+5|', or consists of just an argument number between percent +signs, such as `%1%'. +  File: gettext.info, Node: Maintainers for other Languages, Next: List of Programming Languages, Prev: Translators for other Languages, Up: Programming Languages -13.4 The Maintainer's View +15.4 The Maintainer's View ========================== For the maintainer, the general procedure differs from the C language @@ -9538,7 +9810,7 @@ case in two ways.  File: gettext.info, Node: List of Programming Languages, Next: List of Data Formats, Prev: Maintainers for other Languages, Up: Programming Languages -13.5 Individual Programming Languages +15.5 Individual Programming Languages ===================================== * Menu: @@ -9557,7 +9829,7 @@ File: gettext.info, Node: List of Programming Languages, Next: List of Data Fo * C#:: C# * gawk:: GNU awk * Pascal:: Pascal - Free Pascal Compiler -* wxWindows:: wxWindows library +* wxWidgets:: wxWidgets library * YCP:: YCP - YaST2 scripting language * Tcl:: Tcl - Tk's scripting language * Perl:: Perl @@ -9568,7 +9840,7 @@ File: gettext.info, Node: List of Programming Languages, Next: List of Data Fo  File: gettext.info, Node: C, Next: sh, Prev: List of Programming Languages, Up: List of Programming Languages -13.5.1 C, C++, Objective C +15.5.1 C, C++, Objective C -------------------------- RPMs @@ -9622,13 +9894,13 @@ po-mode marking The following examples are available in the `examples' directory: `hello-c', `hello-c-gnome', `hello-c++', `hello-c++-qt', -`hello-c++-kde', `hello-c++-gnome', `hello-objc', `hello-objc-gnustep', -`hello-objc-gnome'. +`hello-c++-kde', `hello-c++-gnome', `hello-c++-wxwidgets', +`hello-objc', `hello-objc-gnustep', `hello-objc-gnome'.  File: gettext.info, Node: sh, Next: bash, Prev: C, Up: List of Programming Languages -13.5.2 sh - Shell Script +15.5.2 sh - Shell Script ------------------------ RPMs @@ -9689,7 +9961,7 @@ po-mode marking  File: gettext.info, Node: Preparing Shell Scripts, Next: gettext.sh, Prev: sh, Up: sh -13.5.2.1 Preparing Shell Scripts for Internationalization +15.5.2.1 Preparing Shell Scripts for Internationalization ......................................................... Preparing a shell script for internationalization is conceptually @@ -9783,7 +10055,7 @@ for shell scripts are as follows.  File: gettext.info, Node: gettext.sh, Next: gettext Invocation, Prev: Preparing Shell Scripts, Up: sh -13.5.2.2 Contents of `gettext.sh' +15.5.2.2 Contents of `gettext.sh' ................................. `gettext.sh', contained in the run-time package of GNU gettext, provides @@ -9800,7 +10072,7 @@ the following:  File: gettext.info, Node: gettext Invocation, Next: ngettext Invocation, Prev: gettext.sh, Up: sh -13.5.2.3 Invoking the `gettext' program +15.5.2.3 Invoking the `gettext' program ....................................... gettext [OPTION] [[TEXTDOMAIN] MSGID] @@ -9855,7 +10127,7 @@ those messages found in the selected catalog are translated.  File: gettext.info, Node: ngettext Invocation, Next: envsubst Invocation, Prev: gettext Invocation, Up: sh -13.5.2.4 Invoking the `ngettext' program +15.5.2.4 Invoking the `ngettext' program ........................................ ngettext [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT @@ -9907,7 +10179,7 @@ with the environment variable `TEXTDOMAINDIR'.  File: gettext.info, Node: envsubst Invocation, Next: eval_gettext Invocation, Prev: ngettext Invocation, Up: sh -13.5.2.5 Invoking the `envsubst' program +15.5.2.5 Invoking the `envsubst' program ........................................ envsubst [OPTION] [SHELL-FORMAT] @@ -9954,7 +10226,7 @@ SHELL-FORMAT, one per line.  File: gettext.info, Node: eval_gettext Invocation, Next: eval_ngettext Invocation, Prev: envsubst Invocation, Up: sh -13.5.2.6 Invoking the `eval_gettext' function +15.5.2.6 Invoking the `eval_gettext' function ............................................. eval_gettext MSGID @@ -9967,7 +10239,7 @@ result.  File: gettext.info, Node: eval_ngettext Invocation, Prev: eval_gettext Invocation, Up: sh -13.5.2.7 Invoking the `eval_ngettext' function +15.5.2.7 Invoking the `eval_ngettext' function .............................................. eval_ngettext MSGID MSGID-PLURAL COUNT @@ -9981,7 +10253,7 @@ result.  File: gettext.info, Node: bash, Next: Python, Prev: sh, Up: List of Programming Languages -13.5.3 bash - Bourne-Again Shell Script +15.5.3 bash - Bourne-Again Shell Script --------------------------------------- GNU `bash' 2.0 or newer has a special shorthand for translating a @@ -10021,7 +10293,7 @@ that don't have the `gettext()' function in libc.  File: gettext.info, Node: Python, Next: Common Lisp, Prev: bash, Up: List of Programming Languages -13.5.4 Python +15.5.4 Python ------------- RPMs @@ -10077,7 +10349,7 @@ po-mode marking  File: gettext.info, Node: Common Lisp, Next: clisp C, Prev: Python, Up: List of Programming Languages -13.5.5 GNU clisp - Common Lisp +15.5.5 GNU clisp - Common Lisp ------------------------------ RPMs @@ -10127,7 +10399,7 @@ po-mode marking  File: gettext.info, Node: clisp C, Next: Emacs Lisp, Prev: Common Lisp, Up: List of Programming Languages -13.5.6 GNU clisp C sources +15.5.6 GNU clisp C sources -------------------------- RPMs @@ -10177,7 +10449,7 @@ po-mode marking  File: gettext.info, Node: Emacs Lisp, Next: librep, Prev: clisp C, Up: List of Programming Languages -13.5.7 Emacs Lisp +15.5.7 Emacs Lisp ----------------- RPMs @@ -10226,7 +10498,7 @@ po-mode marking  File: gettext.info, Node: librep, Next: Scheme, Prev: Emacs Lisp, Up: List of Programming Languages -13.5.8 librep +15.5.8 librep ------------- RPMs @@ -10276,7 +10548,7 @@ po-mode marking  File: gettext.info, Node: Scheme, Next: Smalltalk, Prev: librep, Up: List of Programming Languages -13.5.9 GNU guile - Scheme +15.5.9 GNU guile - Scheme ------------------------- RPMs @@ -10326,7 +10598,7 @@ po-mode marking  File: gettext.info, Node: Smalltalk, Next: Java, Prev: Scheme, Up: List of Programming Languages -13.5.10 GNU Smalltalk +15.5.10 GNU Smalltalk --------------------- RPMs @@ -10380,7 +10652,7 @@ po-mode marking  File: gettext.info, Node: Java, Next: C#, Prev: Smalltalk, Up: List of Programming Languages -13.5.11 Java +15.5.11 Java ------------ RPMs @@ -10488,7 +10760,25 @@ ResourceBundles, whether GNU gettext generated classes, or other directory: `hello-java', `hello-java-awt', `hello-java-swing'. Now, to make use of the API and define a shorthand for `getString', -there are two idioms that you can choose from: +there are three idioms that you can choose from: + + * (This one assumes Java 1.5 or newer.) In a unique class of your + project, say `Util', define a static variable holding the + `ResourceBundle' instance and the shorthand: + + private static ResourceBundle myResources = + ResourceBundle.getBundle("domain-name"); + public static String _(String s) { + return myResources.getString(s); + } + + All classes containing internationalized strings then contain + + import static Util._; + + and the shorthand is used like this: + + System.out.println(_("Operation completed.")); * In a unique class of your project, say `Util', define a static variable holding the `ResourceBundle' instance: @@ -10520,14 +10810,15 @@ there are two idioms that you can choose from: System.out.println(S._("Operation completed.")); - Which of the two idioms you choose, will depend on whether copying -two lines of codes into every class is more acceptable in your project -than a class with a single-letter name. + Which of the three idioms you choose, will depend on whether your +project requires portability to Java versions prior to Java 1.5 and, if +so, whether copying two lines of codes into every class is more +acceptable in your project than a class with a single-letter name.  File: gettext.info, Node: C#, Next: gawk, Prev: Java, Up: List of Programming Languages -13.5.12 C# +15.5.12 C# ---------- RPMs @@ -10738,7 +11029,7 @@ than a class with a single-letter name.  File: gettext.info, Node: gawk, Next: Pascal, Prev: C#, Up: List of Programming Languages -13.5.13 GNU awk +15.5.13 GNU awk --------------- RPMs @@ -10788,9 +11079,9 @@ po-mode marking An example is available in the `examples' directory: `hello-gawk'.  -File: gettext.info, Node: Pascal, Next: wxWindows, Prev: gawk, Up: List of Programming Languages +File: gettext.info, Node: Pascal, Next: wxWidgets, Prev: gawk, Up: List of Programming Languages -13.5.14 Pascal - Free Pascal Compiler +15.5.14 Pascal - Free Pascal Compiler ------------------------------------- RPMs @@ -10846,9 +11137,9 @@ the `TranslateResourceStrings' function in the `gettext' unit. An example is available in the `examples' directory: `hello-pascal'.  -File: gettext.info, Node: wxWindows, Next: YCP, Prev: Pascal, Up: List of Programming Languages +File: gettext.info, Node: wxWidgets, Next: YCP, Prev: Pascal, Up: List of Programming Languages -13.5.15 wxWindows library +15.5.15 wxWidgets library ------------------------- RPMs @@ -10885,7 +11176,9 @@ Extractor `xgettext' Formatting with positions - -- + wxString::Format supports positions if and only if the system has + `wprintf()', `vswprintf()' functions and they support positions + according to POSIX. Portability fully portable @@ -10894,9 +11187,9 @@ po-mode marking yes  -File: gettext.info, Node: YCP, Next: Tcl, Prev: wxWindows, Up: List of Programming Languages +File: gettext.info, Node: YCP, Next: Tcl, Prev: wxWidgets, Up: List of Programming Languages -13.5.16 YCP - YaST2 scripting language +15.5.16 YCP - YaST2 scripting language -------------------------------------- RPMs @@ -10946,7 +11239,7 @@ po-mode marking  File: gettext.info, Node: Tcl, Next: Perl, Prev: YCP, Up: List of Programming Languages -13.5.17 Tcl - Tk's scripting language +15.5.17 Tcl - Tk's scripting language ------------------------------------- RPMs @@ -11007,7 +11300,7 @@ implicitly calls `format' when more than one argument is given.  File: gettext.info, Node: Perl, Next: PHP, Prev: Tcl, Up: List of Programming Languages -13.5.18 Perl +15.5.18 Perl ------------ RPMs @@ -11119,7 +11412,7 @@ worst probably being its imperfectness.  File: gettext.info, Node: General Problems, Next: Default Keywords, Up: Perl -13.5.18.1 General Problems Parsing Perl Code +15.5.18.1 General Problems Parsing Perl Code ............................................ It is often heard that only Perl can parse Perl. This is not true. @@ -11214,7 +11507,7 @@ a manner less challenging to `xgettext'.  File: gettext.info, Node: Default Keywords, Next: Special Keywords, Prev: General Problems, Up: Perl -13.5.18.2 Which keywords will xgettext look for? +15.5.18.2 Which keywords will xgettext look for? ................................................ Unless you instruct `xgettext' otherwise by invoking it with one of the @@ -11257,7 +11550,7 @@ in your Perl sources:  File: gettext.info, Node: Special Keywords, Next: Quote-like Expressions, Prev: Default Keywords, Up: Perl -13.5.18.3 How to Extract Hash Keys +15.5.18.3 How to Extract Hash Keys .................................. Translating messages at runtime is normally performed by looking up the @@ -11293,7 +11586,7 @@ _not_ allowed, regardless of the `use utf8' pragma.  File: gettext.info, Node: Quote-like Expressions, Next: Interpolation I, Prev: Special Keywords, Up: Perl -13.5.18.4 What are Strings And Quote-like Expressions? +15.5.18.4 What are Strings And Quote-like Expressions? ...................................................... Perl offers a plethora of different string constructs. Those that can @@ -11358,7 +11651,7 @@ lookups are generally supported by `xgettext'.  File: gettext.info, Node: Interpolation I, Next: Interpolation II, Prev: Quote-like Expressions, Up: Perl -13.5.18.5 Invalid Uses Of String Interpolation +15.5.18.5 Invalid Uses Of String Interpolation .............................................. Perl is capable of interpolating variables into strings. This offers @@ -11450,7 +11743,7 @@ you mean.  File: gettext.info, Node: Interpolation II, Next: Parentheses, Prev: Interpolation I, Up: Perl -13.5.18.6 Valid Uses Of String Interpolation +15.5.18.6 Valid Uses Of String Interpolation ............................................ Perl is often used to generate sources for other programming languages @@ -11512,7 +11805,7 @@ with an "invalid interpolation" error.  File: gettext.info, Node: Parentheses, Next: Long Lines, Prev: Interpolation II, Up: Perl -13.5.18.7 When To Use Parentheses +15.5.18.7 When To Use Parentheses ................................. In Perl, parentheses around function arguments are mostly optional. @@ -11552,7 +11845,7 @@ ok to use:  File: gettext.info, Node: Long Lines, Next: Perl Pitfalls, Prev: Parentheses, Up: Perl -13.5.18.8 How To Grok with Long Lines +15.5.18.8 How To Grok with Long Lines ..................................... The necessity of long messages can often lead to a cumbersome or @@ -11602,7 +11895,7 @@ resulting POT file.  File: gettext.info, Node: Perl Pitfalls, Prev: Long Lines, Up: Perl -13.5.18.9 Bugs, Pitfalls, And Things That Do Not Work +15.5.18.9 Bugs, Pitfalls, And Things That Do Not Work ..................................................... The foregoing sections should have proven that `xgettext' is quite @@ -11700,7 +11993,7 @@ along with `printf()' for this special case.  File: gettext.info, Node: PHP, Next: Pike, Prev: Perl, Up: List of Programming Languages -13.5.19 PHP Hypertext Preprocessor +15.5.19 PHP Hypertext Preprocessor ---------------------------------- RPMs @@ -11751,7 +12044,7 @@ po-mode marking  File: gettext.info, Node: Pike, Next: GCC-source, Prev: PHP, Up: List of Programming Languages -13.5.20 Pike +15.5.20 Pike ------------ RPMs @@ -11799,7 +12092,7 @@ po-mode marking  File: gettext.info, Node: GCC-source, Prev: Pike, Up: List of Programming Languages -13.5.21 GNU Compiler Collection sources +15.5.21 GNU Compiler Collection sources --------------------------------------- RPMs @@ -11848,7 +12141,7 @@ po-mode marking  File: gettext.info, Node: List of Data Formats, Prev: List of Programming Languages, Up: Programming Languages -13.6 Internationalizable Data +15.6 Internationalizable Data ============================= Here is a list of other data formats which can be internationalized @@ -11863,7 +12156,7 @@ using GNU gettext.  File: gettext.info, Node: POT, Next: RST, Prev: List of Data Formats, Up: List of Data Formats -13.6.1 POT - Portable Object Template +15.6.1 POT - Portable Object Template ------------------------------------- RPMs @@ -11878,7 +12171,7 @@ Extractor  File: gettext.info, Node: RST, Next: Glade, Prev: POT, Up: List of Data Formats -13.6.2 Resource String Table +15.6.2 Resource String Table ---------------------------- RPMs @@ -11893,7 +12186,7 @@ Extractor  File: gettext.info, Node: Glade, Prev: RST, Up: List of Data Formats -13.6.3 Glade - GNOME user interface description +15.6.3 Glade - GNOME user interface description ----------------------------------------------- RPMs @@ -11909,7 +12202,7 @@ Extractor  File: gettext.info, Node: Conclusion, Next: Language Codes, Prev: Programming Languages, Up: Top -14 Concluding Remarks +16 Concluding Remarks ********************* We would like to conclude this GNU `gettext' manual by presenting an @@ -11925,7 +12218,7 @@ Native Language Support matters.  File: gettext.info, Node: History, Next: References, Prev: Conclusion, Up: Conclusion -14.1 History of GNU `gettext' +16.1 History of GNU `gettext' ============================= Internationalization concerns and algorithms have been informally and @@ -12004,12 +12297,15 @@ manipulating PO files.  File: gettext.info, Node: References, Prev: History, Up: Conclusion -14.2 Related Readings +16.2 Related Readings ===================== -Eugene H. Dorr (`dorre@well.com') maintains an interesting bibliography -on internationalization matters, called `Internationalization Reference -List', which is available as: +* NOTE: * This documentation section is outdated and needs to be +revised. + + Eugene H. Dorr (`dorre@well.com') maintains an interesting +bibliography on internationalization matters, called +`Internationalization Reference List', which is available as: ftp://ftp.ora.com/pub/examples/nutshell/ujip/doc/i18n-books.txt Michael Gschwind (`mike@vlsivie.tuwien.ac.at') maintains a @@ -12602,7 +12898,7 @@ come from this standard. Zulu.  -File: gettext.info, Node: Country Codes, Next: Program Index, Prev: Language Codes, Up: Top +File: gettext.info, Node: Country Codes, Next: Licenses, Prev: Language Codes, Up: Top Appendix B Country Codes ************************ @@ -13329,7 +13625,1367 @@ Translation Project should come from this standard. Zimbabwe.  -File: gettext.info, Node: Program Index, Next: Option Index, Prev: Country Codes, Up: Top +File: gettext.info, Node: Licenses, Next: Program Index, Prev: Country Codes, Up: Top + +Appendix C Licenses +******************* + +The files of this package are covered by the licenses indicated in each +particular file or directory. Here is a summary: + + * The `libintl' and `libasprintf' libraries are covered by the GNU + Library General Public License (LGPL). A copy of the license is + included in *Note GNU LGPL::. + + * The executable programs of this package and the `libgettextpo' + library are covered by the GNU General Public License (GPL). A + copy of the license is included in *Note GNU GPL::. + + * This manual is free documentation. It is dually licensed under the + GNU FDL and the GNU GPL. This means that you can redistribute this + manual under either of these two licenses, at your choice. + This manual is covered by the GNU FDL. Permission is granted to + copy, distribute and/or modify this document under the terms of the + GNU Free Documentation License (FDL), either version 1.2 of the + License, or (at your option) any later version published by the + Free Software Foundation (FSF); with no Invariant Sections, with no + Front-Cover Text, and with no Back-Cover Texts. A copy of the + license is included in *Note GNU FDL::. + This manual is covered by the GNU GPL. You can redistribute it + and/or modify it under the terms of the GNU General Public License + (GPL), either version 2 of the License, or (at your option) any + later version published by the Free Software Foundation (FSF). A + copy of the license is included in *Note GNU GPL::. + +* Menu: + +* GNU GPL:: GNU General Public License +* GNU LGPL:: GNU Lesser General Public License +* GNU FDL:: GNU Free Documentation License + + +File: gettext.info, Node: GNU GPL, Next: GNU LGPL, Up: Licenses + +C.1 GNU GENERAL PUBLIC LICENSE +============================== + + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble +-------- + +The licenses for most software are designed to take away your freedom +to share and change it. By contrast, the GNU General Public License is +intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it in +new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, +and (2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains a + notice placed by the copyright holder saying it may be distributed + under the terms of this General Public License. The "Program", + below, refers to any such program or work, and a "work based on + the Program" means either the Program or any derivative work under + copyright law: that is to say, a work containing the Program or a + portion of it, either verbatim or with modifications and/or + translated into another language. (Hereinafter, translation is + included without limitation in the term "modification".) Each + licensee is addressed as "you". + + Activities other than copying, distribution and modification are + not covered by this License; they are outside its scope. The act + of running the Program is not restricted, and the output from the + Program is covered only if its contents constitute a work based on + the Program (independent of having been made by running the + Program). Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's + source code as you receive it, in any medium, provided that you + conspicuously and appropriately publish on each copy an appropriate + copyright notice and disclaimer of warranty; keep intact all the + notices that refer to this License and to the absence of any + warranty; and give any other recipients of the Program a copy of + this License along with the Program. + + You may charge a fee for the physical act of transferring a copy, + and you may at your option offer warranty protection in exchange + for a fee. + + 2. You may modify your copy or copies of the Program or any portion + of it, thus forming a work based on the Program, and copy and + distribute such modifications or work under the terms of Section 1 + above, provided that you also meet all of these conditions: + + a. You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b. You must cause any work that you distribute or publish, that + in whole or in part contains or is derived from the Program + or any part thereof, to be licensed as a whole at no charge + to all third parties under the terms of this License. + + c. If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display + an announcement including an appropriate copyright notice and + a notice that there is no warranty (or else, saying that you + provide a warranty) and that users may redistribute the + program under these conditions, and telling the user how to + view a copy of this License. (Exception: if the Program + itself is interactive but does not normally print such an + announcement, your work based on the Program is not required + to print an announcement.) + + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the + Program, and can be reasonably considered independent and separate + works in themselves, then this License, and its terms, do not + apply to those sections when you distribute them as separate + works. But when you distribute the same sections as part of a + whole which is a work based on the Program, the distribution of + the whole must be on the terms of this License, whose permissions + for other licensees extend to the entire whole, and thus to each + and every part regardless of who wrote it. + + Thus, it is not the intent of this section to claim rights or + contest your rights to work written entirely by you; rather, the + intent is to exercise the right to control the distribution of + derivative or collective works based on the Program. + + In addition, mere aggregation of another work not based on the + Program with the Program (or with a work based on the Program) on + a volume of a storage or distribution medium does not bring the + other work under the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, + under Section 2) in object code or executable form under the terms + of Sections 1 and 2 above provided that you also do one of the + following: + + a. Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of + Sections 1 and 2 above on a medium customarily used for + software interchange; or, + + b. Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a + medium customarily used for software interchange; or, + + c. Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with + such an offer, in accord with Subsection b above.) + + The source code for a work means the preferred form of the work for + making modifications to it. For an executable work, complete + source code means all the source code for all modules it contains, + plus any associated interface definition files, plus the scripts + used to control compilation and installation of the executable. + However, as a special exception, the source code distributed need + not include anything that is normally distributed (in either + source or binary form) with the major components (compiler, + kernel, and so on) of the operating system on which the executable + runs, unless that component itself accompanies the executable. + + If distribution of executable or object code is made by offering + access to copy from a designated place, then offering equivalent + access to copy the source code from the same place counts as + distribution of the source code, even though third parties are not + compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program + except as expressly provided under this License. Any attempt + otherwise to copy, modify, sublicense or distribute the Program is + void, and will automatically terminate your rights under this + License. However, parties who have received copies, or rights, + from you under this License will not have their licenses + terminated so long as such parties remain in full compliance. + + 5. You are not required to accept this License, since you have not + signed it. However, nothing else grants you permission to modify + or distribute the Program or its derivative works. These actions + are prohibited by law if you do not accept this License. + Therefore, by modifying or distributing the Program (or any work + based on the Program), you indicate your acceptance of this + License to do so, and all its terms and conditions for copying, + distributing or modifying the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the + Program), the recipient automatically receives a license from the + original licensor to copy, distribute or modify the Program + subject to these terms and conditions. You may not impose any + further restrictions on the recipients' exercise of the rights + granted herein. You are not responsible for enforcing compliance + by third parties to this License. + + 7. If, as a consequence of a court judgment or allegation of patent + infringement or for any other reason (not limited to patent + issues), conditions are imposed on you (whether by court order, + agreement or otherwise) that contradict the conditions of this + License, they do not excuse you from the conditions of this + License. If you cannot distribute so as to satisfy simultaneously + your obligations under this License and any other pertinent + obligations, then as a consequence you may not distribute the + Program at all. For example, if a patent license would not permit + royalty-free redistribution of the Program by all those who + receive copies directly or indirectly through you, then the only + way you could satisfy both it and this License would be to refrain + entirely from distribution of the Program. + + If any portion of this section is held invalid or unenforceable + under any particular circumstance, the balance of the section is + intended to apply and the section as a whole is intended to apply + in other circumstances. + + It is not the purpose of this section to induce you to infringe any + patents or other property right claims or to contest validity of + any such claims; this section has the sole purpose of protecting + the integrity of the free software distribution system, which is + implemented by public license practices. Many people have made + generous contributions to the wide range of software distributed + through that system in reliance on consistent application of that + system; it is up to the author/donor to decide if he or she is + willing to distribute software through any other system and a + licensee cannot impose that choice. + + This section is intended to make thoroughly clear what is believed + to be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, + the original copyright holder who places the Program under this + License may add an explicit geographical distribution limitation + excluding those countries, so that distribution is permitted only + in or among countries not thus excluded. In such case, this + License incorporates the limitation as if written in the body of + this License. + + 9. The Free Software Foundation may publish revised and/or new + versions of the General Public License from time to time. Such + new versions will be similar in spirit to the present version, but + may differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the + Program specifies a version number of this License which applies + to it and "any later version", you have the option of following + the terms and conditions either of that version or of any later + version published by the Free Software Foundation. If the Program + does not specify a version number of this License, you may choose + any version ever published by the Free Software Foundation. + + 10. If you wish to incorporate parts of the Program into other free + programs whose distribution conditions are different, write to the + author to ask for permission. For software which is copyrighted + by the Free Software Foundation, write to the Free Software + Foundation; we sometimes make exceptions for this. Our decision + will be guided by the two goals of preserving the free status of + all derivatives of our free software and of promoting the sharing + and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO + WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE + LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT + HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT + WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT + NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE + QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE + PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY + SERVICING, REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY + MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE + LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, + INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR + INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF + DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU + OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY + OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + +Appendix: How to Apply These Terms to Your New Programs +------------------------------------------------------- + +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES. + Copyright (C) YYYY NAME OF AUTHOR + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Also add information on how to contact you by electronic and paper +mail. + + If the program is interactive, make it output a short notice like +this when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19YY NAME OF AUTHOR + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + + The hypothetical commands `show w' and `show c' should show the +appropriate parts of the General Public License. Of course, the +commands you use may be called something other than `show w' and `show +c'; they could even be mouse-clicks or menu items--whatever suits your +program. + + You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for the program, +if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + SIGNATURE OF TY COON, 1 April 1989 + Ty Coon, President of Vice + + This General Public License does not permit incorporating your +program into proprietary programs. If your program is a subroutine +library, you may consider it more useful to permit linking proprietary +applications with the library. If this is what you want to do, use the +GNU Library General Public License instead of this License. + + +File: gettext.info, Node: GNU LGPL, Next: GNU FDL, Prev: GNU GPL, Up: Licenses + +C.2 GNU LESSER GENERAL PUBLIC LICENSE +===================================== + + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + [This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence the + version number 2.1.] + +Preamble +-------- + +The licenses for most software are designed to take away your freedom +to share and change it. By contrast, the GNU General Public Licenses +are intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software--typically libraries--of the Free +Software Foundation and other authors who decide to use it. You can use +it too, but we suggest you first think carefully about whether this +license or the ordinary General Public License is the better strategy to +use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of it +in new free programs; and that you are informed that you can do these +things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know that +what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and is +quite different from the ordinary General Public License. We use this +license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does _Less_ to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of free +software. For example, permission to use the GNU C Library in non-free +programs enables many more people to use the whole GNU operating +system, as well as its variant, the GNU/Linux operating system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run that +program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other + program which contains a notice placed by the copyright holder or + other authorized party saying it may be distributed under the + terms of this Lesser General Public License (also called "this + License"). Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data + prepared so as to be conveniently linked with application programs + (which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work + which has been distributed under these terms. A "work based on the + Library" means either the Library or any derivative work under + copyright law: that is to say, a work containing the Library or a + portion of it, either verbatim or with modifications and/or + translated straightforwardly into another language. (Hereinafter, + translation is included without limitation in the term + "modification".) + + "Source code" for a work means the preferred form of the work for + making modifications to it. For a library, complete source code + means all the source code for all modules it contains, plus any + associated interface definition files, plus the scripts used to + control compilation and installation of the library. + + Activities other than copying, distribution and modification are + not covered by this License; they are outside its scope. The act + of running a program using the Library is not restricted, and + output from such a program is covered only if its contents + constitute a work based on the Library (independent of the use of + the Library in a tool for writing it). Whether that is true + depends on what the Library does and what the program that uses + the Library does. + + 1. You may copy and distribute verbatim copies of the Library's + complete source code as you receive it, in any medium, provided + that you conspicuously and appropriately publish on each copy an + appropriate copyright notice and disclaimer of warranty; keep + intact all the notices that refer to this License and to the + absence of any warranty; and distribute a copy of this License + along with the Library. + + You may charge a fee for the physical act of transferring a copy, + and you may at your option offer warranty protection in exchange + for a fee. + + 2. You may modify your copy or copies of the Library or any portion + of it, thus forming a work based on the Library, and copy and + distribute such modifications or work under the terms of Section 1 + above, provided that you also meet all of these conditions: + + a. The modified work must itself be a software library. + + b. You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c. You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d. If a facility in the modified Library refers to a function or + a table of data to be supplied by an application program that + uses the facility, other than as an argument passed when the + facility is invoked, then you must make a good faith effort + to ensure that, in the event an application does not supply + such function or table, the facility still operates, and + performs whatever part of its purpose remains meaningful. + + (For example, a function in a library to compute square roots + has a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function + must be optional: if the application does not supply it, the + square root function must still compute square roots.) + + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the + Library, and can be reasonably considered independent and separate + works in themselves, then this License, and its terms, do not + apply to those sections when you distribute them as separate + works. But when you distribute the same sections as part of a + whole which is a work based on the Library, the distribution of + the whole must be on the terms of this License, whose permissions + for other licensees extend to the entire whole, and thus to each + and every part regardless of who wrote it. + + Thus, it is not the intent of this section to claim rights or + contest your rights to work written entirely by you; rather, the + intent is to exercise the right to control the distribution of + derivative or collective works based on the Library. + + In addition, mere aggregation of another work not based on the + Library with the Library (or with a work based on the Library) on + a volume of a storage or distribution medium does not bring the + other work under the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public + License instead of this License to a given copy of the Library. + To do this, you must alter all the notices that refer to this + License, so that they refer to the ordinary GNU General Public + License, version 2, instead of to this License. (If a newer + version than version 2 of the ordinary GNU General Public License + has appeared, then you can specify that version instead if you + wish.) Do not make any other change in these notices. + + Once this change is made in a given copy, it is irreversible for + that copy, so the ordinary GNU General Public License applies to + all subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of + the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or + derivative of it, under Section 2) in object code or executable + form under the terms of Sections 1 and 2 above provided that you + accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software + interchange. + + If distribution of object code is made by offering access to copy + from a designated place, then offering equivalent access to copy + the source code from the same place satisfies the requirement to + distribute the source code, even though third parties are not + compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the + Library, but is designed to work with the Library by being + compiled or linked with it, is called a "work that uses the + Library". Such a work, in isolation, is not a derivative work of + the Library, and therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library + creates an executable that is a derivative of the Library (because + it contains portions of the Library), rather than a "work that + uses the library". The executable is therefore covered by this + License. Section 6 states terms for distribution of such + executables. + + When a "work that uses the Library" uses material from a header + file that is part of the Library, the object code for the work may + be a derivative work of the Library even though the source code is + not. Whether this is true is especially significant if the work + can be linked without the Library, or if the work is itself a + library. The threshold for this to be true is not precisely + defined by law. + + If such an object file uses only numerical parameters, data + structure layouts and accessors, and small macros and small inline + functions (ten lines or less in length), then the use of the object + file is unrestricted, regardless of whether it is legally a + derivative work. (Executables containing this object code plus + portions of the Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may + distribute the object code for the work under the terms of Section + 6. Any executables containing that work also fall under Section 6, + whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or + link a "work that uses the Library" with the Library to produce a + work containing portions of the Library, and distribute that work + under terms of your choice, provided that the terms permit + modification of the work for the customer's own use and reverse + engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the + Library is used in it and that the Library and its use are covered + by this License. You must supply a copy of this License. If the + work during execution displays copyright notices, you must include + the copyright notice for the Library among them, as well as a + reference directing the user to the copy of this License. Also, + you must do one of these things: + + a. Accompany the work with the complete corresponding + machine-readable source code for the Library including + whatever changes were used in the work (which must be + distributed under Sections 1 and 2 above); and, if the work + is an executable linked with the Library, with the complete + machine-readable "work that uses the Library", as object code + and/or source code, so that the user can modify the Library + and then relink to produce a modified executable containing + the modified Library. (It is understood that the user who + changes the contents of definitions files in the Library will + not necessarily be able to recompile the application to use + the modified definitions.) + + b. Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run + time a copy of the library already present on the user's + computer system, rather than copying library functions into + the executable, and (2) will operate properly with a modified + version of the library, if the user installs one, as long as + the modified version is interface-compatible with the version + that the work was made with. + + c. Accompany the work with a written offer, valid for at least + three years, to give the same user the materials specified in + Subsection 6a, above, for a charge no more than the cost of + performing this distribution. + + d. If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the + above specified materials from the same place. + + e. Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the + Library" must include any data and utility programs needed for + reproducing the executable from it. However, as a special + exception, the materials to be distributed need not include + anything that is normally distributed (in either source or binary + form) with the major components (compiler, kernel, and so on) of + the operating system on which the executable runs, unless that + component itself accompanies the executable. + + It may happen that this requirement contradicts the license + restrictions of other proprietary libraries that do not normally + accompany the operating system. Such a contradiction means you + cannot use both them and the Library together in an executable + that you distribute. + + 7. You may place library facilities that are a work based on the + Library side-by-side in a single library together with other + library facilities not covered by this License, and distribute + such a combined library, provided that the separate distribution + of the work based on the Library and of the other library + facilities is otherwise permitted, and provided that you do these + two things: + + a. Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b. Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same + work. + + 8. You may not copy, modify, sublicense, link with, or distribute the + Library except as expressly provided under this License. Any + attempt otherwise to copy, modify, sublicense, link with, or + distribute the Library is void, and will automatically terminate + your rights under this License. However, parties who have + received copies, or rights, from you under this License will not + have their licenses terminated so long as such parties remain in + full compliance. + + 9. You are not required to accept this License, since you have not + signed it. However, nothing else grants you permission to modify + or distribute the Library or its derivative works. These actions + are prohibited by law if you do not accept this License. + Therefore, by modifying or distributing the Library (or any work + based on the Library), you indicate your acceptance of this + License to do so, and all its terms and conditions for copying, + distributing or modifying the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the + Library), the recipient automatically receives a license from the + original licensor to copy, distribute, link with or modify the + Library subject to these terms and conditions. You may not impose + any further restrictions on the recipients' exercise of the rights + granted herein. You are not responsible for enforcing compliance + by third parties with this License. + + 11. If, as a consequence of a court judgment or allegation of patent + infringement or for any other reason (not limited to patent + issues), conditions are imposed on you (whether by court order, + agreement or otherwise) that contradict the conditions of this + License, they do not excuse you from the conditions of this + License. If you cannot distribute so as to satisfy simultaneously + your obligations under this License and any other pertinent + obligations, then as a consequence you may not distribute the + Library at all. For example, if a patent license would not permit + royalty-free redistribution of the Library by all those who + receive copies directly or indirectly through you, then the only + way you could satisfy both it and this License would be to refrain + entirely from distribution of the Library. + + If any portion of this section is held invalid or unenforceable + under any particular circumstance, the balance of the section is + intended to apply, and the section as a whole is intended to apply + in other circumstances. + + It is not the purpose of this section to induce you to infringe any + patents or other property right claims or to contest validity of + any such claims; this section has the sole purpose of protecting + the integrity of the free software distribution system which is + implemented by public license practices. Many people have made + generous contributions to the wide range of software distributed + through that system in reliance on consistent application of that + system; it is up to the author/donor to decide if he or she is + willing to distribute software through any other system and a + licensee cannot impose that choice. + + This section is intended to make thoroughly clear what is believed + to be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in + certain countries either by patents or by copyrighted interfaces, + the original copyright holder who places the Library under this + License may add an explicit geographical distribution limitation + excluding those countries, so that distribution is permitted only + in or among countries not thus excluded. In such case, this + License incorporates the limitation as if written in the body of + this License. + + 13. The Free Software Foundation may publish revised and/or new + versions of the Lesser General Public License from time to time. + Such new versions will be similar in spirit to the present version, + but may differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the + Library specifies a version number of this License which applies + to it and "any later version", you have the option of following + the terms and conditions either of that version or of any later + version published by the Free Software Foundation. If the Library + does not specify a license version number, you may choose any + version ever published by the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free + programs whose distribution conditions are incompatible with these, + write to the author to ask for permission. For software which is + copyrighted by the Free Software Foundation, write to the Free + Software Foundation; we sometimes make exceptions for this. Our + decision will be guided by the two goals of preserving the free + status of all derivatives of our free software and of promoting + the sharing and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO + WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE + LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT + HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT + WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT + NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE + QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE + LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY + SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY + MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE + LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, + INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR + INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF + DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU + OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY + OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Libraries +---------------------------------------------- + +If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of +the ordinary General Public License). + + To apply these terms, attach the following notices to the library. +It is safest to attach them to the start of each source file to most +effectively convey the exclusion of warranty; and each file should have +at least the "copyright" line and a pointer to where the full notice is +found. + + ONE LINE TO GIVE THE LIBRARY'S NAME AND AN IDEA OF WHAT IT DOES. + Copyright (C) YEAR NAME OF AUTHOR + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or (at + your option) any later version. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. + + Also add information on how to contact you by electronic and paper +mail. + + You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for the library, +if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the library + `Frob' (a library for tweaking knobs) written by James Random Hacker. + + SIGNATURE OF TY COON, 1 April 1990 + Ty Coon, President of Vice + + That's all there is to it! + + +File: gettext.info, Node: GNU FDL, Prev: GNU LGPL, Up: Licenses + +C.3 GNU Free Documentation License +================================== + + Version 1.2, November 2002 + + Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + 0. PREAMBLE + + The purpose of this License is to make a manual, textbook, or other + functional and useful document "free" in the sense of freedom: to + assure everyone the effective freedom to copy and redistribute it, + with or without modifying it, either commercially or + noncommercially. Secondarily, this License preserves for the + author and publisher a way to get credit for their work, while not + being considered responsible for modifications made by others. + + This License is a kind of "copyleft", which means that derivative + works of the document must themselves be free in the same sense. + It complements the GNU General Public License, which is a copyleft + license designed for free software. + + We have designed this License in order to use it for manuals for + free software, because free software needs free documentation: a + free program should come with manuals providing the same freedoms + that the software does. But this License is not limited to + software manuals; it can be used for any textual work, regardless + of subject matter or whether it is published as a printed book. + We recommend this License principally for works whose purpose is + instruction or reference. + + 1. APPLICABILITY AND DEFINITIONS + + This License applies to any manual or other work, in any medium, + that contains a notice placed by the copyright holder saying it + can be distributed under the terms of this License. Such a notice + grants a world-wide, royalty-free license, unlimited in duration, + to use that work under the conditions stated herein. The + "Document", below, refers to any such manual or work. Any member + of the public is a licensee, and is addressed as "you". You + accept the license if you copy, modify or distribute the work in a + way requiring permission under copyright law. + + A "Modified Version" of the Document means any work containing the + Document or a portion of it, either copied verbatim, or with + modifications and/or translated into another language. + + A "Secondary Section" is a named appendix or a front-matter section + of the Document that deals exclusively with the relationship of the + publishers or authors of the Document to the Document's overall + subject (or to related matters) and contains nothing that could + fall directly within that overall subject. (Thus, if the Document + is in part a textbook of mathematics, a Secondary Section may not + explain any mathematics.) The relationship could be a matter of + historical connection with the subject or with related matters, or + of legal, commercial, philosophical, ethical or political position + regarding them. + + The "Invariant Sections" are certain Secondary Sections whose + titles are designated, as being those of Invariant Sections, in + the notice that says that the Document is released under this + License. If a section does not fit the above definition of + Secondary then it is not allowed to be designated as Invariant. + The Document may contain zero Invariant Sections. If the Document + does not identify any Invariant Sections then there are none. + + The "Cover Texts" are certain short passages of text that are + listed, as Front-Cover Texts or Back-Cover Texts, in the notice + that says that the Document is released under this License. A + Front-Cover Text may be at most 5 words, and a Back-Cover Text may + be at most 25 words. + + A "Transparent" copy of the Document means a machine-readable copy, + represented in a format whose specification is available to the + general public, that is suitable for revising the document + straightforwardly with generic text editors or (for images + composed of pixels) generic paint programs or (for drawings) some + widely available drawing editor, and that is suitable for input to + text formatters or for automatic translation to a variety of + formats suitable for input to text formatters. A copy made in an + otherwise Transparent file format whose markup, or absence of + markup, has been arranged to thwart or discourage subsequent + modification by readers is not Transparent. An image format is + not Transparent if used for any substantial amount of text. A + copy that is not "Transparent" is called "Opaque". + + Examples of suitable formats for Transparent copies include plain + ASCII without markup, Texinfo input format, LaTeX input format, + SGML or XML using a publicly available DTD, and + standard-conforming simple HTML, PostScript or PDF designed for + human modification. Examples of transparent image formats include + PNG, XCF and JPG. Opaque formats include proprietary formats that + can be read and edited only by proprietary word processors, SGML or + XML for which the DTD and/or processing tools are not generally + available, and the machine-generated HTML, PostScript or PDF + produced by some word processors for output purposes only. + + The "Title Page" means, for a printed book, the title page itself, + plus such following pages as are needed to hold, legibly, the + material this License requires to appear in the title page. For + works in formats which do not have any title page as such, "Title + Page" means the text near the most prominent appearance of the + work's title, preceding the beginning of the body of the text. + + A section "Entitled XYZ" means a named subunit of the Document + whose title either is precisely XYZ or contains XYZ in parentheses + following text that translates XYZ in another language. (Here XYZ + stands for a specific section name mentioned below, such as + "Acknowledgements", "Dedications", "Endorsements", or "History".) + To "Preserve the Title" of such a section when you modify the + Document means that it remains a section "Entitled XYZ" according + to this definition. + + The Document may include Warranty Disclaimers next to the notice + which states that this License applies to the Document. These + Warranty Disclaimers are considered to be included by reference in + this License, but only as regards disclaiming warranties: any other + implication that these Warranty Disclaimers may have is void and + has no effect on the meaning of this License. + + 2. VERBATIM COPYING + + You may copy and distribute the Document in any medium, either + commercially or noncommercially, provided that this License, the + copyright notices, and the license notice saying this License + applies to the Document are reproduced in all copies, and that you + add no other conditions whatsoever to those of this License. You + may not use technical measures to obstruct or control the reading + or further copying of the copies you make or distribute. However, + you may accept compensation in exchange for copies. If you + distribute a large enough number of copies you must also follow + the conditions in section 3. + + You may also lend copies, under the same conditions stated above, + and you may publicly display copies. + + 3. COPYING IN QUANTITY + + If you publish printed copies (or copies in media that commonly + have printed covers) of the Document, numbering more than 100, and + the Document's license notice requires Cover Texts, you must + enclose the copies in covers that carry, clearly and legibly, all + these Cover Texts: Front-Cover Texts on the front cover, and + Back-Cover Texts on the back cover. Both covers must also clearly + and legibly identify you as the publisher of these copies. The + front cover must present the full title with all words of the + title equally prominent and visible. You may add other material + on the covers in addition. Copying with changes limited to the + covers, as long as they preserve the title of the Document and + satisfy these conditions, can be treated as verbatim copying in + other respects. + + If the required texts for either cover are too voluminous to fit + legibly, you should put the first ones listed (as many as fit + reasonably) on the actual cover, and continue the rest onto + adjacent pages. + + If you publish or distribute Opaque copies of the Document + numbering more than 100, you must either include a + machine-readable Transparent copy along with each Opaque copy, or + state in or with each Opaque copy a computer-network location from + which the general network-using public has access to download + using public-standard network protocols a complete Transparent + copy of the Document, free of added material. If you use the + latter option, you must take reasonably prudent steps, when you + begin distribution of Opaque copies in quantity, to ensure that + this Transparent copy will remain thus accessible at the stated + location until at least one year after the last time you + distribute an Opaque copy (directly or through your agents or + retailers) of that edition to the public. + + It is requested, but not required, that you contact the authors of + the Document well before redistributing any large number of + copies, to give them a chance to provide you with an updated + version of the Document. + + 4. MODIFICATIONS + + You may copy and distribute a Modified Version of the Document + under the conditions of sections 2 and 3 above, provided that you + release the Modified Version under precisely this License, with + the Modified Version filling the role of the Document, thus + licensing distribution and modification of the Modified Version to + whoever possesses a copy of it. In addition, you must do these + things in the Modified Version: + + A. Use in the Title Page (and on the covers, if any) a title + distinct from that of the Document, and from those of + previous versions (which should, if there were any, be listed + in the History section of the Document). You may use the + same title as a previous version if the original publisher of + that version gives permission. + + B. List on the Title Page, as authors, one or more persons or + entities responsible for authorship of the modifications in + the Modified Version, together with at least five of the + principal authors of the Document (all of its principal + authors, if it has fewer than five), unless they release you + from this requirement. + + C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. + + D. Preserve all the copyright notices of the Document. + + E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. + + F. Include, immediately after the copyright notices, a license + notice giving the public permission to use the Modified + Version under the terms of this License, in the form shown in + the Addendum below. + + G. Preserve in that license notice the full lists of Invariant + Sections and required Cover Texts given in the Document's + license notice. + + H. Include an unaltered copy of this License. + + I. Preserve the section Entitled "History", Preserve its Title, + and add to it an item stating at least the title, year, new + authors, and publisher of the Modified Version as given on + the Title Page. If there is no section Entitled "History" in + the Document, create one stating the title, year, authors, + and publisher of the Document as given on its Title Page, + then add an item describing the Modified Version as stated in + the previous sentence. + + J. Preserve the network location, if any, given in the Document + for public access to a Transparent copy of the Document, and + likewise the network locations given in the Document for + previous versions it was based on. These may be placed in + the "History" section. You may omit a network location for a + work that was published at least four years before the + Document itself, or if the original publisher of the version + it refers to gives permission. + + K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the + section all the substance and tone of each of the contributor + acknowledgements and/or dedications given therein. + + L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section + titles. + + M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. + + N. Do not retitle any existing section to be Entitled + "Endorsements" or to conflict in title with any Invariant + Section. + + O. Preserve any Warranty Disclaimers. + + If the Modified Version includes new front-matter sections or + appendices that qualify as Secondary Sections and contain no + material copied from the Document, you may at your option + designate some or all of these sections as invariant. To do this, + add their titles to the list of Invariant Sections in the Modified + Version's license notice. These titles must be distinct from any + other section titles. + + You may add a section Entitled "Endorsements", provided it contains + nothing but endorsements of your Modified Version by various + parties--for example, statements of peer review or that the text + has been approved by an organization as the authoritative + definition of a standard. + + You may add a passage of up to five words as a Front-Cover Text, + and a passage of up to 25 words as a Back-Cover Text, to the end + of the list of Cover Texts in the Modified Version. Only one + passage of Front-Cover Text and one of Back-Cover Text may be + added by (or through arrangements made by) any one entity. If the + Document already includes a cover text for the same cover, + previously added by you or by arrangement made by the same entity + you are acting on behalf of, you may not add another; but you may + replace the old one, on explicit permission from the previous + publisher that added the old one. + + The author(s) and publisher(s) of the Document do not by this + License give permission to use their names for publicity for or to + assert or imply endorsement of any Modified Version. + + 5. COMBINING DOCUMENTS + + You may combine the Document with other documents released under + this License, under the terms defined in section 4 above for + modified versions, provided that you include in the combination + all of the Invariant Sections of all of the original documents, + unmodified, and list them all as Invariant Sections of your + combined work in its license notice, and that you preserve all + their Warranty Disclaimers. + + The combined work need only contain one copy of this License, and + multiple identical Invariant Sections may be replaced with a single + copy. If there are multiple Invariant Sections with the same name + but different contents, make the title of each such section unique + by adding at the end of it, in parentheses, the name of the + original author or publisher of that section if known, or else a + unique number. Make the same adjustment to the section titles in + the list of Invariant Sections in the license notice of the + combined work. + + In the combination, you must combine any sections Entitled + "History" in the various original documents, forming one section + Entitled "History"; likewise combine any sections Entitled + "Acknowledgements", and any sections Entitled "Dedications". You + must delete all sections Entitled "Endorsements." + + 6. COLLECTIONS OF DOCUMENTS + + You may make a collection consisting of the Document and other + documents released under this License, and replace the individual + copies of this License in the various documents with a single copy + that is included in the collection, provided that you follow the + rules of this License for verbatim copying of each of the + documents in all other respects. + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you insert + a copy of this License into the extracted document, and follow + this License in all other respects regarding verbatim copying of + that document. + + 7. AGGREGATION WITH INDEPENDENT WORKS + + A compilation of the Document or its derivatives with other + separate and independent documents or works, in or on a volume of + a storage or distribution medium, is called an "aggregate" if the + copyright resulting from the compilation is not used to limit the + legal rights of the compilation's users beyond what the individual + works permit. When the Document is included in an aggregate, this + License does not apply to the other works in the aggregate which + are not themselves derivative works of the Document. + + If the Cover Text requirement of section 3 is applicable to these + copies of the Document, then if the Document is less than one half + of the entire aggregate, the Document's Cover Texts may be placed + on covers that bracket the Document within the aggregate, or the + electronic equivalent of covers if the Document is in electronic + form. Otherwise they must appear on printed covers that bracket + the whole aggregate. + + 8. TRANSLATION + + Translation is considered a kind of modification, so you may + distribute translations of the Document under the terms of section + 4. Replacing Invariant Sections with translations requires special + permission from their copyright holders, but you may include + translations of some or all Invariant Sections in addition to the + original versions of these Invariant Sections. You may include a + translation of this License, and all the license notices in the + Document, and any Warranty Disclaimers, provided that you also + include the original English version of this License and the + original versions of those notices and disclaimers. In case of a + disagreement between the translation and the original version of + this License or a notice or disclaimer, the original version will + prevail. + + If a section in the Document is Entitled "Acknowledgements", + "Dedications", or "History", the requirement (section 4) to + Preserve its Title (section 1) will typically require changing the + actual title. + + 9. TERMINATION + + You may not copy, modify, sublicense, or distribute the Document + except as expressly provided for under this License. Any other + attempt to copy, modify, sublicense or distribute the Document is + void, and will automatically terminate your rights under this + License. However, parties who have received copies, or rights, + from you under this License will not have their licenses + terminated so long as such parties remain in full compliance. + + 10. FUTURE REVISIONS OF THIS LICENSE + + The Free Software Foundation may publish new, revised versions of + the GNU Free Documentation License from time to time. Such new + versions will be similar in spirit to the present version, but may + differ in detail to address new problems or concerns. See + `http://www.gnu.org/copyleft/'. + + Each version of the License is given a distinguishing version + number. If the Document specifies that a particular numbered + version of this License "or any later version" applies to it, you + have the option of following the terms and conditions either of + that specified version or of any later version that has been + published (not as a draft) by the Free Software Foundation. If + the Document does not specify a version number of this License, + you may choose any version ever published (not as a draft) by the + Free Software Foundation. + +ADDENDUM: How to use this License for your documents +---------------------------------------------------- + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and license +notices just after the title page: + + Copyright (C) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.2 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover + Texts. A copy of the license is included in the section entitled ``GNU + Free Documentation License''. + + If you have Invariant Sections, Front-Cover Texts and Back-Cover +Texts, replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with + the Front-Cover Texts being LIST, and with the Back-Cover Texts + being LIST. + + If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. + + If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, to +permit their use in free software. + + +File: gettext.info, Node: Program Index, Next: Option Index, Prev: Licenses, Up: Top Program Index ************* @@ -13359,6 +15015,7 @@ Program Index * msguniq: msguniq Invocation. (line 6) * ngettext <1>: ngettext Invocation. (line 6) * ngettext: sh. (line 19) +* recode-sr-latin: msgfilter Invocation. (line 85) * xgettext: xgettext Invocation. (line 6)  @@ -13378,13 +15035,14 @@ Option Index * --add-location, msgconv option: msgconv Invocation. (line 74) * --add-location, msgen option: msgen Invocation. (line 70) * --add-location, msgfilter option: msgfilter Invocation. - (line 111) -* --add-location, msggrep option: msggrep Invocation. (line 134) + (line 128) +* --add-location, msggrep option: msggrep Invocation. (line 152) * --add-location, msgmerge option: msgmerge Invocation. (line 135) * --add-location, msguniq option: msguniq Invocation. (line 92) -* --add-location, xgettext option: xgettext Invocation. (line 211) +* --add-location, xgettext option: xgettext Invocation. (line 276) * --alignment, msgfmt option: msgfmt Invocation. (line 209) * --backup, msgmerge option: msgmerge Invocation. (line 65) +* --boost, xgettext option: xgettext Invocation. (line 244) * --c++, xgettext option: xgettext Invocation. (line 64) * --check, msgfmt option: msgfmt Invocation. (line 146) * --check-accelerators, msgfmt option: msgfmt Invocation. (line 187) @@ -13396,16 +15054,16 @@ Option Index (line 71) * --clear-obsolete, msgattrib option: msgattrib Invocation. (line 77) -* --comment, msggrep option: msggrep Invocation. (line 85) +* --comment, msggrep option: msggrep Invocation. (line 93) * --compendium, msgmerge option: msgmerge Invocation. (line 36) * --copy, gettextize option: gettextize Invocation. (line 40) -* --copyright-holder, xgettext option: xgettext Invocation. (line 258) +* --copyright-holder, xgettext option: xgettext Invocation. (line 323) * --csharp, msgfmt option: msgfmt Invocation. (line 36) * --csharp, msgunfmt option: msgunfmt Invocation. (line 19) * --csharp-resources, msgfmt option: msgfmt Invocation. (line 40) * --csharp-resources, msgunfmt option: msgunfmt Invocation. (line 23) -* --debug, xgettext option: xgettext Invocation. (line 183) +* --debug, xgettext option: xgettext Invocation. (line 248) * --default-domain, xgettext option: xgettext Invocation. (line 36) * --directory, msgattrib option: msgattrib Invocation. (line 19) @@ -13414,7 +15072,7 @@ Option Index * --directory, msgcomm option: msgcomm Invocation. (line 30) * --directory, msgconv option: msgconv Invocation. (line 19) * --directory, msgen option: msgen Invocation. (line 25) -* --directory, msgexec option: msgexec Invocation. (line 42) +* --directory, msgexec option: msgexec Invocation. (line 44) * --directory, msgfilter option: msgfilter Invocation. (line 20) * --directory, msgfmt option: msgfmt Invocation. (line 18) @@ -13423,7 +15081,7 @@ Option Index * --directory, msguniq option: msguniq Invocation. (line 26) * --directory, xgettext option: xgettext Invocation. (line 24) * --domain, gettext option: gettext Invocation. (line 16) -* --domain, msggrep option: msggrep Invocation. (line 73) +* --domain, msggrep option: msggrep Invocation. (line 77) * --domain, ngettext option: ngettext Invocation. (line 15) * --dry-run, autopoint option: autopoint Invocation. (line 24) @@ -13431,17 +15089,18 @@ Option Index (line 65) * --exclude-file, xgettext option: xgettext Invocation. (line 92) * --expression, msgfilter option: msgfilter Invocation. - (line 68) -* --extended-regexp, msggrep option: msggrep Invocation. (line 89) + (line 70) +* --extended-regexp, msggrep option: msggrep Invocation. (line 101) * --extract-all, xgettext option: xgettext Invocation. (line 106) +* --extracted-comment, msggrep option: msggrep Invocation. (line 97) * --file, msgfilter option: msgfilter Invocation. - (line 72) -* --file, msggrep option: msggrep Invocation. (line 101) + (line 74) +* --file, msggrep option: msggrep Invocation. (line 113) * --files-from, msgcat option: msgcat Invocation. (line 27) * --files-from, msgcomm option: msgcomm Invocation. (line 25) * --files-from, xgettext option: xgettext Invocation. (line 19) -* --fixed-strings, msggrep option: msggrep Invocation. (line 93) -* --flag, xgettext option: xgettext Invocation. (line 134) +* --fixed-strings, msggrep option: msggrep Invocation. (line 105) +* --flag, xgettext option: xgettext Invocation. (line 195) * --force, autopoint option: autopoint Invocation. (line 20) * --force, gettextize option: gettextize Invocation. @@ -13453,13 +15112,13 @@ Option Index * --force-po, msgconv option: msgconv Invocation. (line 64) * --force-po, msgen option: msgen Invocation. (line 60) * --force-po, msgfilter option: msgfilter Invocation. - (line 97) -* --force-po, msggrep option: msggrep Invocation. (line 125) + (line 114) +* --force-po, msggrep option: msggrep Invocation. (line 143) * --force-po, msgmerge option: msgmerge Invocation. (line 125) * --force-po, msgunfmt option: msgunfmt Invocation. (line 108) * --force-po, msguniq option: msguniq Invocation. (line 81) -* --force-po, xgettext option: xgettext Invocation. (line 200) -* --foreign-user, xgettext option: xgettext Invocation. (line 273) +* --force-po, xgettext option: xgettext Invocation. (line 265) +* --foreign-user, xgettext option: xgettext Invocation. (line 338) * --from-code, xgettext option: xgettext Invocation. (line 74) * --fuzzy, msgattrib option: msgattrib Invocation. (line 88) @@ -13476,18 +15135,18 @@ Option Index * --help, msgcomm option: msgcomm Invocation. (line 143) * --help, msgconv option: msgconv Invocation. (line 119) * --help, msgen option: msgen Invocation. (line 115) -* --help, msgexec option: msgexec Invocation. (line 67) +* --help, msgexec option: msgexec Invocation. (line 69) * --help, msgfilter option: msgfilter Invocation. - (line 156) + (line 173) * --help, msgfmt option: msgfmt Invocation. (line 222) -* --help, msggrep option: msggrep Invocation. (line 177) +* --help, msggrep option: msggrep Invocation. (line 195) * --help, msginit option: msginit Invocation. (line 90) * --help, msgmerge option: msgmerge Invocation. (line 180) * --help, msgunfmt option: msgunfmt Invocation. (line 153) * --help, msguniq option: msguniq Invocation. (line 137) * --help, ngettext option: ngettext Invocation. (line 31) -* --help, xgettext option: xgettext Invocation. (line 319) -* --ignore-case, msggrep option: msggrep Invocation. (line 105) +* --help, xgettext option: xgettext Invocation. (line 384) +* --ignore-case, msggrep option: msggrep Invocation. (line 117) * --ignore-file, msgattrib option: msgattrib Invocation. (line 84) * --indent, msgattrib option: msgattrib Invocation. @@ -13497,24 +15156,25 @@ Option Index * --indent, msgconv option: msgconv Invocation. (line 68) * --indent, msgen option: msgen Invocation. (line 64) * --indent, msgfilter option: msgfilter Invocation. - (line 100) -* --indent, msggrep option: msggrep Invocation. (line 128) + (line 117) +* --indent, msggrep option: msggrep Invocation. (line 146) * --indent, msgmerge option: msgmerge Invocation. (line 129) * --indent, msgunfmt option: msgunfmt Invocation. (line 112) * --indent, msguniq option: msguniq Invocation. (line 85) -* --indent, xgettext option: xgettext Invocation. (line 204) -* --input, msgexec option: msgexec Invocation. (line 38) +* --indent, xgettext option: xgettext Invocation. (line 269) +* --input, msgexec option: msgexec Invocation. (line 40) * --input, msgfilter option: msgfilter Invocation. (line 16) * --input, msginit option: msginit Invocation. (line 16) * --intl, gettextize option: gettextize Invocation. (line 51) +* --invert-match, msggrep option: msggrep Invocation. (line 121) * --java, msgfmt option: msgfmt Invocation. (line 30) * --java, msgunfmt option: msgunfmt Invocation. (line 16) * --java2, msgfmt option: msgfmt Invocation. (line 33) * --join-existing, xgettext option: xgettext Invocation. (line 88) * --keep-header, msgfilter option: msgfilter Invocation. - (line 103) + (line 120) * --keyword, xgettext option: xgettext Invocation. (line 114) * --language, xgettext option: xgettext Invocation. (line 56) * --less-than, msgcat option: msgcat Invocation. (line 55) @@ -13522,14 +15182,15 @@ Option Index * --locale, msgfmt option: msgfmt Invocation. (line 79) * --locale, msginit option: msginit Invocation. (line 52) * --locale, msgunfmt option: msgunfmt Invocation. (line 47) -* --location, msggrep option: msggrep Invocation. (line 68) +* --location, msggrep option: msggrep Invocation. (line 72) * --more-than, msgcat option: msgcat Invocation. (line 60) * --more-than, msgcomm option: msgcomm Invocation. (line 58) -* --msgid, msggrep option: msggrep Invocation. (line 77) -* --msgid-bugs-address, xgettext option: xgettext Invocation. (line 279) -* --msgstr, msggrep option: msggrep Invocation. (line 81) -* --msgstr-prefix, xgettext option: xgettext Invocation. (line 307) -* --msgstr-suffix, xgettext option: xgettext Invocation. (line 311) +* --msgctxt, msggrep option: msggrep Invocation. (line 81) +* --msgid, msggrep option: msggrep Invocation. (line 85) +* --msgid-bugs-address, xgettext option: xgettext Invocation. (line 344) +* --msgstr, msggrep option: msggrep Invocation. (line 89) +* --msgstr-prefix, xgettext option: xgettext Invocation. (line 372) +* --msgstr-suffix, xgettext option: xgettext Invocation. (line 376) * --multi-domain, msgcmp option: msgcmp Invocation. (line 36) * --multi-domain, msgmerge option: msgmerge Invocation. (line 101) * --no-changelog, gettextize option: gettextize Invocation. @@ -13545,11 +15206,11 @@ Option Index * --no-location, msgconv option: msgconv Invocation. (line 71) * --no-location, msgen option: msgen Invocation. (line 67) * --no-location, msgfilter option: msgfilter Invocation. - (line 108) -* --no-location, msggrep option: msggrep Invocation. (line 131) + (line 125) +* --no-location, msggrep option: msggrep Invocation. (line 149) * --no-location, msgmerge option: msgmerge Invocation. (line 132) * --no-location, msguniq option: msguniq Invocation. (line 88) -* --no-location, xgettext option: xgettext Invocation. (line 207) +* --no-location, xgettext option: xgettext Invocation. (line 272) * --no-obsolete, msgattrib option: msgattrib Invocation. (line 53) * --no-translator, msginit option: msginit Invocation. (line 58) @@ -13560,17 +15221,17 @@ Option Index * --no-wrap, msgconv option: msgconv Invocation. (line 99) * --no-wrap, msgen option: msgen Invocation. (line 95) * --no-wrap, msgfilter option: msgfilter Invocation. - (line 136) -* --no-wrap, msggrep option: msggrep Invocation. (line 159) + (line 153) +* --no-wrap, msggrep option: msggrep Invocation. (line 177) * --no-wrap, msginit option: msginit Invocation. (line 79) * --no-wrap, msgmerge option: msgmerge Invocation. (line 160) * --no-wrap, msgunfmt option: msgunfmt Invocation. (line 137) * --no-wrap, msguniq option: msguniq Invocation. (line 117) -* --no-wrap, xgettext option: xgettext Invocation. (line 235) +* --no-wrap, xgettext option: xgettext Invocation. (line 300) * --obsolete, msgattrib option: msgattrib Invocation. (line 92) * --omit-header, msgcomm option: msgcomm Invocation. (line 135) -* --omit-header, xgettext option: xgettext Invocation. (line 250) +* --omit-header, xgettext option: xgettext Invocation. (line 315) * --only-file, msgattrib option: msgattrib Invocation. (line 80) * --only-fuzzy, msgattrib option: msgattrib Invocation. @@ -13600,11 +15261,11 @@ Option Index * --properties-input, msgcomm option: msgcomm Invocation. (line 72) * --properties-input, msgconv option: msgconv Invocation. (line 52) * --properties-input, msgen option: msgen Invocation. (line 48) -* --properties-input, msgexec option: msgexec Invocation. (line 54) +* --properties-input, msgexec option: msgexec Invocation. (line 56) * --properties-input, msgfilter option: msgfilter Invocation. - (line 85) + (line 102) * --properties-input, msgfmt option: msgfmt Invocation. (line 133) -* --properties-input, msggrep option: msggrep Invocation. (line 113) +* --properties-input, msggrep option: msggrep Invocation. (line 131) * --properties-input, msginit option: msginit Invocation. (line 39) * --properties-input, msgmerge option: msgmerge Invocation. (line 113) * --properties-input, msguniq option: msguniq Invocation. (line 61) @@ -13615,19 +15276,19 @@ Option Index * --properties-output, msgconv option: msgconv Invocation. (line 83) * --properties-output, msgen option: msgen Invocation. (line 79) * --properties-output, msgfilter option: msgfilter Invocation. - (line 120) -* --properties-output, msggrep option: msggrep Invocation. (line 143) + (line 137) +* --properties-output, msggrep option: msggrep Invocation. (line 161) * --properties-output, msginit option: msginit Invocation. (line 63) * --properties-output, msgmerge option: msgmerge Invocation. (line 144) * --properties-output, msgunfmt option: msgunfmt Invocation. (line 121) * --properties-output, msguniq option: msguniq Invocation. (line 101) -* --properties-output, xgettext option: xgettext Invocation. (line 219) +* --properties-output, xgettext option: xgettext Invocation. (line 284) * --qt, msgfmt option: msgfmt Invocation. (line 46) -* --qt, xgettext option: xgettext Invocation. (line 179) +* --qt, xgettext option: xgettext Invocation. (line 240) * --quiet, msgfilter option: msgfilter Invocation. - (line 77) + (line 79) * --quiet, msgmerge option: msgmerge Invocation. (line 193) -* --regexp=, msggrep option: msggrep Invocation. (line 97) +* --regexp=, msggrep option: msggrep Invocation. (line 109) * --repeated, msguniq option: msguniq Invocation. (line 49) * --resource, msgfmt option: msgfmt Invocation. (line 75) * --resource, msgunfmt option: msgunfmt Invocation. (line 43) @@ -13636,7 +15297,7 @@ Option Index * --set-obsolete, msgattrib option: msgattrib Invocation. (line 74) * --silent, msgfilter option: msgfilter Invocation. - (line 77) + (line 79) * --silent, msgmerge option: msgmerge Invocation. (line 193) * --sort-by-file, msgattrib option: msgattrib Invocation. (line 161) @@ -13645,11 +15306,11 @@ Option Index * --sort-by-file, msgconv option: msgconv Invocation. (line 111) * --sort-by-file, msgen option: msgen Invocation. (line 107) * --sort-by-file, msgfilter option: msgfilter Invocation. - (line 148) -* --sort-by-file, msggrep option: msggrep Invocation. (line 169) + (line 165) +* --sort-by-file, msggrep option: msggrep Invocation. (line 187) * --sort-by-file, msgmerge option: msgmerge Invocation. (line 172) * --sort-by-file, msguniq option: msguniq Invocation. (line 129) -* --sort-by-file, xgettext option: xgettext Invocation. (line 247) +* --sort-by-file, xgettext option: xgettext Invocation. (line 312) * --sort-output, msgattrib option: msgattrib Invocation. (line 156) * --sort-output, msgcat option: msgcat Invocation. (line 137) @@ -13657,12 +15318,12 @@ Option Index * --sort-output, msgconv option: msgconv Invocation. (line 106) * --sort-output, msgen option: msgen Invocation. (line 102) * --sort-output, msgfilter option: msgfilter Invocation. - (line 143) -* --sort-output, msggrep option: msggrep Invocation. (line 165) + (line 160) +* --sort-output, msggrep option: msggrep Invocation. (line 183) * --sort-output, msgmerge option: msgmerge Invocation. (line 167) * --sort-output, msgunfmt option: msgunfmt Invocation. (line 144) * --sort-output, msguniq option: msguniq Invocation. (line 124) -* --sort-output, xgettext option: xgettext Invocation. (line 242) +* --sort-output, xgettext option: xgettext Invocation. (line 307) * --statistics, msgfmt option: msgfmt Invocation. (line 229) * --strict, msgattrib option: msgattrib Invocation. (line 127) @@ -13671,24 +15332,24 @@ Option Index * --strict, msgconv option: msgconv Invocation. (line 77) * --strict, msgen option: msgen Invocation. (line 73) * --strict, msgfilter option: msgfilter Invocation. - (line 114) + (line 131) * --strict, msgfmt option: msgfmt Invocation. (line 57) -* --strict, msggrep option: msggrep Invocation. (line 137) +* --strict, msggrep option: msggrep Invocation. (line 155) * --strict, msgmerge option: msgmerge Invocation. (line 138) * --strict, msgunfmt option: msgunfmt Invocation. (line 115) * --strict, msguniq option: msguniq Invocation. (line 95) -* --strict, xgettext option: xgettext Invocation. (line 214) +* --strict, xgettext option: xgettext Invocation. (line 279) * --stringtable-input, msgattrib option: msgattrib Invocation. (line 105) * --stringtable-input, msgcat option: msgcat Invocation. (line 78) * --stringtable-input, msgcmp option: msgcmp Invocation. (line 48) * --stringtable-input, msgcomm option: msgcomm Invocation. (line 76) * --stringtable-input, msgen option: msgen Invocation. (line 52) -* --stringtable-input, msgexec option: msgexec Invocation. (line 58) +* --stringtable-input, msgexec option: msgexec Invocation. (line 60) * --stringtable-input, msgfilter option: msgfilter Invocation. - (line 89) + (line 106) * --stringtable-input, msgfmt option: msgfmt Invocation. (line 137) -* --stringtable-input, msggrep option: msggrep Invocation. (line 117) +* --stringtable-input, msggrep option: msggrep Invocation. (line 135) * --stringtable-input, msginit option: msginit Invocation. (line 43) * --stringtable-input, msgmerge option: msgmerge Invocation. (line 117) * --stringtable-input, msgonv option: msgconv Invocation. (line 56) @@ -13700,13 +15361,13 @@ Option Index * --stringtable-output, msgconv option: msgconv Invocation. (line 88) * --stringtable-output, msgen option: msgen Invocation. (line 84) * --stringtable-output, msgfilter option: msgfilter Invocation. - (line 125) -* --stringtable-output, msggrep option: msggrep Invocation. (line 148) + (line 142) +* --stringtable-output, msggrep option: msggrep Invocation. (line 166) * --stringtable-output, msginit option: msginit Invocation. (line 68) * --stringtable-output, msgmerge option: msgmerge Invocation. (line 149) * --stringtable-output, msgunfmt option: msgunfmt Invocation. (line 126) * --stringtable-output, msguniq option: msguniq Invocation. (line 106) -* --stringtable-output, xgettext option: xgettext Invocation. (line 224) +* --stringtable-output, xgettext option: xgettext Invocation. (line 289) * --suffix, msgmerge option: msgmerge Invocation. (line 68) * --tcl, msgfmt option: msgfmt Invocation. (line 43) * --tcl, msgunfmt option: msgunfmt Invocation. (line 26) @@ -13715,7 +15376,7 @@ Option Index * --to-code, msguniq option: msguniq Invocation. (line 74) * --translated, msgattrib option: msgattrib Invocation. (line 41) -* --trigraphs, xgettext option: xgettext Invocation. (line 174) +* --trigraphs, xgettext option: xgettext Invocation. (line 235) * --unique, msgcat option: msgcat Invocation. (line 65) * --unique, msgcomm option: msgcomm Invocation. (line 63) * --unique, msguniq option: msguniq Invocation. (line 53) @@ -13742,17 +15403,17 @@ Option Index * --version, msgcomm option: msgcomm Invocation. (line 147) * --version, msgconv option: msgconv Invocation. (line 123) * --version, msgen option: msgen Invocation. (line 119) -* --version, msgexec option: msgexec Invocation. (line 71) +* --version, msgexec option: msgexec Invocation. (line 73) * --version, msgfilter option: msgfilter Invocation. - (line 160) + (line 177) * --version, msgfmt option: msgfmt Invocation. (line 226) -* --version, msggrep option: msggrep Invocation. (line 181) +* --version, msggrep option: msggrep Invocation. (line 199) * --version, msginit option: msginit Invocation. (line 94) * --version, msgmerge option: msgmerge Invocation. (line 184) * --version, msgunfmt option: msgunfmt Invocation. (line 157) * --version, msguniq option: msguniq Invocation. (line 141) * --version, ngettext option: ngettext Invocation. (line 35) -* --version, xgettext option: xgettext Invocation. (line 323) +* --version, xgettext option: xgettext Invocation. (line 388) * --width, msgattrib option: msgattrib Invocation. (line 143) * --width, msgcat option: msgcat Invocation. (line 124) @@ -13760,13 +15421,13 @@ Option Index * --width, msgconv option: msgconv Invocation. (line 93) * --width, msgen option: msgen Invocation. (line 89) * --width, msgfilter option: msgfilter Invocation. - (line 130) -* --width, msggrep option: msggrep Invocation. (line 153) + (line 147) +* --width, msggrep option: msggrep Invocation. (line 171) * --width, msginit option: msginit Invocation. (line 73) * --width, msgmerge option: msgmerge Invocation. (line 154) * --width, msgunfmt option: msgunfmt Invocation. (line 131) * --width, msguniq option: msguniq Invocation. (line 111) -* --width, xgettext option: xgettext Invocation. (line 229) +* --width, xgettext option: xgettext Invocation. (line 294) * -<, msgcat option: msgcat Invocation. (line 55) * -<, msgcomm option: msgcomm Invocation. (line 53) * ->, msgcat option: msgcat Invocation. (line 60) @@ -13777,7 +15438,7 @@ Option Index (line 40) * -C, msgfmt option: msgfmt Invocation. (line 183) * -c, msgfmt option: msgfmt Invocation. (line 146) -* -C, msggrep option: msggrep Invocation. (line 85) +* -C, msggrep option: msggrep Invocation. (line 93) * -C, msgmerge option: msgmerge Invocation. (line 36) * -c, xgettext option: xgettext Invocation. (line 97) * -C, xgettext option: xgettext Invocation. (line 64) @@ -13793,7 +15454,7 @@ Option Index * -D, msgcomm option: msgcomm Invocation. (line 30) * -D, msgconv option: msgconv Invocation. (line 19) * -D, msgen option: msgen Invocation. (line 25) -* -D, msgexec option: msgexec Invocation. (line 42) +* -D, msgexec option: msgexec Invocation. (line 44) * -D, msgfilter option: msgfilter Invocation. (line 20) * -d, msgfmt option: msgfmt Invocation. (line 84) @@ -13809,9 +15470,9 @@ Option Index * -E, gettext option: gettext Invocation. (line 27) * -e, gettext option: gettext Invocation. (line 20) * -e, msgfilter option: msgfilter Invocation. - (line 68) -* -e, msggrep option: msggrep Invocation. (line 97) -* -E, msggrep option: msggrep Invocation. (line 89) + (line 70) +* -e, msggrep option: msggrep Invocation. (line 109) +* -E, msggrep option: msggrep Invocation. (line 101) * -E, ngettext option: ngettext Invocation. (line 26) * -e, ngettext option: ngettext Invocation. (line 19) * -f, autopoint option: autopoint Invocation. @@ -13827,15 +15488,15 @@ Option Index * -F, msgconv option: msgconv Invocation. (line 111) * -F, msgen option: msgen Invocation. (line 107) * -F, msgfilter option: msgfilter Invocation. - (line 148) + (line 165) * -f, msgfilter option: msgfilter Invocation. - (line 72) + (line 74) * -f, msgfmt option: msgfmt Invocation. (line 199) -* -f, msggrep option: msggrep Invocation. (line 101) -* -F, msggrep option: msggrep Invocation. (line 93) +* -f, msggrep option: msggrep Invocation. (line 113) +* -F, msggrep option: msggrep Invocation. (line 105) * -F, msgmerge option: msgmerge Invocation. (line 172) * -F, msguniq option: msguniq Invocation. (line 129) -* -F, xgettext option: xgettext Invocation. (line 247) +* -F, xgettext option: xgettext Invocation. (line 312) * -f, xgettext option: xgettext Invocation. (line 19) * -h, envsubst option: envsubst Invocation. (line 22) * -h, gettext option: gettext Invocation. (line 32) @@ -13846,57 +15507,58 @@ Option Index * -h, msgcomm option: msgcomm Invocation. (line 143) * -h, msgconv option: msgconv Invocation. (line 119) * -h, msgen option: msgen Invocation. (line 115) -* -h, msgexec option: msgexec Invocation. (line 67) +* -h, msgexec option: msgexec Invocation. (line 69) * -h, msgfilter option: msgfilter Invocation. - (line 156) + (line 173) * -h, msgfmt option: msgfmt Invocation. (line 222) -* -h, msggrep option: msggrep Invocation. (line 177) +* -h, msggrep option: msggrep Invocation. (line 195) * -h, msginit option: msginit Invocation. (line 90) * -h, msgmerge option: msgmerge Invocation. (line 180) * -h, msgunfmt option: msgunfmt Invocation. (line 153) * -h, msguniq option: msguniq Invocation. (line 137) * -h, ngettext option: ngettext Invocation. (line 31) -* -h, xgettext option: xgettext Invocation. (line 319) +* -h, xgettext option: xgettext Invocation. (line 384) * -i, msgattrib option: msgattrib Invocation. (line 117) * -i, msgcat option: msgcat Invocation. (line 98) * -i, msgcomm option: msgcomm Invocation. (line 88) * -i, msgconv option: msgconv Invocation. (line 68) * -i, msgen option: msgen Invocation. (line 64) -* -i, msgexec option: msgexec Invocation. (line 38) +* -i, msgexec option: msgexec Invocation. (line 40) * -i, msgfilter option: msgfilter Invocation. (line 16) -* -i, msggrep option: msggrep Invocation. (line 105) +* -i, msggrep option: msggrep Invocation. (line 117) * -i, msginit option: msginit Invocation. (line 16) * -i, msgmerge option: msgmerge Invocation. (line 129) * -i, msgunfmt option: msgunfmt Invocation. (line 112) * -i, msguniq option: msguniq Invocation. (line 85) -* -i, xgettext option: xgettext Invocation. (line 204) +* -i, xgettext option: xgettext Invocation. (line 269) * -j, msgfmt option: msgfmt Invocation. (line 30) +* -J, msggrep option: msggrep Invocation. (line 81) * -j, msgunfmt option: msgunfmt Invocation. (line 16) * -j, xgettext option: xgettext Invocation. (line 88) -* -K, msggrep option: msggrep Invocation. (line 77) +* -K, msggrep option: msggrep Invocation. (line 85) * -k, xgettext option: xgettext Invocation. (line 114) * -l, msgfmt option: msgfmt Invocation. (line 79) * -l, msginit option: msginit Invocation. (line 52) * -l, msgunfmt option: msgunfmt Invocation. (line 47) * -L, xgettext option: xgettext Invocation. (line 56) * -m, msgcmp option: msgcmp Invocation. (line 36) -* -M, msggrep option: msggrep Invocation. (line 73) +* -M, msggrep option: msggrep Invocation. (line 77) * -m, msgmerge option: msgmerge Invocation. (line 101) -* -M, xgettext option: xgettext Invocation. (line 311) -* -m, xgettext option: xgettext Invocation. (line 307) +* -M, xgettext option: xgettext Invocation. (line 376) +* -m, xgettext option: xgettext Invocation. (line 372) * -n, gettext option: gettext Invocation. (line 35) * -n, msgattrib option: msgattrib Invocation. (line 124) * -n, msgcat option: msgcat Invocation. (line 105) * -n, msgcomm option: msgcomm Invocation. (line 95) * -n, msgfilter option: msgfilter Invocation. - (line 77) -* -N, msggrep option: msggrep Invocation. (line 68) + (line 79) +* -N, msggrep option: msggrep Invocation. (line 72) * -N, msgmerge option: msgmerge Invocation. (line 105) * -n, msguniq option: msguniq Invocation. (line 92) -* -n, xgettext option: xgettext Invocation. (line 211) +* -n, xgettext option: xgettext Invocation. (line 276) * -o, msgattrib option: msgattrib Invocation. (line 31) * -o, msgcat option: msgcat Invocation. (line 44) @@ -13925,14 +15587,14 @@ Option Index * -P, msgconv option: msgconv Invocation. (line 52) * -p, msgen option: msgen Invocation. (line 79) * -P, msgen option: msgen Invocation. (line 48) -* -P, msgexec option: msgexec Invocation. (line 54) +* -P, msgexec option: msgexec Invocation. (line 56) * -p, msgfilter option: msgfilter Invocation. - (line 120) + (line 137) * -P, msgfilter option: msgfilter Invocation. - (line 85) + (line 102) * -P, msgfmt option: msgfmt Invocation. (line 133) -* -p, msggrep option: msggrep Invocation. (line 143) -* -P, msggrep option: msggrep Invocation. (line 113) +* -p, msggrep option: msggrep Invocation. (line 161) +* -P, msggrep option: msggrep Invocation. (line 131) * -p, msginit option: msginit Invocation. (line 63) * -P, msginit option: msginit Invocation. (line 39) * -p, msgmerge option: msgmerge Invocation. (line 144) @@ -13951,16 +15613,16 @@ Option Index * -s, msgconv option: msgconv Invocation. (line 106) * -s, msgen option: msgen Invocation. (line 102) * -s, msgfilter option: msgfilter Invocation. - (line 143) + (line 160) * -s, msgmerge option: msgmerge Invocation. (line 167) * -s, msgunfmt option: msgunfmt Invocation. (line 144) * -s, msguniq option: msguniq Invocation. (line 124) -* -s, xgettext option: xgettext Invocation. (line 242) +* -s, xgettext option: xgettext Invocation. (line 307) * -t, msgcat option: msgcat Invocation. (line 87) * -t, msgconv option: msgconv Invocation. (line 42) -* -T, msggrep option: msggrep Invocation. (line 81) +* -T, msggrep option: msggrep Invocation. (line 89) * -t, msguniq option: msguniq Invocation. (line 74) -* -T, xgettext option: xgettext Invocation. (line 174) +* -T, xgettext option: xgettext Invocation. (line 235) * -u, msgcat option: msgcat Invocation. (line 65) * -u, msgcomm option: msgcomm Invocation. (line 63) * -U, msgmerge option: msgmerge Invocation. (line 45) @@ -13975,12 +15637,13 @@ Option Index * -V, msgcomm option: msgcomm Invocation. (line 147) * -V, msgconv option: msgconv Invocation. (line 123) * -V, msgen option: msgen Invocation. (line 119) -* -V, msgexec option: msgexec Invocation. (line 71) +* -V, msgexec option: msgexec Invocation. (line 73) * -V, msgfilter option: msgfilter Invocation. - (line 160) + (line 177) * -v, msgfmt option: msgfmt Invocation. (line 233) * -V, msgfmt option: msgfmt Invocation. (line 226) -* -V, msggrep option: msggrep Invocation. (line 181) +* -V, msggrep option: msggrep Invocation. (line 199) +* -v, msggrep option: msggrep Invocation. (line 121) * -V, msginit option: msginit Invocation. (line 94) * -v, msgmerge option: msgmerge Invocation. (line 188) * -V, msgmerge option: msgmerge Invocation. (line 184) @@ -13988,7 +15651,7 @@ Option Index * -V, msgunfmt option: msgunfmt Invocation. (line 157) * -V, msguniq option: msguniq Invocation. (line 141) * -V, ngettext option: ngettext Invocation. (line 35) -* -V, xgettext option: xgettext Invocation. (line 323) +* -V, xgettext option: xgettext Invocation. (line 388) * -w, msgattrib option: msgattrib Invocation. (line 143) * -w, msgcat option: msgcat Invocation. (line 124) @@ -13996,13 +15659,14 @@ Option Index * -w, msgconv option: msgconv Invocation. (line 93) * -w, msgen option: msgen Invocation. (line 89) * -w, msgfilter option: msgfilter Invocation. - (line 130) -* -w, msggrep option: msggrep Invocation. (line 153) + (line 147) +* -w, msggrep option: msggrep Invocation. (line 171) * -w, msginit option: msginit Invocation. (line 73) * -w, msgmerge option: msgmerge Invocation. (line 154) * -w, msgunfmt option: msgunfmt Invocation. (line 131) * -w, msguniq option: msguniq Invocation. (line 111) -* -w, xgettext option: xgettext Invocation. (line 229) +* -w, xgettext option: xgettext Invocation. (line 294) +* -X, msggrep option: msggrep Invocation. (line 97) * -x, xgettext option: xgettext Invocation. (line 92)  @@ -14016,19 +15680,20 @@ Variable Index * GETTEXT_LOG_UNTRANSLATED, environment variable: Prioritizing messages. (line 23) -* LANG, environment variable <1>: gettext grok. (line 29) +* LANG, environment variable <1>: gettext grok. (line 32) * LANG, environment variable: End Users. (line 6) -* LANGUAGE, environment variable <1>: po/Makevars. (line 18) -* LANGUAGE, environment variable: gettext grok. (line 25) -* LC_ALL, environment variable: gettext grok. (line 25) -* LC_COLLATE, environment variable: gettext grok. (line 27) -* LC_CTYPE, environment variable: gettext grok. (line 27) -* LC_MESSAGES, environment variable: gettext grok. (line 27) -* LC_MONETARY, environment variable: gettext grok. (line 27) -* LC_NUMERIC, environment variable: gettext grok. (line 27) -* LC_TIME, environment variable: gettext grok. (line 27) +* LANGUAGE, environment variable <1>: po/Rules-*. (line 11) +* LANGUAGE, environment variable: gettext grok. (line 28) +* LC_ALL, environment variable: gettext grok. (line 28) +* LC_COLLATE, environment variable: gettext grok. (line 30) +* LC_CTYPE, environment variable: gettext grok. (line 30) +* LC_MESSAGES, environment variable: gettext grok. (line 30) +* LC_MONETARY, environment variable: gettext grok. (line 30) +* LC_NUMERIC, environment variable: gettext grok. (line 30) +* LC_TIME, environment variable: gettext grok. (line 30) * LINGUAS, environment variable: Installers. (line 17) * MSGEXEC_LOCATION, environment variable: msgexec Invocation. (line 18) +* MSGEXEC_MSGCTXT, environment variable: msgexec Invocation. (line 18) * MSGEXEC_MSGID, environment variable: msgexec Invocation. (line 18) * TEXTDOMAIN, environment variable: sh. (line 23) * TEXTDOMAINDIR, environment variable: sh. (line 26) @@ -14159,8 +15824,7 @@ PO Mode Index (line 23) * po-next-untranslated-entry, PO Mode command: Untranslated Entries. (line 35) -* po-normalize, PO Mode command <1>: Normalizing. (line 31) -* po-normalize, PO Mode command: PO Files. (line 192) +* po-normalize, PO Mode command: Normalizing. (line 31) * po-other-window, PO Mode command: Main PO Commands. (line 72) * po-pop-location, PO Mode command: Entry Positioning. (line 92) * po-previous-entry, PO Mode command: Entry Positioning. (line 69) @@ -14260,7 +15924,7 @@ General Index * Menu: * _, a macro to mark strings for translation: Mark Keywords. (line 45) -* _nl_msg_cat_cntr: gettext grok. (line 59) +* _nl_msg_cat_cntr: gettext grok. (line 62) * ABOUT-NLS file: Matrix. (line 6) * acconfig.h file: acconfig. (line 6) * accumulating translations: Creating Compendia. (line 14) @@ -14283,15 +15947,17 @@ General Index * auxiliary PO file: Auxiliary. (line 13) * available translations: Matrix. (line 6) * awk: gawk. (line 6) -* awk-format flag: PO Files. (line 133) +* awk-format flag: PO Files. (line 144) * backup old file, and msgmerge program: msgmerge Invocation. (line 65) * bash: bash. (line 6) * bibliography: References. (line 6) * big picture: Overview. (line 6) * bind_textdomain_codeset: Charset conversion. (line 28) -* bug report address: Introduction. (line 29) +* Boost format strings: xgettext Invocation. (line 244) +* boost-format flag: PO Files. (line 180) +* bug report address: Introduction. (line 24) * C and C-like languages: C. (line 6) -* C trigraphs: xgettext Invocation. (line 174) +* C trigraphs: xgettext Invocation. (line 235) * C#: C#. (line 6) * C# mode, and msgfmt program: msgfmt Invocation. (line 36) * C# mode, and msgunfmt program: msgunfmt Invocation. (line 19) @@ -14299,9 +15965,9 @@ General Index * C# resources mode, and msgunfmt program: msgunfmt Invocation. (line 23) * C#, string concatenation: Preparing Strings. (line 166) -* c-format flag: PO Files. (line 74) +* c-format flag: PO Files. (line 85) * c-format, and xgettext: c-format Flag. (line 48) -* catalog encoding and msgexec output: msgexec Invocation. (line 23) +* catalog encoding and msgexec output: msgexec Invocation. (line 25) * catclose, a catgets function: Interface to catgets. (line 44) * catgets, a catgets function: Interface to catgets. @@ -14317,7 +15983,10 @@ General Index * clisp: Common Lisp. (line 6) * clisp C sources: clisp C. (line 6) * codeset: Aspects. (line 67) -* comments in PO files: PO Files. (line 235) +* comments in PO files: PO Files. (line 270) +* comments, automatic: PO Files. (line 35) +* comments, extracted: PO Files. (line 35) +* comments, translator: PO Files. (line 35) * Common Lisp: Common Lisp. (line 6) * compare PO files: msgcmp Invocation. (line 8) * comparison of interfaces: Comparison. (line 6) @@ -14329,6 +15998,11 @@ General Index (line 14) * concatenation of strings: Preparing Strings. (line 115) * config.h.in file: config.h.in. (line 6) +* context: Contexts. (line 6) +* context, argument specification in xgettext: xgettext Invocation. + (line 117) +* context, in MO files: MO Files. (line 63) +* context, in PO files: PO Files. (line 184) * convert binary message catalog into PO file: msgunfmt Invocation. (line 8) * convert translations to a different encoding: msgconv Invocation. @@ -14338,25 +16012,31 @@ General Index * create new PO file: msginit Invocation. (line 8) * creating a new PO file: Creating. (line 6) * creating compendia: Creating Compendia. (line 6) -* csharp-format flag: PO Files. (line 129) +* csharp-format flag: PO Files. (line 140) * currency symbols: Aspects. (line 79) * date format: Aspects. (line 84) * dcngettext: Plural forms. (line 111) +* dcpgettext: Contexts. (line 56) +* dcpgettext_expr: Contexts. (line 112) * debugging messages marked as format strings: xgettext Invocation. - (line 183) + (line 248) * dialect: Manipulating. (line 28) * disabling NLS: lib/gettext.h. (line 6) * distribution tarball: Release Management. (line 6) * dngettext: Plural forms. (line 103) * dollar substitution: envsubst Invocation. (line 8) * domain ambiguities: Ambiguities. (line 6) +* dpgettext: Contexts. (line 56) +* dpgettext_expr: Contexts. (line 112) * duplicate elimination: Manipulating. (line 45) * duplicate removal: msguniq Invocation. (line 8) * editing comments in PO files: Modifying Comments. (line 6) +* Editing PO Files: Editing. (line 6) * editing translations: Modifying Translations. (line 6) -* elisp-format flag: PO Files. (line 109) +* elisp-format flag: PO Files. (line 120) * Emacs Lisp: Emacs Lisp. (line 6) +* Emacs PO Mode: PO Mode. (line 6) * encoding: Aspects. (line 67) * encoding conversion: Manipulating. (line 17) * encoding conversion at runtime: Charset conversion. (line 6) @@ -14369,25 +16049,26 @@ General Index (line 6) * eval_ngettext function, usage: eval_ngettext Invocation. (line 6) -* evolution of packages: Overview. (line 142) +* evolution of packages: Overview. (line 127) * extracting parts of a PO file into a compendium: Creating Compendia. (line 65) +* FDL, GNU Free Documentation License: GNU FDL. (line 6) * file format, .mo: MO Files. (line 6) * file format, .po: PO Files. (line 6) * files, .po and .mo: Files. (line 6) -* files, .pot: Overview. (line 79) +* files, .pot: Overview. (line 67) * filter messages according to attributes: msgattrib Invocation. (line 8) * find common messages: msgcomm Invocation. (line 8) * force use of fuzzy entries: msgfmt Invocation. (line 199) * format strings: c-format Flag. (line 6) * Free Pascal: Pascal. (line 6) -* function attribute, __format__: xgettext Invocation. (line 138) -* function attribute, __format_arg__: xgettext Invocation. (line 152) +* function attribute, __format__: xgettext Invocation. (line 199) +* function attribute, __format_arg__: xgettext Invocation. (line 213) * fuzzy entries: Fuzzy Entries. (line 6) -* fuzzy flag: PO Files. (line 64) +* fuzzy flag: PO Files. (line 75) * gawk: gawk. (line 6) -* gcc-internal-format flag: PO Files. (line 161) +* gcc-internal-format flag: PO Files. (line 172) * GCC-source: GCC-source. (line 6) * generate binary message catalog from PO file: msgfmt Invocation. (line 8) @@ -14402,11 +16083,12 @@ General Index * gettext.h file: lib/gettext.h. (line 6) * gettextize program, usage: gettextize Invocation. (line 34) -* GUI programs: GUI program problems. - (line 6) +* GNOME PO file editor: Gtranslator. (line 6) +* GPL, GNU General Public License: GNU GPL. (line 6) +* GUI programs: Contexts. (line 6) * guile: Scheme. (line 6) * hash table, inside MO files: MO Files. (line 47) -* he, she, and they: Introduction. (line 11) +* he, she, and they: Introduction. (line 15) * header entry of a PO file: Header Entry. (line 6) * help option: Preparing Strings. (line 107) * history of GNU gettext: History. (line 6) @@ -14414,8 +16096,8 @@ General Index * importing PO files: Normalizing. (line 55) * include file libintl.h <1>: lib/gettext.h. (line 29) * include file libintl.h <2>: Comparison. (line 33) -* include file libintl.h <3>: Sources. (line 19) -* include file libintl.h: Overview. (line 69) +* include file libintl.h <3>: Importing. (line 11) +* include file libintl.h: Overview. (line 57) * initialization: Triggering. (line 6) * initialize new PO file: msginit Invocation. (line 8) * initialize translations from a compendium: Using Compendia. (line 12) @@ -14430,26 +16112,32 @@ General Index * Java mode, and msgfmt program: msgfmt Invocation. (line 30) * Java mode, and msgunfmt program: msgunfmt Invocation. (line 16) * Java, string concatenation: Preparing Strings. (line 166) -* java-format flag: PO Files. (line 125) +* java-format flag: PO Files. (line 136) +* KDE PO file editor: KBabel. (line 6) * keyboard accelerator checking: msgfmt Invocation. (line 187) * l10n: Concepts. (line 6) * language codes: Language Codes. (line 6) * language selection: End Users. (line 6) -* language selection at runtime: gettext grok. (line 11) +* language selection at runtime: gettext grok. (line 14) * large package: Ambiguities. (line 6) +* LGPL, GNU Lesser General Public License: GNU LGPL. (line 6) * libiconv library: AM_ICONV. (line 21) * libintl for C#: C#. (line 161) * libintl for Java: Java. (line 104) * libintl library: AM_GNU_GETTEXT. (line 48) * librep Lisp: librep. (line 6) -* librep-format flag: PO Files. (line 113) +* librep-format flag: PO Files. (line 124) +* License, GNU FDL: GNU FDL. (line 6) +* License, GNU GPL: GNU GPL. (line 6) +* License, GNU LGPL: GNU LGPL. (line 6) +* Licenses: Licenses. (line 6) * LINGUAS file: po/LINGUAS. (line 6) -* link with libintl: Overview. (line 74) +* link with libintl: Overview. (line 62) * Linux <1>: Header Entry. (line 91) -* Linux <2>: Overview. (line 74) +* Linux <2>: Overview. (line 62) * Linux: Aspects. (line 114) * Lisp: Common Lisp. (line 6) -* lisp-format flag: PO Files. (line 105) +* lisp-format flag: PO Files. (line 116) * list of translation teams, where to find: Header Entry. (line 58) * locale facet, LC_ALL: Triggering. (line 23) * locale facet, LC_COLLATE: Triggering. (line 52) @@ -14474,15 +16162,15 @@ General Index (line 8) * lookup plural message translation: ngettext Invocation. (line 8) * magic signature of MO files: MO Files. (line 9) +* Makefile.in.in extensions: po/Rules-*. (line 6) * Makevars file: po/Makevars. (line 6) * manipulating PO files: Manipulating. (line 6) * marking Perl sources: Perl. (line 93) * marking string initializers: Special cases. (line 6) * marking strings that require translation: Mark Keywords. (line 6) * marking strings, preparations: Preparing Strings. (line 6) -* marking translatable strings: Overview. (line 46) -* menu entries: GUI program problems. - (line 6) +* marking translatable strings: Overview. (line 34) +* menu entries: Contexts. (line 6) * menu, keyboard accelerator support: msgfmt Invocation. (line 187) * merge PO files: msgcat Invocation. (line 8) * merging two PO files: Manipulating. (line 10) @@ -14500,55 +16188,57 @@ General Index * msgcmp program, usage: msgcmp Invocation. (line 6) * msgcomm program, usage: msgcomm Invocation. (line 6) * msgconv program, usage: msgconv Invocation. (line 6) +* msgctxt: PO Files. (line 184) * msgen program, usage: msgen Invocation. (line 6) * msgexec program, usage: msgexec Invocation. (line 6) * msgfilter filter and catalog encoding: msgfilter Invocation. - (line 45) + (line 46) * msgfilter program, usage: msgfilter Invocation. (line 6) * msgfmt program, usage: msgfmt Invocation. (line 6) * msggrep program, usage: msggrep Invocation. (line 6) -* msgid: PO Files. (line 40) -* msgid_plural: PO Files. (line 169) +* msgid: PO Files. (line 51) +* msgid_plural: PO Files. (line 202) * msginit program, usage: msginit Invocation. (line 6) * msgmerge program, usage: msgmerge Invocation. (line 6) -* msgstr: PO Files. (line 40) +* msgstr: PO Files. (line 51) * msgunfmt program, usage: msgunfmt Invocation. (line 6) * msguniq program, usage: msguniq Invocation. (line 6) * multi-line strings: Normalizing. (line 65) * N_, a convenience macro: Comparison. (line 41) * Native Language Support: Concepts. (line 51) * Natural Language Support: Concepts. (line 51) -* newlines in PO files: PO Files. (line 230) +* newlines in PO files: PO Files. (line 265) * ngettext: Plural forms. (line 84) * ngettext program, usage: ngettext Invocation. (line 6) * NLS: Concepts. (line 51) -* no-awk-format flag: PO Files. (line 134) -* no-c-format flag: PO Files. (line 75) +* no-awk-format flag: PO Files. (line 145) +* no-boost-format flag: PO Files. (line 181) +* no-c-format flag: PO Files. (line 86) * no-c-format, and xgettext: c-format Flag. (line 48) -* no-csharp-format flag: PO Files. (line 130) -* no-elisp-format flag: PO Files. (line 110) -* no-gcc-internal-format flag: PO Files. (line 162) -* no-java-format flag: PO Files. (line 126) -* no-librep-format flag: PO Files. (line 114) -* no-lisp-format flag: PO Files. (line 106) -* no-objc-format flag: PO Files. (line 94) -* no-object-pascal-format flag: PO Files. (line 138) -* no-perl-brace-format flag: PO Files. (line 154) -* no-perl-format flag: PO Files. (line 150) -* no-php-format flag: PO Files. (line 158) -* no-python-format flag: PO Files. (line 102) -* no-qt-format flag: PO Files. (line 166) -* no-scheme-format flag: PO Files. (line 118) -* no-sh-format flag: PO Files. (line 98) -* no-smalltalk-format flag: PO Files. (line 122) -* no-tcl-format flag: PO Files. (line 146) -* no-ycp-format flag: PO Files. (line 142) +* no-csharp-format flag: PO Files. (line 141) +* no-elisp-format flag: PO Files. (line 121) +* no-gcc-internal-format flag: PO Files. (line 173) +* no-java-format flag: PO Files. (line 137) +* no-librep-format flag: PO Files. (line 125) +* no-lisp-format flag: PO Files. (line 117) +* no-objc-format flag: PO Files. (line 105) +* no-object-pascal-format flag: PO Files. (line 149) +* no-perl-brace-format flag: PO Files. (line 165) +* no-perl-format flag: PO Files. (line 161) +* no-php-format flag: PO Files. (line 169) +* no-python-format flag: PO Files. (line 113) +* no-qt-format flag: PO Files. (line 177) +* no-scheme-format flag: PO Files. (line 129) +* no-sh-format flag: PO Files. (line 109) +* no-smalltalk-format flag: PO Files. (line 133) +* no-tcl-format flag: PO Files. (line 157) +* no-ycp-format flag: PO Files. (line 153) * nplurals, in a PO file header: Plural forms. (line 128) * number format: Aspects. (line 94) -* objc-format flag: PO Files. (line 93) +* objc-format flag: PO Files. (line 104) * Object Pascal: Pascal. (line 6) -* object-pascal-format flag: PO Files. (line 137) +* object-pascal-format flag: PO Files. (line 148) * obsolete entries: Obsolete Entries. (line 6) * optimization of gettext functions: Optimized gettext. (line 6) * orthography: Manipulating. (line 28) @@ -14558,6 +16248,8 @@ General Index * package and version declaration in configure.in: configure.in. (line 9) * package build and installation options: Installers. (line 6) +* package distributor's view of gettext: Installers. (line 6) +* package installer's view of gettext: Installers. (line 6) * package maintainer's view of gettext: Maintainers. (line 6) * paragraphs: Preparing Strings. (line 99) * Pascal: Pascal. (line 6) @@ -14571,15 +16263,17 @@ General Index (line 6) * Perl special keywords for hash-lookups: Special Keywords. (line 6) * Perl valid string interpolation: Interpolation II. (line 6) -* perl-brace-format flag: PO Files. (line 153) -* perl-format flag: PO Files. (line 149) +* perl-brace-format flag: PO Files. (line 164) +* perl-format flag: PO Files. (line 160) +* pgettext: Contexts. (line 33) +* pgettext_expr: Contexts. (line 112) * PHP: PHP. (line 6) -* php-format flag: PO Files. (line 157) +* php-format flag: PO Files. (line 168) * Pike: Pike. (line 6) -* plural form formulas: Plural forms. (line 145) +* plural form formulas: Plural forms. (line 148) * plural forms: Plural forms. (line 6) -* plural forms, in MO files: MO Files. (line 63) -* plural forms, in PO files: PO Files. (line 169) +* plural forms, in MO files: MO Files. (line 66) +* plural forms, in PO files: PO Files. (line 202) * plural, in a PO file header: Plural forms. (line 128) * PO files' format: PO Files. (line 6) * PO mode (Emacs) commands: Main PO Commands. (line 6) @@ -14595,7 +16289,7 @@ General Index * po_message_msgstr_plural: libgettextpo. (line 86) * po_next_message: libgettextpo. (line 62) * portability problems with sed: msgfilter Invocation. - (line 55) + (line 57) * POTFILES.in file: po/POTFILES.in. (line 6) * preparing programs for translation: Sources. (line 6) * preparing shell scripts for translation: Preparing Shell Scripts. @@ -14605,18 +16299,20 @@ General Index * programming languages: Language Implementors. (line 6) * Python: Python. (line 6) -* python-format flag: PO Files. (line 101) -* Qt format strings: xgettext Invocation. (line 179) +* python-format flag: PO Files. (line 112) +* Qt format strings: xgettext Invocation. (line 240) * Qt mode, and msgfmt program: msgfmt Invocation. (line 46) -* qt-format flag: PO Files. (line 165) -* quotation marks <1>: po/Makevars. (line 18) +* qt-format flag: PO Files. (line 176) +* quotation marks <1>: po/Rules-*. (line 11) * quotation marks: Header Entry. (line 145) * quote characters, use in PO files: Header Entry. (line 145) +* recode-sr-latin program: msgfilter Invocation. + (line 85) * related reading: References. (line 6) * release: Release Management. (line 6) * RST: RST. (line 6) * Scheme: Scheme. (line 6) -* scheme-format flag: PO Files. (line 117) +* scheme-format flag: PO Files. (line 128) * scripting languages: Language Implementors. (line 6) * search messages in a catalog: msggrep Invocation. (line 8) @@ -14625,19 +16321,17 @@ General Index * setting up gettext at build time: Installers. (line 6) * setting up gettext at run time: End Users. (line 6) * several domains: Ambiguities. (line 6) -* sex: Introduction. (line 11) -* sgettext: GUI program problems. - (line 59) -* sh-format flag: PO Files. (line 97) -* she, he, and they: Introduction. (line 11) +* sex: Introduction. (line 15) +* sh-format flag: PO Files. (line 108) +* she, he, and they: Introduction. (line 15) * shell format string: envsubst Invocation. (line 8) * shell scripts: sh. (line 6) * Smalltalk: Smalltalk. (line 6) -* smalltalk-format flag: PO Files. (line 121) +* smalltalk-format flag: PO Files. (line 132) * sorting msgcat output: msgcat Invocation. (line 137) * sorting msgmerge output: msgmerge Invocation. (line 167) * sorting msgunfmt output: msgunfmt Invocation. (line 144) -* sorting output of xgettext: xgettext Invocation. (line 242) +* sorting output of xgettext: xgettext Invocation. (line 307) * specifying plural form in a PO file: Plural forms. (line 128) * standard output, and msgcat: msgcat Invocation. (line 47) * standard output, and msgmerge program: msgmerge Invocation. (line 56) @@ -14648,13 +16342,12 @@ General Index * Tcl: Tcl. (line 6) * Tcl mode, and msgfmt program: msgfmt Invocation. (line 43) * Tcl mode, and msgunfmt program: msgunfmt Invocation. (line 26) -* tcl-format flag: PO Files. (line 145) -* template PO file: Overview. (line 79) -* testing .po files for equivalence: xgettext Invocation. (line 252) +* tcl-format flag: PO Files. (line 156) +* template PO file: Overview. (line 67) +* testing .po files for equivalence: xgettext Invocation. (line 317) * Tk's scripting language: Tcl. (line 6) * translated entries: Translated Entries. (line 6) -* translating menu entries: GUI program problems. - (line 6) +* translating menu entries: Contexts. (line 6) * translation aspects: Aspects. (line 6) * Translation Matrix: Matrix. (line 6) * Translation Project: Why. (line 17) @@ -14667,218 +16360,228 @@ General Index * upgrading to new versions of gettext: Prerequisites. (line 6) * version control for backup files, msgmerge: msgmerge Invocation. (line 71) -* wxWindows library: wxWindows. (line 6) +* wxWidgets library: wxWidgets. (line 6) * xargs, and output from msgexec: msgexec Invocation. (line 14) * xgettext program, usage: xgettext Invocation. (line 6) * xmodmap program, and typing quotation marks: Header Entry. (line 157) * YaST2 scripting language: YCP. (line 6) * YCP: YCP. (line 6) -* ycp-format flag: PO Files. (line 141) +* ycp-format flag: PO Files. (line 152)  Tag Table: -Node: Top2663 -Node: Introduction15060 -Node: Why16922 -Ref: Why-Footnote-120034 -Node: Concepts20190 -Node: Aspects23608 -Node: Files29466 -Node: Overview31372 -Node: Basics42169 -Node: Installation43000 -Node: PO Files44947 -Ref: PO Files-Footnote-154373 -Node: Main PO Commands54500 -Node: Entry Positioning59576 -Node: Normalizing65037 -Node: Sources69496 -Node: Triggering71194 -Node: Preparing Strings74229 -Node: Mark Keywords81934 -Node: Marking85494 -Node: c-format Flag93221 -Node: Special cases97137 -Node: Names99863 -Node: Libraries103464 -Node: Template106495 -Node: xgettext Invocation107216 -Node: Creating118812 -Node: msginit Invocation119694 -Node: Header Entry122320 -Node: Updating129325 -Node: msgmerge Invocation130084 -Node: Translated Entries135125 -Node: Fuzzy Entries136485 -Node: Untranslated Entries139659 -Node: Obsolete Entries141585 -Node: Modifying Translations144804 -Node: Modifying Comments152767 -Node: Subedit157186 -Node: C Sources Context161074 -Node: Auxiliary166190 -Node: Compendium169423 -Node: Creating Compendia170040 -Node: Using Compendia172520 -Node: Manipulating173449 -Node: msgcat Invocation177212 -Node: msgconv Invocation181462 -Node: msggrep Invocation184641 -Node: msgfilter Invocation189412 -Node: msguniq Invocation194291 -Node: msgcomm Invocation198180 -Node: msgcmp Invocation202225 -Node: msgattrib Invocation203837 -Node: msgen Invocation208432 -Node: msgexec Invocation211767 -Node: libgettextpo214214 -Node: Binaries219336 -Node: msgfmt Invocation219672 -Node: msgunfmt Invocation226655 -Node: MO Files230799 -Node: Users238895 -Node: Matrix240379 -Node: Installers241588 -Node: End Users242763 -Node: Programmers243416 -Node: catgets244592 -Node: Interface to catgets246002 -Node: Problems with catgets248008 -Node: gettext248920 -Node: Interface to gettext250426 -Node: Ambiguities252783 -Node: Locating Catalogs255487 -Ref: Locating Catalogs-Footnote-1256645 -Ref: Locating Catalogs-Footnote-2256870 -Node: Charset conversion257019 -Node: Plural forms259474 -Ref: Plural forms-Footnote-1270380 -Node: GUI program problems270472 -Node: Optimized gettext275587 -Node: Comparison276931 -Node: Using libintl.a281198 -Node: gettext grok281638 -Node: Temp Programmers284189 -Node: Temp Implementations284639 -Node: Temp catgets286016 -Node: Temp WSI287714 -Node: Temp Notes289713 -Node: Translators290213 -Node: Trans Intro 0290676 -Node: Trans Intro 1293332 -Node: Discussions295203 -Node: Organization298780 -Node: Central Coordination300768 -Node: National Teams301907 -Node: Sub-Cultures304431 -Node: Organizational Ideas305365 -Node: Mailing Lists306383 -Node: Information Flow308197 -Node: Prioritizing messages310367 -Node: Maintainers314638 -Node: Flat and Non-Flat316602 -Node: Prerequisites318092 -Node: gettextize Invocation322239 -Node: Adjusting Files328953 -Node: po/POTFILES.in330677 -Node: po/LINGUAS331923 -Node: po/Makevars333612 -Node: configure.in335203 -Node: config.guess337306 -Node: mkinstalldirs338675 -Node: aclocal339447 -Node: acconfig341240 -Node: config.h.in341737 -Node: Makefile343200 -Node: src/Makefile345794 -Node: lib/gettext.h350181 -Node: autoconf macros352427 -Node: AM_GNU_GETTEXT353061 -Node: AM_GNU_GETTEXT_VERSION356655 -Node: AM_PO_SUBDIRS357101 -Node: AM_ICONV357879 -Node: CVS Issues360086 -Node: Distributed CVS360674 -Node: Files under CVS362599 -Node: autopoint Invocation365872 -Node: Release Management367716 -Node: Programming Languages368226 -Node: Language Implementors369050 -Node: Programmers for other Languages373839 -Node: Translators for other Languages374412 -Node: c-format375885 -Node: objc-format377599 -Node: sh-format377951 -Node: python-format378753 -Node: lisp-format379191 -Node: elisp-format379517 -Node: librep-format380007 -Node: scheme-format380407 -Node: smalltalk-format380683 -Node: java-format381183 -Node: csharp-format381631 -Node: awk-format382006 -Node: object-pascal-format382331 -Node: ycp-format382560 -Node: tcl-format382959 -Node: perl-format383254 -Node: php-format383999 -Node: gcc-internal-format384364 -Node: qt-format385406 -Node: Maintainers for other Languages385819 -Node: List of Programming Languages387054 -Node: C388337 -Node: sh389614 -Node: Preparing Shell Scripts390888 -Node: gettext.sh394277 -Node: gettext Invocation394824 -Node: ngettext Invocation396579 -Node: envsubst Invocation398167 -Node: eval_gettext Invocation399588 -Node: eval_ngettext Invocation400049 -Node: bash400563 -Node: Python402539 -Node: Common Lisp403689 -Node: clisp C404489 -Node: Emacs Lisp405204 -Node: librep405930 -Node: Scheme406665 -Node: Smalltalk407449 -Node: Java408483 -Node: C#413502 -Node: gawk421919 -Node: Pascal422831 -Node: wxWindows424139 -Node: YCP424889 -Node: Tcl425628 -Node: Perl427038 -Node: General Problems430046 -Node: Default Keywords433704 -Node: Special Keywords434656 -Node: Quote-like Expressions436170 -Node: Interpolation I438445 -Node: Interpolation II442235 -Node: Parentheses444600 -Node: Long Lines446117 -Node: Perl Pitfalls447964 -Node: PHP452206 -Node: Pike453137 -Node: GCC-source453798 -Node: List of Data Formats454545 -Node: POT455011 -Node: RST455269 -Node: Glade455495 -Node: Conclusion455855 -Node: History456358 -Node: References460624 -Node: Language Codes462190 -Node: Country Codes466536 -Node: Program Index472293 -Node: Option Index474111 -Node: Variable Index519612 -Node: PO Mode Index521077 -Node: Autoconf Macro Index534986 -Node: Index535505 +Node: Top2955 +Node: Introduction15951 +Node: Why17571 +Ref: Why-Footnote-120781 +Node: Concepts20937 +Node: Aspects24355 +Node: Files30213 +Node: Overview32119 +Node: Users42037 +Node: Matrix43469 +Node: End Users44677 +Node: PO Files45326 +Ref: PO Files-Footnote-156086 +Node: Sources56213 +Node: Importing57366 +Node: Triggering58046 +Node: Preparing Strings61083 +Node: Mark Keywords68786 +Node: Marking72346 +Node: c-format Flag80073 +Node: Special cases83989 +Node: Names86715 +Node: Libraries90316 +Node: Template93347 +Node: xgettext Invocation94068 +Node: Creating108383 +Node: msginit Invocation109265 +Node: Header Entry111891 +Node: Updating118897 +Node: msgmerge Invocation119112 +Node: Editing124126 +Node: KBabel124424 +Node: Gtranslator124562 +Node: PO Mode124704 +Node: Installation126396 +Node: Main PO Commands128357 +Node: Entry Positioning133442 +Node: Normalizing138908 +Node: Translated Entries143399 +Node: Fuzzy Entries144754 +Node: Untranslated Entries147931 +Node: Obsolete Entries149860 +Node: Modifying Translations153082 +Node: Modifying Comments161048 +Node: Subedit165472 +Node: C Sources Context169365 +Node: Auxiliary174486 +Node: Compendium177722 +Node: Creating Compendia178342 +Node: Using Compendia180826 +Node: Manipulating181759 +Node: msgcat Invocation185521 +Node: msgconv Invocation189771 +Node: msggrep Invocation192950 +Node: msgfilter Invocation198131 +Node: msguniq Invocation203755 +Node: msgcomm Invocation207644 +Node: msgcmp Invocation211689 +Node: msgattrib Invocation213301 +Node: msgen Invocation217896 +Node: msgexec Invocation221231 +Node: libgettextpo223812 +Node: Binaries228934 +Node: msgfmt Invocation229278 +Node: msgunfmt Invocation236283 +Node: MO Files240445 +Node: Programmers248683 +Node: catgets249862 +Node: Interface to catgets251272 +Node: Problems with catgets253278 +Node: gettext254190 +Node: Interface to gettext255690 +Node: Ambiguities258047 +Node: Locating Catalogs260751 +Ref: Locating Catalogs-Footnote-1261909 +Ref: Locating Catalogs-Footnote-2262134 +Node: Charset conversion262283 +Node: Contexts264734 +Node: Plural forms270234 +Ref: Plural forms-Footnote-1281582 +Node: Optimized gettext281674 +Node: Comparison283010 +Node: Using libintl.a287277 +Node: gettext grok287717 +Node: Temp Programmers290346 +Node: Temp Implementations290871 +Node: Temp catgets292248 +Node: Temp WSI293946 +Node: Temp Notes295945 +Node: Translators296445 +Node: Trans Intro 0296908 +Node: Trans Intro 1299642 +Node: Discussions301591 +Node: Organization305246 +Node: Central Coordination307312 +Node: National Teams308451 +Node: Sub-Cultures310975 +Node: Organizational Ideas311909 +Node: Mailing Lists312927 +Node: Information Flow314741 +Node: Prioritizing messages316989 +Node: Maintainers321285 +Node: Flat and Non-Flat323238 +Node: Prerequisites324728 +Node: gettextize Invocation328875 +Node: Adjusting Files335817 +Node: po/POTFILES.in337601 +Node: po/LINGUAS338847 +Node: po/Makevars340536 +Node: po/Rules-*341284 +Node: configure.in342752 +Node: config.guess345763 +Node: mkinstalldirs347116 +Node: aclocal347518 +Node: acconfig349325 +Node: config.h.in349822 +Node: Makefile351287 +Node: src/Makefile353881 +Node: lib/gettext.h358268 +Node: autoconf macros360514 +Node: AM_GNU_GETTEXT361148 +Node: AM_GNU_GETTEXT_VERSION364742 +Node: AM_PO_SUBDIRS365188 +Node: AM_ICONV365966 +Node: CVS Issues368173 +Node: Distributed CVS368761 +Node: Files under CVS370686 +Node: autopoint Invocation373957 +Node: Release Management375797 +Node: Installers376307 +Node: Programming Languages377531 +Node: Language Implementors378354 +Node: Programmers for other Languages383168 +Node: Translators for other Languages383749 +Node: c-format385275 +Node: objc-format386988 +Node: sh-format387340 +Node: python-format388142 +Node: lisp-format388580 +Node: elisp-format388906 +Node: librep-format389396 +Node: scheme-format389796 +Node: smalltalk-format390072 +Node: java-format390572 +Node: csharp-format391020 +Node: awk-format391395 +Node: object-pascal-format391720 +Node: ycp-format391949 +Node: tcl-format392348 +Node: perl-format392643 +Node: php-format393388 +Node: gcc-internal-format393753 +Node: qt-format394795 +Node: boost-format395229 +Node: Maintainers for other Languages395773 +Node: List of Programming Languages397008 +Node: C398291 +Node: sh399591 +Node: Preparing Shell Scripts400865 +Node: gettext.sh404254 +Node: gettext Invocation404801 +Node: ngettext Invocation406556 +Node: envsubst Invocation408144 +Node: eval_gettext Invocation409565 +Node: eval_ngettext Invocation410026 +Node: bash410540 +Node: Python412516 +Node: Common Lisp413666 +Node: clisp C414466 +Node: Emacs Lisp415181 +Node: librep415907 +Node: Scheme416642 +Node: Smalltalk417426 +Node: Java418460 +Node: C#424168 +Node: gawk432585 +Node: Pascal433497 +Node: wxWidgets434805 +Node: YCP435712 +Node: Tcl436451 +Node: Perl437861 +Node: General Problems440869 +Node: Default Keywords444527 +Node: Special Keywords445479 +Node: Quote-like Expressions446993 +Node: Interpolation I449268 +Node: Interpolation II453058 +Node: Parentheses455423 +Node: Long Lines456940 +Node: Perl Pitfalls458787 +Node: PHP463029 +Node: Pike463960 +Node: GCC-source464621 +Node: List of Data Formats465368 +Node: POT465834 +Node: RST466092 +Node: Glade466318 +Node: Conclusion466678 +Node: History467181 +Node: References471447 +Node: Language Codes473091 +Node: Country Codes477437 +Node: Licenses483189 +Node: GNU GPL485031 +Node: GNU LGPL504208 +Node: GNU FDL532341 +Node: Program Index554727 +Node: Option Index556613 +Node: Variable Index602625 +Node: PO Mode Index604163 +Node: Autoconf Macro Index617999 +Node: Index618518  End Tag Table diff --git a/gettext-tools/doc/gettext_1.html b/gettext-tools/doc/gettext_1.html index ff66cb9b4..2e096352b 100644 --- a/gettext-tools/doc/gettext_1.html +++ b/gettext-tools/doc/gettext_1.html @@ -1,26 +1,31 @@ - + + GNU gettext utilities - 1 Introduction -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents.

-

1 Introduction

+

1 Introduction

-

-This manual is still in DRAFT state. Some sections are still -empty, or almost. We keep merging material from other sources -(essentially e-mail folders) while the proper integration of this -material is delayed. -

+This chapter explains the goals sought in the creation +of GNU gettext and the free Translation Project. +Then, it explains a few broad concepts around +Native Language Support, and positions message translation with regard +to other aspects of national and cultural variance, as they apply +to programs. It also surveys those files used to convey the +translations. It explains how the various tools interact in the +initial generation of these files, and later, how the maintenance +cycle should usually operate. +

@@ -34,18 +39,6 @@ to males or females. Besides, as you might guess, GNU gettext is meant to be useful for people using computers, whatever their sex, race, religion or nationality! -

-

-This chapter explains the goals sought in the creation -of GNU gettext and the free Translation Project. -Then, it explains a few broad concepts around -Native Language Support, and positions message translation with regard -to other aspects of national and cultural variance, as they apply to -to programs. It also surveys those files used to convey the -translations. It explains how the various tools interact in the -initial generation of these files, and later, how the maintenance -cycle should usually operate. -

@@ -124,6 +117,11 @@ translatable strings, or already translated strings.

  • +A library supporting the parsing and creation of files containing +translated messages. + +
  • + A special mode for Emacs(1) which helps preparing these sets and bringing them up to date. @@ -176,7 +174,7 @@ by which the programs are untied from calling only English strings or other English specific habits, and connected to generic ways of doing the same, instead. Program developers may use various techniques to internationalize their programs. Some of these have been standardized. -GNU gettext offers one of these standards. See section 11 The Programmer's View. +GNU gettext offers one of these standards. See section 11 The Programmer's View.

    @@ -205,7 +203,7 @@ internationalized software and which allow them to access the data stored in a particular locale. When someone presently refers to a particular locale, they are obviously referring to the data stored within that particular locale. Similarly, if a programmer is referring -to "accessing the locale routines", they are referring to the +to “accessing the locale routines”, they are referring to the complete suite of routines that access all of the locale's information.

    @@ -280,8 +278,8 @@ Many programs read, interpret, compile, or are somewhat driven by input files which are texts containing keywords, identifiers, or replies which are inherently translatable. For example, one may want gcc to allow diacriticized characters in identifiers or use -translated keywords; `rm -i´ might accept something else than -`y´ or `n´ for replies, etc. Even if the program will +translated keywords; ‘rm -i’ might accept something else than +‘y’ or ‘n’ for replies, etc. Even if the program will eventually make most of its output in the foreign languages, one has to decide whether the input syntax, option values, etc., are to be localized or not. @@ -405,8 +403,8 @@ or less reasonable support for at least some of the missing components.

    -The letters PO in `.po´ files means Portable Object, to -distinguish it from `.mo´ files, where MO stands for Machine +The letters PO in ‘.po’ files means Portable Object, to +distinguish it from ‘.mo’ files, where MO stands for Machine Object. This paradigm, as well as the PO file format, is inspired by the NLS standard developed by Uniforum, and first implemented by Sun in their Solaris system. @@ -425,7 +423,7 @@ marked messages from a set of C files and initializes a PO file with empty translations. Program msgmerge takes care of adjusting PO files between releases of the corresponding sources, commenting obsolete entries, initializing new ones, and updating all source -line references. Files ending with `.pot´ are kind of base +line references. Files ending with ‘.pot’ are kind of base translation files found in distributions, in PO file format.

    @@ -437,7 +435,7 @@ format of these MO files is often different from system to system, and non-portable. The tools already provided with these systems don't support all the features of GNU gettext. Therefore GNU gettext uses its own format for MO files. Files ending with -`.gmo´ are really MO files, when it is known that these files use +‘.gmo’ are really MO files, when it is known that these files use the GNU format.

    @@ -459,42 +457,30 @@ and maintainers. 

    -Original C Sources ---> PO mode ---> Marked C Sources ---.
-                                                         |
-              .---------<--- GNU gettext Library         |
-.--- make <---+                                          |
-|             `---------<--------------------+-----------'
-|                                            |
-|   .-----<--- PACKAGE.pot <--- xgettext <---'   .---<--- PO Compendium
-|   |                                            |             ^
-|   |                                            `---.         |
-|   `---.                                            +---> PO mode ---.
-|       +----> msgmerge ------> LANG.po ---->--------'                |
-|   .---'                                                             |
-|   |                                                                 |
-|   `-------------<---------------.                                   |
-|                                 +--- New LANG.po <------------------'
-|   .--- LANG.gmo <--- msgfmt <---'
-|   |
-|   `---> install ---> /.../LANG/PACKAGE.mo ---.
-|                                              +---> "Hello world!"
-`-------> install ---> /.../bin/PROGRAM -------'
+@group
+Original C Sources ───> Preparation ───> Marked C Sources ───╮
+                                                             │
+              ╭─────────<─── GNU gettext Library             │
+╭─── make <───┤                                              │
+│             ╰─────────<────────────────────┬───────────────╯
+│                                            │
+│   ╭─────<─── PACKAGE.pot <─── xgettext <───╯   ╭───<─── PO Compendium
+│   │                                            │              ↑
+│   │                                            ╰───╮          │
+│   ╰───╮                                            ├───> PO editor ───╮
+│       ├────> msgmerge ──────> LANG.po ────>────────╯                  │
+│   ╭───╯                                                               │
+│   │                                                                   │
+│   ╰─────────────<───────────────╮                                     │
+│                                 ├─── New LANG.po <────────────────────╯
+│   ╭─── LANG.gmo <─── msgfmt <───╯
+│   │
+│   ╰───> install ───> /.../LANG/PACKAGE.mo ───╮
+│                                              ├───> "Hello world!"
+╰───────> install ───> /.../bin/PROGRAM ───────╯
+@end group
    -

    -The indication `PO mode´ appears in two places in this picture, -and you may safely read it as merely meaning "hand editing", using -any editor of your choice, really. However, for those of you being -the lucky users of Emacs, PO mode has been specifically created -for providing a cozy environment for editing or modifying PO files. -While editing a PO file, PO mode allows for the easy browsing of -auxiliary and compendium PO files, as well as for following references into -the set of C program sources from which PO files have been derived. -It has a few special features, among which are the interactive marking -of program strings as translatable, and the validation of PO files -with easy repositioning to PO file lines showing errors. - -

    As a programmer, the first step to bringing GNU gettext @@ -541,7 +527,7 @@ simply replace these definitions by the following:

    -and link against `libintl.a´ or `libintl.so´. Note that on +and link against ‘libintl.a’ or ‘libintl.so’. Note that on GNU systems, you don't need to link with libintl because the gettext library functions are already contained in GNU libc. That is all you have to change. @@ -552,24 +538,24 @@ That is all you have to change. Once the C sources have been modified, the xgettext program is used to find and extract all translatable strings, and create a -PO template file out of all these. This `package.pot´ file +PO template file out of all these. This ‘package.pot’ file contains all original program strings. It has sets of pointers to exactly where in C sources each string is used. All translations -are set to empty. The letter t in `.pot´ marks this as +are set to empty. The letter t in ‘.pot’ marks this as a Template PO file, not yet oriented towards any particular language. -See section 5.1 Invoking the xgettext Program, for more details about how one calls the +See section 5.1 Invoking the xgettext Program, for more details about how one calls the xgettext program. If you are really lazy, you might be interested at working a lot more right away, and preparing the -whole distribution setup (see section 13 The Maintainer's View). By doing so, you +whole distribution setup (see section 13 The Maintainer's View). By doing so, you spare yourself typing the xgettext command, as make should now generate the proper things automatically for you!

    -The first time through, there is no `lang.po´ yet, so the +The first time through, there is no ‘lang.po’ yet, so the msgmerge step may be skipped and replaced by a mere copy of -`package.pot´ to `lang.po´, where lang -represents the target language. See section 6 Creating a New PO File for details. +‘package.pot’ to ‘lang.po’, where lang +represents the target language. See section 6 Creating a New PO File for details.

    @@ -577,31 +563,29 @@ Then comes the initial translation of messages. Translation in itself is a whole matter, still exclusively meant for humans, and whose complexity far overwhelms the level of this manual. Nevertheless, a few hints are given in some other chapter of this -manual (see section 12 The Translator's View). You will also find there indications +manual (see section 12 The Translator's View). You will also find there indications about how to contact translating teams, or becoming part of them, for sharing your translating concerns with others who target the same native language.

    -While adding the translated messages into the `lang.po´ -PO file, if you do not have Emacs handy, you are on your own +While adding the translated messages into the ‘lang.po’ +PO file, if you are not using one of the dedicated PO file editors +(see section 8 Editing PO Files), you are on your own for ensuring that your efforts fully respect the PO file format, and quoting conventions (see section 3 The Format of PO Files). This is surely not an impossible task, -as this is the way many people have handled PO files already for Uniforum or -Solaris. On the other hand, by using PO mode in Emacs, most details +as this is the way many people have handled PO files around 1995. +On the other hand, by using a PO file editor, most details of PO file format are taken care of for you, but you have to acquire -some familiarity with PO mode itself. Besides main PO mode commands -(see section 8.3.2 Main PO mode Commands), you should know how to move between entries -(see section 8.3.3 Entry Positioning), and how to handle untranslated entries -(see section 8.3.7 Untranslated Entries). +some familiarity with PO file editor itself.

    If some common translations have already been saved into a compendium PO file, translators may use PO mode for initializing untranslated entries from the compendium, and also save selected translations into -the compendium, updating it (see section 8.3.14 Using Translation Compendia). Compendium files +the compendium, updating it (see section 8.3.14 Using Translation Compendia). Compendium files are meant to be exchanged between members of a given translation team.

    @@ -623,8 +607,8 @@ strings as translatable, when they should be, and do not otherwise worry about them being translated, as this will come in proper time. Consequently, when programs and their strings are adjusted in various ways by maintainers, and for matters usually unrelated to translation, -xgettext would construct `package.pot´ files which are -evolving over time, so the translations carried by `lang.po´ +xgettext would construct ‘package.pot’ files which are +evolving over time, so the translations carried by ‘lang.po’ are slowly fading out of date.

    @@ -641,20 +625,20 @@ appear, needing translation.

    The msgmerge program has the purpose of refreshing an already -existing `lang.po´ file, by comparing it with a newer -`package.pot´ template file, extracted by xgettext +existing ‘lang.po’ file, by comparing it with a newer +‘package.pot’ template file, extracted by xgettext out of recent C sources. The refreshing operation adjusts all references to C source locations for strings, since these strings move as programs are modified. Also, msgmerge comments out as -obsolete, in `lang.po´, those already translated entries -which are no longer used in the program sources (see section 8.3.8 Obsolete Entries). It finally discovers new strings and inserts them in -the resulting PO file as untranslated entries (see section 8.3.7 Untranslated Entries). See section 7.1 Invoking the msgmerge Program, for more information about what +obsolete, in ‘lang.po’, those already translated entries +which are no longer used in the program sources (see section 8.3.8 Obsolete Entries). It finally discovers new strings and inserts them in +the resulting PO file as untranslated entries (see section 8.3.7 Untranslated Entries). See section 7.1 Invoking the msgmerge Program, for more information about what msgmerge really does.

    Whatever route or means taken, the goal is to obtain an updated -`lang.po´ file offering translations for all strings. +‘lang.po’ file offering translations for all strings.

    @@ -678,14 +662,14 @@ distribution. Once the PO file is complete and dependable, the msgfmt program is used for turning the PO file into a machine-oriented format, which may yield efficient retrieval of translations by the programs of the -package, whenever needed at runtime (see section 10.3 The Format of GNU MO Files). See section 10.1 Invoking the msgfmt Program, for more information about all modes of execution +package, whenever needed at runtime (see section 10.3 The Format of GNU MO Files). See section 10.1 Invoking the msgfmt Program, for more information about all modes of execution for the msgfmt program.

    Finally, the modified and marked C sources are compiled and linked with the GNU gettext library, usually through the operation of -make, given a suitable `Makefile´ exists for the project, +make, given a suitable ‘Makefile’ exists for the project, and the resulting executable is installed somewhere users will find it. The MO files themselves should also be properly installed. Given the appropriate environment variables are set (see section 2.2 Magic for End Users), the @@ -698,6 +682,6 @@ steps outlined above.

    -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents. diff --git a/gettext-tools/doc/gettext_10.html b/gettext-tools/doc/gettext_10.html index 965b3dbcb..a10cd1b9a 100644 --- a/gettext-tools/doc/gettext_10.html +++ b/gettext-tools/doc/gettext_10.html @@ -1,128 +1,129 @@ - + + GNU gettext utilities - 10 Producing Binary MO Files -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents.

    -

    10 Producing Binary MO Files

    +

    10 Producing Binary MO Files

    -

    10.1 Invoking the msgfmt Program

    +

    10.1 Invoking the msgfmt Program

    - - + + 

     msgfmt [option] filename.po ...

    - + The msgfmt programs generates a binary message catalog from a textual translation description.

    -

    10.1.1 Input file location

    +

    10.1.1 Input file location

    -
    `filename.po ...´ +
    ‘filename.po ...’
    -
    `-D directory´ +
    ‘-D directory’
    -
    `--directory=directory´ +
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are -searched relative to this list of directories. The resulting `.po´ +searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though.

    -If an input file is `-´, standard input is read. +If an input file is ‘-’, standard input is read.

    -

    10.1.2 Operation mode

    +

    10.1.2 Operation mode

    -
    `-j´ +
    ‘-j’
    -
    `--java´ +
    ‘--java’
    - - - + + + Java mode: generate a Java ResourceBundle class. -
    `--java2´ +
    ‘--java2’
    - + Like --java, and assume Java2 (JDK 1.2 or higher). -
    `--csharp´ +
    ‘--csharp’
    - - + + C# mode: generate a .NET .dll file containing a subclass of GettextResourceSet. -
    `--csharp-resources´ +
    ‘--csharp-resources’
    - - -C# resources mode: generate a .NET `.resources´ file. + + +C# resources mode: generate a .NET ‘.resources’ file. -
    `--tcl´ +
    ‘--tcl’
    - - -Tcl mode: generate a tcl/msgcat `.msg´ file. + + +Tcl mode: generate a tcl/msgcat ‘.msg’ file. -
    `--qt´ +
    ‘--qt’
    - - -Qt mode: generate a Qt `.qm´ file. + + +Qt mode: generate a Qt ‘.qm’ file.
    -

    10.1.3 Output file location

    +

    10.1.3 Output file location

    -
    `-o file´ +
    ‘-o file’
    -
    `--output-file=file´ +
    ‘--output-file=file’
    - - + + Write output to specified file. -
    `--strict´ +
    ‘--strict’
    - + Direct the program to work strictly following the Uniforum/Sun implementation. Currently this only affects the naming of the output file. If this option is not given the name of the output file is the same as the domain name. If the strict Uniforum mode is enabled the -suffix `.mo´ is added to the file name if it is not already +suffix ‘.mo’ is added to the file name if it is not already present. We find this behaviour of Sun's implementation rather silly and so by @@ -131,126 +132,126 @@ default this mode is not selected.

    -If the output file is `-´, output is written to standard output. +If the output file is ‘-’, output is written to standard output.

    -

    10.1.4 Output file location in Java mode

    +

    10.1.4 Output file location in Java mode

    -
    `-r resource´ +
    ‘-r resource’
    -
    `--resource=resource´ +
    ‘--resource=resource’
    - - + + Specify the resource name. -
    `-l locale´ +
    ‘-l locale’
    -
    `--locale=locale´ +
    ‘--locale=locale’
    - - + + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC. -
    `-d directory´ +
    ‘-d directory’
    - + Specify the base directory of classes directory hierarchy.

    The class name is determined by appending the locale name to the resource name, -separated with an underscore. The `-d´ option is mandatory. The class +separated with an underscore. The ‘-d’ option is mandatory. The class is written under the specified directory.

    -

    10.1.5 Output file location in C# mode

    +

    10.1.5 Output file location in C# mode

    -
    `-r resource´ +
    ‘-r resource’
    -
    `--resource=resource´ +
    ‘--resource=resource’
    - - + + Specify the resource name. -
    `-l locale´ +
    ‘-l locale’
    -
    `--locale=locale´ +
    ‘--locale=locale’
    - - + + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC. -
    `-d directory´ +
    ‘-d directory’
    - -Specify the base directory for locale dependent `.dll´ files. + +Specify the base directory for locale dependent ‘.dll’ files.

    -The `-l´ and `-d´ options are mandatory. The `.dll´ file is +The ‘-l’ and ‘-d’ options are mandatory. The ‘.dll’ file is written in a subdirectory of the specified directory whose name depends on the locale.

    -

    10.1.6 Output file location in Tcl mode

    +

    10.1.6 Output file location in Tcl mode

    -
    `-l locale´ +
    ‘-l locale’
    -
    `--locale=locale´ +
    ‘--locale=locale’
    - - + + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC. -
    `-d directory´ +
    ‘-d directory’
    - -Specify the base directory of `.msg´ message catalogs. + +Specify the base directory of ‘.msg’ message catalogs.

    -The `-l´ and `-d´ options are mandatory. The `.msg´ file is +The ‘-l’ and ‘-d’ options are mandatory. The ‘.msg’ file is written in the specified directory.

    -

    10.1.7 Input file syntax

    +

    10.1.7 Input file syntax

    -
    `-P´ +
    ‘-P’
    -
    `--properties-input´ +
    ‘--properties-input’
    - - + + Assume the input files are Java ResourceBundles in Java .properties syntax, not in PO file syntax. -
    `--stringtable-input´ +
    ‘--stringtable-input’
    - + Assume the input files are NeXTstep/GNUstep localized resource files in .strings syntax, not in PO file syntax. @@ -258,32 +259,32 @@ Assume the input files are NeXTstep/GNUstep localized resource files in -

    10.1.8 Input file interpretation

    +

    10.1.8 Input file interpretation

    -
    `-c´ +
    ‘-c’
    -
    `--check´ +
    ‘--check’
    - - + + Perform all the checks implied by --check-format, --check-header, --check-domain. -
    `--check-format´ +
    ‘--check-format’
    - - + + Check language dependent format strings. If the string represents a format string used in a printf-like function both strings should have the same number of -`%´ format specifiers, with matching types. If the flag +‘%’ format specifiers, with matching types. If the flag c-format or possible-c-format appears in the special comment #, for this entry a check is performed. For example, the -check will diagnose using `%.*s´ against `%s´, or `%d´ -against `%s´, or `%d´ against `%x´. It can even handle +check will diagnose using ‘%.*s’ against ‘%s’, or ‘%d’ +against ‘%s’, or ‘%d’ against ‘%x’. It can even handle positional parameters. Normally the xgettext program automatically decides whether a @@ -293,55 +294,55 @@ used in a printf-like function and so msgfmt might rep errors where there are none. To solve this problem the programmer can dictate the decision to the -xgettext program (see section 15.3.1 C Format Strings). The translator should not +xgettext program (see section 15.3.1 C Format Strings). The translator should not consider removing the flag from the #, line. This "fix" would be reversed again as soon as msgmerge is called the next time. -
    `--check-header´ +
    ‘--check-header’
    - -Verify presence and contents of the header entry. See section 6.2 Filling in the Header Entry, + +Verify presence and contents of the header entry. See section 6.2 Filling in the Header Entry, for a description of the various fields in the header entry. -
    `--check-domain´ +
    ‘--check-domain’
    - + Check for conflicts between domain directives and the --output-file option -
    `-C´ +
    ‘-C’
    -
    `--check-compatibility´ +
    ‘--check-compatibility’
    - - - + + + Check that GNU msgfmt behaves like X/Open msgfmt. This will give an error when attempting to use the GNU extensions. -
    `--check-accelerators[=char]´ +
    ‘--check-accelerators[=char]’
    - - - - + + + + Check presence of keyboard accelerators for menu items. This is based on the convention used in some GUIs that a keyboard accelerator in a menu -item string is designated by an immediately preceding `&´ character. +item string is designated by an immediately preceding ‘&’ character. Sometimes a keyboard accelerator is also called "keyboard mnemonic". This check verifies that if the untranslated string has exactly one -`&´ character, the translated string has exactly one `&´ as well. +‘&’ character, the translated string has exactly one ‘&’ as well. If this option is given with a char argument, this char should be a non-alphanumeric character and is used as keyboard accelerator mark -instead of `&´. +instead of ‘&’. -
    `-f´ +
    ‘-f’
    -
    `--use-fuzzy´ +
    ‘--use-fuzzy’
    - - - + + + Use fuzzy entries in output. Note that using this option is usually wrong, because fuzzy messages are exactly those which have not been validated by a human translator. @@ -350,21 +351,21 @@ a human translator. -

    10.1.9 Output details

    +

    10.1.9 Output details

    -
    `-a number´ +
    ‘-a number’
    -
    `--alignment=number´ +
    ‘--alignment=number’
    - - + + Align strings to number bytes (default: 1). -
    `--no-hash´ +
    ‘--no-hash’
    - + Don't include a hash table in the binary file. Lookup will be more expensive at run time (binary search instead of hash table lookup). @@ -372,131 +373,131 @@ at run time (binary search instead of hash table lookup). -

    10.1.10 Informative output

    +

    10.1.10 Informative output

    -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit. -
    `--statistics´ +
    ‘--statistics’
    - + Print statistics about translations. -
    `-v´ +
    ‘-v’
    -
    `--verbose´ +
    ‘--verbose’
    - - + + Increase verbosity level.
    -

    10.2 Invoking the msgunfmt Program

    +

    10.2 Invoking the msgunfmt Program

    - - + + 

     msgunfmt [option] [file]...

    - + The msgunfmt program converts a binary message catalog to a Uniforum style .po file.

    -

    10.2.1 Operation mode

    +

    10.2.1 Operation mode

    -
    `-j´ +
    ‘-j’
    -
    `--java´ +
    ‘--java’
    - - - + + + Java mode: input is a Java ResourceBundle class. -
    `--csharp´ +
    ‘--csharp’
    - - + + C# mode: input is a .NET .dll file containing a subclass of GettextResourceSet. -
    `--csharp-resources´ +
    ‘--csharp-resources’
    - - -C# resources mode: input is a .NET `.resources´ file. + + +C# resources mode: input is a .NET ‘.resources’ file. -
    `--tcl´ +
    ‘--tcl’
    - - -Tcl mode: input is a tcl/msgcat `.msg´ file. + + +Tcl mode: input is a tcl/msgcat ‘.msg’ file.
    -

    10.2.2 Input file location

    +

    10.2.2 Input file location

    -
    `file ...´ +
    ‘file ...’
    Input .mo files.

    -If no input file is given or if it is `-´, standard input is read. +If no input file is given or if it is ‘-’, standard input is read.

    -

    10.2.3 Input file location in Java mode

    +

    10.2.3 Input file location in Java mode

    -
    `-r resource´ +
    ‘-r resource’
    -
    `--resource=resource´ +
    ‘--resource=resource’
    - - + + Specify the resource name. -
    `-l locale´ +
    ‘-l locale’
    -
    `--locale=locale´ +
    ‘--locale=locale’
    - - + + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC. @@ -509,154 +510,154 @@ separated with an underscore. The class is located using the CLASSPATH -

    10.2.4 Input file location in C# mode

    +

    10.2.4 Input file location in C# mode

    -
    `-r resource´ +
    ‘-r resource’
    -
    `--resource=resource´ +
    ‘--resource=resource’
    - - + + Specify the resource name. -
    `-l locale´ +
    ‘-l locale’
    -
    `--locale=locale´ +
    ‘--locale=locale’
    - - + + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC. -
    `-d directory´ +
    ‘-d directory’
    - -Specify the base directory for locale dependent `.dll´ files. + +Specify the base directory for locale dependent ‘.dll’ files.

    -The `-l´ and `-d´ options are mandatory. The `.msg´ file is +The ‘-l’ and ‘-d’ options are mandatory. The ‘.msg’ file is located in a subdirectory of the specified directory whose name depends on the locale.

    -

    10.2.5 Input file location in Tcl mode

    +

    10.2.5 Input file location in Tcl mode

    -
    `-l locale´ +
    ‘-l locale’
    -
    `--locale=locale´ +
    ‘--locale=locale’
    - - + + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC. -
    `-d directory´ +
    ‘-d directory’
    - -Specify the base directory of `.msg´ message catalogs. + +Specify the base directory of ‘.msg’ message catalogs.

    -The `-l´ and `-d´ options are mandatory. The `.msg´ file is +The ‘-l’ and ‘-d’ options are mandatory. The ‘.msg’ file is located in the specified directory.

    -

    10.2.6 Output file location

    +

    10.2.6 Output file location

    -
    `-o file´ +
    ‘-o file’
    -
    `--output-file=file´ +
    ‘--output-file=file’
    - - + + Write output to specified file.

    The results are written to standard output if no output file is specified -or if it is `-´. +or if it is ‘-’.

    -

    10.2.7 Output details

    +

    10.2.7 Output details

    -
    `--force-po´ +
    ‘--force-po’
    - + Always write an output file even if it contains no message. -
    `-i´ +
    ‘-i’
    -
    `--indent´ +
    ‘--indent’
    - - + + Write the .po file using indented style. -
    `--strict´ +
    ‘--strict’
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. -
    `-p´ +
    ‘-p’
    -
    `--properties-output´ +
    ‘--properties-output’
    - - + + Write out a Java ResourceBundle in Java .properties syntax. Note that this file format doesn't support plural forms and silently drops obsolete messages. -
    `--stringtable-output´ +
    ‘--stringtable-output’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. -
    `-w number´ +
    ‘-w number’
    -
    `--width=number´ +
    ‘--width=number’
    - - + + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number. -
    `--no-wrap´ +
    ‘--no-wrap’
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. -
    `-s´ +
    ‘-s’
    -
    `--sort-output´ +
    ‘--sort-output’
    - - - + + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -664,42 +665,42 @@ for the translator to understand each message's context. -

    10.2.8 Informative output

    +

    10.2.8 Informative output

    -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit. -
    `-v´ +
    ‘-v’
    -
    `--verbose´ +
    ‘--verbose’
    - - + + Increase verbosity level.
    -

    10.3 The Format of GNU MO Files

    +

    10.3 The Format of GNU MO Files

    - - + +

    @@ -708,7 +709,7 @@ which appears below.

    - + The first two words serve the identification of the file. The magic number will always signal GNU MO files. The number is stored in the byte order of the generating machine, so the magic number really is @@ -718,7 +719,7 @@ revision is 0. This might change in future versions, and ensures that the readers of MO files can distinguish new formats from old ones, so that both can be handled correctly. The version is kept separate from the magic number, instead of using different magic -numbers for different formats, mainly because `/etc/magic´ is +numbers for different formats, mainly because ‘/etc/magic’ is not updated often. It might be better to have magic separated from internal format version identification. @@ -756,7 +757,7 @@ translated tables, making the system information very easy to find.

    - + The size S of the hash table can be zero. In this case, the hash table itself is not contained in the MO file. Some people might prefer this because a precomputed hashing table takes disk space, and @@ -777,7 +778,13 @@ machines, a correct alignment will speed things up.

    - + +Contexts are stored by storing the concatenation of the context, a +EOT byte, and the original string, instead of the original string. + +

    +

    + Plural forms are stored by letting the plural of the original string follow the singular of the original string, separated through a NUL byte. The length which appears in the string descriptor @@ -797,7 +804,7 @@ interfaces would be later possible, if for example, we ever want to implement wide characters right in MO files, where NUL bytes may accidently appear. (No, we don't want to have wide characters in MO files. They would make the file unnecessarily large, and the -`wchar_t´ type being platform dependent, MO files would be +‘wchar_t’ type being platform dependent, MO files would be platform dependent as well.)

    @@ -863,6 +870,6 @@ T + ((N-1)*8)| length & offset (N-1)th translation | | | | |

    -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents. diff --git a/gettext-tools/doc/gettext_11.html b/gettext-tools/doc/gettext_11.html index 01c4665ff..e74fa3fe0 100644 --- a/gettext-tools/doc/gettext_11.html +++ b/gettext-tools/doc/gettext_11.html @@ -1,16 +1,17 @@ - + + GNU gettext utilities - 11 The Programmer's View -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents.

    -

    11 The Programmer's View

    +

    11 The Programmer's View

    One aim of the current message catalog implementation provided by @@ -28,9 +29,9 @@ later explain our solution of this dilemma. -

    11.1 About catgets

    +

    11.1 About catgets

    - +

    @@ -63,9 +64,9 @@ therefore part of all Unix implementation (implementations, which are -

    11.1.1 The Interface

    +

    11.1.1 The Interface

    - +

    @@ -78,7 +79,7 @@ for the functions and the needed definitions are in the

    - + catopen is used like in this:

    @@ -97,7 +98,7 @@ message catalog, equivalent to handles to file returned by open.

    - + This handle is of course used in the catgets function which can be used like this: @@ -129,7 +130,7 @@ should better be const char *, but the standard is published in

    - + The last of these functions is used and behaves as expected:

    @@ -144,9 +145,9 @@ After this no catgets call using the descriptor is legal anymore.

    -

    11.1.2 Problems with the catgets Interface?!

    +

    11.1.2 Problems with the catgets Interface?!

    - +

    @@ -165,9 +166,9 @@ more easy to manage.

    -

    11.2 About gettext

    +

    11.2 About gettext

    - +

    @@ -182,7 +183,7 @@ The main point about this solution is that it does not follow the method of normal file handling (open-use-close) and that it does not burden the programmer with so many tasks, especially the unique key handling. Of course here also a unique key is needed, but this key is the message -itself (how long or short it is). See section 11.3 Comparing the Two Interfaces for a more +itself (how long or short it is). See section 11.3 Comparing the Two Interfaces for a more detailed comparison of the two methods.

    @@ -196,9 +197,9 @@ in using this library will be interested in this description. -

    11.2.1 The Interface

    +

    11.2.1 The Interface

    - +

    @@ -267,11 +268,11 @@ your language.

    -

    11.2.2 Solving Ambiguities

    +

    11.2.2 Solving Ambiguities

    - - - + + +

    @@ -345,9 +346,9 @@ unreliabilities.

    -

    11.2.3 Locating Message Catalog Files

    +

    11.2.3 Locating Message Catalog Files

    - +

    @@ -385,10 +386,10 @@ The value of the locale is determined through

    -

    11.2.4 How to specify the output character set gettext uses

    +

    11.2.4 How to specify the output character set gettext uses

    - - + +

    @@ -420,7 +421,7 @@ recommended that all msgids be US-ASCII strings.

    Function: char * bind_textdomain_codeset (const char *domainname, const char *codeset) -
    +
    The bind_textdomain_codeset function can be used to specify the output character set for message catalogs for domain domainname. The codeset argument must be a valid codeset name which can be used @@ -452,9 +453,195 @@ global variable errno is set accordingly.

    -

    11.2.5 Additional functions for plural forms

    +

    11.2.5 Using contexts for solving ambiguities

    +

    + + + + + +

    +

    +One place where the gettext functions, if used normally, have big +problems is within programs with graphical user interfaces (GUIs). The +problem is that many of the strings which have to be translated are very +short. They have to appear in pull-down menus which restricts the +length. But strings which are not containing entire sentences or at +least large fragments of a sentence may appear in more than one +situation in the program but might have different translations. This is +especially true for the one-word strings which are frequently used in +GUI programs. + +

    - +As a consequence many people say that the gettext approach is +wrong and instead catgets should be used which indeed does not +have this problem. But there is a very simple and powerful method to +handle this kind of problems with the gettext functions. + +

    +

    +Contexts can be added to strings to be translated. A context dependent +translation lookup is when a translation for a given string is searched, +that is limited to a given context. The translation for the same string +in a different context can be different. The different translations of +the same string in different contexts can be stored in the in the same +MO file, and can be edited by the translator in the same PO file. + +

    +

    +The ‘gettext.h’ include file contains the lookup macros for strings +with contexts. They are implemented as thin macros and inline functions +over the functions from <libintl.h>. + +

    +

    + + +

    +const char *pgettext (const char *msgctxt, const char *msgid);
+
    + +

    +In a call of this macro, msgctxt and msgid must be string +literals. The macro returns the translation of msgid, restricted +to the context given by msgctxt. + +

    +

    +The msgctxt string is visible in the PO file to the translator. +You should try to make it somehow canonical and never changing. Because +every time you change an msgctxt, the translator will have to review +the translation of msgid. + +

    +

    +Finding a canonical msgctxt string that doesn't change over time can +be hard. But you shouldn't use the file name or class name containing the +pgettext call -- because it is a common development task to rename +a file or a class, and it shouldn't cause translator work. Also you shouldn't +use a comment in the form of a complete English sentence as msgctxt -- +because orthography or grammar changes are often applied to such sentences, +and again, it shouldn't force the translator to do a review. + +

    +

    +The ‘p’ in ‘pgettext’ stands for “particular”: pgettext +fetches a particular translation of the msgid. + +

    +

    + + + +

    +const char *dpgettext (const char *domain_name,
+                       const char *msgctxt, const char *msgid);
+const char *dcpgettext (const char *domain_name,
+                        const char *msgctxt, const char *msgid,
+                        int category);
+
    + +

    +These are generalizations of pgettext. They behave similarly to +dgettext and dcgettext, respectively. The domain_name +argument defines the translation domain. The category argument +allows to use another locale facet than LC_MESSAGES. + +

    +

    +As as example consider the following fictional situation. A GUI program +has a menu bar with the following entries: + +

    + +
    ++------------+------------+--------------------------------------+
+| File       | Printer    |                                      |
++------------+------------+--------------------------------------+
+| Open     | | Select   |
+| New      | | Open     |
++----------+ | Connect  |
+             +----------+
+
    + +

    +To have the strings File, Printer, Open, +New, Select, and Connect translated there has to be +at some point in the code a call to a function of the gettext +family. But in two places the string passed into the function would be +Open. The translations might not be the same and therefore we +are in the dilemma described above. + +

    +

    +What distinguishes the two places is the menu path from the menu root to +the particular menu entries: + +

    + +
    +Menu|File
+Menu|Printer
+Menu|File|Open
+Menu|File|New
+Menu|Printer|Select
+Menu|Printer|Open
+Menu|Printer|Connect
+
    + +

    +The context is thus the menu path without its last part. So, the calls +look like this: + +

    + +
    +pgettext ("Menu|", "File")
+pgettext ("Menu|", "Printer")
+pgettext ("Menu|File|", "Open")
+pgettext ("Menu|File|", "New")
+pgettext ("Menu|Printer|", "Select")
+pgettext ("Menu|Printer|", "Open")
+pgettext ("Menu|Printer|", "Connect")
+
    + +

    +Whether or not to use the ‘|’ character at the end of the context is a +matter of style. + +

    +

    +For more complex cases, where the msgctxt or msgid are not +string literals, more general macros are available: + +

    +

    + + + + +

    +const char *pgettext_expr (const char *msgctxt, const char *msgid);
+const char *dpgettext_expr (const char *domain_name,
+                            const char *msgctxt, const char *msgid);
+const char *dcpgettext_expr (const char *domain_name,
+                             const char *msgctxt, const char *msgid,
+                             int category);
+
    + +

    +Here msgctxt and msgid can be arbitrary string-valued expressions. +These macros are more general. But in the case that both argument expressions +are string literals, the macros without the ‘_expr’ suffix are more +efficient. + +

    + + +

    11.2.6 Additional functions for plural forms

    +

    +

    @@ -492,8 +679,9 @@ tries to solve the problem correctly looked like this:

    But this does not solve the problem. It helps languages where the -plural form of a noun is not simply constructed by adding an `s' but -that is all. Once again people fell into the trap of believing the +plural form of a noun is not simply constructed by adding an +‘s’ +but that is all. Once again people fell into the trap of believing the rules their language is using are universal. But the handling of plural forms differs widely between the language families. For example, Rafal Maszkowski <rzm@mat.uni.torun.pl> reports: @@ -530,7 +718,9 @@ The form how plural forms are built differs. This is a problem with languages which have many irregularities. German, for instance, is a drastic case. Though English and German are part of the same language family (Germanic), the almost regular forming of plural noun forms -(appending an `s') is hardly found in German. +(appending an +‘s’) +is hardly found in German.

  • @@ -574,7 +764,7 @@ purpose.

    Function: char * ngettext (const char *msgid1, const char *msgid2, unsigned long int n) -
    +
    The ngettext function is similar to the gettext function as it finds the message catalogs in the same way. But it takes two extra arguments. The msgid1 parameter must contain the singular @@ -604,7 +794,7 @@ Please note that the numeric value n has to be passed to the

    Function: char * dngettext (const char *domain, const char *msgid1, const char *msgid2, unsigned long int n) -
    +
    The dngettext is similar to the dgettext function in the way the message catalog is selected. The difference is that it takes two extra parameter to provide the correct plural form. These two @@ -615,7 +805,7 @@ parameters are handled in the same way ngettext handles them.

    Function: char * dcngettext (const char *domain, const char *msgid1, const char *msgid2, unsigned long int n, int category) -
    +
    The dcngettext is similar to the dcgettext function in the way the message catalog is selected. The difference is that it takes two extra parameter to provide the correct plural form. These two @@ -640,9 +830,9 @@ possibility of extensions to not prevent the use of new languages).

    - - - + + + The information about the plural form selection has to be stored in the header entry of the PO file (the one with the empty msgid string). The plural form information looks like this: @@ -658,8 +848,10 @@ The nplurals value must be a decimal number which specifies how many different plural forms exist for this language. The string following plural is an expression which is using the C language syntax. Exceptions are that no negative numbers are allowed, numbers -must be decimal, and the only variable allowed is n. This -expression will be evaluated whenever one of the functions +must be decimal, and the only variable allowed is n. Spaces are +allowed in the expression, but backslash-newlines are not; in the +examples below the backslash-newlines are present for formatting purposes +only. This expression will be evaluated whenever one of the functions ngettext, dngettext, or dcngettext is called. The numeric value passed to these functions is then substituted for all uses of the variable n in the expression. The resulting value then @@ -668,7 +860,7 @@ value of nplurals.

    - + The following rules are known at this point. The language with families are listed. But this does not necessarily mean the information can be generalized for the whole family (as can be easily seen in the table @@ -794,6 +986,25 @@ Languages with this property include: Gaeilge (Irish)

    +
    Three forms, special case for numbers ending in 00 or [2-9][0-9] +
    +The header entry would be: + + +
    +Plural-Forms: nplurals=3; \
+    plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;
+
    + +Languages with this property include: + +
    + +
    Romanic family +
    +Romanian +
    +
    Three forms, special case for numbers ending in 1[2-9]
    The header entry would look like this: @@ -895,165 +1106,9 @@ Slovenian -

    11.2.6 How to use gettext in GUI programs

    -

    - - - - -

    +

    11.2.7 Optimization of the *gettext functions

    -One place where the gettext functions, if used normally, have big -problems is within programs with graphical user interfaces (GUIs). The -problem is that many of the strings which have to be translated are very -short. They have to appear in pull-down menus which restricts the -length. But strings which are not containing entire sentences or at -least large fragments of a sentence may appear in more than one -situation in the program but might have different translations. This is -especially true for the one-word strings which are frequently used in -GUI programs. - -

    -

    -As a consequence many people say that the gettext approach is -wrong and instead catgets should be used which indeed does not -have this problem. But there is a very simple and powerful method to -handle these kind of problems with the gettext functions. - -

    -

    -As as example consider the following fictional situation. A GUI program -has a menu bar with the following entries: - -

    - -
    -+------------+------------+--------------------------------------+
-| File       | Printer    |                                      |
-+------------+------------+--------------------------------------+
-| Open     | | Select   |
-| New      | | Open     |
-+----------+ | Connect  |
-             +----------+
-
    - -

    -To have the strings File, Printer, Open, -New, Select, and Connect translated there has to be -at some point in the code a call to a function of the gettext -family. But in two places the string passed into the function would be -Open. The translations might not be the same and therefore we -are in the dilemma described above. - -

    -

    -One solution to this problem is to artificially enlengthen the strings -to make them unambiguous. But what would the program do if no -translation is available? The enlengthened string is not what should be -printed. So we should use a little bit modified version of the functions. - -

    -

    -To enlengthen the strings a uniform method should be used. E.g., in the -example above the strings could be chosen as - -

    - -
    -Menu|File
-Menu|Printer
-Menu|File|Open
-Menu|File|New
-Menu|Printer|Select
-Menu|Printer|Open
-Menu|Printer|Connect
-
    - -

    -Now all the strings are different and if now instead of gettext -the following little wrapper function is used, everything works just -fine: - -

    -

    - - -

    -  char *
-  sgettext (const char *msgid)
-  {
-    char *msgval = gettext (msgid);
-    if (msgval == msgid)
-      msgval = strrchr (msgid, '|') + 1;
-    return msgval;
-  }
-
    - -

    -What this little function does is to recognize the case when no -translation is available. This can be done very efficiently by a -pointer comparison since the return value is the input value. If there -is no translation we know that the input string is in the format we used -for the Menu entries and therefore contains a | character. We -simply search for the last occurrence of this character and return a -pointer to the character following it. That's it! - -

    -

    -If one now consistently uses the enlengthened string form and replaces -the gettext calls with calls to sgettext (this is normally -limited to very few places in the GUI implementation) then it is -possible to produce a program which can be internationalized. - -

    -

    -The other gettext functions (dgettext, dcgettext -and the ngettext equivalents) can and should have corresponding -functions as well which look almost identical, except for the parameters -and the call to the underlying function. - -

    -

    -Now there is of course the question why such functions do not exist in -the GNU gettext package? There are two parts of the answer to this question. - -

    - -
      -
    • - -They are easy to write and therefore can be provided by the project they -are used in. This is not an answer by itself and must be seen together -with the second part which is: - -
    • - -There is no way the gettext package can contain a version which can work -everywhere. The problem is the selection of the character to separate -the prefix from the actual string in the enlenghtened string. The -examples above used | which is a quite good choice because it -resembles a notation frequently used in this context and it also is a -character not often used in message strings. - -But what if the character is used in message strings? Or if the chose -character is not available in the character set on the machine one -compiles (e.g., | is not required to exist for ISO C; this is -why the `iso646.h´ file exists in ISO C programming environments). -
    - -

    -There is only one more comment to be said. The wrapper function above -requires that the translations strings are not enlengthened themselves. -This is only logical. There is no need to disambiguate the strings -(since they are never used as keys for a search) and one also saves -quite some memory and disk space by doing this. - -

    - - -

    11.2.7 Optimization of the *gettext functions

    -

    - +

    @@ -1106,10 +1161,10 @@ find the result through a single cache lookup.

    -

    11.3 Comparing the Two Interfaces

    +

    11.3 Comparing the Two Interfaces

    - - + +

    @@ -1159,7 +1214,7 @@ by

    - + 

     #include <libintl.h>
@@ -1167,16 +1222,16 @@ by

    -Additionally we run the program `xgettext´ on all source code file +Additionally we run the program ‘xgettext’ on all source code file which contain translatable strings and that's it: we have a running program which does not depend on translations to be available, but which can use any that becomes available.

    - + The same procedure can be done for the gettext_noop invocations -(see section 4.6 Special Cases of Translatable Strings). One usually defines gettext_noop as a +(see section 4.7 Special Cases of Translatable Strings). One usually defines gettext_noop as a no-op macro. So you should consider the following code for your project:

    @@ -1187,8 +1242,8 @@ no-op macro. So you should consider the following code for your project:

    -N_ is a short form similar to _. The `Makefile´ in -the `po/´ directory of GNU gettext knows by default both of the +N_ is a short form similar to _. The ‘Makefile’ in +the ‘po/’ directory of GNU gettext knows by default both of the mentioned short forms so you are invited to follow this proposal for your own ease. @@ -1253,24 +1308,29 @@ little bit. But it is not impossible to overcome.

    catgets allows same original entry to have different translations, but gettext has another, scalable approach for solving ambiguities -of this kind: See section 11.2.2 Solving Ambiguities. +of this kind: See section 11.2.2 Solving Ambiguities.

    -

    11.4 Using libintl.a in own programs

    +

    11.4 Using libintl.a in own programs

    Starting with version 0.9.4 the library libintl.h should be self-contained. I.e., you can use it in your own programs without -providing additional functions. The `Makefile´ will put the header +providing additional functions. The ‘Makefile’ will put the header and the library in directories selected using the $(prefix).

    -

    11.5 Being a gettext grok

    +

    11.5 Being a gettext grok

    +

    + NOTE: This documentation section is outdated and needs to be +revised. + +

    To fully exploit the functionality of the GNU gettext library it is surely helpful to read the source code. But for those who don't want @@ -1282,7 +1342,7 @@ is a list comments:

    • Changing the language at runtime - + For interactive programs it might be useful to offer a selection of the used language at runtime. To understand how to do this one need to know @@ -1299,20 +1359,20 @@ priority:
      1. LANGUAGE - + - +
      2. LC_ALL - - - - - - + + + + + +
      3. LC_xxx, according to selected locale - +
      4. LANG
      @@ -1330,7 +1390,7 @@ But there is one little hook. The code for gcc-2.7.0 and up provides some optimization. This optimization normally prevents the calling of the dcgettext function as long as no new catalog is loaded. But if dcgettext is not called the program also cannot find the -LANGUAGE variable be changed (see section 11.2.7 Optimization of the *gettext functions). A +LANGUAGE variable be changed (see section 11.2.7 Optimization of the *gettext functions). A solution for this is very easy. Include the following code in the language switching function. @@ -1346,8 +1406,8 @@ language switching function. } - -The variable _nl_msg_cat_cntr is defined in `loadmsgcat.c´. + +The variable _nl_msg_cat_cntr is defined in ‘loadmsgcat.c’. You don't need to know what this is for. But it can be used to detect whether a gettext implementation is GNU gettext and not non-GNU system's native gettext implementation. @@ -1356,11 +1416,17 @@ system's native gettext implementation. -

      11.6 Temporary Notes for the Programmers Chapter

      +

      11.6 Temporary Notes for the Programmers Chapter

      + +

      + NOTE: This documentation section is outdated and needs to be +revised. + +

      -

      11.6.1 Temporary - Two Possible Implementations

      +

      11.6.1 Temporary - Two Possible Implementations

      There are two competing methods for language independent messages: @@ -1380,8 +1446,8 @@ in the POSIX.1 committee about using the gettext routines vs. catgets (XPG). In the end the committee couldn't agree on anything, so no messaging system was included as part of the standard. I believe the informative annex of the standard -includes the XPG3 messaging interfaces, "...as an example of -a messaging system that has been implemented..." +includes the XPG3 messaging interfaces, “...as an example of +a messaging system that has been implemented...”

      @@ -1392,7 +1458,7 @@ see the Programming for Internationalization FAQ.

      -

      11.6.2 Temporary - About catgets

      +

      11.6.2 Temporary - About catgets

      There have been a few discussions of late on the use of @@ -1437,7 +1503,7 @@ of all Unix systems.

      -

      11.6.3 Temporary - Why a single implementation

      +

      11.6.3 Temporary - Why a single implementation

      Now it seems kind of wasteful to me to have two different systems @@ -1482,7 +1548,7 @@ the future.

      -

      11.6.4 Temporary - Notes

      +

      11.6.4 Temporary - Notes

      X/Open agreed very late on the standard form so that many @@ -1497,6 +1563,6 @@ Solaris is not the only system having gettext.

      -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents. diff --git a/gettext-tools/doc/gettext_12.html b/gettext-tools/doc/gettext_12.html index 441a90478..7668f8d5c 100644 --- a/gettext-tools/doc/gettext_12.html +++ b/gettext-tools/doc/gettext_12.html @@ -1,21 +1,27 @@ - + + GNU gettext utilities - 12 The Translator's View -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents.

      -

      12 The Translator's View

      +

      12 The Translator's View

      -

      12.1 Introduction 0

      +

      12.1 Introduction 0

      +

      + NOTE: This documentation section is outdated and needs to be +revised. + +

      Free software is going international! The Translation Project is a way to get maintainers, translators and users all together, so free software @@ -41,7 +47,7 @@ please send mail to your translating team.

      Each team has its own mailing list, courtesy of Linux International. You may reach your translating team at the address -`ll@li.org´, replacing ll by the two-letter ISO 639 +‘ll@li.org’, replacing ll by the two-letter ISO 639 code for your language. Language codes are not the same as country codes given in ISO 3166. The following translating teams exist: @@ -60,9 +66,9 @@ Swedish sv and Turkish tr.

      For example, you may reach the Chinese translating team by writing to -`zh@li.org´. When you become a member of the translating team +‘zh@li.org’. When you become a member of the translating team for your own language, you may subscribe to its list. For example, -Swedish people can send a message to `sv-request@li.org´, +Swedish people can send a message to ‘sv-request@li.org’, having this message body:

      @@ -75,7 +81,7 @@ subscribe Keep in mind that team members should be interested in working at translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to -start one, please write to `translation@iro.umontreal.ca´; +start one, please write to ‘translation@iro.umontreal.ca’; you will then reach the coordinator for all translator teams.

      @@ -86,14 +92,19 @@ teams have begun to organize, using these packages as a starting point. But there are many more packages and many languages for which we have no volunteer translators. If you would like to volunteer to work at translating messages, please send mail to -`translation@iro.umontreal.ca´ indicating what language(s) +‘translation@iro.umontreal.ca’ indicating what language(s) you can work on.

      -

      12.2 Introduction 1

      +

      12.2 Introduction 1

      + +

      + NOTE: This documentation section is outdated and needs to be +revised. +

      This is now official, GNU is going international! Here is the announcement submitted for the January 1995 GNU Bulletin: @@ -108,7 +119,7 @@ teams have begun to organize, using these packages as a starting point. But there are many more packages and many languages for which we have no volunteer translators. If you'd like to volunteer to work at translating messages, please send mail to -`translation@iro.umontreal.ca´ indicating what language(s) +‘translation@iro.umontreal.ca’ indicating what language(s) you can work on. @@ -137,13 +148,18 @@ internationalization of free software is dedicated to succeed.

      For suggestion clarifications, additions or corrections to this -document, please e-mail to `translation@iro.umontreal.ca´. +document, please e-mail to ‘translation@iro.umontreal.ca’.

      -

      12.3 Discussions

      +

      12.3 Discussions

      +

      + NOTE: This documentation section is outdated and needs to be +revised. + +

      Facing this internationalization effort, a few users expressed their concerns. Some of these doubts are presented and discussed, here. @@ -180,8 +196,8 @@ dear to their hearts. The biggest problem is to find the right translations so that everybody can understand the messages. Translations are usually a little odd. Some people get used to English, to the extent they may -find translations into their own language "rather pushy, obnoxious -and sometimes even hilarious." As a French speaking man, I have +find translations into their own language “rather pushy, obnoxious +and sometimes even hilarious.” As a French speaking man, I have the experience of those instruction manuals for goods, so poorly translated in French in Korea or Taiwan... @@ -197,7 +213,7 @@ Some people wonder if using GNU gettext necessarily brings their package under the protective wing of the GNU General Public License or the GNU Library General Public License, when they do not want to make their program free, or want other kinds of freedom. The simplest -answer is "normally not". +answer is “normally not”. The gettext-runtime part of GNU gettext, i.e. the contents of libintl, is covered by the GNU Library General Public @@ -220,8 +236,13 @@ software. -

      12.4 Organization

      +

      12.4 Organization

      + +

      + NOTE: This documentation section is outdated and needs to be +revised. +

      On a larger scale, the true solution would be to organize some kind of fairly precise set up in which volunteers could participate. I gave @@ -256,7 +277,7 @@ become a permanent and continuous activity in the free software community, once well started. The setup should be minimally completed and tested before GNU gettext becomes an official reality. The e-mail address -`translation@iro.umontreal.ca´ has been setup for receiving +‘translation@iro.umontreal.ca’ has been setup for receiving offers from volunteers and general e-mail on these topics. This address reaches the Translation Project coordinator. @@ -264,14 +285,14 @@ reaches the Translation Project coordinator. -

      12.4.1 Central Coordination

      +

      12.4.1 Central Coordination

      I also think GNU will need sooner than it thinks, that someone setup a way to organize and coordinate these groups. Some kind of group of groups. My opinion is that it would be good that GNU delegates this task to a small group of collaborating volunteers, shortly. -Perhaps in `gnu.announce´ a list of this national committee's +Perhaps in ‘gnu.announce’ a list of this national committee's can be published.

      @@ -289,7 +310,7 @@ overwhelming task, the time to put delegations in place.

      -

      12.4.2 National Teams

      +

      12.4.2 National Teams

      I suggest we look for volunteer coordinators/editors for individual @@ -352,7 +373,7 @@ consistent. -

      12.4.2.1 Sub-Cultures

      +

      12.4.2.1 Sub-Cultures

      Taking French for example, there are a few sub-cultures around computers @@ -374,7 +395,7 @@ means soon!

      -

      12.4.2.2 Organizational Ideas

      +

      12.4.2.2 Organizational Ideas

      I expect the next big changes after the official release. Please note @@ -411,7 +432,7 @@ this also seems to work). -

      12.4.3 Mailing Lists

      +

      12.4.3 Mailing Lists

      If we get any inquiries about GNU gettext, send them on to: @@ -419,18 +440,18 @@ If we get any inquiries about GNU gettext, send them on to: 

      -`translation@iro.umontreal.ca´
+‘translation@iro.umontreal.ca’

      -The `*-pretest´ lists are quite useful to me, maybe the idea could +The ‘*-pretest’ lists are quite useful to me, maybe the idea could be generalized to many GNU, and non-GNU packages. But each maintainer his/her way!

      François, we have a mechanism in place here at -`gnu.ai.mit.edu´ to track teams, support mailing lists for +‘gnu.ai.mit.edu’ to track teams, support mailing lists for them and log members. We have a slight preference that you use it. If this is OK with you, I can get you clued in. @@ -465,8 +486,13 @@ subscribe as they see fit, as long as each team is represented in it.

      -

      12.5 Information Flow

      +

      12.5 Information Flow

      +

      + NOTE: This documentation section is outdated and needs to be +revised. + +

      There will surely be some discussion about this messages after the packages are finally released. If people now send you some proposals @@ -514,7 +540,7 @@ have more information about this.

      -

      12.6 Prioritizing messages: How to determine which messages to translate first

      +

      12.6 Prioritizing messages: How to determine which messages to translate first

      A translator sometimes has only a limited amount of time per week to @@ -538,15 +564,15 @@ of messages.

      - + Here a more details. The GNU libintl library (but not the corresponding functions in GNU libc) supports an environment variable GETTEXT_LOG_UNTRANSLATED. The GNU libintl library will log into this file the messages for which gettext() and related functions couldn't find the translation. If the file doesn't exist, it will be created as needed. On systems with GNU libc a shared library -`preloadable_libintl.so´ is provided that can be used with the ELF -`LD_PRELOAD´ mechanism. +‘preloadable_libintl.so’ is provided that can be used with the ELF +‘LD_PRELOAD’ mechanism.

      @@ -595,8 +621,8 @@ $ msguniq $HOME/gettextlogused > missing.po

      -The result is a PO file, but needs some preprocessing before the Emacs PO -mode can be used with it. First, it is a multi-domain PO file, containing +The result is a PO file, but needs some preprocessing before a PO file editor +can be used with it. First, it is a multi-domain PO file, containing messages from many translation domains. Second, it lacks all translator comments and source references. Here is how to get a list of the affected translation domains: @@ -621,12 +647,12 @@ $ package=/usr/src/gnu/coreutils-4.5.4 # the package where it comes from

      -She takes the latest copy of `$lang.po´ from the Translation Project, -or from the package (in most cases, `$package/po/$lang.po´), or -creates a fresh one if she's the first translator (see section 6 Creating a New PO File). +She takes the latest copy of ‘$lang.po’ from the Translation Project, +or from the package (in most cases, ‘$package/po/$lang.po’), or +creates a fresh one if she's the first translator (see section 6 Creating a New PO File). She then uses the following commands to mark the not urgent messages as "obsolete". (This doesn't mean that these messages - translated and -untranslated ones - will go away. It simply means that Emacs PO mode +untranslated ones - will go away. It simply means that the PO file editor will ignore them in the following editing session.)

      @@ -639,7 +665,8 @@ $ msgattrib --set-obsolete --ignore-file $domain-missing.po $domain.$lang.po \

      -The she translates `$domain.$lang-urgent.po´ by use of Emacs PO mode. +The she translates ‘$domain.$lang-urgent.po’ by use of a PO file editor +(see section 8 Editing PO Files). (FIXME: I don't know whether KBabel and gtranslator also preserve obsolete messages, as they should.) Finally she restores the not urgent messages (with their earlier @@ -653,10 +680,10 @@ $ msgmerge --no-fuzzy-matching $domain.$lang-urgent.po $package/po/$domain.pot \

      -Then she can submit `$domain.$lang.po´ and proceed to the next domain. +Then she can submit ‘$domain.$lang.po’ and proceed to the next domain.

      -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents. diff --git a/gettext-tools/doc/gettext_13.html b/gettext-tools/doc/gettext_13.html index 6a27953f7..4f0dacf5a 100644 --- a/gettext-tools/doc/gettext_13.html +++ b/gettext-tools/doc/gettext_13.html @@ -1,18 +1,19 @@ - + + GNU gettext utilities - 13 The Maintainer's View -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents.

      -

      13 The Maintainer's View

      +

      13 The Maintainer's View

      - +

      @@ -31,7 +32,7 @@ standards, or even better, Gnits standards, because GNU gettext is purposely for helping the internationalization of the whole GNU project, and as many other good free packages as possible. So, the maintainer's view presented here presumes that the package already has -a `configure.in´ file and uses GNU Autoconf. +a ‘configure.in’ file and uses GNU Autoconf.

      @@ -52,15 +53,15 @@ for changes. -

      13.1 Flat or Non-Flat Directory Structures

      +

      13.1 Flat or Non-Flat Directory Structures

      Some free software packages are distributed as tar files which unpack in a single directory, these are said to be flat distributions. Other free software packages have a one level hierarchy of subdirectories, using -for example a subdirectory named `doc/´ for the Texinfo manual and -man pages, another called `lib/´ for holding functions meant to -replace or complement C libraries, and a subdirectory `src/´ for +for example a subdirectory named ‘doc/’ for the Texinfo manual and +man pages, another called ‘lib/’ for holding functions meant to +replace or complement C libraries, and a subdirectory ‘src/’ for holding the proper sources for the package. These other distributions are said to be non-flat. @@ -85,11 +86,11 @@ use this as an opportunity to unflatten their package structure.

      -

      13.2 Prerequisite Works

      +

      13.2 Prerequisite Works

      - - - + + +

      @@ -113,9 +114,9 @@ GNU m4 must be fully installed before GNU Autoconf is even To further ease the task of a package maintainer the automake package was designed and implemented. GNU gettext now uses this -tool and the `Makefile´s in the `intl/´ and `po/´ +tool and the ‘Makefile’s in the ‘intl/’ and ‘po/’ therefore know about all the goals necessary for using automake -and `libintl´ in one project. +and ‘libintl’ in one project. Those four packages are only needed by you, as a maintainer; the installers of your own package and end users do not really need any of @@ -128,8 +129,8 @@ want to see the translation of shell script messages.

    • -Your package should use Autoconf and have a `configure.in´ or -`configure.ac´ file. +Your package should use Autoconf and have a ‘configure.in’ or +‘configure.ac’ file. If it does not, you have to learn how. The Autoconf documentation is quite well written, it is a good idea that you print it and get familiar with it. @@ -141,8 +142,8 @@ instructions given earlier in this manual. See section 13.3 Invoking the gettextize Program +

      13.3 Invoking the gettextize Program

      The gettextize program is an interactive tool that helps the @@ -221,7 +222,7 @@ GNU gettext.

    • It performs as many of the tasks mentioned in the next section -section 13.4 Files You Must Create or Alter as can be performed automatically. +section 13.4 Files You Must Create or Alter as can be performed automatically.
    • It removes obsolete files and idioms used for previous GNU @@ -238,8 +239,8 @@ It can be invoked as follows:

      - - + + 

       gettextize [ option... ] [ directory ]
@@ -251,61 +252,61 @@ and accepts the following options:
 
      
 
      
 
-
      `-c´
+
      ‘-c’
 
      
-
      `--copy´
+
      ‘--copy’
 
      
-
-
+
+
 Copy the needed files instead of making symbolic links.  Using links
 would allow the package to always use the latest gettext code
 available on the system, but it might disturb some mechanism the
 maintainer is used to apply to the sources.  Because running
 gettextize is easy there shouldn't be problems with using copies.
 
-
      `-f´
+
      ‘-f’
 
      
-
      `--force´
+
      ‘--force’
 
      
-
-
+
+
 Force replacement of files which already exist.
 
-
      `--intl´
+
      ‘--intl’
 
      
-
-Install the libintl sources in a subdirectory named `intl/´.
+
+Install the libintl sources in a subdirectory named ‘intl/’.
 This libintl will be used to provide internationalization on systems
 that don't have GNU libintl installed.  If this option is omitted,
-the call to AM_GNU_GETTEXT in `configure.in´ should read:
-`AM_GNU_GETTEXT([external])´, and internationalization will not
+the call to AM_GNU_GETTEXT in ‘configure.in’ should read:
+‘AM_GNU_GETTEXT([external])’, and internationalization will not
 be enabled on systems lacking GNU gettext.
 
-
      `--no-changelog´
+
      ‘--no-changelog’
 
      
-
+
 Don't update or create ChangeLog files.  By default, gettextize
 logs all changes (file additions, modifications and removals) in a
-file called `ChangeLog´ in each affected directory.
+file called ‘ChangeLog’ in each affected directory.
 
-
      `-n´
+
      ‘-n’
 
      
-
      `--dry-run´
+
      ‘--dry-run’
 
      
-
-
+
+
 Print modifications but don't perform them.  All actions that
 gettextize would normally execute are inhibited and instead only
 listed on standard output.
 
-
      `--help´
+
      ‘--help’
 
      
-
+
 Display this help and exit.
 
-
      `--version´
+
      ‘--version’
 
      
-
+
 Output version information and exit.
 
 
      
@@ -327,68 +328,68 @@ no existing file will be replaced unless the option --force
 
        
 
      1. 
 
-The `ABOUT-NLS´ file is copied in the main directory of your package,
+The ‘ABOUT-NLS’ file is copied in the main directory of your package,
 the one being at the top level.  This file gives the main indications
 about how to install and use the Native Language Support features
 of your program.  You might elect to use a more recent copy of this
-`ABOUT-NLS´ file than the one provided through gettextize,
+‘ABOUT-NLS’ file than the one provided through gettextize,
 if you have one handy.  You may also fetch a more recent copy of file
-`ABOUT-NLS´ from Translation Project sites, and from most GNU
+‘ABOUT-NLS’ from Translation Project sites, and from most GNU
 archive sites.
 
 
      2. 
 
-A `po/´ directory is created for eventually holding
+A ‘po/’ directory is created for eventually holding
 all translation files, but initially only containing the file
-`po/Makefile.in.in´ from the GNU gettext distribution
-(beware the double `.in´ in the file name) and a few auxiliary
-files.  If the `po/´ directory already exists, it will be preserved
-along with the files it contains, and only `Makefile.in.in´ and
+‘po/Makefile.in.in’ from the GNU gettext distribution
+(beware the double ‘.in’ in the file name) and a few auxiliary
+files.  If the ‘po/’ directory already exists, it will be preserved
+along with the files it contains, and only ‘Makefile.in.in’ and
 the auxiliary files will be overwritten.
 
 
      3. 
 
-Only if `--intl´ has been specified:
-A `intl/´ directory is created and filled with most of the files
-originally in the `intl/´ directory of the GNU gettext
+Only if ‘--intl’ has been specified:
+A ‘intl/’ directory is created and filled with most of the files
+originally in the ‘intl/’ directory of the GNU gettext
 distribution.  Also, if option --force (-f) is given,
-the `intl/´ directory is emptied first.
+the ‘intl/’ directory is emptied first.
 
 
      4. 
 
-The files `config.rpath´ and `mkinstalldirs´ are copied into
-the directory containing configuration support files.  It is needed by
-the AM_GNU_GETTEXT autoconf macro.
+The file ‘config.rpath’ is copied into the directory containing
+configuration support files.  It is needed by the AM_GNU_GETTEXT
+autoconf macro.
 
 
      5. 
 
 Only if the project is using GNU automake:
 A set of autoconf macro files is copied into the package's
-autoconf macro repository, usually in a directory called `m4/´.
+autoconf macro repository, usually in a directory called ‘m4/’.
 
      
 
 
      
 If your site support symbolic links, gettextize will not
 actually copy the files into your package, but establish symbolic
 links instead.  This avoids duplicating the disk space needed in
-all packages.  Merely using the `-h´ option while creating the
+all packages.  Merely using the ‘-h’ option while creating the
 tar archive of your distribution will resolve each link by an
 actual copy in the distribution archive.  So, to insist, you really
-should use `-h´ option with tar within your dist
-goal of your main `Makefile.in´.
+should use ‘-h’ option with tar within your dist
+goal of your main ‘Makefile.in’.
 
 
      
 
      
-Furthermore, gettextize will update all `Makefile.am´ files
-in each affected directory, as well as the top level `configure.in´
-or `configure.ac´ file.
+Furthermore, gettextize will update all ‘Makefile.am’ files
+in each affected directory, as well as the top level ‘configure.in’
+or ‘configure.ac’ file.
 
 
      
 
      
 It is interesting to understand that most new files for supporting
-GNU gettext facilities in one package go in `intl/´,
-`po/´ and `m4/´ subdirectories.  One distinction between
-`intl/´ and the two other directories is that `intl/´ is
+GNU gettext facilities in one package go in ‘intl/’,
+‘po/’ and ‘m4/’ subdirectories.  One distinction between
+‘intl/’ and the two other directories is that ‘intl/’ is
 meant to be completely identical in all packages using GNU gettext,
 while the other directories will mostly contain package dependent
 files.
@@ -399,7 +400,7 @@ The gettextize program makes backup files for all files it
 replaces or changes, and also write ChangeLog entries about these
 changes.  This way, the careful maintainer can check after running
 gettextize whether its changes are acceptable to him, and
-possibly adjust them.  An exception to this rule is the `intl/´
+possibly adjust them.  An exception to this rule is the ‘intl/’
 directory, which is added or replaced or removed as a whole.
 
 
      
@@ -408,7 +409,14 @@ It is important to understand that gettextize can not do the
 entire job of adapting a package for using GNU gettext.  The
 amount of remaining work depends on whether the package uses GNU
 automake or not.  But in any case, the maintainer should still
-read the section section 13.4  Files You Must Create or Alter after invoking gettextize.
+read the section section 13.4  Files You Must Create or Alter after invoking gettextize.
+
+
      
+
      
+In particular, if after using ‘gettexize’, you get an error
+‘AC_COMPILE_IFELSE was called before AC_GNU_SOURCE’ or
+‘AC_RUN_IFELSE was called before AC_GNU_SOURCE’, you can fix it
+by modifying ‘configure.ac’, as described in section 13.4.5  ‘configure.in’ at top level.
 
 
      
 
      
@@ -416,14 +424,14 @@ It is also important to understand that gettextize is not part
 of the GNU build system, in the sense that it should not be invoked
 automatically, and not be invoked by someone who doesn't assume the
 responsibilities of a package maintainer.  For the latter purpose, a
-separate tool is provided, see section 13.6.3  Invoking the autopoint Program.
+separate tool is provided, see section 13.6.3  Invoking the autopoint Program.
 
 
      
 
 
-
      13.4  Files You Must Create or Alter
      
+
      13.4  Files You Must Create or Alter
      
 
      
-
+
 
 
      
 
      
@@ -438,7 +446,7 @@ changes needed in each.
 
      
 So, here comes a list of files, each one followed by a description of
 all alterations it needs.  Many examples are taken out from the GNU
-gettext 0.15-pre0 distribution itself, or from the GNU
+gettext 0.15 distribution itself, or from the GNU
 hello distribution (http://www.franken.de/users/gnu/ke/hello
 or http://www.gnu.franken.de/ke/hello/)  You may indeed
 refer to the source code of the GNU gettext and GNU hello
@@ -449,14 +457,14 @@ gettext functionality.
 
 
 
-
      13.4.1  `POTFILES.in´ in `po/´
      
+
      13.4.1  ‘POTFILES.in’ in ‘po/’
      
 
      
-
+
 
 
      
 
      
-The `po/´ directory should receive a file named
-`POTFILES.in´.  This file tells which files, among all program
+The ‘po/’ directory should receive a file named
+‘POTFILES.in’.  This file tells which files, among all program
 sources, have marked strings needing translation.  Here is an example
 of such a file:
 
@@ -480,29 +488,29 @@ src/xgettext.c
 
      
 Hash-marked comments and white lines are ignored.  All other lines
 list those source files containing strings marked for translation
-(see section 4.3  How Marks Appear in Sources), in a notation relative to the top level
+(see section 4.4  How Marks Appear in Sources), in a notation relative to the top level
 of your whole distribution, rather than the location of the
-`POTFILES.in´ file itself.
+‘POTFILES.in’ file itself.
 
 
      
 
      
 When a C file is automatically generated by a tool, like flex or
 bison, that doesn't introduce translatable strings by itself,
-it is recommended to list in `po/POTFILES.in´ the real source file
-(ending in `.l´ in the case of flex, or in `.y´ in the
+it is recommended to list in ‘po/POTFILES.in’ the real source file
+(ending in ‘.l’ in the case of flex, or in ‘.y’ in the
 case of bison), not the generated C file.
 
 
      
 
 
-
      13.4.2  `LINGUAS´ in `po/´
      
+
      13.4.2  ‘LINGUAS’ in ‘po/’
      
 
      
-
+
 
 
      
 
      
-The `po/´ directory should also receive a file named
-`LINGUAS´.  This file contains the list of available translations.
+The ‘po/’ directory should also receive a file named
+‘LINGUAS’.  This file contains the list of available translations.
 It is a whitespace separated list.  Hash-marked comments and white lines
 are ignored.  Here is an example file:
 
@@ -517,93 +525,114 @@ de fr
 This example means that German and French PO files are available, so
 that these languages are currently supported by your package.  If you
 want to further restrict, at installation time, the set of installed
-languages, this should not be done by modifying the `LINGUAS´ file,
+languages, this should not be done by modifying the ‘LINGUAS’ file,
 but rather by using the LINGUAS environment variable
-(see section 14  The Installer's and Distributor's View).
+(see section 14  The Installer's and Distributor's View).
 
 
      
 
      
-It is recommended that you add the "languages" `en@quot´ and
-`en@boldquot´ to the LINGUAS file.  en@quot is a
+It is recommended that you add the "languages" ‘en@quot’ and
+‘en@boldquot’ to the LINGUAS file.  en@quot is a
 variant of English message catalogs (en) which uses real quotation
-marks instead of the ugly looking asymmetric ASCII substitutes ``´
-and `'´.  en@boldquot is a variant of en@quot that
+marks instead of the ugly looking asymmetric ASCII substitutes ‘`’
+and ‘'’.  en@boldquot is a variant of en@quot that
 additionally outputs quoted pieces of text in a bold font, when used in
 a terminal emulator which supports the VT100 escape sequences (such as
 xterm or the Linux console, but not Emacs in M-x shell mode).
 
 
      
 
      
-These extra message catalogs `en@quot´ and `en@boldquot´
+These extra message catalogs ‘en@quot’ and ‘en@boldquot’
 are constructed automatically, not by translators; to support them, you
-need the files `Rules-quot´, `quot.sed´, `boldquot.sed´,
-`en@quot.header´, `en@boldquot.header´, `insert-header.sin´
-in the `po/´ directory.  You can copy them from GNU gettext's `po/´
+need the files ‘Rules-quot’, ‘quot.sed’, ‘boldquot.sed’,
+‘en@quot.header’, ‘en@boldquot.header’, ‘insert-header.sin’
+in the ‘po/’ directory.  You can copy them from GNU gettext's ‘po/’
 directory; they are also installed by running gettextize.
 
 
      
 
 
-
      13.4.3  `Makevars´ in `po/´
      
+
      13.4.3  ‘Makevars’ in ‘po/’
      
+
      
+
+
+
      
 
      
-
+The ‘po/’ directory also has a file named ‘Makevars’.  It
+contains variables that are specific to your project.  ‘po/Makevars’
+gets inserted into the ‘po/Makefile’ when the latter is created.
+The variables thus take effect when the POT file is created or updated,
+and when the message catalogs get installed.
 
 
      
 
      
-The `po/´ directory also has a file named `Makevars´.
-It can be left unmodified if your package has a single message domain
-and, accordingly, a single `po/´ directory.  Only packages which
-have multiple `po/´ directories at different locations need to
-adjust the three variables defined in `Makevars´.
+The first three variables can be left unmodified if your package has a
+single message domain and, accordingly, a single ‘po/’ directory.
+Only packages which have multiple ‘po/’ directories at different
+locations need to adjust the three first variables defined in
+‘Makevars’.
 
 
      
+
+
+
      13.4.4  Extending ‘Makefile’ in ‘po/’
      
 
      
-`po/Makevars´ gets inserted into the `po/Makefile´ when the
-latter is created.  At the same time, all files called `Rules-*´ in the
-`po/´ directory get appended to the `po/Makefile´.  They present
-an opportunity to add rules for special PO files to the Makefile, without
-needing to mess with `po/Makefile.in.in´.
+
 
 
      
 
      
-
-
-GNU gettext comes with a `Rules-quot´ file, containing rules for
-building catalogs `en@quot.po´ and `en@boldquot.po´.  The
-effect of `en@quot.po´ is that people who set their LANGUAGE
-environment variable to `en@quot´ will get messages with proper
+All files called ‘Rules-*’ in the ‘po/’ directory get appended to
+the ‘po/Makefile’ when it is created.  They present an opportunity to
+add rules for special PO files to the Makefile, without needing to mess
+with ‘po/Makefile.in.in’.
+
+
      
+
      
+
+
+GNU gettext comes with a ‘Rules-quot’ file, containing rules for
+building catalogs ‘en@quot.po’ and ‘en@boldquot.po’.  The
+effect of ‘en@quot.po’ is that people who set their LANGUAGE
+environment variable to ‘en@quot’ will get messages with proper
 looking symmetric Unicode quotation marks instead of abusing the ASCII
 grave accent and the ASCII apostrophe for indicating quotations.  To
-enable this catalog, simply add en@quot to the `po/LINGUAS´
-file.  The effect of `en@boldquot.po´ is that people who set
-LANGUAGE to `en@boldquot´ will get not only proper quotation
+enable this catalog, simply add en@quot to the ‘po/LINGUAS’
+file.  The effect of ‘en@boldquot.po’ is that people who set
+LANGUAGE to ‘en@boldquot’ will get not only proper quotation
 marks, but also the quoted text will be shown in a bold font on terminals
 and consoles.  This catalog is useful only for command-line programs, not
 GUI programs.  To enable it, similarly add en@boldquot to the
-`po/LINGUAS´ file.
+‘po/LINGUAS’ file.
+
+
      
+
      
+Similarly, you can create rules for building message catalogs for the
+‘sr@latin’ locale -- Serbian written with the Latin alphabet --
+from those for the ‘sr’ locale -- Serbian written with Cyrillic
+letters.  See section 9.4  Invoking the msgfilter Program.
 
 
      
 
 
-
      13.4.4  `configure.in´ at top level
      
+
      13.4.5  ‘configure.in’ at top level
      
 
 
      
-`configure.in´ or `configure.ac´ - this is the source from which
-autoconf generates the `configure´ script.
+‘configure.in’ or ‘configure.ac’ - this is the source from which
+autoconf generates the ‘configure’ script.
 
 
      
 
 
        
 
      1. Declare the package and version.
 
-
+
 
 This is done by a set of lines like these:
 
 
 
         PACKAGE=gettext
-VERSION=0.15-pre0
+VERSION=0.15
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -614,18 +643,18 @@ or, if you are using GNU automake, by a line like this:
 
 
 
        -AM_INIT_AUTOMAKE(gettext, 0.15-pre0)
+AM_INIT_AUTOMAKE(gettext, 0.15)
 
        
 
-Of course, you replace `gettext´ with the name of your package,
-and `0.15-pre0´ by its version numbers, exactly as they
+Of course, you replace ‘gettext’ with the name of your package,
+and ‘0.15’ by its version numbers, exactly as they
 should appear in the packaged tar file name of your distribution
-(`gettext-0.15-pre0.tar.gz´, here).
+(‘gettext-0.15.tar.gz’, here).
 
 
      2. Check for internationalization support.
 
 Here is the main m4 macro for triggering internationalization
-support.  Just add this line to `configure.in´:
+support.  Just add this line to ‘configure.in’:
 
 
 
        @@ -635,8 +664,8 @@ AM_GNU_GETTEXT
 This call is purposely simple, even if it generates a lot of configure
 time checking and actions.
 
-If you have suppressed the `intl/´ subdirectory by calling
-gettextize without `--intl´ option, this call should read
+If you have suppressed the ‘intl/’ subdirectory by calling
+gettextize without ‘--intl’ option, this call should read
 
 
 
        @@ -645,7 +674,7 @@ AM_GNU_GETTEXT([external])
 
 
      3. Have output files created.
 
-The AC_OUTPUT directive, at the end of your `configure.in´
+The AC_OUTPUT directive, at the end of your ‘configure.in’
 file, needs to be modified in two ways:
 
 
@@ -655,32 +684,58 @@ AC_OUTPUT([existing configuration files intl/Makefile po/Makefile.in]
 
        4. 
 
 The modification to the first argument to AC_OUTPUT asks
-for substitution in the `intl/´ and `po/´ directories.
-Note the `.in´ suffix used for `po/´ only.  This is because
-the distributed file is really `po/Makefile.in.in´.
+for substitution in the ‘intl/’ and ‘po/’ directories.
+Note the ‘.in’ suffix used for ‘po/’ only.  This is because
+the distributed file is really ‘po/Makefile.in.in’.
 
-If you have suppressed the `intl/´ subdirectory by calling
-gettextize without `--intl´ option, then you don't need to
+If you have suppressed the ‘intl/’ subdirectory by calling
+gettextize without ‘--intl’ option, then you don't need to
 add intl/Makefile to the AC_OUTPUT line.
 
 
      
 
+
      
+If, after doing the recommended modifications, a command like
+‘aclocal -I m4’ or ‘autoconf’ or ‘autoreconf’ fails with
+a trace similar to this:
+
+
      
+
+
      +configure.ac:44: warning: AC_COMPILE_IFELSE was called before AC_GNU_SOURCE
+../../lib/autoconf/specific.m4:335: AC_GNU_SOURCE is expanded from...
+m4/lock.m4:224: gl_LOCK is expanded from...
+m4/gettext.m4:571: gt_INTL_SUBDIR_CORE is expanded from...
+m4/gettext.m4:472: AM_INTL_SUBDIR is expanded from...
+m4/gettext.m4:347: AM_GNU_GETTEXT is expanded from...
+configure.ac:44: the top level
+configure.ac:44: warning: AC_RUN_IFELSE was called before AC_GNU_SOURCE
+
      
+
+
      
+you need to add an explicit invocation of ‘AC_GNU_SOURCE’ in the
+‘configure.ac’ file - after ‘AC_PROG_CC’ but before
+‘AM_GNU_GETTEXT’, most likely very close to the ‘AC_PROG_CC’
+invocation.  This is necessary because of ordering restrictions imposed
+by GNU autoconf.
+
+
      
 
 
-
      13.4.5  `config.guess´, `config.sub´ at top level
      
+
      13.4.6  ‘config.guess’, ‘config.sub’ at top level
      
 
 
      
-If you haven't suppressed the `intl/´ subdirectory,
-you need to add the GNU `config.guess´ and `config.sub´ files
-to your distribution.  They are needed because the `intl/´ directory
+If you haven't suppressed the ‘intl/’ subdirectory,
+you need to add the GNU ‘config.guess’ and ‘config.sub’ files
+to your distribution.  They are needed because the ‘intl/’ directory
 has platform dependent support for determining the locale's character
 encoding and therefore needs to identify the platform.
 
 
      
 
      
-You can obtain the newest version of `config.guess´ and
-`config.sub´ from the CVS of the `config´ project at
-`http://savannah.gnu.org/´. The commands to fetch them are
+You can obtain the newest version of ‘config.guess’ and
+‘config.sub’ from the CVS of the ‘config’ project at
+‘http://savannah.gnu.org/’. The commands to fetch them are
 
 
       $ wget 'http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess'
@@ -693,13 +748,12 @@ GNU libtool packages.
 
 
      
 
      
-Normally, `config.guess´ and `config.sub´ are put at the
+Normally, ‘config.guess’ and ‘config.sub’ are put at the
 top level of a distribution.  But it is also possible to put them in a
 subdirectory, altogether with other configuration support files like
-`install-sh´, `ltconfig´, `ltmain.sh´,
-`mkinstalldirs´ or `missing´.  All you need to do, other than
-moving the files, is to add the following line to your
-`configure.in´.
+‘install-sh’, ‘ltconfig’, ‘ltmain.sh’ or ‘missing’.
+All you need to do, other than moving the files, is to add the following line
+to your ‘configure.in’.
 
 
      
 
@@ -709,59 +763,46 @@ AC_CONFIG_AUX_DIR([subdir])
 
 
 
-
      13.4.6  `mkinstalldirs´ at top level
      
-
      
-
-
-
      
+
      13.4.7  ‘mkinstalldirs’ at top level
      
 
      
-If gettextize has not already done it, you need to add the GNU
-`mkinstalldirs´ script to your distribution.  It is needed because
-`mkdir -p´ is not portable enough.  You find this script in the
-GNU automake distribution.
+
 
 
      
 
      
-Normally, `mkinstalldirs´ is put at the top level of a distribution.
-But it is also possible to put it in a subdirectory, altogether with other
-configuration support files like `install-sh´, `ltconfig´,
-`ltmain.sh´ or `missing´.  All you need to do, other than
-moving the files, is to add the following line to your `configure.in´.
+With earlier versions of GNU gettext, you needed to add the GNU
+‘mkinstalldirs’ script to your distribution.  This is not needed any
+more.  You can remove it if you not also using an automake version older than
+automake 1.9.
 
 
      
 
-
      -AC_CONFIG_AUX_DIR([subdir])
-
      
-
 
-
-
      13.4.7  `aclocal.m4´ at top level
      
+
      13.4.8  ‘aclocal.m4’ at top level
      
 
      
-
+
 
 
      
 
      
-If you do not have an `aclocal.m4´ file in your distribution,
-the simplest is to concatenate the files `codeset.m4´,
-`gettext.m4´, `glibc2.m4´, `glibc21.m4´, `iconv.m4´,
-`intdiv0.m4´, `intmax.m4´, `inttypes.m4´, `inttypes_h.m4´,
-`inttypes-pri.m4´, `isc-posix.m4´, `lcmessage.m4´,
-`lib-ld.m4´, `lib-link.m4´, `lib-prefix.m4´, `lock.m4´,
-`longdouble.m4´, `longlong.m4´, `printf-posix.m4´,
-`progtest.m4´, `signed.m4´, `size_max.m4´,
-`stdint_h.m4´, `uintmax_t.m4´, `ulonglong.m4´,
-`wchar_t.m4´, `wint_t.m4´, `xsize.m4´
+If you do not have an ‘aclocal.m4’ file in your distribution,
+the simplest is to concatenate the files ‘codeset.m4’,
+‘gettext.m4’, ‘glibc2.m4’, ‘glibc21.m4’, ‘iconv.m4’,
+‘intdiv0.m4’, ‘intmax.m4’, ‘inttypes_h.m4’, ‘inttypes-h.m4’,
+‘inttypes-pri.m4’, ‘lcmessage.m4’,
+‘lib-ld.m4’, ‘lib-link.m4’, ‘lib-prefix.m4’, ‘lock.m4’,
+‘longdouble.m4’, ‘longlong.m4’, ‘printf-posix.m4’,
+‘progtest.m4’, ‘signed.m4’, ‘size_max.m4’,
+‘stdint_h.m4’, ‘uintmax_t.m4’, ‘ulonglong.m4’,
+‘visibility.m4’, ‘wchar_t.m4’, ‘wint_t.m4’, ‘xsize.m4’
 from GNU gettext's
-`m4/´ directory into a single file.  If you have suppressed the
-`intl/´ directory, only `gettext.m4´, `iconv.m4´,
-`lib-ld.m4´, `lib-link.m4´, `lib-prefix.m4´,
-`progtest.m4´ need to be concatenated.
+‘m4/’ directory into a single file.  If you have suppressed the
+‘intl/’ directory, only ‘gettext.m4’, ‘iconv.m4’,
+‘lib-ld.m4’, ‘lib-link.m4’, ‘lib-prefix.m4’,
+‘progtest.m4’ need to be concatenated.
 
 
      
 
      
-If you already have an `aclocal.m4´ file, then you will have
-to merge the said macro files into your `aclocal.m4´.  Note that if
+If you already have an ‘aclocal.m4’ file, then you will have
+to merge the said macro files into your ‘aclocal.m4’.  Note that if
 you are upgrading from a previous release of GNU gettext, you
 should most probably replace the macros (AM_GNU_GETTEXT,
 etc.), as they usually
@@ -772,7 +813,7 @@ out there.
 
      
 
      
 If you are using GNU automake 1.5 or newer, it is enough to put
-these macro files into a subdirectory named `m4/´ and add the line
+these macro files into a subdirectory named ‘m4/’ and add the line
 
 
      
 
@@ -781,7 +822,7 @@ ACLOCAL_AMFLAGS = -I m4
 
      
 
 
      
-to your top level `Makefile.am´.
+to your top level ‘Makefile.am’.
 
 
      
 
      
@@ -794,60 +835,60 @@ piece of m4 code will be the same for all projects using GNU
 
      
 
 
-
      13.4.8  `acconfig.h´ at top level
      
+
      13.4.9  ‘acconfig.h’ at top level
      
 
      
-
+
 
 
      
 
      
 Earlier GNU gettext releases required to put definitions for
 ENABLE_NLS, HAVE_GETTEXT and HAVE_LC_MESSAGES,
 HAVE_STPCPY, PACKAGE and VERSION into an
-`acconfig.h´ file.  This is not needed any more; you can remove
-them from your `acconfig.h´ file unless your package uses them
-independently from the `intl/´ directory.
+‘acconfig.h’ file.  This is not needed any more; you can remove
+them from your ‘acconfig.h’ file unless your package uses them
+independently from the ‘intl/’ directory.
 
 
      
 
 
-
      13.4.9  `config.h.in´ at top level
      
+
      13.4.10  ‘config.h.in’ at top level
      
 
      
-
+
 
 
      
 
      
 The include file template that holds the C macros to be defined by
-configure is usually called `config.h.in´ and may be
+configure is usually called ‘config.h.in’ and may be
 maintained either manually or automatically.
 
 
      
 
      
-If gettextize has created an `intl/´ directory, this file
-must be called `config.h.in´ and must be at the top level.  If,
-however, you have suppressed the `intl/´ directory by calling
-gettextize without `--intl´ option, then you can choose the
+If gettextize has created an ‘intl/’ directory, this file
+must be called ‘config.h.in’ and must be at the top level.  If,
+however, you have suppressed the ‘intl/’ directory by calling
+gettextize without ‘--intl’ option, then you can choose the
 name of this file and its location freely.
 
 
      
 
      
-If it is maintained automatically, by use of the `autoheader´
+If it is maintained automatically, by use of the ‘autoheader’
 program, you need to do nothing about it.  This is the case in particular
 if you are using GNU automake.
 
 
      
 
      
 If it is maintained manually, and if gettextize has created an
-`intl/´ directory, you should switch to using `autoheader´.
-The list of C macros to be added for the sake of the `intl/´
+‘intl/’ directory, you should switch to using ‘autoheader’.
+The list of C macros to be added for the sake of the ‘intl/’
 directory is just too long to be maintained manually; it also changes
 between different versions of GNU gettext.
 
 
      
 
      
 If it is maintained manually, and if on the other hand you have
-suppressed the `intl/´ directory by calling gettextize
-without `--intl´ option, then you can get away by adding the
-following lines to `config.h.in´:
+suppressed the ‘intl/’ directory by calling gettextize
+without ‘--intl’ option, then you can get away by adding the
+following lines to ‘config.h.in’:
 
 
      
 
@@ -859,19 +900,19 @@ following lines to `config.h.in´:
 
 
 
-
      13.4.10  `Makefile.in´ at top level
      
+
      13.4.11  ‘Makefile.in’ at top level
      
 
 
      
 Here are a few modifications you need to make to your main, top-level
-`Makefile.in´ file.
+‘Makefile.in’ file.
 
 
      
 
 
        
 
      1. 
 
-Add the following lines near the beginning of your `Makefile.in´,
-so the `dist:´ goal will work properly (as explained further down):
+Add the following lines near the beginning of your ‘Makefile.in’,
+so the ‘dist:’ goal will work properly (as explained further down):
 
 
 
        @@ -881,41 +922,41 @@ VERSION = @VERSION@
 
 
      2. 
 
-Add file `ABOUT-NLS´ to the DISTFILES definition, so the file gets
+Add file ‘ABOUT-NLS’ to the DISTFILES definition, so the file gets
 distributed.
 
 
      3. 
 
-Wherever you process subdirectories in your `Makefile.in´, be sure
-you also process the subdirectories `intl´ and `po´.  Special
-rules in the `Makefiles´ take care for the case where no
+Wherever you process subdirectories in your ‘Makefile.in’, be sure
+you also process the subdirectories ‘intl’ and ‘po’.  Special
+rules in the ‘Makefiles’ take care for the case where no
 internationalization is wanted.
 
 If you are using Makefiles, either generated by automake, or hand-written
 so they carefully follow the GNU coding standards, the effected goals for
-which the new subdirectories must be handled include `installdirs´,
-`install´, `uninstall´, `clean´, `distclean´.
+which the new subdirectories must be handled include ‘installdirs’,
+‘install’, ‘uninstall’, ‘clean’, ‘distclean’.
 
 Here is an example of a canonical order of processing.  In this
 example, we also define SUBDIRS in Makefile.in for it
-to be further used in the `dist:´ goal.
+to be further used in the ‘dist:’ goal.
 
 
 
         SUBDIRS = doc intl lib src po
 
        
 
-Note that you must arrange for `make´ to descend into the
+Note that you must arrange for ‘make’ to descend into the
 intl directory before descending into other directories containing
 code which make use of the libintl.h header file.  For this
 reason, here we mention intl before lib and src.
 
 
      4. 
 
-A delicate point is the `dist:´ goal, as both
-`intl/Makefile´ and `po/Makefile´ will later assume that the
-proper directory has been set up from the main `Makefile´.  Here is
-an example at what the `dist:´ goal might look like:
+A delicate point is the ‘dist:’ goal, as both
+‘intl/Makefile’ and ‘po/Makefile’ will later assume that the
+proper directory has been set up from the main ‘Makefile’.  Here is
+an example at what the ‘dist:’ goal might look like:
 
 
 
        @@ -939,28 +980,28 @@ dist: Makefile
 
      
 
 
      
-Note that if you are using GNU automake, `Makefile.in´ is
-automatically generated from `Makefile.am´, and all needed changes
-to `Makefile.am´ are already made by running `gettextize´.
+Note that if you are using GNU automake, ‘Makefile.in’ is
+automatically generated from ‘Makefile.am’, and all needed changes
+to ‘Makefile.am’ are already made by running ‘gettextize’.
 
 
      
 
 
-
      13.4.11  `Makefile.in´ in `src/´
      
+
      13.4.12  ‘Makefile.in’ in ‘src/’
      
 
 
      
-Some of the modifications made in the main `Makefile.in´ will
-also be needed in the `Makefile.in´ from your package sources,
-which we assume here to be in the `src/´ subdirectory.  Here are
-all the modifications needed in `src/Makefile.in´:
+Some of the modifications made in the main ‘Makefile.in’ will
+also be needed in the ‘Makefile.in’ from your package sources,
+which we assume here to be in the ‘src/’ subdirectory.  Here are
+all the modifications needed in ‘src/Makefile.in’:
 
 
      
 
 
        
 
      1. 
 
-In view of the `dist:´ goal, you should have these lines near the
-beginning of `src/Makefile.in´:
+In view of the ‘dist:’ goal, you should have these lines near the
+beginning of ‘src/Makefile.in’:
 
 
 
        @@ -981,9 +1022,9 @@ top_srcdir = @top_srcdir@
 
 
      2. 
 
-You might also want to define subdir as `src´, later
-allowing for almost uniform `dist:´ goals in all your
-`Makefile.in´.  At list, the `dist:´ goal below assume that
+You might also want to define subdir as ‘src’, later
+allowing for almost uniform ‘dist:’ goals in all your
+‘Makefile.in’.  At list, the ‘dist:’ goal below assume that
 you used:
 
 
@@ -994,7 +1035,7 @@ subdir = src
 
      3. 
 
 The main function of your program will normally call
-bindtextdomain (see see section 4.1  Triggering gettext Operations), like this:
+bindtextdomain (see see section 4.2  Triggering gettext Operations), like this:
 
 
 
        @@ -1003,7 +1044,7 @@ textdomain (PACKAGE);
 
        
 
 To make LOCALEDIR known to the program, add the following lines to
-`Makefile.in´:
+‘Makefile.in’:
 
 
 
        @@ -1012,8 +1053,8 @@ localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
        
 
-Note that @datadir@ defaults to `$(prefix)/share´, thus
-$(localedir) defaults to `$(prefix)/share/locale´.
+Note that @datadir@ defaults to ‘$(prefix)/share’, thus
+$(localedir) defaults to ‘$(prefix)/share/locale’.
 
 
      4. 
 
@@ -1029,12 +1070,12 @@ LIBS = @LIBINTL@ @LIBS@
 
        5. 
 
 In most packages internationalized with GNU gettext, one will
-find a directory `lib/´ in which a library containing some helper
+find a directory ‘lib/’ in which a library containing some helper
 functions will be build.  (You need at least the few functions which the
 GNU gettext Library itself needs.)  However some of the functions
-in the `lib/´ also give messages to the user which of course should be
+in the ‘lib/’ also give messages to the user which of course should be
 translated, too.  Taking care of this, the support library (say
-`libsupport.a´) should be placed before @LIBINTL@ and
+‘libsupport.a’) should be placed before @LIBINTL@ and
 @LIBS@ in the above example.  So one has to write this:
 
 
@@ -1044,14 +1085,14 @@ LIBS = ../lib/libsupport.a @LIBINTL@ @LIBS@
 
 
      5. 
 
-You should also ensure that directory `intl/´ will be searched for
+You should also ensure that directory ‘intl/’ will be searched for
 C preprocessor include files in all circumstances.  So, you have to
-manage so both `-I../intl´ and `-I$(top_srcdir)/intl´ will
+manage so both ‘-I../intl’ and ‘-I$(top_srcdir)/intl’ will
 be given to the C compiler.
 
 
      6. 
 
-Your `dist:´ goal has to conform with others.  Here is a
+Your ‘dist:’ goal has to conform with others.  Here is a
 reasonable definition for it:
 
 
@@ -1066,10 +1107,10 @@ dist: Makefile $(DISTFILES)
 
      
 
 
      
-Note that if you are using GNU automake, `Makefile.in´ is
-automatically generated from `Makefile.am´, and the first three
+Note that if you are using GNU automake, ‘Makefile.in’ is
+automatically generated from ‘Makefile.am’, and the first three
 changes and the last change are not necessary.  The remaining needed
-`Makefile.am´ modifications are the following:
+‘Makefile.am’ modifications are the following:
 
 
      
 
@@ -1077,7 +1118,7 @@ changes and the last change are not necessary.  The remaining needed
 
    • 
 
 To make LOCALEDIR known to the program, add the following to
-`Makefile.am´:
+‘Makefile.am’:
 
 
 
      @@ -1092,7 +1133,7 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
 
      
 
 for all modules and compilation units together.  Furthermore, add this
-line to define `localedir´:
+line to define ‘localedir’:
 
 
 
      @@ -1103,7 +1144,7 @@ localedir = $(datadir)/locale
 
 To ensure that the final linking will use @LIBINTL@ or
 @LTLIBINTL@ as a library, add the following to
-`Makefile.am´:
+‘Makefile.am’:
 
 
 
      @@ -1123,10 +1164,10 @@ for that program.
 
 
    • 
 
-If you have an `intl/´ directory, whose contents is created by
+If you have an ‘intl/’ directory, whose contents is created by
 gettextize, then to ensure that it will be searched for
 C preprocessor include files in all circumstances, add something like
-this to `Makefile.am´:
+this to ‘Makefile.am’:
 
 
 
      @@ -1137,11 +1178,11 @@ AM_CPPFLAGS = -I../intl -I$(top_srcdir)/intl
 
 
 
-
      13.4.12  `gettext.h´ in `lib/´
      
+
      13.4.13  ‘gettext.h’ in ‘lib/’
      
 
      
-
-
-
+
+
+
 
 
      
 
      
@@ -1153,7 +1194,7 @@ optional.  It can be turned off in two situations:
 
        
 
      • 
 
-When the installer has specified `./configure --disable-nls´.  This
+When the installer has specified ‘./configure --disable-nls’.  This
 can be useful when small binaries are more important than features, for
 example when building utilities for boot diskettes.  It can also be useful
 in order to get some specific C compiler warnings about code quality with
@@ -1172,18 +1213,18 @@ error.
 A C preprocessor macro can be used to detect these two cases.  Usually,
 when libintl.h was found and not explicitly disabled, the
 ENABLE_NLS macro will be defined to 1 in the autoconf generated
-configuration file (usually called `config.h´).  In the two negative
+configuration file (usually called ‘config.h’).  In the two negative
 situations, however, this macro will not be defined, thus it will evaluate
 to 0 in C preprocessor expressions.
 
 
        
 
        
-
-`gettext.h´ is a convenience header file for conditional use of
-`<libintl.h>´, depending on the ENABLE_NLS macro.  If
-ENABLE_NLS is set, it includes `<libintl.h>´; otherwise it
+
+‘gettext.h’ is a convenience header file for conditional use of
+‘<libintl.h>’, depending on the ENABLE_NLS macro.  If
+ENABLE_NLS is set, it includes ‘<libintl.h>’; otherwise it
 defines no-op substitutes for the libintl.h functions.  We recommend
-the use of "gettext.h" over direct use of `<libintl.h>´,
+the use of "gettext.h" over direct use of ‘<libintl.h>’,
 so that portability to older systems is guaranteed and installers can
 turn off internationalization if they want to.  In the C code, you will
 then write
@@ -1206,8 +1247,8 @@ instead of
 
        
 The location of gettext.h is usually in a directory containing
 auxiliary include files.  In many GNU packages, there is a directory
-`lib/´ containing helper functions; `gettext.h´ fits there.
-In other packages, it can go into the `src´ directory.
+‘lib/’ containing helper functions; ‘gettext.h’ fits there.
+In other packages, it can go into the ‘src’ directory.
 
 
        
 
        
@@ -1217,30 +1258,30 @@ package that needs it should contain a copy of it on its own.
 
        
 
 
-
        13.5  Autoconf macros for use in `configure.in´
        
+
        13.5  Autoconf macros for use in ‘configure.in’
        
 
        
-
+
 
 
        
 
        
 GNU gettext installs macros for use in a package's
-`configure.in´ or `configure.ac´.
-See section `Introduction' in The Autoconf Manual.
+‘configure.in’ or ‘configure.ac’.
+See section ‘Introduction’ in The Autoconf Manual.
 The primary macro is, of course, AM_GNU_GETTEXT.
 
 
        
 
 
 
-
        13.5.1  AM_GNU_GETTEXT in `gettext.m4´
        
+
        13.5.1  AM_GNU_GETTEXT in ‘gettext.m4’
        
 
 
        
-
+
 The AM_GNU_GETTEXT macro tests for the presence of the GNU gettext
 function family in either the C library or a separate libintl
 library (shared or static libraries are both supported) or in the package's
-`intl/´ directory.  It also invokes AM_PO_SUBDIRS, thus preparing
-the `po/´ directories of the package for building.
+‘intl/’ directory.  It also invokes AM_PO_SUBDIRS, thus preparing
+the ‘po/’ directories of the package for building.
 
 
        
 
        
@@ -1254,41 +1295,41 @@ AM_GNU_GETTEXT([intlsymbol], [needsymbol], [intldir
 
 
        
-intlsymbol can be `external´ or `no-libtool´.  The default
-(if it is not specified or empty) is `no-libtool´.  intlsymbol
-should be `external´ for packages with no `intl/´ directory,
-and `no-libtool´ for packages with an `intl/´ directory.  In
+intlsymbol can be ‘external’ or ‘no-libtool’.  The default
+(if it is not specified or empty) is ‘no-libtool’.  intlsymbol
+should be ‘external’ for packages with no ‘intl/’ directory,
+and ‘no-libtool’ for packages with an ‘intl/’ directory.  In
 the latter case, a static library $(top_builddir)/intl/libintl.a
 will be created.
 
 
        
 
        
-If needsymbol is specified and is `need-ngettext´, then GNU
+If needsymbol is specified and is ‘need-ngettext’, then GNU
 gettext implementations (in libc or libintl) without the ngettext()
 function will be ignored.  If needsymbol is specified and is
-`need-formatstring-macros´, then GNU gettext implementations that don't
-support the ISO C 99 `<inttypes.h>´ formatstring macros will be ignored.
+‘need-formatstring-macros’, then GNU gettext implementations that don't
+support the ISO C 99 ‘<inttypes.h>’ formatstring macros will be ignored.
 Only one needsymbol can be specified.  To specify more than one
 requirement, just specify the strongest one among them.  The hierarchy among
-the various alternatives is as follows: `need-formatstring-macros´
-implies `need-ngettext´.
+the various alternatives is as follows: ‘need-formatstring-macros’
+implies ‘need-ngettext’.
 
 
        
 
        
 intldir is used to find the intl libraries.  If empty, the value
-`$(top_builddir)/intl/´ is used.
+‘$(top_builddir)/intl/’ is used.
 
 
        
 
        
 The AM_GNU_GETTEXT macro determines whether GNU gettext is
 available and should be used.  If so, it sets the USE_NLS variable
-to `yes´; it defines ENABLE_NLS to 1 in the autoconf
-generated configuration file (usually called `config.h´); it sets
+to ‘yes’; it defines ENABLE_NLS to 1 in the autoconf
+generated configuration file (usually called ‘config.h’); it sets
 the variables LIBINTL and LTLIBINTL to the linker options
 for use in a Makefile (LIBINTL for use without libtool,
-LTLIBINTL for use with libtool); it adds an `-I´ option to
+LTLIBINTL for use with libtool); it adds an ‘-I’ option to
 CPPFLAGS if necessary.  In the negative case, it sets
-USE_NLS to `no´; it sets LIBINTL and LTLIBINTL
+USE_NLS to ‘no’; it sets LIBINTL and LTLIBINTL
 to empty and doesn't change CPPFLAGS.
 
 
        
@@ -1300,7 +1341,7 @@ The complexities that AM_GNU_GETTEXT deals with are the following:
 
          
 
        • 
 
-
+
 Some operating systems have gettext in the C library, for example
 glibc.  Some have it in a separate library libintl.  GNU libintl
 might have been installed as part of the GNU gettext package.
@@ -1336,56 +1377,56 @@ and LTLIBINTL variables.
 
 
 
-
          13.5.2  AM_GNU_GETTEXT_VERSION in `gettext.m4´
          
+
          13.5.2  AM_GNU_GETTEXT_VERSION in ‘gettext.m4’
          
 
 
          
-
+
 The AM_GNU_GETTEXT_VERSION macro declares the version number of
 the GNU gettext infrastructure that is used by the package.
 
 
          
 
          
 The use of this macro is optional; only the autopoint program makes
-use of it (see section 13.6  Integrating with CVS).
+use of it (see section 13.6  Integrating with CVS).
 
 
          
 
 
-
          13.5.3  AM_PO_SUBDIRS in `po.m4´
          
+
          13.5.3  AM_PO_SUBDIRS in ‘po.m4’
          
 
 
          
-
-The AM_PO_SUBDIRS macro prepares the `po/´ directories of the
+
+The AM_PO_SUBDIRS macro prepares the ‘po/’ directories of the
 package for building.  This macro should be used in internationalized
 programs written in other programming languages than C, C++, Objective C,
-for example sh, Python, Lisp.  See section 15  Other Programming Languages for a list of programming languages that support localization
+for example sh, Python, Lisp.  See section 15  Other Programming Languages for a list of programming languages that support localization
 through PO files.
 
 
          
 
          
 The AM_PO_SUBDIRS macro determines whether internationalization
-should be used.  If so, it sets the USE_NLS variable to `yes´,
-otherwise to `no´.  It also determines the right values for Makefile
-variables in each `po/´ directory.
+should be used.  If so, it sets the USE_NLS variable to ‘yes’,
+otherwise to ‘no’.  It also determines the right values for Makefile
+variables in each ‘po/’ directory.
 
 
          
 
 
-
          13.5.4  AM_ICONV in `iconv.m4´
          
+
          13.5.4  AM_ICONV in ‘iconv.m4’
          
 
 
          
-
+
 The AM_ICONV macro tests for the presence of the POSIX/XSI
 iconv function family in either the C library or a separate
 libiconv library.  If found, it sets the am_cv_func_iconv
-variable to `yes´; it defines HAVE_ICONV to 1 in the autoconf
-generated configuration file (usually called `config.h´); it defines
-ICONV_CONST to `const´ or to empty, depending on whether the
-second argument of iconv() is of type `const char **´ or
-`char **´; it sets the variables LIBICONV and
+variable to ‘yes’; it defines HAVE_ICONV to 1 in the autoconf
+generated configuration file (usually called ‘config.h’); it defines
+ICONV_CONST to ‘const’ or to empty, depending on whether the
+second argument of iconv() is of type ‘const char **’ or
+‘char **’; it sets the variables LIBICONV and
 LTLIBICONV to the linker options for use in a Makefile
 (LIBICONV for use without libtool, LTLIBICONV for use with
-libtool); it adds an `-I´ option to CPPFLAGS if
+libtool); it adds an ‘-I’ option to CPPFLAGS if
 necessary.  If not found, it sets LIBICONV and LTLIBICONV to
 empty and doesn't change CPPFLAGS.
 
@@ -1398,7 +1439,7 @@ The complexities that AM_ICONV deals with are the following:
 
            
 
          • 
 
-
+
 Some operating systems have iconv in the C library, for example
 glibc.  Some have it in a separate library libiconv, for example
 OSF/1 or FreeBSD.  Regardless of the operating system, GNU libiconv
@@ -1414,8 +1455,8 @@ the library search path).
 
          • 
 
 GNU libiconv is binary incompatible with some operating system's
-native iconv, for example on FreeBSD.  Use of an `iconv.h´
-and `libiconv.so´ that don't fit together would produce program
+native iconv, for example on FreeBSD.  Use of an ‘iconv.h’
+and ‘libiconv.so’ that don't fit together would produce program
 crashes.
 
 
          • 
@@ -1429,13 +1470,13 @@ library support, like SCO.
 
          
 
 
          
-`iconv.m4´ is distributed with the GNU gettext package because
-`gettext.m4´ relies on it.
+‘iconv.m4’ is distributed with the GNU gettext package because
+‘gettext.m4’ relies on it.
 
 
          
 
 
-
          13.6  Integrating with CVS
          
+
          13.6  Integrating with CVS
          
 
 
          
 Many projects use CVS for distributed development, version control and
@@ -1446,13 +1487,13 @@ of cvs, gettextize, autopoint and a
 
 
 
-
          13.6.1  Avoiding version mismatch in distributed development
          
+
          13.6.1  Avoiding version mismatch in distributed development
          
 
 
          
 In a project development with multiple developers, using CVS, there
 should be a single developer who occasionally - when there is desire to
 upgrade to a new gettext version - runs gettextize and
-performs the changes listed in section 13.4  Files You Must Create or Alter, and then commits
+performs the changes listed in section 13.4  Files You Must Create or Alter, and then commits
 his changes to the CVS.
 
 
          
@@ -1469,7 +1510,7 @@ Otherwise the following damages will likely occur:
 
        • 
 
 Apparent version mismatch between developers.  Since some gettext
-specific portions in `configure.in´, `configure.ac´ and
+specific portions in ‘configure.in’, ‘configure.ac’ and
 Makefile.am, Makefile.in files depend on the gettext
 version, the use of infrastructure files belonging to different
 gettext versions can easily lead to build errors.
@@ -1494,12 +1535,12 @@ undiscovered due to this constellation.
 
 
 
-
          13.6.2  Files to put under CVS version control
          
+
          13.6.2  Files to put under CVS version control
          
 
 
          
 There are basically three ways to deal with generated files in the
-context of a CVS repository, such as `configure´ generated from
-`configure.in´, parser.c generated from
+context of a CVS repository, such as ‘configure’ generated from
+‘configure.in’, parser.c generated from
 parser.y, or po/Makefile.in.in autoinstalled by
 gettextize or autopoint.
 
@@ -1562,18 +1603,18 @@ committed into the CVS.
 
          
 For the third approach, the maintainer can omit from the CVS repository
 all the files that gettextize mentions as "copy".  Instead, he
-adds to the `configure.in´ or `configure.ac´ a line of the
+adds to the ‘configure.in’ or ‘configure.ac’ a line of the
 form
 
 
          
 
 
          -AM_GNU_GETTEXT_VERSION(0.15-pre0)
+AM_GNU_GETTEXT_VERSION(0.15)
 
          
 
 
          
 and adds to the package's pre-build script an invocation of
-`autopoint´.  For everyone who checks out the CVS, this
+‘autopoint’.  For everyone who checks out the CVS, this
 autopoint invocation will copy into the right place the
 gettext infrastructure files that have been omitted from the CVS.
 
@@ -1581,7 +1622,7 @@ and adds to the package's pre-build script an invocation of
 
          
 The version number used as argument to AM_GNU_GETTEXT_VERSION is
 the version of the gettext infrastructure that the package wants
-to use.  It is also the minimum version number of the `autopoint´
+to use.  It is also the minimum version number of the ‘autopoint’
 program.  So, if you write AM_GNU_GETTEXT_VERSION(0.11.5) then the
 developers can have any version >= 0.11.5 installed; the package will work
 with the 0.11.5 infrastructure in all developers' builds.  When the
@@ -1594,11 +1635,11 @@ installed.
 
          
 
 
-
          13.6.3  Invoking the autopoint Program
          
+
          13.6.3  Invoking the autopoint Program
          
 
 
          
-
-
+
+
 
 
           autopoint [option]...
@@ -1608,31 +1649,31 @@ autopoint [option]...
 The autopoint program copies standard gettext infrastructure files
 into a source package.  It extracts from a macro call of the form
 AM_GNU_GETTEXT_VERSION(version), found in the package's
-`configure.in´ or `configure.ac´ file, the gettext version
+‘configure.in’ or ‘configure.ac’ file, the gettext version
 used by the package, and copies the infrastructure files belonging to
 this version into the package.
 
 
          
 
 
-
          13.6.3.1  Options
          
+
          13.6.3.1  Options
          
 
 
          
 
-
          `-f´
+
          ‘-f’
 
          
-
          `--force´
+
          ‘--force’
 
          
-
-
+
+
 Force overwriting of files that already exist.
 
-
          `-n´
+
          ‘-n’
 
          
-
          `--dry-run´
+
          ‘--dry-run’
 
          
-
-
+
+
 Print modifications but don't perform them.  All file copying actions that
 autopoint would normally execute are inhibited and instead only
 listed on standard output.
@@ -1641,26 +1682,26 @@ listed on standard output.
 
 
 
-
          13.6.3.2  Informative output
          
+
          13.6.3.2  Informative output
          
 
 
          
 
-
          `--help´
+
          ‘--help’
 
          
-
+
 Display this help and exit.
 
-
          `--version´
+
          ‘--version’
 
          
-
+
 Output version information and exit.
 
 
          
 
 
          
 autopoint supports the GNU gettext versions from 0.10.35 to
-the current one, 0.15-pre0.  In order to apply autopoint to
-a package using a gettext version newer than 0.15-pre0, you
+the current one, 0.15.  In order to apply autopoint to
+a package using a gettext version newer than 0.15, you
 need to install this same version of GNU gettext at least.
 
 
          
@@ -1669,26 +1710,26 @@ In packages using GNU automake, an invocation of autopointaclocal and then autoconf
 and autoheader.  The reason is that autopoint installs some
 autoconf macro files, which are used by aclocal to create
-`aclocal.m4´, and the latter is used by autoconf to create the
-package's `configure´ script and by autoheader to create the
-package's `config.h.in´ include file template.
+‘aclocal.m4’, and the latter is used by autoconf to create the
+package's ‘configure’ script and by autoheader to create the
+package's ‘config.h.in’ include file template.
 
 
          
 
          
-The name `autopoint´ is an abbreviation of `auto-po-intl-m4´;
-the tool copies or updates mostly files in the `po´, `intl´,
-`m4´ directories.
+The name ‘autopoint’ is an abbreviation of ‘auto-po-intl-m4’;
+the tool copies or updates mostly files in the ‘po’, ‘intl’,
+‘m4’ directories.
 
 
          
 
 
-
          13.7  Creating a Distribution Tarball
          
+
          13.7  Creating a Distribution Tarball
          
 
 
          
-
-
+
+
 In projects that use GNU automake, the usual commands for creating
-a distribution tarball, `make dist´ or `make distcheck´,
+a distribution tarball, ‘make dist’ or ‘make distcheck’,
 automatically update the PO files as needed.
 
 
          
@@ -1705,6 +1746,6 @@ $ make distclean
 
          
 
 
          
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_14.html b/gettext-tools/doc/gettext_14.html
index 7b84329a6..6cb934707 100644
--- a/gettext-tools/doc/gettext_14.html
+++ b/gettext-tools/doc/gettext_14.html
@@ -1,21 +1,22 @@
 
 
-
+
 
+
 GNU gettext utilities - 14  The Installer's and Distributor's View
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
          
 
 
-
          14  The Installer's and Distributor's View
          
+
          14  The Installer's and Distributor's View
          
 
          
-
-
-
-
+
+
+
+
 
 
          
 
          
@@ -26,16 +27,16 @@ automatically detect whether the underlying host system already provides
 the GNU gettext functions.  If not,
 the GNU gettext library should be automatically prepared
 and used.  Installers may use special options at configuration
-time for changing this behavior.  The command `./configure
---with-included-gettext´ bypasses system gettext to
+time for changing this behavior.  The command ‘./configure
+--with-included-gettext’ bypasses system gettext to
 use the included GNU gettext instead,
-while `./configure --disable-nls´
+while ‘./configure --disable-nls’
 produces programs totally unable to translate messages.
 
 
          
 
          
-
-Internationalized packages have usually many `ll.po´
+
+Internationalized packages have usually many ‘ll.po’
 files.  Unless
 translations are disabled, all those available are installed together
 with the package.  However, the environment variable LINGUAS
@@ -45,6 +46,6 @@ codes, stating which languages are allowed.
 
 
          
 
          
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_15.html b/gettext-tools/doc/gettext_15.html
index 02c25d02e..b0680143c 100644
--- a/gettext-tools/doc/gettext_15.html
+++ b/gettext-tools/doc/gettext_15.html
@@ -1,16 +1,17 @@
 
 
-
+
 
+
 GNU gettext utilities - 15  Other Programming Languages
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
          
 
 
-
          15  Other Programming Languages
          
+
          15  Other Programming Languages
          
 
 
          
 While the presentation of gettext focuses mostly on C and
@@ -23,10 +24,10 @@ approach.
 
 
 
-
          15.1  The Language Implementor's View
          
+
          15.1  The Language Implementor's View
          
 
          
-
-
+
+
 
 
          
 
          
@@ -95,7 +96,7 @@ The language's library should have a string formatting facility where
 the arguments of a format string are denoted by a positional number or a
 name.  This is needed because for some languages and some messages with
 more than one substitutable argument, the translation will need to
-output the substituted arguments in different order.  See section 4.5  Special Comments preceding Keywords.
+output the substituted arguments in different order.  See section 4.6  Special Comments preceding Keywords.
 
 
        • 
 
@@ -108,9 +109,10 @@ without actually translating the strings.
 
        • 
 
 To help the programmer in the task of marking translatable strings,
-which is usually performed using the Emacs PO mode, you are welcome to
+which is sometimes performed using the Emacs PO mode (see section 4.5  Marking Translatable Strings),
+you are welcome to
 contact the GNU gettext maintainers, so they can add support for
-your language to `po-mode.el´.
+your language to ‘po-mode.el’.
 
 
 
          
@@ -122,8 +124,8 @@ different effects on portability and copyright:
 
            
 
          • 
 
-You may integrate the GNU gettext's `intl/´ directory in
-your package, as described in section 13  The Maintainer's View.  This allows you to
+You may integrate the GNU gettext's ‘intl/’ directory in
+your package, as described in section 13  The Maintainer's View.  This allows you to
 have internationalization on all kinds of platforms.  Note that when you
 then distribute your package, it legally falls under the GNU General
 Public License, and the GNU project will be glad about your contribution
@@ -149,11 +151,11 @@ and plural handling).
 
 
 
-
            15.2  The Programmer's View
            
+
            15.2  The Programmer's View
            
 
 
            
 For the programmer, the general procedure is the same as for the C
-language.  The Emacs PO mode supports other languages, and the GNU
+language.  The Emacs PO mode marking supports other languages, and the GNU
 xgettext string extractor recognizes other languages based on the
 file extension or a command-line option.  In some languages,
 setlocale is not needed because it is already performed by the
@@ -162,7 +164,7 @@ underlying language runtime.
 
            
 
 
-
            15.3  The Translator's View
            
+
            15.3  The Translator's View
            
 
 
            
 The translator works exactly as in the C language case.  The only
@@ -174,7 +176,7 @@ strings.
 
 
 
-
            15.3.1  C Format Strings
            
+
            15.3.1  C Format Strings
            
 
 
            
 C format strings are described in POSIX (IEEE P1003.1 2001), section
@@ -206,33 +208,33 @@ which is semantically equivalent to
 
            
 are a POSIX/XSI feature and not specified by ISO C 99, translators can rely
 on this reordering ability: On the few platforms where printf(),
-fprintf() etc. don't support this feature natively, `libintl.a´
-or `libintl.so´ provides replacement functions, and GNU <libintl.h>
+fprintf() etc. don't support this feature natively, ‘libintl.a’
+or ‘libintl.so’ provides replacement functions, and GNU <libintl.h>
 activates these replacement functions automatically.
 
 
            
 
            
-
-
+
+
 As a special feature for Farsi (Persian) and maybe Arabic, translators can
-insert an `I´ flag into numeric format directives.  For example, the
+insert an ‘I’ flag into numeric format directives.  For example, the
 translation of "%d" can be "%Id".  The effect of this flag,
 on systems with GNU libc, is that in the output, the ASCII digits are
-replaced with the `outdigits´ defined in the LC_CTYPE locale
+replaced with the ‘outdigits’ defined in the LC_CTYPE locale
 facet.  On other systems, the gettext function removes this flag,
 so that it has no effect.
 
 
            
 
            
 Note that the programmer should not put this flag into the
-untranslated string.  (Putting the `I´ format directive flag into an
+untranslated string.  (Putting the ‘I’ format directive flag into an
 msgid string would lead to undefined behaviour on platforms without
 glibc when NLS is disabled.)
 
 
            
 
 
-
            15.3.2  Objective C Format Strings
            
+
            15.3.2  Objective C Format Strings
            
 
 
            
 Objective C format strings are like C format strings.  They support an
@@ -242,10 +244,10 @@ of type Object *.
 
            
 
 
-
            15.3.3  Shell Format Strings
            
+
            15.3.3  Shell Format Strings
            
 
 
            
-Shell format strings, as supported by GNU gettext and the `envsubst´
+Shell format strings, as supported by GNU gettext and the ‘envsubst’
 program, are strings with references to shell variables in the form
 $variable or ${variable}.  References of the form
 ${variable-default},
@@ -264,7 +266,7 @@ a variable reference is ignored.
 
            
 
 
-
            15.3.4  Python Format Strings
            
+
            15.3.4  Python Format Strings
            
 
 
            
 Python format strings are described in
@@ -278,7 +280,7 @@ Python Library reference /
 
            
 
 
-
            15.3.5  Lisp Format Strings
            
+
            15.3.5  Lisp Format Strings
            
 
 
            
 Lisp format strings are described in the Common Lisp HyperSpec,
@@ -288,7 +290,7 @@ chapter 22.3 Formatted Output,
 
            
 
 
-
            15.3.6  Emacs Lisp Format Strings
            
+
            15.3.6  Emacs Lisp Format Strings
            
 
 
            
 Emacs Lisp format strings are documented in the Emacs Lisp reference,
@@ -300,7 +302,7 @@ in format strings while FSF Emacs doesn't.
 
            
 
 
-
            15.3.7  librep Format Strings
            
+
            15.3.7  librep Format Strings
            
 
 
            
 librep format strings are documented in the librep manual, section
@@ -311,7 +313,7 @@ Formatted Output,
 
            
 
 
-
            15.3.8  Scheme Format Strings
            
+
            15.3.8  Scheme Format Strings
            
 
 
            
 Scheme format strings are documented in the SLIB manual, section
@@ -320,20 +322,20 @@ Format Specification.
 
            
 
 
-
            15.3.9  Smalltalk Format Strings
            
+
            15.3.9  Smalltalk Format Strings
            
 
 
            
 Smalltalk format strings are described in the GNU Smalltalk documentation,
-class CharArray, methods `bindWith:´ and
-`bindWithArguments:´.
+class CharArray, methods ‘bindWith:’ and
+‘bindWithArguments:’.
 http://www.gnu.org/software/smalltalk/gst-manual/gst_68.html#SEC238.
-In summary, a directive starts with `%´ and is followed by `%´
-or a nonzero digit (`1´ to `9´).
+In summary, a directive starts with ‘%’ and is followed by ‘%’
+or a nonzero digit (‘1’ to ‘9’).
 
 
            
 
 
-
            15.3.10  Java Format Strings
            
+
            15.3.10  Java Format Strings
            
 
 
            
 Java format strings are described in the JDK documentation for class
@@ -345,7 +347,7 @@ See also the ICU documentation
 
            
 
 
-
            15.3.11  C# Format Strings
            
+
            15.3.11  C# Format Strings
            
 
 
            
 C# format strings are described in the .NET documentation for class
@@ -355,7 +357,7 @@ C# format strings are described in the .NET documentation for class
 
            
 
 
-
            15.3.12  awk Format Strings
            
+
            15.3.12  awk Format Strings
            
 
 
            
 awk format strings are described in the gawk documentation, section
@@ -365,7 +367,7 @@ Printf,
 
            
 
 
-
            15.3.13  Object Pascal Format Strings
            
+
            15.3.13  Object Pascal Format Strings
            
 
 
            
 Where is this documented?
@@ -373,93 +375,107 @@ Where is this documented?
 
            
 
 
-
            15.3.14  YCP Format Strings
            
+
            15.3.14  YCP Format Strings
            
 
 
            
 YCP sformat strings are described in the libycp documentation
 file:/usr/share/doc/packages/libycp/YCP-builtins.html.
-In summary, a directive starts with `%´ and is followed by `%´
-or a nonzero digit (`1´ to `9´).
+In summary, a directive starts with ‘%’ and is followed by ‘%’
+or a nonzero digit (‘1’ to ‘9’).
 
 
            
 
 
-
            15.3.15  Tcl Format Strings
            
+
            15.3.15  Tcl Format Strings
            
 
 
            
-Tcl format strings are described in the `format.n´ manual page,
+Tcl format strings are described in the ‘format.n’ manual page,
 http://www.scriptics.com/man/tcl8.3/TclCmd/format.htm.
 
 
            
 
 
-
            15.3.16  Perl Format Strings
            
+
            15.3.16  Perl Format Strings
            
 
 
            
 There are two kinds format strings in Perl: those acceptable to the
-Perl built-in function printf, labelled as `perl-format´,
+Perl built-in function printf, labelled as ‘perl-format’,
 and those acceptable to the libintl-perl function __x,
-labelled as `perl-brace-format´.
+labelled as ‘perl-brace-format’.
 
 
            
 
            
 Perl printf format strings are described in the sprintf
-section of `man perlfunc´.
+section of ‘man perlfunc’.
 
 
            
 
            
 Perl brace format strings are described in the
-`Locale::TextDomain(3pm)´ manual page of the CPAN package
+‘Locale::TextDomain(3pm)’ manual page of the CPAN package
 libintl-perl.  In brief, Perl format uses placeholders put between
-braces (`{´ and `}´).  The placeholder must have the syntax
+braces (‘{’ and ‘}’).  The placeholder must have the syntax
 of simple identifiers.
 
 
            
 
 
-
            15.3.17  PHP Format Strings
            
+
            15.3.17  PHP Format Strings
            
 
 
            
 PHP format strings are described in the documentation of the PHP function
-sprintf, in `phpdoc/manual/function.sprintf.html´ or
+sprintf, in ‘phpdoc/manual/function.sprintf.html’ or
 http://www.php.net/manual/en/function.sprintf.php.
 
 
            
 
 
-
            15.3.18  GCC internal Format Strings
            
+
            15.3.18  GCC internal Format Strings
            
 
 
            
 These format strings are used inside the GCC sources.  In such a format
-string, a directive starts with `%´, is optionally followed by a
-size specifier `l´, an optional flag `+´, another optional flag
-`#´, and is finished by a specifier: `%´ denotes a literal
-percent sign, `c´ denotes a character, `s´ denotes a string,
-`i´ and `d´ denote an integer, `o´, `u´, `x´
-denote an unsigned integer, `.*s´ denotes a string preceded by a
-width specification, `H´ denotes a `location_t *´ pointer,
-`D´ denotes a general declaration, `F´ denotes a function
-declaration, `T´ denotes a type, `A´ denotes a function argument,
-`C´ denotes a tree code, `E´ denotes an expression, `L´
-denotes a programming language, `O´ denotes a binary operator,
-`P´ denotes a function parameter, `Q´ denotes an assignment
-operator, `V´ denotes a const/volatile qualifier.
+string, a directive starts with ‘%’, is optionally followed by a
+size specifier ‘l’, an optional flag ‘+’, another optional flag
+‘#’, and is finished by a specifier: ‘%’ denotes a literal
+percent sign, ‘c’ denotes a character, ‘s’ denotes a string,
+‘i’ and ‘d’ denote an integer, ‘o’, ‘u’, ‘x’
+denote an unsigned integer, ‘.*s’ denotes a string preceded by a
+width specification, ‘H’ denotes a ‘location_t *’ pointer,
+‘D’ denotes a general declaration, ‘F’ denotes a function
+declaration, ‘T’ denotes a type, ‘A’ denotes a function argument,
+‘C’ denotes a tree code, ‘E’ denotes an expression, ‘L’
+denotes a programming language, ‘O’ denotes a binary operator,
+‘P’ denotes a function parameter, ‘Q’ denotes an assignment
+operator, ‘V’ denotes a const/volatile qualifier.
 
 
            
 
 
-
            15.3.19  Qt Format Strings
            
+
            15.3.19  Qt Format Strings
            
 
 
            
 Qt format strings are described in the documentation of the QString class
 file:/usr/lib/qt-3.0.5/doc/html/qstring.html.
-In summary, a directive consists of a `%´ followed by a digit. The same
+In summary, a directive consists of a ‘%’ followed by a digit. The same
 directive cannot occur more than once in a format string.
 
 
            
 
 
-
            15.4  The Maintainer's View
            
+
            15.3.20  Boost Format Strings
            
+
+
            
+Boost format strings are described in the documentation of the
+boost::format class, at
+http://www.boost.org/libs/format/doc/format.html.
+In summary, a directive has either the same syntax as in a C format string,
+such as ‘%1$+5d’, or may be surrounded by vertical bars, such as
+‘%|1$+5d|’ or ‘%|1$+5|’, or consists of just an argument number
+between percent signs, such as ‘%1%’.
+
+
            
+
+
+
            15.4  The Maintainer's View
            
 
 
            
 For the maintainer, the general procedure differs from the C language
@@ -470,33 +486,33 @@ case in two ways.
 
              
 
            • 
 
-For those languages that don't use GNU gettext, the `intl/´ directory
+For those languages that don't use GNU gettext, the ‘intl/’ directory
 is not needed and can be omitted.  This means that the maintainer calls the
-gettextize program without the `--intl´ option, and that he
+gettextize program without the ‘--intl’ option, and that he
 invokes the AM_GNU_GETTEXT autoconf macro via
-`AM_GNU_GETTEXT([external])´.
+‘AM_GNU_GETTEXT([external])’.
 
 
            • 
 
 If only a single programming language is used, the XGETTEXT_OPTIONS
-variable in `po/Makevars´ (see section 13.4.3  `Makevars´ in `po/´) should be adjusted to
+variable in ‘po/Makevars’ (see section 13.4.3  ‘Makevars’ in ‘po/’) should be adjusted to
 match the xgettext options for that particular programming language.
 If the package uses more than one programming language with gettext
 support, it becomes necessary to change the POT file construction rule
-in `po/Makefile.in.in´.  It is recommended to make one xgettext
+in ‘po/Makefile.in.in’.  It is recommended to make one xgettext
 invocation per programming language, each with the options appropriate for
 that language, and to combine the resulting files using msgcat.
 
            
 
 
 
-
            15.5  Individual Programming Languages
            
+
            15.5  Individual Programming Languages
            
 
 
 
-
            15.5.1  C, C++, Objective C
            
+
            15.5.1  C, C++, Objective C
            
 
            
-
+
 
 
            
 
            
@@ -554,7 +570,7 @@ Use
 
            
 fprintf "%2$d %1$d"
 
            In C++: autosprintf "%2$d %1$d"
-(see section `Introduction' in GNU autosprintf)
+(see section ‘Introduction’ in GNU autosprintf)
 
 
            Portability
 
            
@@ -566,17 +582,17 @@ yes
 
            
 
 
            
-The following examples are available in the `examples´ directory:
+The following examples are available in the ‘examples’ directory:
 hello-c, hello-c-gnome, hello-c++, hello-c++-qt, 
-hello-c++-kde, hello-c++-gnome, hello-objc, 
-hello-objc-gnustep, hello-objc-gnome.
+hello-c++-kde, hello-c++-gnome, hello-c++-wxwidgets,
+hello-objc, hello-objc-gnustep, hello-objc-gnome.
 
 
            
 
 
-
            15.5.2  sh - Shell Script
            
+
            15.5.2  sh - Shell Script
            
 
            
-
+
 
 
            
 
            
@@ -599,19 +615,19 @@ bash, gettext
 
 
            gettext/ngettext functions
 
            
-
-
+
+
 gettext, ngettext programs
 
            eval_gettext, eval_ngettext shell functions
 
 
            textdomain
 
            
-
+
 environment variable TEXTDOMAIN
 
 
            bindtextdomain
 
            
-
+
 environment variable TEXTDOMAINDIR
 
 
            setlocale
@@ -644,15 +660,15 @@ fully portable
 
            
 
 
            
-An example is available in the `examples´ directory: hello-sh.
+An example is available in the ‘examples’ directory: hello-sh.
 
 
            
 
 
 
-
            15.5.2.1  Preparing Shell Scripts for Internationalization
            
+
            15.5.2.1  Preparing Shell Scripts for Internationalization
            
 
            
-
+
 
 
            
 
            
@@ -674,8 +690,8 @@ Insert the line
 
 near the top of the script.  gettext.sh is a shell function library
 that provides the functions
-eval_gettext (see section 15.5.2.6  Invoking the eval_gettext function) and
-eval_ngettext (see section 15.5.2.7  Invoking the eval_ngettext function).
+eval_gettext (see section 15.5.2.6  Invoking the eval_gettext function) and
+eval_ngettext (see section 15.5.2.7  Invoking the eval_ngettext function).
 You have to ensure that gettext.sh can be found in the PATH.
 
 
          • 
@@ -695,7 +711,7 @@ export TEXTDOMAINDIR
 
 
          • 
 
-Prepare the strings for translation, as described in section 4.2  Preparing Translatable Strings.
+Prepare the strings for translation, as described in section 4.3  Preparing Translatable Strings.
 
 
          • 
 
@@ -736,16 +752,16 @@ echo "Remaining files: $filecount"
 
 
          • 
 
-For each translatable string, change the output command `echo´ or
-`$echo´ to `gettext´ (if the string contains no references to
-shell variables) or to `eval_gettext´ (if it refers to shell variables),
-followed by a no-argument `echo´ command (to account for the terminating
+For each translatable string, change the output command ‘echo’ or
+‘$echo’ to ‘gettext’ (if the string contains no references to
+shell variables) or to ‘eval_gettext’ (if it refers to shell variables),
+followed by a no-argument ‘echo’ command (to account for the terminating
 newline). Similarly, for cases with plural handling, replace a conditional
-`echo´ command with an invocation of `ngettext´ or
-`eval_ngettext´, followed by a no-argument `echo´ command.
+‘echo’ command with an invocation of ‘ngettext’ or
+‘eval_ngettext’, followed by a no-argument ‘echo’ command.
 
 When doing this, you also need to add an extra backslash before the dollar
-sign in references to shell variables, so that the `eval_gettext´
+sign in references to shell variables, so that the ‘eval_gettext’
 function receives the translatable string before the variable values are
 substituted into it. For example,
 
@@ -761,11 +777,11 @@ becomes
 eval_gettext "Remaining files: \$filecount"; echo
 
      
 
-If the output command is not `echo´, you can make it use `echo´
+If the output command is not ‘echo’, you can make it use ‘echo’
 nevertheless, through the use of backquotes. However, note that inside
 backquotes, backslashes must be doubled to be effective (because the
 backquoting eats one level of backslashes). For example, assuming that
-`error´ is a shell function that signals an error,
+‘error’ is a shell function that signals an error,
 
 
 
      @@ -790,7 +806,7 @@ error "`eval_gettext \"file not found: \\\$filename\"`"
 
 
 
-
      15.5.2.2  Contents of gettext.sh
      
+
      15.5.2.2  Contents of gettext.sh
      
 
 
      
 gettext.sh, contained in the run-time package of GNU gettext, provides
@@ -806,20 +822,20 @@ and a newline, without interpreting backslashes in the argument string.
 
 
    • eval_gettext
 
-See section 15.5.2.6  Invoking the eval_gettext function.
+See section 15.5.2.6  Invoking the eval_gettext function.
 
 
    • eval_ngettext
 
-See section 15.5.2.7  Invoking the eval_ngettext function.
+See section 15.5.2.7  Invoking the eval_ngettext function.
    -

    15.5.2.3 Invoking the gettext program

    +

    15.5.2.3 Invoking the gettext program

    - - + + 

     gettext [option] [[textdomain] msgid]
@@ -827,7 +843,7 @@ gettext [option] -s [msgid]...

    - + The gettext program displays the native language translation of a textual message. @@ -838,53 +854,53 @@ textual message.

    -
    `-d textdomain´ +
    ‘-d textdomain’
    -
    `--domain=textdomain´ +
    ‘--domain=textdomain’
    - - + + Retrieve translated messages from textdomain. Usually a textdomain corresponds to a package, a program, or a module of a program. -
    `-e´ +
    ‘-e’
    - + Enable expansion of some escape sequences. This option is for compatibility -with the `echo´ program or shell built-in. The escape sequences -`\a´, `\b´, `\c´, `\f´, `\n´, `\r´, `\t´, -`\v´, `\\´, and `\´ followed by one to three octal digits, are -interpreted like the SystemV `echo´ program does. +with the ‘echo’ program or shell built-in. The escape sequences +‘\a’, ‘\b’, ‘\c’, ‘\f’, ‘\n’, ‘\r’, ‘\t’, +‘\v’, ‘\\’, and ‘\’ followed by one to three octal digits, are +interpreted like the SystemV ‘echo’ program does. -
    `-E´ +
    ‘-E’
    - -This option is only for compatibility with the `echo´ program or shell + +This option is only for compatibility with the ‘echo’ program or shell built-in. It has no effect. -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-n´ +
    ‘-n’
    - + Suppress trailing newline. By default, gettext adds a newline to the output. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit. -
    `[textdomain] msgid´ +
    ‘[textdomain] msgid’
    Retrieve translated message corresponding to msgid from textdomain. @@ -898,25 +914,25 @@ environment variable TEXTDOMAINDIR.

    -When used with the -s option the program behaves like the `echo´ +When used with the -s option the program behaves like the ‘echo’ command. But it does not simply copy its arguments to stdout. Instead those messages found in the selected catalog are translated.

    -

    15.5.2.4 Invoking the ngettext program

    +

    15.5.2.4 Invoking the ngettext program

    - - + + 

     ngettext [option] [textdomain] msgid msgid-plural count

    - + The ngettext program displays the native language translation of a textual message whose grammatical form depends on a number. @@ -927,55 +943,55 @@ textual message whose grammatical form depends on a number.

    -
    `-d textdomain´ +
    ‘-d textdomain’
    -
    `--domain=textdomain´ +
    ‘--domain=textdomain’
    - - + + Retrieve translated messages from textdomain. Usually a textdomain corresponds to a package, a program, or a module of a program. -
    `-e´ +
    ‘-e’
    - + Enable expansion of some escape sequences. This option is for compatibility -with the `gettext´ program. The escape sequences -`\a´, `\b´, `\c´, `\f´, `\n´, `\r´, `\t´, -`\v´, `\\´, and `\´ followed by one to three octal digits, are -interpreted like the SystemV `echo´ program does. +with the ‘gettext’ program. The escape sequences +‘\a’, ‘\b’, ‘\c’, ‘\f’, ‘\n’, ‘\r’, ‘\t’, +‘\v’, ‘\\’, and ‘\’ followed by one to three octal digits, are +interpreted like the SystemV ‘echo’ program does. -
    `-E´ +
    ‘-E’
    - -This option is only for compatibility with the `gettext´ program. It has + +This option is only for compatibility with the ‘gettext’ program. It has no effect. -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit. -
    `textdomain´ +
    ‘textdomain’
    Retrieve translated message from textdomain. -
    `msgid msgid-plural´ +
    ‘msgid msgid-plural’
    Translate msgid (English singular) / msgid-plural (English plural). -
    `count´ +
    ‘count’
    Choose singular/plural form based on this value. @@ -990,20 +1006,20 @@ environment variable TEXTDOMAINDIR.

    -

    15.5.2.5 Invoking the envsubst program

    +

    15.5.2.5 Invoking the envsubst program

    - - + + 

     envsubst [option] [shell-format]

    - - - + + + The envsubst program substitutes the values of environment variables.

    @@ -1013,12 +1029,12 @@ The envsubst program substitutes the values of environment variable

    -
    `-v´ +
    ‘-v’
    -
    `--variables´ +
    ‘--variables’
    - - + + Output the variables occurring in shell-format.
    @@ -1029,20 +1045,20 @@ Output the variables occurring in shell-format.

    -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit.
    @@ -1072,17 +1088,17 @@ consists of the environment variables that are referenced in

    -

    15.5.2.6 Invoking the eval_gettext function

    +

    15.5.2.6 Invoking the eval_gettext function

    - + 

     eval_gettext msgid

    - + This function outputs the native language translation of a textual message, performing dollar-substitution on the result. Note that only shell variables mentioned in msgid will be dollar-substituted in the result. @@ -1090,17 +1106,17 @@ mentioned in msgid will be dollar-substituted in the result.

    -

    15.5.2.7 Invoking the eval_ngettext function

    +

    15.5.2.7 Invoking the eval_ngettext function

    - + 

     eval_ngettext msgid msgid-plural count

    - + This function outputs the native language translation of a textual message whose grammatical form depends on a number, performing dollar-substitution on the result. Note that only shell variables mentioned in msgid or @@ -1109,9 +1125,9 @@ on the result. Note that only shell variables mentioned in msgid or

    -

    15.5.3 bash - Bourne-Again Shell Script

    +

    15.5.3 bash - Bourne-Again Shell Script

    - +

    @@ -1124,7 +1140,7 @@ holes it opens and due to its portability problems.

    The security holes of $"..." come from the fact that after looking up the translation of the string, bash processes it like it processes -any double-quoted string: dollar and backquote processing, like `eval´ +any double-quoted string: dollar and backquote processing, like ‘eval’ does.

    @@ -1160,9 +1176,9 @@ that don't have the gettext() function in libc.

    -

    15.5.4 Python

    +

    15.5.4 Python

    - +

    @@ -1179,7 +1195,7 @@ python
    'abc', u'abc', r'abc', ur'abc',
    "abc", u"abc", r"abc", ur"abc", -
    "'abc"', u"'abc"', r"'abc"', ur"'abc"', +
    ”'abc”', u”'abc”', r”'abc”', ur”'abc”',
    """abc""", u"""abc""", r"""abc""", ur"""abc"""
    gettext shorthand @@ -1232,16 +1248,16 @@ fully portable

    -An example is available in the `examples´ directory: hello-python. +An example is available in the ‘examples’ directory: hello-python.

    -

    15.5.5 GNU clisp - Common Lisp

    +

    15.5.5 GNU clisp - Common Lisp

    - - - + + +

    @@ -1304,14 +1320,14 @@ On platforms without gettext, no translation.

    -An example is available in the `examples´ directory: hello-clisp. +An example is available in the ‘examples’ directory: hello-clisp.

    -

    15.5.6 GNU clisp C sources

    +

    15.5.6 GNU clisp C sources

    - +

    @@ -1377,9 +1393,9 @@ On platforms without gettext, no translation. -

    15.5.7 Emacs Lisp

    +

    15.5.7 Emacs Lisp

    - +

    @@ -1443,9 +1459,9 @@ Only XEmacs. Without I18N3 defined at build time, no translation. -

    15.5.8 librep

    +

    15.5.8 librep

    - +

    @@ -1508,15 +1524,15 @@ On platforms without gettext, no translation.

    -An example is available in the `examples´ directory: hello-librep. +An example is available in the ‘examples’ directory: hello-librep.

    -

    15.5.9 GNU guile - Scheme

    +

    15.5.9 GNU guile - Scheme

    - - + +

    @@ -1579,14 +1595,14 @@ On platforms without gettext, no translation.

    -An example is available in the `examples´ directory: hello-guile. +An example is available in the ‘examples’ directory: hello-guile.

    -

    15.5.10 GNU Smalltalk

    +

    15.5.10 GNU Smalltalk

    - +

    @@ -1651,15 +1667,15 @@ fully portable

    -An example is available in the `examples´ directory: +An example is available in the ‘examples’ directory: hello-smalltalk.

    -

    15.5.11 Java

    +

    15.5.11 Java

    - +

    @@ -1793,26 +1809,55 @@ a translation is missing, the msgid argument is returned unchanged. This has the advantage of having the ngettext function for plural handling. - + To use this API, one needs the libintl.jar file which is part of the GNU gettext package and distributed under the LGPL.

    -Three examples, using the second API, are available in the `examples´ +Three examples, using the second API, are available in the ‘examples’ directory: hello-java, hello-java-awt, hello-java-swing.

    -Now, to make use of the API and define a shorthand for `getString´, -there are two idioms that you can choose from: +Now, to make use of the API and define a shorthand for ‘getString’, +there are three idioms that you can choose from:

    • -In a unique class of your project, say `Util´, define a static variable +(This one assumes Java 1.5 or newer.) +In a unique class of your project, say ‘Util’, define a static variable +holding the ResourceBundle instance and the shorthand: + + +
      +private static ResourceBundle myResources =
+  ResourceBundle.getBundle("domain-name");
+public static String _(String s) {
+  return myResources.getString(s);
+}
+
      + +All classes containing internationalized strings then contain + + +
      +import static Util._;
+
      + +and the shorthand is used like this: + + +
      +System.out.println(_("Operation completed."));
+
      + +
    • + +In a unique class of your project, say ‘Util’, define a static variable holding the ResourceBundle instance: @@ -1838,7 +1883,7 @@ System.out.println(_("Operation completed."));
    • -You add a class with a very short name, say `S´, containing just the +You add a class with a very short name, say ‘S’, containing just the definition of the resource bundle and of the shorthand: @@ -1862,16 +1907,17 @@ System.out.println(S._("Operation completed."));

    -Which of the two idioms you choose, will depend on whether copying two lines -of codes into every class is more acceptable in your project than a class -with a single-letter name. +Which of the three idioms you choose, will depend on whether your project +requires portability to Java versions prior to Java 1.5 and, if so, whether +copying two lines of codes into every class is more acceptable in your project +than a class with a single-letter name.

    -

    15.5.12 C#

    +

    15.5.12 C#

    - +

    @@ -1983,9 +2029,9 @@ on any platform.

    To convert a PO file to a .resources file, the msgfmt program -can be used with the option `--csharp-resources´. To convert a +can be used with the option ‘--csharp-resources’. To convert a .resources file back to a PO file, the msgunfmt program can be -used with the option `--csharp-resources´. You can also, in some cases, +used with the option ‘--csharp-resources’. You can also, in some cases, use the resgen program (from the pnet package) or the monoresgen program (from the mono/mcs package). These programs can also convert a .resources file back to a PO file. But @@ -2092,7 +2138,7 @@ a translation is missing, the msgid argument is returned unchanged. The GetPluralString function returns a string translation with plural handling, like the ngettext function in C. - + To use this API, one needs the GNU.Gettext.dll file which is part of the GNU gettext package and distributed under the LGPL. @@ -2107,12 +2153,12 @@ but don't want to change an existing source code that uses

    -Two examples, using the second API, are available in the `examples´ +Two examples, using the second API, are available in the ‘examples’ directory: hello-csharp, hello-csharp-forms.

    -Now, to make use of the API and define a shorthand for `GetString´, +Now, to make use of the API and define a shorthand for ‘GetString’, there are two idioms that you can choose from:

    @@ -2120,7 +2166,7 @@ there are two idioms that you can choose from:
    • -In a unique class of your project, say `Util´, define a static variable +In a unique class of your project, say ‘Util’, define a static variable holding the ResourceManager instance: @@ -2146,7 +2192,7 @@ Console.WriteLine(_("Operation completed."));
    • -You add a class with a very short name, say `S´, containing just the +You add a class with a very short name, say ‘S’, containing just the definition of the resource manager and of the shorthand: @@ -2177,10 +2223,10 @@ with a single-letter name.

      -

      15.5.13 GNU awk

      +

      15.5.13 GNU awk

      - - + +

      @@ -2245,16 +2291,16 @@ yourself.

      -An example is available in the `examples´ directory: hello-gawk. +An example is available in the ‘examples’ directory: hello-gawk.

      -

      15.5.14 Pascal - Free Pascal Compiler

      +

      15.5.14 Pascal - Free Pascal Compiler

      - - - + + +

      @@ -2326,14 +2372,14 @@ can be loaded using the TranslateResourceStrings function in the

      -An example is available in the `examples´ directory: hello-pascal. +An example is available in the ‘examples’ directory: hello-pascal.

      -

      15.5.15 wxWindows library

      +

      15.5.15 wxWidgets library

      - +

      @@ -2384,7 +2430,9 @@ emulate, see include/wx/intl.h and src/common/intl.cpp
      Formatting with positions
      ---- +wxString::Format supports positions if and only if the system has +wprintf(), vswprintf() functions and they support positions +according to POSIX.
      Portability
      @@ -2397,10 +2445,10 @@ yes -

      15.5.16 YCP - YaST2 scripting language

      +

      15.5.16 YCP - YaST2 scripting language

      - - + +

      @@ -2463,15 +2511,15 @@ fully portable

      -An example is available in the `examples´ directory: hello-ycp. +An example is available in the ‘examples’ directory: hello-ycp.

      -

      15.5.17 Tcl - Tk's scripting language

      +

      15.5.17 Tcl - Tk's scripting language

      - - + +

      @@ -2535,7 +2583,7 @@ fully portable

      -Two examples are available in the `examples´ directory: +Two examples are available in the ‘examples’ directory: hello-tcl, hello-tcl-tk.

      @@ -2554,9 +2602,9 @@ argument is given.

      -

      15.5.18 Perl

      +

      15.5.18 Perl

      - +

      @@ -2596,7 +2644,7 @@ perl
    • $tied_hash_reference->{"message"} -
    • etc., issue the command `man perlsyn´ for details +
    • etc., issue the command ‘man perlsyn’ for details
    @@ -2665,11 +2713,11 @@ Included in libintl-perl, available on CPAN

    -An example is available in the `examples´ directory: hello-perl. +An example is available in the ‘examples’ directory: hello-perl.

    - +

    @@ -2684,7 +2732,7 @@ worst probably being its imperfectness. -

    15.5.18.1 General Problems Parsing Perl Code

    +

    15.5.18.1 General Problems Parsing Perl Code

    It is often heard that only Perl can parse Perl. This is not true. @@ -2740,8 +2788,8 @@ use vars qw (*gettext);

    In this case, the string gettext will be interpreted as a file -handle again, and the above example will create a file `testfile´ -and write the string "Hello world!" into it. Even advanced +handle again, and the above example will create a file ‘testfile’ +and write the string “Hello world!” into it. Even advanced control flow analysis will not really help:

    @@ -2818,9 +2866,9 @@ reformulate your code in a manner less challenging to xgettext.

    -

    15.5.18.2 Which keywords will xgettext look for?

    +

    15.5.18.2 Which keywords will xgettext look for?

    - +

    @@ -2867,15 +2915,15 @@ The keys of lookups into the hash reference $gettext will be extrac -

    15.5.18.3 How to Extract Hash Keys

    +

    15.5.18.3 How to Extract Hash Keys

    - +

    Translating messages at runtime is normally performed by looking up the original string in the translation database and returning the -translated version. The "natural" Perl implementation is a hash +translated version. The “natural” Perl implementation is a hash lookup, and, of course, xgettext supports such practice.

    @@ -2922,9 +2970,9 @@ are not allowed, regardless of the use utf8 pragma.

    -

    15.5.18.4 What are Strings And Quote-like Expressions?

    +

    15.5.18.4 What are Strings And Quote-like Expressions?

    - +

    @@ -3022,9 +3070,9 @@ Delimiters that start with a digit are not supported! -

    15.5.18.5 Invalid Uses Of String Interpolation

    +

    15.5.18.5 Invalid Uses Of String Interpolation

    - +

    @@ -3084,7 +3132,7 @@ internationalization.

    -Please see the manual page `man perlop´ for details of strings and +Please see the manual page ‘man perlop’ for details of strings and quote-like expressions that are subject to interpolation and those that are not. Safe interpolations (that will not lead to a fatal error) are: @@ -3160,9 +3208,9 @@ well write what you mean.

    -

    15.5.18.6 Valid Uses Of String Interpolation

    +

    15.5.18.6 Valid Uses Of String Interpolation

    - +

    @@ -3218,7 +3266,7 @@ the resulting PO file will begrudgingly improve in terms of readability.

    You can interpolate hash lookups in all strings or quote-like expressions that are subject to interpolation (see the manual page -`man perlop´ for details). Double interpolation is invalid, however: +‘man perlop’ for details). Double interpolation is invalid, however:

    @@ -3231,7 +3279,7 @@ print gettext qq{Welcome to $gettext->{"the earth"}}; The qq-quoted string is recognized as an argument to xgettext in the first place, and checked for invalid variable interpolation. The dollar sign of hash-dereferencing will therefore terminate the parser -with an "invalid interpolation" error. +with an “invalid interpolation” error.

    @@ -3248,9 +3296,9 @@ s/$gettext{"U. S. A."}/$gettext{"U. S. A."} $gettext{"(dial +0)"}/g; -

    15.5.18.7 When To Use Parentheses

    +

    15.5.18.7 When To Use Parentheses

    - +

    @@ -3294,9 +3342,9 @@ print dngettext 'package', ("one cake", "several cakes", $n), $discarded; -

    15.5.18.8 How To Grok with Long Lines

    +

    15.5.18.8 How To Grok with Long Lines

    - +

    @@ -3325,8 +3373,8 @@ POT file.

    Note that the future Perl 6 will probably use the underscore -(`_´) as the string concatenation operator, and the dot -(`.´) for dereferencing. This new syntax is not yet supported by +(‘_’) as the string concatenation operator, and the dot +(‘.’) for dereferencing. This new syntax is not yet supported by xgettext.

    @@ -3368,9 +3416,9 @@ the resulting POT file.

    -

    15.5.18.9 Bugs, Pitfalls, And Things That Do Not Work

    +

    15.5.18.9 Bugs, Pitfalls, And Things That Do Not Work

    - +

    @@ -3413,7 +3461,7 @@ s/<!--START_OF_WEEK-->/gettext ("Sunday")/e; The modifier e will cause the substitution to be interpreted as an evaluable statement. Consequently, at runtime the function gettext() is called, but again, the parser fails to extract the -string "Sunday". Use a temporary variable as a simple workaround if +string “Sunday”. Use a temporary variable as a simple workaround if you really happen to need this feature:

    @@ -3476,7 +3524,7 @@ die __x ("usage: {program} {OPTIONS} FILENAME...\n", program => $0);

    -Whereas `{program}´ is a placeholder, `{OPTIONS}´ +Whereas ‘{program}’ is a placeholder, ‘{OPTIONS}’ is not and should probably be translated. Yet, there is no way to teach the Perl parser in xgettext to recognize the first one, and leave the other one alone. @@ -3520,9 +3568,9 @@ get executed. Most of the time you will happily get along with

    -

    15.5.19 PHP Hypertext Preprocessor

    +

    15.5.19 PHP Hypertext Preprocessor

    - +

    @@ -3586,14 +3634,14 @@ On platforms without gettext, the functions are not available.

    -An example is available in the `examples´ directory: hello-php. +An example is available in the ‘examples’ directory: hello-php.

    -

    15.5.20 Pike

    +

    15.5.20 Pike

    - +

    @@ -3657,9 +3705,9 @@ On platforms without gettext, the functions are not available. -

    15.5.21 GNU Compiler Collection sources

    +

    15.5.21 GNU Compiler Collection sources

    - +

    @@ -3724,7 +3772,7 @@ yes -

    15.6 Internationalizable Data

    +

    15.6 Internationalizable Data

    Here is a list of other data formats which can be internationalized @@ -3734,7 +3782,7 @@ using GNU gettext. -

    15.6.1 POT - Portable Object Template

    +

    15.6.1 POT - Portable Object Template

    @@ -3753,9 +3801,9 @@ gettext -

    15.6.2 Resource String Table

    +

    15.6.2 Resource String Table

    - +

    @@ -3775,7 +3823,7 @@ fpk -

    15.6.3 Glade - GNOME user interface description

    +

    15.6.3 Glade - GNOME user interface description

    @@ -3793,6 +3841,6 @@ glade, libglade, glade2, libglade2, intltool

    -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents. diff --git a/gettext-tools/doc/gettext_16.html b/gettext-tools/doc/gettext_16.html index 5b69aa639..c358b8324 100644 --- a/gettext-tools/doc/gettext_16.html +++ b/gettext-tools/doc/gettext_16.html @@ -1,16 +1,17 @@ - + + GNU gettext utilities - 16 Concluding Remarks -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents.

    -

    16 Concluding Remarks

    +

    16 Concluding Remarks

    We would like to conclude this GNU gettext manual by presenting @@ -22,9 +23,9 @@ about Native Language Support matters. -

    16.1 History of GNU gettext

    +

    16.1 History of GNU gettext

    - +

    @@ -124,14 +125,19 @@ manipulating PO files.

    -

    16.2 Related Readings

    +

    16.2 Related Readings

    - - + +

    -Eugene H. Dorr (`dorre@well.com´) maintains an interesting + NOTE: This documentation section is outdated and needs to be +revised. + +

    +

    +Eugene H. Dorr (‘dorre@well.com’) maintains an interesting bibliography on internationalization matters, called Internationalization Reference List, which is available as: @@ -140,24 +146,24 @@ ftp://ftp.ora.com/pub/examples/nutshell/ujip/doc/i18n-books.txt

    -Michael Gschwind (`mike@vlsivie.tuwien.ac.at´) maintains a +Michael Gschwind (‘mike@vlsivie.tuwien.ac.at’) maintains a Frequently Asked Questions (FAQ) list, entitled Programming for Internationalisation. This FAQ discusses writing programs which can handle different language conventions, character sets, etc.; and is applicable to all character set encodings, with particular emphasis on ISO 8859-1. It is regularly published in Usenet -groups `comp.unix.questions´, `comp.std.internat´, -`comp.software.international´, `comp.lang.c´, -`comp.windows.x´, `comp.std.c´, `comp.answers´ -and `news.answers´. The home location of this document is: +groups ‘comp.unix.questions’, ‘comp.std.internat’, +‘comp.software.international’, ‘comp.lang.c’, +‘comp.windows.x’, ‘comp.std.c’, ‘comp.answers’ +and ‘news.answers’. The home location of this document is: 

     ftp://ftp.vlsivie.tuwien.ac.at/pub/8bit/ISO-programming

    -Patrick D'Cruze (`pdcruze@li.org´) wrote a tutorial about NLS -matters, and Jochen Hein (`Hein@student.tu-clausthal.de´) took +Patrick D'Cruze (‘pdcruze@li.org’) wrote a tutorial about NLS +matters, and Jochen Hein (‘Hein@student.tu-clausthal.de’) took over the responsibility of maintaining it. It may be found as: 

    @@ -184,6 +190,6 @@ together with French translations of many Linux-related documents.
 
 
    
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_17.html b/gettext-tools/doc/gettext_17.html
index a306ade3d..9a9d84658 100644
--- a/gettext-tools/doc/gettext_17.html
+++ b/gettext-tools/doc/gettext_17.html
@@ -1,19 +1,20 @@
 
 
-
+
 
+
 GNU gettext utilities - A  Language Codes
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
-
    A  Language Codes
    
+
    A  Language Codes
    
 
    
-
-
+
+
 
 
    
 
    
@@ -24,564 +25,564 @@ come from this standard.
 
    
 
    
 
-
    `aa´
+
    ‘aa’
 
    
 Afar.
-
    `ab´
+
    ‘ab’
 
    
 Abkhazian.
-
    `ae´
+
    ‘ae’
 
    
 Avestan.
-
    `af´
+
    ‘af’
 
    
 Afrikaans.
-
    `ak´
+
    ‘ak’
 
    
 Akan.
-
    `am´
+
    ‘am’
 
    
 Amharic.
-
    `an´
+
    ‘an’
 
    
 Aragonese.
-
    `ar´
+
    ‘ar’
 
    
 Arabic.
-
    `as´
+
    ‘as’
 
    
 Assamese.
-
    `av´
+
    ‘av’
 
    
 Avaric.
-
    `ay´
+
    ‘ay’
 
    
 Aymara.
-
    `az´
+
    ‘az’
 
    
 Azerbaijani.
-
    `ba´
+
    ‘ba’
 
    
 Bashkir.
-
    `be´
+
    ‘be’
 
    
 Byelorussian; Belarusian.
-
    `bg´
+
    ‘bg’
 
    
 Bulgarian.
-
    `bh´
+
    ‘bh’
 
    
 Bihari.
-
    `bi´
+
    ‘bi’
 
    
 Bislama.
-
    `bm´
+
    ‘bm’
 
    
 Bambara.
-
    `bn´
+
    ‘bn’
 
    
 Bengali; Bangla.
-
    `bo´
+
    ‘bo’
 
    
 Tibetan.
-
    `br´
+
    ‘br’
 
    
 Breton.
-
    `bs´
+
    ‘bs’
 
    
 Bosnian.
-
    `ca´
+
    ‘ca’
 
    
 Catalan.
-
    `ce´
+
    ‘ce’
 
    
 Chechen.
-
    `ch´
+
    ‘ch’
 
    
 Chamorro.
-
    `co´
+
    ‘co’
 
    
 Corsican.
-
    `cr´
+
    ‘cr’
 
    
 Cree.
-
    `cs´
+
    ‘cs’
 
    
 Czech.
-
    `cu´
+
    ‘cu’
 
    
 Church Slavic.
-
    `cv´
+
    ‘cv’
 
    
 Chuvash.
-
    `cy´
+
    ‘cy’
 
    
 Welsh.
-
    `da´
+
    ‘da’
 
    
 Danish.
-
    `de´
+
    ‘de’
 
    
 German.
-
    `dv´
+
    ‘dv’
 
    
 Divehi.
-
    `dz´
+
    ‘dz’
 
    
 Dzongkha; Bhutani.
-
    `ee´
+
    ‘ee’
 
    
 'Ew'e.
-
    `el´
+
    ‘el’
 
    
 Greek.
-
    `en´
+
    ‘en’
 
    
 English.
-
    `eo´
+
    ‘eo’
 
    
 Esperanto.
-
    `es´
+
    ‘es’
 
    
 Spanish.
-
    `et´
+
    ‘et’
 
    
 Estonian.
-
    `eu´
+
    ‘eu’
 
    
 Basque.
-
    `fa´
+
    ‘fa’
 
    
 Persian.
-
    `ff´
+
    ‘ff’
 
    
 Fulah.
-
    `fi´
+
    ‘fi’
 
    
 Finnish.
-
    `fj´
+
    ‘fj’
 
    
 Fijian; Fiji.
-
    `fo´
+
    ‘fo’
 
    
 Faroese.
-
    `fr´
+
    ‘fr’
 
    
 French.
-
    `fy´
+
    ‘fy’
 
    
 Frisian.
-
    `ga´
+
    ‘ga’
 
    
 Irish.
-
    `gd´
+
    ‘gd’
 
    
 Scots; Gaelic.
-
    `gl´
+
    ‘gl’
 
    
 Gallegan; Galician.
-
    `gn´
+
    ‘gn’
 
    
 Guarani.
-
    `gu´
+
    ‘gu’
 
    
 Gujarati.
-
    `gv´
+
    ‘gv’
 
    
 Manx.
-
    `ha´
+
    ‘ha’
 
    
 Hausa (?).
-
    `he´
+
    ‘he’
 
    
 Hebrew (formerly iw).
-
    `hi´
+
    ‘hi’
 
    
 Hindi.
-
    `ho´
+
    ‘ho’
 
    
 Hiri Motu.
-
    `hr´
+
    ‘hr’
 
    
 Croatian.
-
    `ht´
+
    ‘ht’
 
    
 Haitian; Haitian Creole.
-
    `hu´
+
    ‘hu’
 
    
 Hungarian.
-
    `hy´
+
    ‘hy’
 
    
 Armenian.
-
    `hz´
+
    ‘hz’
 
    
 Herero.
-
    `ia´
+
    ‘ia’
 
    
 Interlingua.
-
    `id´
+
    ‘id’
 
    
 Indonesian (formerly in).
-
    `ie´
+
    ‘ie’
 
    
 Interlingue.
-
    `ig´
+
    ‘ig’
 
    
 Igbo.
-
    `ii´
+
    ‘ii’
 
    
 Sichuan Yi.
-
    `ik´
+
    ‘ik’
 
    
 Inupiak.
-
    `io´
+
    ‘io’
 
    
 Ido.
-
    `is´
+
    ‘is’
 
    
 Icelandic.
-
    `it´
+
    ‘it’
 
    
 Italian.
-
    `iu´
+
    ‘iu’
 
    
 Inuktitut.
-
    `ja´
+
    ‘ja’
 
    
 Japanese.
-
    `jv´
+
    ‘jv’
 
    
 Javanese.
-
    `ka´
+
    ‘ka’
 
    
 Georgian.
-
    `kg´
+
    ‘kg’
 
    
 Kongo.
-
    `ki´
+
    ‘ki’
 
    
 Kikuyu.
-
    `kj´
+
    ‘kj’
 
    
 Kuanyama.
-
    `kk´
+
    ‘kk’
 
    
 Kazakh.
-
    `kl´
+
    ‘kl’
 
    
 Kalaallisut; Greenlandic.
-
    `km´
+
    ‘km’
 
    
 Khmer; Cambodian.
-
    `kn´
+
    ‘kn’
 
    
 Kannada.
-
    `ko´
+
    ‘ko’
 
    
 Korean.
-
    `kr´
+
    ‘kr’
 
    
 Kanuri.
-
    `ks´
+
    ‘ks’
 
    
 Kashmiri.
-
    `ku´
+
    ‘ku’
 
    
 Kurdish.
-
    `kv´
+
    ‘kv’
 
    
 Komi.
-
    `kw´
+
    ‘kw’
 
    
 Cornish.
-
    `ky´
+
    ‘ky’
 
    
 Kirghiz.
-
    `la´
+
    ‘la’
 
    
 Latin.
-
    `lb´
+
    ‘lb’
 
    
 Letzeburgesch.
-
    `lg´
+
    ‘lg’
 
    
 Ganda.
-
    `li´
+
    ‘li’
 
    
 Limburgish; Limburger; Limburgan.
-
    `ln´
+
    ‘ln’
 
    
 Lingala.
-
    `lo´
+
    ‘lo’
 
    
 Lao; Laotian.
-
    `lt´
+
    ‘lt’
 
    
 Lithuanian.
-
    `lu´
+
    ‘lu’
 
    
 Luba-Katanga.
-
    `lv´
+
    ‘lv’
 
    
 Latvian; Lettish.
-
    `mg´
+
    ‘mg’
 
    
 Malagasy.
-
    `mh´
+
    ‘mh’
 
    
 Marshall.
-
    `mi´
+
    ‘mi’
 
    
 Maori.
-
    `mk´
+
    ‘mk’
 
    
 Macedonian.
-
    `ml´
+
    ‘ml’
 
    
 Malayalam.
-
    `mn´
+
    ‘mn’
 
    
 Mongolian.
-
    `mo´
+
    ‘mo’
 
    
 Moldavian.
-
    `mr´
+
    ‘mr’
 
    
 Marathi.
-
    `ms´
+
    ‘ms’
 
    
 Malay.
-
    `mt´
+
    ‘mt’
 
    
 Maltese.
-
    `my´
+
    ‘my’
 
    
 Burmese.
-
    `na´
+
    ‘na’
 
    
 Nauru.
-
    `nb´
+
    ‘nb’
 
    
 Norwegian Bokmål.
-
    `nd´
+
    ‘nd’
 
    
 Ndebele, North.
-
    `ne´
+
    ‘ne’
 
    
 Nepali.
-
    `ng´
+
    ‘ng’
 
    
 Ndonga.
-
    `nl´
+
    ‘nl’
 
    
 Dutch.
-
    `nn´
+
    ‘nn’
 
    
 Norwegian Nynorsk.
-
    `no´
+
    ‘no’
 
    
 Norwegian.
-
    `nr´
+
    ‘nr’
 
    
 Ndebele, South.
-
    `nv´
+
    ‘nv’
 
    
 Navajo.
-
    `ny´
+
    ‘ny’
 
    
 Chichewa; Nyanja.
-
    `oc´
+
    ‘oc’
 
    
 Occitan; Provençal.
-
    `oj´
+
    ‘oj’
 
    
 Ojibwa.
-
    `om´
+
    ‘om’
 
    
 (Afan) Oromo.
-
    `or´
+
    ‘or’
 
    
 Oriya.
-
    `os´
+
    ‘os’
 
    
 Ossetian; Ossetic.
-
    `pa´
+
    ‘pa’
 
    
 Panjabi; Punjabi.
-
    `pi´
+
    ‘pi’
 
    
 Pali.
-
    `pl´
+
    ‘pl’
 
    
 Polish.
-
    `ps´
+
    ‘ps’
 
    
 Pashto, Pushto.
-
    `pt´
+
    ‘pt’
 
    
 Portuguese.
-
    `qu´
+
    ‘qu’
 
    
 Quechua.
-
    `rm´
+
    ‘rm’
 
    
 Rhaeto-Romance.
-
    `rn´
+
    ‘rn’
 
    
 Rundi; Kirundi.
-
    `ro´
+
    ‘ro’
 
    
 Romanian.
-
    `ru´
+
    ‘ru’
 
    
 Russian.
-
    `rw´
+
    ‘rw’
 
    
 Kinyarwanda.
-
    `sa´
+
    ‘sa’
 
    
 Sanskrit.
-
    `sc´
+
    ‘sc’
 
    
 Sardinian.
-
    `sd´
+
    ‘sd’
 
    
 Sindhi.
-
    `se´
+
    ‘se’
 
    
 Northern Sami.
-
    `sg´
+
    ‘sg’
 
    
 Sango; Sangro.
-
    `si´
+
    ‘si’
 
    
 Sinhalese.
-
    `sk´
+
    ‘sk’
 
    
 Slovak.
-
    `sl´
+
    ‘sl’
 
    
 Slovenian.
-
    `sm´
+
    ‘sm’
 
    
 Samoan.
-
    `sn´
+
    ‘sn’
 
    
 Shona.
-
    `so´
+
    ‘so’
 
    
 Somali.
-
    `sq´
+
    ‘sq’
 
    
 Albanian.
-
    `sr´
+
    ‘sr’
 
    
 Serbian.
-
    `ss´
+
    ‘ss’
 
    
 Swati; Siswati.
-
    `st´
+
    ‘st’
 
    
 Sesotho; Sotho, Southern.
-
    `su´
+
    ‘su’
 
    
 Sundanese.
-
    `sv´
+
    ‘sv’
 
    
 Swedish.
-
    `sw´
+
    ‘sw’
 
    
 Swahili.
-
    `ta´
+
    ‘ta’
 
    
 Tamil.
-
    `te´
+
    ‘te’
 
    
 Telugu.
-
    `tg´
+
    ‘tg’
 
    
 Tajik.
-
    `th´
+
    ‘th’
 
    
 Thai.
-
    `ti´
+
    ‘ti’
 
    
 Tigrinya.
-
    `tk´
+
    ‘tk’
 
    
 Turkmen.
-
    `tl´
+
    ‘tl’
 
    
 Tagalog.
-
    `tn´
+
    ‘tn’
 
    
 Tswana; Setswana.
-
    `to´
+
    ‘to’
 
    
 Tonga (?).
-
    `tr´
+
    ‘tr’
 
    
 Turkish.
-
    `ts´
+
    ‘ts’
 
    
 Tsonga.
-
    `tt´
+
    ‘tt’
 
    
 Tatar.
-
    `tw´
+
    ‘tw’
 
    
 Twi.
-
    `ty´
+
    ‘ty’
 
    
 Tahitian.
-
    `ug´
+
    ‘ug’
 
    
 Uighur.
-
    `uk´
+
    ‘uk’
 
    
 Ukrainian.
-
    `ur´
+
    ‘ur’
 
    
 Urdu.
-
    `uz´
+
    ‘uz’
 
    
 Uzbek.
-
    `ve´
+
    ‘ve’
 
    
 Venda.
-
    `vi´
+
    ‘vi’
 
    
 Vietnamese.
-
    `vo´
+
    ‘vo’
 
    
 Volapük; Volapuk.
-
    `wa´
+
    ‘wa’
 
    
 Walloon.
-
    `wo´
+
    ‘wo’
 
    
 Wolof.
-
    `xh´
+
    ‘xh’
 
    
 Xhosa.
-
    `yi´
+
    ‘yi’
 
    
 Yiddish (formerly ji).
-
    `yo´
+
    ‘yo’
 
    
 Yoruba.
-
    `za´
+
    ‘za’
 
    
 Zhuang.
-
    `zh´
+
    ‘zh’
 
    
 Chinese.
-
    `zu´
+
    ‘zu’
 
    
 Zulu.
 
    
 
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_18.html b/gettext-tools/doc/gettext_18.html
index bd5869bee..ddcb54299 100644
--- a/gettext-tools/doc/gettext_18.html
+++ b/gettext-tools/doc/gettext_18.html
@@ -1,19 +1,20 @@
 
 
-
+
 
+
 GNU gettext utilities - B  Country Codes
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
-
    B  Country Codes
    
+
    B  Country Codes
    
 
    
-
-
+
+
 
 
    
 
    
@@ -24,726 +25,726 @@ Project should come from this standard.
 
    
 
    
 
-
    `AD´
+
    ‘AD’
 
    
 Andorra.
-
    `AE´
+
    ‘AE’
 
    
 United Arab Emirates.
-
    `AF´
+
    ‘AF’
 
    
 Afghanistan.
-
    `AG´
+
    ‘AG’
 
    
 Antigua and Barbuda.
-
    `AI´
+
    ‘AI’
 
    
 Anguilla.
-
    `AL´
+
    ‘AL’
 
    
 Albania.
-
    `AM´
+
    ‘AM’
 
    
 Armenia.
-
    `AN´
+
    ‘AN’
 
    
 Netherlands Antilles.
-
    `AO´
+
    ‘AO’
 
    
 Angola.
-
    `AQ´
+
    ‘AQ’
 
    
 Antarctica.
-
    `AR´
+
    ‘AR’
 
    
 Argentina.
-
    `AS´
+
    ‘AS’
 
    
 Samoa (American).
-
    `AT´
+
    ‘AT’
 
    
 Austria.
-
    `AU´
+
    ‘AU’
 
    
 Australia.
-
    `AW´
+
    ‘AW’
 
    
 Aruba.
-
    `AZ´
+
    ‘AZ’
 
    
 Azerbaijan.
-
    `BA´
+
    ‘BA’
 
    
 Bosnia and Herzegovina.
-
    `BB´
+
    ‘BB’
 
    
 Barbados.
-
    `BD´
+
    ‘BD’
 
    
 Bangladesh.
-
    `BE´
+
    ‘BE’
 
    
 Belgium.
-
    `BF´
+
    ‘BF’
 
    
 Burkina Faso.
-
    `BG´
+
    ‘BG’
 
    
 Bulgaria.
-
    `BH´
+
    ‘BH’
 
    
 Bahrain.
-
    `BI´
+
    ‘BI’
 
    
 Burundi.
-
    `BJ´
+
    ‘BJ’
 
    
 Benin.
-
    `BM´
+
    ‘BM’
 
    
 Bermuda.
-
    `BN´
+
    ‘BN’
 
    
 Brunei.
-
    `BO´
+
    ‘BO’
 
    
 Bolivia.
-
    `BR´
+
    ‘BR’
 
    
 Brazil.
-
    `BS´
+
    ‘BS’
 
    
 Bahamas.
-
    `BT´
+
    ‘BT’
 
    
 Bhutan.
-
    `BV´
+
    ‘BV’
 
    
 Bouvet Island.
-
    `BW´
+
    ‘BW’
 
    
 Botswana.
-
    `BY´
+
    ‘BY’
 
    
 Belarus.
-
    `BZ´
+
    ‘BZ’
 
    
 Belize.
-
    `CA´
+
    ‘CA’
 
    
 Canada.
-
    `CC´
+
    ‘CC’
 
    
 Cocos (Keeling) Islands.
-
    `CD´
+
    ‘CD’
 
    
 Congo (Dem. Rep.).
-
    `CF´
+
    ‘CF’
 
    
 Central African Rep..
-
    `CG´
+
    ‘CG’
 
    
 Congo (Rep.).
-
    `CH´
+
    ‘CH’
 
    
 Switzerland.
-
    `CI´
+
    ‘CI’
 
    
 Côte d'Ivoire.
-
    `CK´
+
    ‘CK’
 
    
 Cook Islands.
-
    `CL´
+
    ‘CL’
 
    
 Chile.
-
    `CM´
+
    ‘CM’
 
    
 Cameroon.
-
    `CN´
+
    ‘CN’
 
    
 China.
-
    `CO´
+
    ‘CO’
 
    
 Colombia.
-
    `CR´
+
    ‘CR’
 
    
 Costa Rica.
-
    `CS´
+
    ‘CS’
 
    
 Serbia and Montenegro.
-
    `CU´
+
    ‘CU’
 
    
 Cuba.
-
    `CV´
+
    ‘CV’
 
    
 Cape Verde.
-
    `CX´
+
    ‘CX’
 
    
 Christmas Island.
-
    `CY´
+
    ‘CY’
 
    
 Cyprus.
-
    `CZ´
+
    ‘CZ’
 
    
 Czech Republic.
-
    `DE´
+
    ‘DE’
 
    
 Germany.
-
    `DJ´
+
    ‘DJ’
 
    
 Djibouti.
-
    `DK´
+
    ‘DK’
 
    
 Denmark.
-
    `DM´
+
    ‘DM’
 
    
 Dominica.
-
    `DO´
+
    ‘DO’
 
    
 Dominican Republic.
-
    `DZ´
+
    ‘DZ’
 
    
 Algeria.
-
    `EC´
+
    ‘EC’
 
    
 Ecuador.
-
    `EE´
+
    ‘EE’
 
    
 Estonia.
-
    `EG´
+
    ‘EG’
 
    
 Egypt.
-
    `EH´
+
    ‘EH’
 
    
 Western Sahara.
-
    `ER´
+
    ‘ER’
 
    
 Eritrea.
-
    `ES´
+
    ‘ES’
 
    
 Spain.
-
    `ET´
+
    ‘ET’
 
    
 Ethiopia.
-
    `FI´
+
    ‘FI’
 
    
 Finland.
-
    `FJ´
+
    ‘FJ’
 
    
 Fiji.
-
    `FK´
+
    ‘FK’
 
    
 Falkland Islands.
-
    `FM´
+
    ‘FM’
 
    
 Micronesia.
-
    `FO´
+
    ‘FO’
 
    
 Faeroe Islands.
-
    `FR´
+
    ‘FR’
 
    
 France.
-
    `GA´
+
    ‘GA’
 
    
 Gabon.
-
    `GB´
+
    ‘GB’
 
    
 Britain (UK).
-
    `GD´
+
    ‘GD’
 
    
 Grenada.
-
    `GE´
+
    ‘GE’
 
    
 Georgia.
-
    `GF´
+
    ‘GF’
 
    
 French Guiana.
-
    `GH´
+
    ‘GH’
 
    
 Ghana.
-
    `GI´
+
    ‘GI’
 
    
 Gibraltar.
-
    `GL´
+
    ‘GL’
 
    
 Greenland.
-
    `GM´
+
    ‘GM’
 
    
 Gambia.
-
    `GN´
+
    ‘GN’
 
    
 Guinea.
-
    `GP´
+
    ‘GP’
 
    
 Guadeloupe.
-
    `GQ´
+
    ‘GQ’
 
    
 Equatorial Guinea.
-
    `GR´
+
    ‘GR’
 
    
 Greece.
-
    `GS´
+
    ‘GS’
 
    
 South Georgia and the South Sandwich Islands.
-
    `GT´
+
    ‘GT’
 
    
 Guatemala.
-
    `GU´
+
    ‘GU’
 
    
 Guam.
-
    `GW´
+
    ‘GW’
 
    
 Guinea-Bissau.
-
    `GY´
+
    ‘GY’
 
    
 Guyana.
-
    `HK´
+
    ‘HK’
 
    
 Hong Kong.
-
    `HM´
+
    ‘HM’
 
    
 Heard Island and McDonald Islands.
-
    `HN´
+
    ‘HN’
 
    
 Honduras.
-
    `HR´
+
    ‘HR’
 
    
 Croatia.
-
    `HT´
+
    ‘HT’
 
    
 Haiti.
-
    `HU´
+
    ‘HU’
 
    
 Hungary.
-
    `ID´
+
    ‘ID’
 
    
 Indonesia.
-
    `IE´
+
    ‘IE’
 
    
 Ireland.
-
    `IL´
+
    ‘IL’
 
    
 Israel.
-
    `IN´
+
    ‘IN’
 
    
 India.
-
    `IO´
+
    ‘IO’
 
    
 British Indian Ocean Territory.
-
    `IQ´
+
    ‘IQ’
 
    
 Iraq.
-
    `IR´
+
    ‘IR’
 
    
 Iran.
-
    `IS´
+
    ‘IS’
 
    
 Iceland.
-
    `IT´
+
    ‘IT’
 
    
 Italy.
-
    `JM´
+
    ‘JM’
 
    
 Jamaica.
-
    `JO´
+
    ‘JO’
 
    
 Jordan.
-
    `JP´
+
    ‘JP’
 
    
 Japan.
-
    `KE´
+
    ‘KE’
 
    
 Kenya.
-
    `KG´
+
    ‘KG’
 
    
 Kyrgyzstan.
-
    `KH´
+
    ‘KH’
 
    
 Cambodia.
-
    `KI´
+
    ‘KI’
 
    
 Kiribati.
-
    `KM´
+
    ‘KM’
 
    
 Comoros.
-
    `KN´
+
    ‘KN’
 
    
 St Kitts and Nevis.
-
    `KP´
+
    ‘KP’
 
    
 Korea (North).
-
    `KR´
+
    ‘KR’
 
    
 Korea (South).
-
    `KW´
+
    ‘KW’
 
    
 Kuwait.
-
    `KY´
+
    ‘KY’
 
    
 Cayman Islands.
-
    `KZ´
+
    ‘KZ’
 
    
 Kazakhstan.
-
    `LA´
+
    ‘LA’
 
    
 Laos.
-
    `LB´
+
    ‘LB’
 
    
 Lebanon.
-
    `LC´
+
    ‘LC’
 
    
 St Lucia.
-
    `LI´
+
    ‘LI’
 
    
 Liechtenstein.
-
    `LK´
+
    ‘LK’
 
    
 Sri Lanka.
-
    `LR´
+
    ‘LR’
 
    
 Liberia.
-
    `LS´
+
    ‘LS’
 
    
 Lesotho.
-
    `LT´
+
    ‘LT’
 
    
 Lithuania.
-
    `LU´
+
    ‘LU’
 
    
 Luxembourg.
-
    `LV´
+
    ‘LV’
 
    
 Latvia.
-
    `LY´
+
    ‘LY’
 
    
 Libya.
-
    `MA´
+
    ‘MA’
 
    
 Morocco.
-
    `MC´
+
    ‘MC’
 
    
 Monaco.
-
    `MD´
+
    ‘MD’
 
    
 Moldova.
-
    `MG´
+
    ‘MG’
 
    
 Madagascar.
-
    `MH´
+
    ‘MH’
 
    
 Marshall Islands.
-
    `MK´
+
    ‘MK’
 
    
 Macedonia.
-
    `ML´
+
    ‘ML’
 
    
 Mali.
-
    `MM´
+
    ‘MM’
 
    
 Myanmar (Burma).
-
    `MN´
+
    ‘MN’
 
    
 Mongolia.
-
    `MO´
+
    ‘MO’
 
    
 Macao.
-
    `MP´
+
    ‘MP’
 
    
 Northern Mariana Islands.
-
    `MQ´
+
    ‘MQ’
 
    
 Martinique.
-
    `MR´
+
    ‘MR’
 
    
 Mauritania.
-
    `MS´
+
    ‘MS’
 
    
 Montserrat.
-
    `MT´
+
    ‘MT’
 
    
 Malta.
-
    `MU´
+
    ‘MU’
 
    
 Mauritius.
-
    `MV´
+
    ‘MV’
 
    
 Maldives.
-
    `MW´
+
    ‘MW’
 
    
 Malawi.
-
    `MX´
+
    ‘MX’
 
    
 Mexico.
-
    `MY´
+
    ‘MY’
 
    
 Malaysia.
-
    `MZ´
+
    ‘MZ’
 
    
 Mozambique.
-
    `NA´
+
    ‘NA’
 
    
 Namibia.
-
    `NC´
+
    ‘NC’
 
    
 New Caledonia.
-
    `NE´
+
    ‘NE’
 
    
 Niger.
-
    `NF´
+
    ‘NF’
 
    
 Norfolk Island.
-
    `NG´
+
    ‘NG’
 
    
 Nigeria.
-
    `NI´
+
    ‘NI’
 
    
 Nicaragua.
-
    `NL´
+
    ‘NL’
 
    
 Netherlands.
-
    `NO´
+
    ‘NO’
 
    
 Norway.
-
    `NP´
+
    ‘NP’
 
    
 Nepal.
-
    `NR´
+
    ‘NR’
 
    
 Nauru.
-
    `NU´
+
    ‘NU’
 
    
 Niue.
-
    `NZ´
+
    ‘NZ’
 
    
 New Zealand.
-
    `OM´
+
    ‘OM’
 
    
 Oman.
-
    `PA´
+
    ‘PA’
 
    
 Panama.
-
    `PE´
+
    ‘PE’
 
    
 Peru.
-
    `PF´
+
    ‘PF’
 
    
 French Polynesia.
-
    `PG´
+
    ‘PG’
 
    
 Papua New Guinea.
-
    `PH´
+
    ‘PH’
 
    
 Philippines.
-
    `PK´
+
    ‘PK’
 
    
 Pakistan.
-
    `PL´
+
    ‘PL’
 
    
 Poland.
-
    `PM´
+
    ‘PM’
 
    
 St Pierre and Miquelon.
-
    `PN´
+
    ‘PN’
 
    
 Pitcairn.
-
    `PR´
+
    ‘PR’
 
    
 Puerto Rico.
-
    `PS´
+
    ‘PS’
 
    
 Palestine.
-
    `PT´
+
    ‘PT’
 
    
 Portugal.
-
    `PW´
+
    ‘PW’
 
    
 Palau.
-
    `PY´
+
    ‘PY’
 
    
 Paraguay.
-
    `QA´
+
    ‘QA’
 
    
 Qatar.
-
    `RE´
+
    ‘RE’
 
    
 Reunion.
-
    `RO´
+
    ‘RO’
 
    
 Romania.
-
    `RU´
+
    ‘RU’
 
    
 Russia.
-
    `RW´
+
    ‘RW’
 
    
 Rwanda.
-
    `SA´
+
    ‘SA’
 
    
 Saudi Arabia.
-
    `SB´
+
    ‘SB’
 
    
 Solomon Islands.
-
    `SC´
+
    ‘SC’
 
    
 Seychelles.
-
    `SD´
+
    ‘SD’
 
    
 Sudan.
-
    `SE´
+
    ‘SE’
 
    
 Sweden.
-
    `SG´
+
    ‘SG’
 
    
 Singapore.
-
    `SH´
+
    ‘SH’
 
    
 St Helena.
-
    `SI´
+
    ‘SI’
 
    
 Slovenia.
-
    `SJ´
+
    ‘SJ’
 
    
 Svalbard and Jan Mayen.
-
    `SK´
+
    ‘SK’
 
    
 Slovakia.
-
    `SL´
+
    ‘SL’
 
    
 Sierra Leone.
-
    `SM´
+
    ‘SM’
 
    
 San Marino.
-
    `SN´
+
    ‘SN’
 
    
 Senegal.
-
    `SO´
+
    ‘SO’
 
    
 Somalia.
-
    `SR´
+
    ‘SR’
 
    
 Suriname.
-
    `ST´
+
    ‘ST’
 
    
 Sao Tome and Principe.
-
    `SV´
+
    ‘SV’
 
    
 El Salvador.
-
    `SY´
+
    ‘SY’
 
    
 Syria.
-
    `SZ´
+
    ‘SZ’
 
    
 Swaziland.
-
    `TC´
+
    ‘TC’
 
    
 Turks and Caicos Islands.
-
    `TD´
+
    ‘TD’
 
    
 Chad.
-
    `TF´
+
    ‘TF’
 
    
 French Southern and Antarctic Lands.
-
    `TG´
+
    ‘TG’
 
    
 Togo.
-
    `TH´
+
    ‘TH’
 
    
 Thailand.
-
    `TJ´
+
    ‘TJ’
 
    
 Tajikistan.
-
    `TK´
+
    ‘TK’
 
    
 Tokelau.
-
    `TL´
+
    ‘TL’
 
    
 Timor-Leste.
-
    `TM´
+
    ‘TM’
 
    
 Turkmenistan.
-
    `TN´
+
    ‘TN’
 
    
 Tunisia.
-
    `TO´
+
    ‘TO’
 
    
 Tonga.
-
    `TR´
+
    ‘TR’
 
    
 Turkey.
-
    `TT´
+
    ‘TT’
 
    
 Trinidad and Tobago.
-
    `TV´
+
    ‘TV’
 
    
 Tuvalu.
-
    `TW´
+
    ‘TW’
 
    
 Taiwan.
-
    `TZ´
+
    ‘TZ’
 
    
 Tanzania.
-
    `UA´
+
    ‘UA’
 
    
 Ukraine.
-
    `UG´
+
    ‘UG’
 
    
 Uganda.
-
    `UM´
+
    ‘UM’
 
    
 US minor outlying islands.
-
    `US´
+
    ‘US’
 
    
 United States.
-
    `UY´
+
    ‘UY’
 
    
 Uruguay.
-
    `UZ´
+
    ‘UZ’
 
    
 Uzbekistan.
-
    `VA´
+
    ‘VA’
 
    
 Vatican City.
-
    `VC´
+
    ‘VC’
 
    
 St Vincent.
-
    `VE´
+
    ‘VE’
 
    
 Venezuela.
-
    `VG´
+
    ‘VG’
 
    
 Virgin Islands (UK).
-
    `VI´
+
    ‘VI’
 
    
 Virgin Islands (US).
-
    `VN´
+
    ‘VN’
 
    
 Vietnam.
-
    `VU´
+
    ‘VU’
 
    
 Vanuatu.
-
    `WF´
+
    ‘WF’
 
    
 Wallis and Futuna.
-
    `WS´
+
    ‘WS’
 
    
 Samoa (Western).
-
    `YE´
+
    ‘YE’
 
    
 Yemen.
-
    `YT´
+
    ‘YT’
 
    
 Mayotte.
-
    `ZA´
+
    ‘ZA’
 
    
 South Africa.
-
    `ZM´
+
    ‘ZM’
 
    
 Zambia.
-
    `ZW´
+
    ‘ZW’
 
    
 Zimbabwe.
 
    
 
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_19.html b/gettext-tools/doc/gettext_19.html
index 963ed5baf..a655311a5 100644
--- a/gettext-tools/doc/gettext_19.html
+++ b/gettext-tools/doc/gettext_19.html
@@ -1,72 +1,1607 @@
 
 
-
+
 
-GNU gettext utilities - Program Index
+
+GNU gettext utilities - C  Licenses
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
-
    Program Index
    
-
-
    
-Jump to:
-a
--
-e
--
-g
--
-m
--
-n
--
-x
-
    
-
    a
    
-
-
  • autopoint
-
    • 
-
    e
    
-
-
  • envsubst
-
    • 
-
    g
    
-
-
  • gettext, gettext
-
  • gettextize
-
    • 
-
    m
    
-
-
  • msgattrib
-
  • msgcat
-
  • msgcmp
-
  • msgcomm
-
  • msgconv
-
  • msgen
-
  • msgexec
-
  • msgfilter
-
  • msgfmt
-
  • msggrep
-
  • msginit
-
  • msgmerge
-
  • msgunfmt
-
  • msguniq
-
    • 
-
    n
    
-
-
  • ngettext, ngettext
-
    • 
-
    x
    
-
-
  • xgettext
-
    • 
+
    C  Licenses
    
+
    
+
+
+
    
+
    
+The files of this package are covered by the licenses indicated in each
+particular file or directory.  Here is a summary:
+
+
    
+
+
      
+
    • 
+
+The libintl and libasprintf libraries are covered by the
+GNU Library General Public License (LGPL).  
+A copy of the license is included in section C.2  GNU LESSER GENERAL PUBLIC LICENSE.
+
+
    • 
+
+The executable programs of this package and the libgettextpo library
+are covered by the GNU General Public License (GPL).
+A copy of the license is included in section C.1  GNU GENERAL PUBLIC LICENSE.
+
+
    • 
+
+This manual is free documentation.  It is dually licensed under the
+GNU FDL and the GNU GPL.  This means that you can redistribute this
+manual under either of these two licenses, at your choice.
+
      
+This manual is covered by the GNU FDL.  Permission is granted to copy,
+distribute and/or modify this document under the terms of the
+GNU Free Documentation License (FDL), either version 1.2 of the
+License, or (at your option) any later version published by the
+Free Software Foundation (FSF); with no Invariant Sections, with no
+Front-Cover Text, and with no Back-Cover Texts.
+A copy of the license is included in section C.3  GNU Free Documentation License.
+
      
+This manual is covered by the GNU GPL.  You can redistribute it and/or
+modify it under the terms of the GNU General Public License (GPL), either
+version 2 of the License, or (at your option) any later version published
+by the Free Software Foundation (FSF).
+A copy of the license is included in section C.1  GNU GENERAL PUBLIC LICENSE.
+
    
+
+
+
+
    C.1  GNU GENERAL PUBLIC LICENSE
    
+
    
+
+
+Version 2, June 1991
+
+
    
+
+
+
    +Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
    
+
+
+
+
    Preamble
    
+
+
    
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+
    
+
    
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+
    
+
    
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+
    
+
    
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+
    
+
    
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+
    
+
    
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+
    
+
    
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+
    
+
    
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+
    
+
+
+
      
+
    1. 
+
+This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The “Program”, below,
+refers to any such program or work, and a “work based on the Program”
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term “modification”.)  Each licensee is addressed as “you”.
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+
    2. 
+
+You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+
    3. 
+
+You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+
+
        
+
      1. 
+
+You must cause the modified files to carry prominent notices
+stating that you changed the files and the date of any change.
+
+
      2. 
+
+You must cause any work that you distribute or publish, that in
+whole or in part contains or is derived from the Program or any
+part thereof, to be licensed as a whole at no charge to all third
+parties under the terms of this License.
+
+
      3. 
+
+If the modified program normally reads commands interactively
+when run, you must cause it, when started running for such
+interactive use in the most ordinary way, to print or display an
+announcement including an appropriate copyright notice and a
+notice that there is no warranty (or else, saying that you provide
+a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this
+License.  (Exception: if the Program itself is interactive but
+does not normally print such an announcement, your work based on
+the Program is not required to print an announcement.)
+
      
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+
    4. 
+
+You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+
+
        
+
      1. 
+
+Accompany it with the complete corresponding machine-readable
+source code, which must be distributed under the terms of Sections
+1 and 2 above on a medium customarily used for software interchange; or,
+
+
      2. 
+
+Accompany it with a written offer, valid for at least three
+years, to give any third party, for a charge no more than your
+cost of physically performing source distribution, a complete
+machine-readable copy of the corresponding source code, to be
+distributed under the terms of Sections 1 and 2 above on a medium
+customarily used for software interchange; or,
+
+
      3. 
+
+Accompany it with the information you received as to the offer
+to distribute corresponding source code.  (This alternative is
+allowed only for noncommercial distribution and only if you
+received the program in object code or executable form with such
+an offer, in accord with Subsection b above.)
+
      
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+
    5. 
+
+You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
    6. 
+
+You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+
    7. 
+
+Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+
    8. 
+
+If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+
    9. 
+
+If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+
    10. 
+
+The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and “any
+later version”, you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+
    11. 
+
+If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+
    12. 
+
+BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+
    13. 
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
    
+
+
+
+
    Appendix: How to Apply These Terms to Your New Programs
    
+
+
    
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+
    
+
    
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the “copyright” line and a pointer to where the full notice is found.
+
+
    
+
+
    +one line to give the program's name and a brief idea of what it does.
+Copyright (C) yyyy  name of author
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
    
+
+
    
+Also add information on how to contact you by electronic and paper mail.
+
+
    
+
    
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+
    
+
+
    +Gnomovision version 69, Copyright (C) 19yy name of author
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+This is free software, and you are welcome to redistribute it
+under certain conditions; type `show c' for details.
+
    
+
+
    
+The hypothetical commands ‘show w’ and ‘show c’ should show
+the appropriate parts of the General Public License.  Of course, the
+commands you use may be called something other than ‘show w’ and
+‘show c’; they could even be mouse-clicks or menu items--whatever
+suits your program.
+
+
    
+
    
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a “copyright disclaimer” for the program, if
+necessary.  Here is a sample; alter the names:
+
+
    
+
+
    +Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+`Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+signature of Ty Coon, 1 April 1989
+Ty Coon, President of Vice
+
    
+
+
    
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+
+
    C.2  GNU LESSER GENERAL PUBLIC LICENSE
    
+
    
+
+
+Version 2.1, February 1999
+
+
    
+
+
    +Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+51 Franklin St -- Fifth Floor, Boston, MA 02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+as the successor of the GNU Library Public License, version 2, hence the
+version number 2.1.]
+
    
+
+
+
+
    Preamble
    
+
+
    
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+
    
+
    
+  This license, the Lesser General Public License, applies to some
+specially designated software--typically libraries--of the Free
+Software Foundation and other authors who decide to use it.  You can use
+it too, but we suggest you first think carefully about whether this
+license or the ordinary General Public License is the better strategy to
+use in any particular case, based on the explanations below.
+
+
    
+
    
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of it
+in new free programs; and that you are informed that you can do these
+things.
+
+
    
+
    
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
 
 
    
+
    
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+
    
+
    
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+
    
+
    
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+
    
+
    
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+
    
+
    
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+
    
+
    
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+
    
+
    
+  We call this license the Lesser General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+
    
+
    
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+
    
+
    
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+
    
+
    
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+
    
+
    
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+“work based on the library” and a “work that uses the library”.  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+
    
+
+
+
      
+
    1. 
+
+This License Agreement applies to any software library or other program
+which contains a notice placed by the copyright holder or other
+authorized party saying it may be distributed under the terms of this
+Lesser General Public License (also called “this License”).  Each
+licensee is addressed as “you”.
+
+  A “library” means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The “Library”, below, refers to any such software library or work
+which has been distributed under these terms.  A “work based on the
+Library” means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term “modification”.)
+
+  “Source code” for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+
    2. 
+
+You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+
    3. 
+
+You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+
+
        
+
      1. 
+
+The modified work must itself be a software library.
+
+
      2. 
+
+You must cause the files modified to carry prominent notices
+stating that you changed the files and the date of any change.
+
+
      3. 
+
+You must cause the whole of the work to be licensed at no
+charge to all third parties under the terms of this License.
+
+
      4. 
+
+If a facility in the modified Library refers to a function or a
+table of data to be supplied by an application program that uses
+the facility, other than as an argument passed when the facility
+is invoked, then you must make a good faith effort to ensure that,
+in the event an application does not supply such function or
+table, the facility still operates, and performs whatever part of
+its purpose remains meaningful.
+
+(For example, a function in a library to compute square roots has
+a purpose that is entirely well-defined independent of the
+application.  Therefore, Subsection 2d requires that any
+application-supplied function or table used by this function must
+be optional: if the application does not supply it, the square
+root function must still compute square roots.)
+
      
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+
    4. 
+
+You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+
    5. 
+
+You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+
    6. 
+
+A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a “work that uses the Library”.  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a “work that uses the Library” with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a “work that uses the
+library”.  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a “work that uses the Library” uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+
    7. 
+
+As an exception to the Sections above, you may also combine or
+link a “work that uses the Library” with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+
+
        
+
      1. 
+
+Accompany the work with the complete corresponding
+machine-readable source code for the Library including whatever
+changes were used in the work (which must be distributed under
+Sections 1 and 2 above); and, if the work is an executable linked
+with the Library, with the complete machine-readable “work that
+uses the Library”, as object code and/or source code, so that the
+user can modify the Library and then relink to produce a modified
+executable containing the modified Library.  (It is understood
+that the user who changes the contents of definitions files in the
+Library will not necessarily be able to recompile the application
+to use the modified definitions.)
+
+
      2. 
+
+Use a suitable shared library mechanism for linking with the Library.  A
+suitable mechanism is one that (1) uses at run time a copy of the
+library already present on the user's computer system, rather than
+copying library functions into the executable, and (2) will operate
+properly with a modified version of the library, if the user installs
+one, as long as the modified version is interface-compatible with the
+version that the work was made with.
+
+
      3. 
+
+Accompany the work with a written offer, valid for at
+least three years, to give the same user the materials
+specified in Subsection 6a, above, for a charge no more
+than the cost of performing this distribution.
+
+
      4. 
+
+If distribution of the work is made by offering access to copy
+from a designated place, offer equivalent access to copy the above
+specified materials from the same place.
+
+
      5. 
+
+Verify that the user has already received a copy of these
+materials or that you have already sent this user a copy.
+
      
+
+  For an executable, the required form of the “work that uses the
+Library” must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies the
+executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+
    8. 
+
+You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+
+
        
+
      1. 
+
+Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library
+facilities.  This must be distributed under the terms of the
+Sections above.
+
+
      2. 
+
+Give prominent notice with the combined library of the fact
+that part of it is a work based on the Library, and explaining
+where to find the accompanying uncombined form of the same work.
+
      
+
+
    9. 
+
+You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+
    10. 
+
+You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+
    11. 
+
+Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+
    12. 
+
+If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+
    13. 
+
+If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+
    14. 
+
+The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+“any later version”, you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+
    15. 
+
+If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+
    16. 
+
+BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY “AS IS” WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+
    17. 
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
    
+
+
+
+
    How to Apply These Terms to Your New Libraries
    
+
+
    
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+
    
+
    
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+“copyright” line and a pointer to where the full notice is found.
+
+
    
+
+
    +one line to give the library's name and an idea of what it does.
+Copyright (C) year  name of author
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+USA.
+
    
+
+
    
+Also add information on how to contact you by electronic and paper mail.
+
+
    
+
    
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a “copyright disclaimer” for the library, if
+necessary.  Here is a sample; alter the names:
+
+
    
+
+
    +Yoyodyne, Inc., hereby disclaims all copyright interest in the library
+`Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+signature of Ty Coon, 1 April 1990
+Ty Coon, President of Vice
+
    
+
+
    
+That's all there is to it!
+
+
+
    C.3  GNU Free Documentation License
    
+
    
+
+
+Version 1.2, November 2002
+
+
    
+
+
    +Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
    
+
+
+
      
+
    1. 
+
+PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document free in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of “copyleft”, which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
    2. 
+
+APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The “Document”, below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as “you”.  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A “Modified Version” of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A “Secondary Section” is a named appendix or a front-matter section
+of the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall
+subject (or to related matters) and contains nothing that could fall
+directly within that overall subject.  (Thus, if the Document is in
+part a textbook of mathematics, a Secondary Section may not explain
+any mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The “Invariant Sections” are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The “Cover Texts” are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A “Transparent” copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not “Transparent” is called “Opaque”.
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input
+format, SGML or XML using a publicly available
+DTD, and standard-conforming simple HTML,
+PostScript or PDF designed for human modification.  Examples
+of transparent image formats include PNG, XCF and
+JPG.  Opaque formats include proprietary formats that can be
+read and edited only by proprietary word processors, SGML or
+XML for which the DTD and/or processing tools are
+not generally available, and the machine-generated HTML,
+PostScript or PDF produced by some word processors for
+output purposes only.
+
+The “Title Page” means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, “Title Page” means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section “Entitled XYZ” means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as “Acknowledgements”,
+“Dedications”, “Endorsements”, or “History”.)  To “Preserve the Title”
+of such a section when you modify the Document means that it remains a
+section “Entitled XYZ” according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
    3. 
+
+VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
    4. 
+
+COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
    5. 
+
+MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+
+
        
+
      1. 
+
+Use in the Title Page (and on the covers, if any) a title distinct
+from that of the Document, and from those of previous versions
+(which should, if there were any, be listed in the History section
+of the Document).  You may use the same title as a previous version
+if the original publisher of that version gives permission.
+
+
      2. 
+
+List on the Title Page, as authors, one or more persons or entities
+responsible for authorship of the modifications in the Modified
+Version, together with at least five of the principal authors of the
+Document (all of its principal authors, if it has fewer than five),
+unless they release you from this requirement.
+
+
      3. 
+
+State on the Title page the name of the publisher of the
+Modified Version, as the publisher.
+
+
      4. 
+
+Preserve all the copyright notices of the Document.
+
+
      5. 
+
+Add an appropriate copyright notice for your modifications
+adjacent to the other copyright notices.
+
+
      6. 
+
+Include, immediately after the copyright notices, a license notice
+giving the public permission to use the Modified Version under the
+terms of this License, in the form shown in the Addendum below.
+
+
      7. 
+
+Preserve in that license notice the full lists of Invariant Sections
+and required Cover Texts given in the Document's license notice.
+
+
      8. 
+
+Include an unaltered copy of this License.
+
+
      9. 
+
+Preserve the section Entitled “History”, Preserve its Title, and add
+to it an item stating at least the title, year, new authors, and
+publisher of the Modified Version as given on the Title Page.  If
+there is no section Entitled “History” in the Document, create one
+stating the title, year, authors, and publisher of the Document as
+given on its Title Page, then add an item describing the Modified
+Version as stated in the previous sentence.
+
+
      10. 
+
+Preserve the network location, if any, given in the Document for
+public access to a Transparent copy of the Document, and likewise
+the network locations given in the Document for previous versions
+it was based on.  These may be placed in the “History” section.
+You may omit a network location for a work that was published at
+least four years before the Document itself, or if the original
+publisher of the version it refers to gives permission.
+
+
      11. 
+
+For any section Entitled “Acknowledgements” or “Dedications”, Preserve
+the Title of the section, and preserve in the section all the
+substance and tone of each of the contributor acknowledgements and/or
+dedications given therein.
+
+
      12. 
+
+Preserve all the Invariant Sections of the Document,
+unaltered in their text and in their titles.  Section numbers
+or the equivalent are not considered part of the section titles.
+
+
      13. 
+
+Delete any section Entitled “Endorsements”.  Such a section
+may not be included in the Modified Version.
+
+
      14. 
+
+Do not retitle any existing section to be Entitled “Endorsements” or
+to conflict in title with any Invariant Section.
+
+
      15. 
+
+Preserve any Warranty Disclaimers.
+
      
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled “Endorsements”, provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
    6. 
+
+COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled “History”
+in the various original documents, forming one section Entitled
+“History”; likewise combine any sections Entitled “Acknowledgements”,
+and any sections Entitled “Dedications”.  You must delete all
+sections Entitled “Endorsements.”
+
+
    7. 
+
+COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
    8. 
+
+AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an “aggregate” if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
    9. 
+
+TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled “Acknowledgements”,
+“Dedications”, or “History”, the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
    10. 
+
+TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
    11. 
+
+FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License “or any later version” applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
    
+
+
+
+
    ADDENDUM: How to use this License for your documents
    
+
+
    
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+
    
+
+
    +  Copyright (C)  year  your name.
+  Permission is granted to copy, distribute and/or modify this document
+  under the terms of the GNU Free Documentation License, Version 1.2
+  or any later version published by the Free Software Foundation;
+  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+  Texts.  A copy of the license is included in the section entitled ``GNU
+  Free Documentation License''.
+
    
+
+
    
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the “with...Texts.” line with this:
+
+
    
+
+
    +    with the Invariant Sections being list their titles, with
+    the Front-Cover Texts being list, and with the Back-Cover Texts
+    being list.
+
    
+
+
    
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+
    
+
    
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+
+
    
+
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_2.html b/gettext-tools/doc/gettext_2.html
index 88a864ebc..7ed53dcd4 100644
--- a/gettext-tools/doc/gettext_2.html
+++ b/gettext-tools/doc/gettext_2.html
@@ -1,12 +1,13 @@
 
 
-
+
 
+
 GNU gettext utilities - 2  The User's View
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
@@ -43,7 +44,7 @@ for both installers and end users.
 
 
 
-
    2.1  The Current `ABOUT-NLS´ Matrix
    
+
    2.1  The Current ‘ABOUT-NLS’ Matrix
    
 
    
 
 
@@ -53,10 +54,10 @@ for both installers and end users.
 
    
 Languages are not equally supported in all packages using GNU
 gettext.  To know if some package uses GNU gettext, one
-may check the distribution for the `ABOUT-NLS´ information file, for
-some `ll.po´ files, often kept together into some `po/´
-directory, or for an `intl/´ directory.  Internationalized packages
-have usually many `ll.po´ files, where ll represents
+may check the distribution for the ‘ABOUT-NLS’ information file, for
+some ‘ll.po’ files, often kept together into some ‘po/’
+directory, or for an ‘intl/’ directory.  Internationalized packages
+have usually many ‘ll.po’ files, where ll represents
 the language.  section 2.2  Magic for End Users for a complete description of the format
 for ll.
 
@@ -67,8 +68,8 @@ of the Translation Project, listing which packages are prepared for
 multi-lingual messages, and which languages are supported by each.
 Because this information changes often, this matrix is not kept within
 this GNU gettext manual.  This information is often found in
-file `ABOUT-NLS´ from various distributions, but is also as old as
-the distribution itself.  A recent copy of this `ABOUT-NLS´ file,
+file ‘ABOUT-NLS’ from various distributions, but is also as old as
+the distribution itself.  A recent copy of this ‘ABOUT-NLS’ file,
 containing up-to-date information, should generally be found on the
 Translation Project sites, and also on most GNU archive sites.
 
@@ -87,15 +88,15 @@ Translation Project sites, and also on most GNU archive sites.
 We consider here those packages using GNU gettext internally,
 and for which the installers did not disable translation at
 configure time.  Then, users only have to set the LANG
-environment variable to the appropriate `ll_CC´
-combination prior to using the programs in the package.  See section 2.1  The Current `ABOUT-NLS´ Matrix.
+environment variable to the appropriate ‘ll_CC’
+combination prior to using the programs in the package.  See section 2.1  The Current ‘ABOUT-NLS’ Matrix.
 For example, let's presume a German site.  At the shell prompt, users
-merely have to execute `setenv LANG de_DE´ (in csh) or
-`export LANG; LANG=de_DE´ (in sh).  They could even do
-this from their `.login´ or `.profile´ file.
+merely have to execute ‘setenv LANG de_DE’ (in csh) or
+‘export LANG; LANG=de_DE’ (in sh).  They could even do
+this from their ‘.login’ or ‘.profile’ file.
 
 
    
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_20.html b/gettext-tools/doc/gettext_20.html
index 89278c101..3cf0e6de1 100644
--- a/gettext-tools/doc/gettext_20.html
+++ b/gettext-tools/doc/gettext_20.html
@@ -1,567 +1,79 @@
 
 
-
+
 
-GNU gettext utilities - Option Index
+
+GNU gettext utilities - Program Index
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
-
    Option Index
    
+
    Program Index
    
 
 
    
 Jump to:
--
+a
+-
+e
+-
+g
+-
+m
+-
+n
+-
+r
+-
+x
 
    
-
    -
    
+
    a
    
 
-
  • --add-comments, xgettext option
-
  • --add-location, msgattrib option
-
  • --add-location, msgcat option
-
  • --add-location, msgcomm option
-
  • --add-location, msgconv option
-
  • --add-location, msgen option
-
  • --add-location, msgfilter option
-
  • --add-location, msggrep option
-
  • --add-location, msgmerge option
-
  • --add-location, msguniq option
-
  • --add-location, xgettext option
-
  • --alignment, msgfmt option
-
  • --backup, msgmerge option
-
  • --c++, xgettext option
-
  • --check, msgfmt option
-
  • --check-accelerators, msgfmt option
-
  • --check-compatibility, msgfmt option
-
  • --check-domain, msgfmt option
-
  • --check-format, msgfmt option
-
  • --check-header, msgfmt option
-
  • --clear-fuzzy, msgattrib option
-
  • --clear-obsolete, msgattrib option
-
  • --comment, msggrep option
-
  • --compendium, msgmerge option
-
  • --copy, gettextize option
-
  • --copyright-holder, xgettext option
-
  • --csharp, msgfmt option
-
  • --csharp, msgunfmt option
-
  • --csharp-resources, msgfmt option
-
  • --csharp-resources, msgunfmt option
-
  • --debug, xgettext option
-
  • --default-domain, xgettext option
-
  • --directory, msgattrib option
-
  • --directory, msgcat option
-
  • --directory, msgcmp option
-
  • --directory, msgcomm option
-
  • --directory, msgconv option
-
  • --directory, msgen option
-
  • --directory, msgexec option
-
  • --directory, msgfilter option
-
  • --directory, msgfmt option
-
  • --directory, msggrep option
-
  • --directory, msgmerge option
-
  • --directory, msguniq option
-
  • --directory, xgettext option
-
  • --domain, gettext option
-
  • --domain, msggrep option
-
  • --domain, ngettext option
-
  • --dry-run, autopoint option
-
  • --dry-run, gettextize option
-
  • --exclude-file, xgettext option
-
  • --expression, msgfilter option
-
  • --extended-regexp, msggrep option
-
  • --extract-all, xgettext option
-
  • --file, msgfilter option
-
  • --file, msggrep option
-
  • --files-from, msgcat option
-
  • --files-from, msgcomm option
-
  • --files-from, xgettext option
-
  • --fixed-strings, msggrep option
-
  • --flag, xgettext option
-
  • --force, autopoint option
-
  • --force, gettextize option
-
  • --force-po, msgattrib option
-
  • --force-po, msgcat option
-
  • --force-po, msgcomm option
-
  • --force-po, msgconv option
-
  • --force-po, msgen option
-
  • --force-po, msgfilter option
-
  • --force-po, msggrep option
-
  • --force-po, msgmerge option
-
  • --force-po, msgunfmt option
-
  • --force-po, msguniq option
-
  • --force-po, xgettext option
-
  • --foreign-user, xgettext option
-
  • --from-code, xgettext option
-
  • --fuzzy, msgattrib option
-
  • --help, autopoint option
-
  • --help, envsubst option
-
  • --help, gettext option
-
  • --help, gettextize option
-
  • --help, msgattrib option
-
  • --help, msgcat option
-
  • --help, msgcmp option
-
  • --help, msgcomm option
-
  • --help, msgconv option
-
  • --help, msgen option
-
  • --help, msgexec option
-
  • --help, msgfilter option
-
  • --help, msgfmt option
-
  • --help, msggrep option
-
  • --help, msginit option
-
  • --help, msgmerge option
-
  • --help, msgunfmt option
-
  • --help, msguniq option
-
  • --help, ngettext option
-
  • --help, xgettext option
-
  • --ignore-case, msggrep option
-
  • --ignore-file, msgattrib option
-
  • --indent, msgattrib option
-
  • --indent, msgcat option
-
  • --indent, msgcomm option
-
  • --indent, msgconv option
-
  • --indent, msgen option
-
  • --indent, msgfilter option
-
  • --indent, msggrep option
-
  • --indent, msgmerge option
-
  • --indent, msgunfmt option
-
  • --indent, msguniq option
-
  • --indent, xgettext option
-
  • --input, msgexec option
-
  • --input, msgfilter option
-
  • --input, msginit option
-
  • --intl, gettextize option
-
  • --java, msgfmt option
-
  • --java, msgunfmt option
-
  • --java2, msgfmt option
-
  • --join-existing, xgettext option
-
  • --keep-header, msgfilter option
-
  • --keyword, xgettext option
-
  • --language, xgettext option
-
  • --less-than, msgcat option
-
  • --less-than, msgcomm option
-
  • --locale, msgfmt option, --locale, msgfmt option, --locale, msgfmt option
-
  • --locale, msginit option
-
  • --locale, msgunfmt option, --locale, msgunfmt option, --locale, msgunfmt option
-
  • --location, msggrep option
-
  • --more-than, msgcat option
-
  • --more-than, msgcomm option
-
  • --msgid, msggrep option
-
  • --msgid-bugs-address, xgettext option
-
  • --msgstr, msggrep option
-
  • --msgstr-prefix, xgettext option
-
  • --msgstr-suffix, xgettext option
-
  • --multi-domain, msgcmp option
-
  • --multi-domain, msgmerge option
-
  • --no-changelog, gettextize option
-
  • --no-fuzzy, msgattrib option
-
  • --no-fuzzy-matching, msgmerge option
-
  • --no-hash, msgfmt option
-
  • --no-location, msgattrib option
-
  • --no-location, msgcat option
-
  • --no-location, msgcomm option
-
  • --no-location, msgconv option
-
  • --no-location, msgen option
-
  • --no-location, msgfilter option
-
  • --no-location, msggrep option
-
  • --no-location, msgmerge option
-
  • --no-location, msguniq option
-
  • --no-location, xgettext option
-
  • --no-obsolete, msgattrib option
-
  • --no-translator, msginit option
-
  • --no-wrap, msgattrib option
-
  • --no-wrap, msgcat option
-
  • --no-wrap, msgcomm option
-
  • --no-wrap, msgconv option
-
  • --no-wrap, msgen option
-
  • --no-wrap, msgfilter option
-
  • --no-wrap, msggrep option
-
  • --no-wrap, msginit option
-
  • --no-wrap, msgmerge option
-
  • --no-wrap, msgunfmt option
-
  • --no-wrap, msguniq option
-
  • --no-wrap, xgettext option
-
  • --obsolete, msgattrib option
-
  • --omit-header, msgcomm option
-
  • --omit-header, xgettext option
-
  • --only-file, msgattrib option
-
  • --only-fuzzy, msgattrib option
-
  • --only-obsolete, msgattrib option
-
  • --output, xgettext option
-
  • --output-dir, xgettext option
-
  • --output-file, msgattrib option
-
  • --output-file, msgcat option
-
  • --output-file, msgcomm option
-
  • --output-file, msgconv option
-
  • --output-file, msgen option
-
  • --output-file, msgfilter option
-
  • --output-file, msgfmt option
-
  • --output-file, msggrep option
-
  • --output-file, msginit option
-
  • --output-file, msgmerge option
-
  • --output-file, msgunfmt option
-
  • --output-file, msguniq option
-
  • --properties-input, msgattrib option
-
  • --properties-input, msgcat option
-
  • --properties-input, msgcmp option
-
  • --properties-input, msgcomm option
-
  • --properties-input, msgconv option
-
  • --properties-input, msgen option
-
  • --properties-input, msgexec option
-
  • --properties-input, msgfilter option
-
  • --properties-input, msgfmt option
-
  • --properties-input, msggrep option
-
  • --properties-input, msginit option
-
  • --properties-input, msgmerge option
-
  • --properties-input, msguniq option
-
  • --properties-output, msgattrib option
-
  • --properties-output, msgcat option
-
  • --properties-output, msgcomm option
-
  • --properties-output, msgconv option
-
  • --properties-output, msgen option
-
  • --properties-output, msgfilter option
-
  • --properties-output, msggrep option
-
  • --properties-output, msginit option
-
  • --properties-output, msgmerge option
-
  • --properties-output, msgunfmt option
-
  • --properties-output, msguniq option
-
  • --properties-output, xgettext option
-
  • --qt, msgfmt option
-
  • --qt, xgettext option
-
  • --quiet, msgfilter option
-
  • --quiet, msgmerge option
-
  • --regexp=, msggrep option
-
  • --repeated, msguniq option
-
  • --resource, msgfmt option, --resource, msgfmt option
-
  • --resource, msgunfmt option, --resource, msgunfmt option
-
  • --set-fuzzy, msgattrib option
-
  • --set-obsolete, msgattrib option
-
  • --silent, msgfilter option
-
  • --silent, msgmerge option
-
  • --sort-by-file, msgattrib option
-
  • --sort-by-file, msgcat option
-
  • --sort-by-file, msgcomm option
-
  • --sort-by-file, msgconv option
-
  • --sort-by-file, msgen option
-
  • --sort-by-file, msgfilter option
-
  • --sort-by-file, msggrep option
-
  • --sort-by-file, msgmerge option
-
  • --sort-by-file, msguniq option
-
  • --sort-by-file, xgettext option
-
  • --sort-output, msgattrib option
-
  • --sort-output, msgcat option
-
  • --sort-output, msgcomm option
-
  • --sort-output, msgconv option
-
  • --sort-output, msgen option
-
  • --sort-output, msgfilter option
-
  • --sort-output, msggrep option
-
  • --sort-output, msgmerge option
-
  • --sort-output, msgunfmt option
-
  • --sort-output, msguniq option
-
  • --sort-output, xgettext option
-
  • --statistics, msgfmt option
-
  • --strict, msgattrib option
-
  • --strict, msgcat option
-
  • --strict, msgcomm option
-
  • --strict, msgconv option
-
  • --strict, msgen option
-
  • --strict, msgfilter option
-
  • --strict, msgfmt option
-
  • --strict, msggrep option
-
  • --strict, msgmerge option
-
  • --strict, msgunfmt option
-
  • --strict, msguniq option
-
  • --strict, xgettext option
-
  • --stringtable-input, msgattrib option
-
  • --stringtable-input, msgcat option
-
  • --stringtable-input, msgcmp option
-
  • --stringtable-input, msgcomm option
-
  • --stringtable-input, msgen option
-
  • --stringtable-input, msgexec option
-
  • --stringtable-input, msgfilter option
-
  • --stringtable-input, msgfmt option
-
  • --stringtable-input, msggrep option
-
  • --stringtable-input, msginit option
-
  • --stringtable-input, msgmerge option
-
  • --stringtable-input, msgonv option
-
  • --stringtable-input, msguniq option
-
  • --stringtable-output, msgattrib option
-
  • --stringtable-output, msgcat option
-
  • --stringtable-output, msgcomm option
-
  • --stringtable-output, msgconv option
-
  • --stringtable-output, msgen option
-
  • --stringtable-output, msgfilter option
-
  • --stringtable-output, msggrep option
-
  • --stringtable-output, msginit option
-
  • --stringtable-output, msgmerge option
-
  • --stringtable-output, msgunfmt option
-
  • --stringtable-output, msguniq option
-
  • --stringtable-output, xgettext option
-
  • --suffix, msgmerge option
-
  • --tcl, msgfmt option
-
  • --tcl, msgunfmt option
-
  • --to-code, msgcat option
-
  • --to-code, msgconv option
-
  • --to-code, msguniq option
-
  • --translated, msgattrib option
-
  • --trigraphs, xgettext option
-
  • --unique, msgcat option
-
  • --unique, msgcomm option
-
  • --unique, msguniq option
-
  • --untranslated, msgattrib option
-
  • --update, msgmerge option
-
  • --use-first, msgcat option
-
  • --use-first, msguniq option
-
  • --use-fuzzy, msgfmt option
-
  • --variables, envsubst option
-
  • --verbose, msgfmt option
-
  • --verbose, msgmerge option
-
  • --verbose, msgunfmt option
-
  • --version, autopoint option
-
  • --version, envsubst option
-
  • --version, gettext option
-
  • --version, gettextize option
-
  • --version, msgattrib option
-
  • --version, msgcat option
-
  • --version, msgcmp option
-
  • --version, msgcomm option
-
  • --version, msgconv option
-
  • --version, msgen option
-
  • --version, msgexec option
-
  • --version, msgfilter option
-
  • --version, msgfmt option
-
  • --version, msggrep option
-
  • --version, msginit option
-
  • --version, msgmerge option
-
  • --version, msgunfmt option
-
  • --version, msguniq option
-
  • --version, ngettext option
-
  • --version, xgettext option
-
  • --width, msgattrib option
-
  • --width, msgcat option
-
  • --width, msgcomm option
-
  • --width, msgconv option
-
  • --width, msgen option
-
  • --width, msgfilter option
-
  • --width, msggrep option
-
  • --width, msginit option
-
  • --width, msgmerge option
-
  • --width, msgunfmt option
-
  • --width, msguniq option
-
  • --width, xgettext option
-
  • -<, msgcat option
-
  • -<, msgcomm option
-
  • ->, msgcat option
-
  • ->, msgcomm option
-
  • -a, msgfmt option
-
  • -a, xgettext option
-
  • -c, gettextize option
-
  • -C, msgfmt option
-
  • -c, msgfmt option
-
  • -C, msggrep option
-
  • -C, msgmerge option
-
  • -C, xgettext option
-
  • -c, xgettext option
-
  • -d, autopoint option
-
  • -d, gettext option
-
  • -d, gettextize option
-
  • -D, msgattrib option
-
  • -D, msgcat option
-
  • -D, msgcmp option
-
  • -D, msgcomm option
-
  • -D, msgconv option
-
  • -D, msgen option
-
  • -D, msgexec option
-
  • -D, msgfilter option
-
  • -d, msgfmt option, -d, msgfmt option, -d, msgfmt option
-
  • -D, msgfmt option
-
  • -D, msggrep option
-
  • -D, msgmerge option
-
  • -d, msgunfmt option, -d, msgunfmt option
-
  • -D, msguniq option
-
  • -d, msguniq option
-
  • -d, ngettext option
-
  • -D, xgettext option
-
  • -d, xgettext option
-
  • -e, gettext option
-
  • -E, gettext option
-
  • -e, msgfilter option
-
  • -E, msggrep option
-
  • -e, msggrep option
-
  • -e, ngettext option
-
  • -E, ngettext option
-
  • -f, autopoint option
-
  • -f, gettextize option
-
  • -F, msgattrib option
-
  • -f, msgcat option
-
  • -F, msgcat option
-
  • -F, msgcomm option
-
  • -f, msgcomm option
-
  • -F, msgconv option
-
  • -F, msgen option
-
  • -F, msgfilter option
-
  • -f, msgfilter option
-
  • -f, msgfmt option
-
  • -f, msggrep option
-
  • -F, msggrep option
-
  • -F, msgmerge option
-
  • -F, msguniq option
-
  • -F, xgettext option
-
  • -f, xgettext option
-
  • -h, envsubst option
-
  • -h, gettext option
-
  • -h, msgattrib option
-
  • -h, msgcat option
-
  • -h, msgcmp option
-
  • -h, msgcomm option
-
  • -h, msgconv option
-
  • -h, msgen option
-
  • -h, msgexec option
-
  • -h, msgfilter option
-
  • -h, msgfmt option
-
  • -h, msggrep option
-
  • -h, msginit option
-
  • -h, msgmerge option
-
  • -h, msgunfmt option
-
  • -h, msguniq option
-
  • -h, ngettext option
-
  • -h, xgettext option
-
  • -i, msgattrib option
-
  • -i, msgcat option
-
  • -i, msgcomm option
-
  • -i, msgconv option
-
  • -i, msgen option
-
  • -i, msgexec option
-
  • -i, msgfilter option
-
  • -i, msggrep option
-
  • -i, msginit option
-
  • -i, msgmerge option
-
  • -i, msgunfmt option
-
  • -i, msguniq option
-
  • -i, xgettext option
-
  • -j, msgfmt option
-
  • -j, msgunfmt option
-
  • -j, xgettext option
-
  • -K, msggrep option
-
  • -k, xgettext option
-
  • -l, msgfmt option, -l, msgfmt option, -l, msgfmt option
-
  • -l, msginit option
-
  • -l, msgunfmt option, -l, msgunfmt option, -l, msgunfmt option
-
  • -L, xgettext option
-
  • -m, msgcmp option
-
  • -M, msggrep option
-
  • -m, msgmerge option
-
  • -M, xgettext option
-
  • -m, xgettext option
-
  • -n, gettext option
-
  • -n, msgattrib option
-
  • -n, msgcat option
-
  • -n, msgcomm option
-
  • -n, msgfilter option
-
  • -N, msggrep option
-
  • -N, msgmerge option
-
  • -n, msguniq option
-
  • -n, xgettext option
-
  • -o, msgattrib option
-
  • -o, msgcat option
-
  • -o, msgcomm option
-
  • -o, msgconv option
-
  • -o, msgen option
-
  • -o, msgfilter option
-
  • -o, msgfmt option
-
  • -o, msggrep option
-
  • -o, msginit option
-
  • -o, msgmerge option
-
  • -o, msgunfmt option
-
  • -o, msguniq option
-
  • -o, xgettext option
-
  • -P, msgattrib option
-
  • -p, msgattrib option
-
  • -P, msgcat option
-
  • -p, msgcat option
-
  • -P, msgcmp option
-
  • -P, msgcomm option
-
  • -p, msgcomm option
-
  • -P, msgconv option
-
  • -p, msgconv option
-
  • -P, msgen option
-
  • -p, msgen option
-
  • -P, msgexec option
-
  • -P, msgfilter option
-
  • -p, msgfilter option
-
  • -P, msgfmt option
-
  • -p, msggrep option
-
  • -P, msggrep option
-
  • -P, msginit option
-
  • -p, msginit option
-
  • -p, msgmerge option
-
  • -P, msgmerge option
-
  • -p, msgunfmt option
-
  • -p, msguniq option
-
  • -P, msguniq option
-
  • -p, xgettext option
-
  • -q, msgmerge option
-
  • -r, msgfmt option, -r, msgfmt option
-
  • -r, msgunfmt option, -r, msgunfmt option
-
  • -s, msgattrib option
-
  • -s, msgcat option
-
  • -s, msgcomm option
-
  • -s, msgconv option
-
  • -s, msgen option
-
  • -s, msgfilter option
-
  • -s, msgmerge option
-
  • -s, msgunfmt option
-
  • -s, msguniq option
-
  • -s, xgettext option
-
  • -t, msgcat option
-
  • -t, msgconv option
-
  • -T, msggrep option
-
  • -t, msguniq option
-
  • -T, xgettext option
-
  • -u, msgcat option
-
  • -u, msgcomm option
-
  • -U, msgmerge option
-
  • -u, msguniq option
-
  • -v, envsubst option
-
  • -V, envsubst option
-
  • -V, gettext option
-
  • -V, msgattrib option
-
  • -V, msgcat option
-
  • -V, msgcmp option
-
  • -V, msgcomm option
-
  • -V, msgconv option
-
  • -V, msgen option
-
  • -V, msgexec option
-
  • -V, msgfilter option
-
  • -V, msgfmt option
-
  • -v, msgfmt option
-
  • -V, msggrep option
-
  • -V, msginit option
-
  • -v, msgmerge option
-
  • -V, msgmerge option
-
  • -v, msgunfmt option
-
  • -V, msgunfmt option
-
  • -V, msguniq option
-
  • -V, ngettext option
-
  • -V, xgettext option
-
  • -w, msgattrib option
-
  • -w, msgcat option
-
  • -w, msgcomm option
-
  • -w, msgconv option
-
  • -w, msgen option
-
  • -w, msgfilter option
-
  • -w, msggrep option
-
  • -w, msginit option
-
  • -w, msgmerge option
-
  • -w, msgunfmt option
-
  • -w, msguniq option
-
  • -w, xgettext option
-
  • -x, xgettext option
+
  • autopoint
+
    • 
+
    e
    
+
+
  • envsubst
+
    • 
+
    g
    
+
+
  • gettext, gettext
+
  • gettextize
+
    • 
+
    m
    
+
+
  • msgattrib
+
  • msgcat
+
  • msgcmp
+
  • msgcomm
+
  • msgconv
+
  • msgen
+
  • msgexec
+
  • msgfilter
+
  • msgfmt
+
  • msggrep
+
  • msginit
+
  • msgmerge
+
  • msgunfmt
+
  • msguniq
+
    • 
+
    n
    
+
+
  • ngettext, ngettext
+
    • 
+
    r
    
+
+
  • recode-sr-latin
+
    • 
+
    x
    
+
+
  • xgettext
 
    • 
 
 
    
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_21.html b/gettext-tools/doc/gettext_21.html
index 122f17ebe..8e4b261a0 100644
--- a/gettext-tools/doc/gettext_21.html
+++ b/gettext-tools/doc/gettext_21.html
@@ -1,57 +1,575 @@
 
 
-
+
 
-GNU gettext utilities - Variable Index
+
+GNU gettext utilities - Option Index
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
-
    Variable Index
    
+
    Option Index
    
 
 
    
 Jump to:
-g
--
-l
--
-m
--
-t
+-
 
    
-
    g
    
+
    -
    
 
-
  • GETTEXT_LOG_UNTRANSLATED, environment variable
-
    • 
-
    l
    
-
-
  • LANG, environment variable, LANG, environment variable
-
  • LANGUAGE, environment variable, LANGUAGE, environment variable
-
  • LC_ALL, environment variable
-
  • LC_COLLATE, environment variable
-
  • LC_CTYPE, environment variable
-
  • LC_MESSAGES, environment variable
-
  • LC_MONETARY, environment variable
-
  • LC_NUMERIC, environment variable
-
  • LC_TIME, environment variable
-
  • LINGUAS, environment variable
-
    • 
-
    m
    
-
-
  • MSGEXEC_LOCATION, environment variable
-
  • MSGEXEC_MSGID, environment variable
-
    • 
-
    t
    
-
-
  • TEXTDOMAIN, environment variable
-
  • TEXTDOMAINDIR, environment variable
+
  • --add-comments, xgettext option
+
  • --add-location, msgattrib option
+
  • --add-location, msgcat option
+
  • --add-location, msgcomm option
+
  • --add-location, msgconv option
+
  • --add-location, msgen option
+
  • --add-location, msgfilter option
+
  • --add-location, msggrep option
+
  • --add-location, msgmerge option
+
  • --add-location, msguniq option
+
  • --add-location, xgettext option
+
  • --alignment, msgfmt option
+
  • --backup, msgmerge option
+
  • --boost, xgettext option
+
  • --c++, xgettext option
+
  • --check, msgfmt option
+
  • --check-accelerators, msgfmt option
+
  • --check-compatibility, msgfmt option
+
  • --check-domain, msgfmt option
+
  • --check-format, msgfmt option
+
  • --check-header, msgfmt option
+
  • --clear-fuzzy, msgattrib option
+
  • --clear-obsolete, msgattrib option
+
  • --comment, msggrep option
+
  • --compendium, msgmerge option
+
  • --copy, gettextize option
+
  • --copyright-holder, xgettext option
+
  • --csharp, msgfmt option
+
  • --csharp, msgunfmt option
+
  • --csharp-resources, msgfmt option
+
  • --csharp-resources, msgunfmt option
+
  • --debug, xgettext option
+
  • --default-domain, xgettext option
+
  • --directory, msgattrib option
+
  • --directory, msgcat option
+
  • --directory, msgcmp option
+
  • --directory, msgcomm option
+
  • --directory, msgconv option
+
  • --directory, msgen option
+
  • --directory, msgexec option
+
  • --directory, msgfilter option
+
  • --directory, msgfmt option
+
  • --directory, msggrep option
+
  • --directory, msgmerge option
+
  • --directory, msguniq option
+
  • --directory, xgettext option
+
  • --domain, gettext option
+
  • --domain, msggrep option
+
  • --domain, ngettext option
+
  • --dry-run, autopoint option
+
  • --dry-run, gettextize option
+
  • --exclude-file, xgettext option
+
  • --expression, msgfilter option
+
  • --extended-regexp, msggrep option
+
  • --extract-all, xgettext option
+
  • --extracted-comment, msggrep option
+
  • --file, msgfilter option
+
  • --file, msggrep option
+
  • --files-from, msgcat option
+
  • --files-from, msgcomm option
+
  • --files-from, xgettext option
+
  • --fixed-strings, msggrep option
+
  • --flag, xgettext option
+
  • --force, autopoint option
+
  • --force, gettextize option
+
  • --force-po, msgattrib option
+
  • --force-po, msgcat option
+
  • --force-po, msgcomm option
+
  • --force-po, msgconv option
+
  • --force-po, msgen option
+
  • --force-po, msgfilter option
+
  • --force-po, msggrep option
+
  • --force-po, msgmerge option
+
  • --force-po, msgunfmt option
+
  • --force-po, msguniq option
+
  • --force-po, xgettext option
+
  • --foreign-user, xgettext option
+
  • --from-code, xgettext option
+
  • --fuzzy, msgattrib option
+
  • --help, autopoint option
+
  • --help, envsubst option
+
  • --help, gettext option
+
  • --help, gettextize option
+
  • --help, msgattrib option
+
  • --help, msgcat option
+
  • --help, msgcmp option
+
  • --help, msgcomm option
+
  • --help, msgconv option
+
  • --help, msgen option
+
  • --help, msgexec option
+
  • --help, msgfilter option
+
  • --help, msgfmt option
+
  • --help, msggrep option
+
  • --help, msginit option
+
  • --help, msgmerge option
+
  • --help, msgunfmt option
+
  • --help, msguniq option
+
  • --help, ngettext option
+
  • --help, xgettext option
+
  • --ignore-case, msggrep option
+
  • --ignore-file, msgattrib option
+
  • --indent, msgattrib option
+
  • --indent, msgcat option
+
  • --indent, msgcomm option
+
  • --indent, msgconv option
+
  • --indent, msgen option
+
  • --indent, msgfilter option
+
  • --indent, msggrep option
+
  • --indent, msgmerge option
+
  • --indent, msgunfmt option
+
  • --indent, msguniq option
+
  • --indent, xgettext option
+
  • --input, msgexec option
+
  • --input, msgfilter option
+
  • --input, msginit option
+
  • --intl, gettextize option
+
  • --invert-match, msggrep option
+
  • --java, msgfmt option
+
  • --java, msgunfmt option
+
  • --java2, msgfmt option
+
  • --join-existing, xgettext option
+
  • --keep-header, msgfilter option
+
  • --keyword, xgettext option
+
  • --language, xgettext option
+
  • --less-than, msgcat option
+
  • --less-than, msgcomm option
+
  • --locale, msgfmt option, --locale, msgfmt option, --locale, msgfmt option
+
  • --locale, msginit option
+
  • --locale, msgunfmt option, --locale, msgunfmt option, --locale, msgunfmt option
+
  • --location, msggrep option
+
  • --more-than, msgcat option
+
  • --more-than, msgcomm option
+
  • --msgctxt, msggrep option
+
  • --msgid, msggrep option
+
  • --msgid-bugs-address, xgettext option
+
  • --msgstr, msggrep option
+
  • --msgstr-prefix, xgettext option
+
  • --msgstr-suffix, xgettext option
+
  • --multi-domain, msgcmp option
+
  • --multi-domain, msgmerge option
+
  • --no-changelog, gettextize option
+
  • --no-fuzzy, msgattrib option
+
  • --no-fuzzy-matching, msgmerge option
+
  • --no-hash, msgfmt option
+
  • --no-location, msgattrib option
+
  • --no-location, msgcat option
+
  • --no-location, msgcomm option
+
  • --no-location, msgconv option
+
  • --no-location, msgen option
+
  • --no-location, msgfilter option
+
  • --no-location, msggrep option
+
  • --no-location, msgmerge option
+
  • --no-location, msguniq option
+
  • --no-location, xgettext option
+
  • --no-obsolete, msgattrib option
+
  • --no-translator, msginit option
+
  • --no-wrap, msgattrib option
+
  • --no-wrap, msgcat option
+
  • --no-wrap, msgcomm option
+
  • --no-wrap, msgconv option
+
  • --no-wrap, msgen option
+
  • --no-wrap, msgfilter option
+
  • --no-wrap, msggrep option
+
  • --no-wrap, msginit option
+
  • --no-wrap, msgmerge option
+
  • --no-wrap, msgunfmt option
+
  • --no-wrap, msguniq option
+
  • --no-wrap, xgettext option
+
  • --obsolete, msgattrib option
+
  • --omit-header, msgcomm option
+
  • --omit-header, xgettext option
+
  • --only-file, msgattrib option
+
  • --only-fuzzy, msgattrib option
+
  • --only-obsolete, msgattrib option
+
  • --output, xgettext option
+
  • --output-dir, xgettext option
+
  • --output-file, msgattrib option
+
  • --output-file, msgcat option
+
  • --output-file, msgcomm option
+
  • --output-file, msgconv option
+
  • --output-file, msgen option
+
  • --output-file, msgfilter option
+
  • --output-file, msgfmt option
+
  • --output-file, msggrep option
+
  • --output-file, msginit option
+
  • --output-file, msgmerge option
+
  • --output-file, msgunfmt option
+
  • --output-file, msguniq option
+
  • --properties-input, msgattrib option
+
  • --properties-input, msgcat option
+
  • --properties-input, msgcmp option
+
  • --properties-input, msgcomm option
+
  • --properties-input, msgconv option
+
  • --properties-input, msgen option
+
  • --properties-input, msgexec option
+
  • --properties-input, msgfilter option
+
  • --properties-input, msgfmt option
+
  • --properties-input, msggrep option
+
  • --properties-input, msginit option
+
  • --properties-input, msgmerge option
+
  • --properties-input, msguniq option
+
  • --properties-output, msgattrib option
+
  • --properties-output, msgcat option
+
  • --properties-output, msgcomm option
+
  • --properties-output, msgconv option
+
  • --properties-output, msgen option
+
  • --properties-output, msgfilter option
+
  • --properties-output, msggrep option
+
  • --properties-output, msginit option
+
  • --properties-output, msgmerge option
+
  • --properties-output, msgunfmt option
+
  • --properties-output, msguniq option
+
  • --properties-output, xgettext option
+
  • --qt, msgfmt option
+
  • --qt, xgettext option
+
  • --quiet, msgfilter option
+
  • --quiet, msgmerge option
+
  • --regexp=, msggrep option
+
  • --repeated, msguniq option
+
  • --resource, msgfmt option, --resource, msgfmt option
+
  • --resource, msgunfmt option, --resource, msgunfmt option
+
  • --set-fuzzy, msgattrib option
+
  • --set-obsolete, msgattrib option
+
  • --silent, msgfilter option
+
  • --silent, msgmerge option
+
  • --sort-by-file, msgattrib option
+
  • --sort-by-file, msgcat option
+
  • --sort-by-file, msgcomm option
+
  • --sort-by-file, msgconv option
+
  • --sort-by-file, msgen option
+
  • --sort-by-file, msgfilter option
+
  • --sort-by-file, msggrep option
+
  • --sort-by-file, msgmerge option
+
  • --sort-by-file, msguniq option
+
  • --sort-by-file, xgettext option
+
  • --sort-output, msgattrib option
+
  • --sort-output, msgcat option
+
  • --sort-output, msgcomm option
+
  • --sort-output, msgconv option
+
  • --sort-output, msgen option
+
  • --sort-output, msgfilter option
+
  • --sort-output, msggrep option
+
  • --sort-output, msgmerge option
+
  • --sort-output, msgunfmt option
+
  • --sort-output, msguniq option
+
  • --sort-output, xgettext option
+
  • --statistics, msgfmt option
+
  • --strict, msgattrib option
+
  • --strict, msgcat option
+
  • --strict, msgcomm option
+
  • --strict, msgconv option
+
  • --strict, msgen option
+
  • --strict, msgfilter option
+
  • --strict, msgfmt option
+
  • --strict, msggrep option
+
  • --strict, msgmerge option
+
  • --strict, msgunfmt option
+
  • --strict, msguniq option
+
  • --strict, xgettext option
+
  • --stringtable-input, msgattrib option
+
  • --stringtable-input, msgcat option
+
  • --stringtable-input, msgcmp option
+
  • --stringtable-input, msgcomm option
+
  • --stringtable-input, msgen option
+
  • --stringtable-input, msgexec option
+
  • --stringtable-input, msgfilter option
+
  • --stringtable-input, msgfmt option
+
  • --stringtable-input, msggrep option
+
  • --stringtable-input, msginit option
+
  • --stringtable-input, msgmerge option
+
  • --stringtable-input, msgonv option
+
  • --stringtable-input, msguniq option
+
  • --stringtable-output, msgattrib option
+
  • --stringtable-output, msgcat option
+
  • --stringtable-output, msgcomm option
+
  • --stringtable-output, msgconv option
+
  • --stringtable-output, msgen option
+
  • --stringtable-output, msgfilter option
+
  • --stringtable-output, msggrep option
+
  • --stringtable-output, msginit option
+
  • --stringtable-output, msgmerge option
+
  • --stringtable-output, msgunfmt option
+
  • --stringtable-output, msguniq option
+
  • --stringtable-output, xgettext option
+
  • --suffix, msgmerge option
+
  • --tcl, msgfmt option
+
  • --tcl, msgunfmt option
+
  • --to-code, msgcat option
+
  • --to-code, msgconv option
+
  • --to-code, msguniq option
+
  • --translated, msgattrib option
+
  • --trigraphs, xgettext option
+
  • --unique, msgcat option
+
  • --unique, msgcomm option
+
  • --unique, msguniq option
+
  • --untranslated, msgattrib option
+
  • --update, msgmerge option
+
  • --use-first, msgcat option
+
  • --use-first, msguniq option
+
  • --use-fuzzy, msgfmt option
+
  • --variables, envsubst option
+
  • --verbose, msgfmt option
+
  • --verbose, msgmerge option
+
  • --verbose, msgunfmt option
+
  • --version, autopoint option
+
  • --version, envsubst option
+
  • --version, gettext option
+
  • --version, gettextize option
+
  • --version, msgattrib option
+
  • --version, msgcat option
+
  • --version, msgcmp option
+
  • --version, msgcomm option
+
  • --version, msgconv option
+
  • --version, msgen option
+
  • --version, msgexec option
+
  • --version, msgfilter option
+
  • --version, msgfmt option
+
  • --version, msggrep option
+
  • --version, msginit option
+
  • --version, msgmerge option
+
  • --version, msgunfmt option
+
  • --version, msguniq option
+
  • --version, ngettext option
+
  • --version, xgettext option
+
  • --width, msgattrib option
+
  • --width, msgcat option
+
  • --width, msgcomm option
+
  • --width, msgconv option
+
  • --width, msgen option
+
  • --width, msgfilter option
+
  • --width, msggrep option
+
  • --width, msginit option
+
  • --width, msgmerge option
+
  • --width, msgunfmt option
+
  • --width, msguniq option
+
  • --width, xgettext option
+
  • -<, msgcat option
+
  • -<, msgcomm option
+
  • ->, msgcat option
+
  • ->, msgcomm option
+
  • -a, msgfmt option
+
  • -a, xgettext option
+
  • -c, gettextize option
+
  • -C, msgfmt option
+
  • -c, msgfmt option
+
  • -C, msggrep option
+
  • -C, msgmerge option
+
  • -C, xgettext option
+
  • -c, xgettext option
+
  • -d, autopoint option
+
  • -d, gettext option
+
  • -d, gettextize option
+
  • -D, msgattrib option
+
  • -D, msgcat option
+
  • -D, msgcmp option
+
  • -D, msgcomm option
+
  • -D, msgconv option
+
  • -D, msgen option
+
  • -D, msgexec option
+
  • -D, msgfilter option
+
  • -d, msgfmt option, -d, msgfmt option, -d, msgfmt option
+
  • -D, msgfmt option
+
  • -D, msggrep option
+
  • -D, msgmerge option
+
  • -d, msgunfmt option, -d, msgunfmt option
+
  • -D, msguniq option
+
  • -d, msguniq option
+
  • -d, ngettext option
+
  • -D, xgettext option
+
  • -d, xgettext option
+
  • -e, gettext option
+
  • -E, gettext option
+
  • -e, msgfilter option
+
  • -E, msggrep option
+
  • -e, msggrep option
+
  • -e, ngettext option
+
  • -E, ngettext option
+
  • -f, autopoint option
+
  • -f, gettextize option
+
  • -F, msgattrib option
+
  • -f, msgcat option
+
  • -F, msgcat option
+
  • -F, msgcomm option
+
  • -f, msgcomm option
+
  • -F, msgconv option
+
  • -F, msgen option
+
  • -F, msgfilter option
+
  • -f, msgfilter option
+
  • -f, msgfmt option
+
  • -f, msggrep option
+
  • -F, msggrep option
+
  • -F, msgmerge option
+
  • -F, msguniq option
+
  • -F, xgettext option
+
  • -f, xgettext option
+
  • -h, envsubst option
+
  • -h, gettext option
+
  • -h, msgattrib option
+
  • -h, msgcat option
+
  • -h, msgcmp option
+
  • -h, msgcomm option
+
  • -h, msgconv option
+
  • -h, msgen option
+
  • -h, msgexec option
+
  • -h, msgfilter option
+
  • -h, msgfmt option
+
  • -h, msggrep option
+
  • -h, msginit option
+
  • -h, msgmerge option
+
  • -h, msgunfmt option
+
  • -h, msguniq option
+
  • -h, ngettext option
+
  • -h, xgettext option
+
  • -i, msgattrib option
+
  • -i, msgcat option
+
  • -i, msgcomm option
+
  • -i, msgconv option
+
  • -i, msgen option
+
  • -i, msgexec option
+
  • -i, msgfilter option
+
  • -i, msggrep option
+
  • -i, msginit option
+
  • -i, msgmerge option
+
  • -i, msgunfmt option
+
  • -i, msguniq option
+
  • -i, xgettext option
+
  • -j, msgfmt option
+
  • -J, msggrep option
+
  • -j, msgunfmt option
+
  • -j, xgettext option
+
  • -K, msggrep option
+
  • -k, xgettext option
+
  • -l, msgfmt option, -l, msgfmt option, -l, msgfmt option
+
  • -l, msginit option
+
  • -l, msgunfmt option, -l, msgunfmt option, -l, msgunfmt option
+
  • -L, xgettext option
+
  • -m, msgcmp option
+
  • -M, msggrep option
+
  • -m, msgmerge option
+
  • -M, xgettext option
+
  • -m, xgettext option
+
  • -n, gettext option
+
  • -n, msgattrib option
+
  • -n, msgcat option
+
  • -n, msgcomm option
+
  • -n, msgfilter option
+
  • -N, msggrep option
+
  • -N, msgmerge option
+
  • -n, msguniq option
+
  • -n, xgettext option
+
  • -o, msgattrib option
+
  • -o, msgcat option
+
  • -o, msgcomm option
+
  • -o, msgconv option
+
  • -o, msgen option
+
  • -o, msgfilter option
+
  • -o, msgfmt option
+
  • -o, msggrep option
+
  • -o, msginit option
+
  • -o, msgmerge option
+
  • -o, msgunfmt option
+
  • -o, msguniq option
+
  • -o, xgettext option
+
  • -P, msgattrib option
+
  • -p, msgattrib option
+
  • -P, msgcat option
+
  • -p, msgcat option
+
  • -P, msgcmp option
+
  • -P, msgcomm option
+
  • -p, msgcomm option
+
  • -P, msgconv option
+
  • -p, msgconv option
+
  • -P, msgen option
+
  • -p, msgen option
+
  • -P, msgexec option
+
  • -P, msgfilter option
+
  • -p, msgfilter option
+
  • -P, msgfmt option
+
  • -p, msggrep option
+
  • -P, msggrep option
+
  • -P, msginit option
+
  • -p, msginit option
+
  • -p, msgmerge option
+
  • -P, msgmerge option
+
  • -p, msgunfmt option
+
  • -p, msguniq option
+
  • -P, msguniq option
+
  • -p, xgettext option
+
  • -q, msgmerge option
+
  • -r, msgfmt option, -r, msgfmt option
+
  • -r, msgunfmt option, -r, msgunfmt option
+
  • -s, msgattrib option
+
  • -s, msgcat option
+
  • -s, msgcomm option
+
  • -s, msgconv option
+
  • -s, msgen option
+
  • -s, msgfilter option
+
  • -s, msgmerge option
+
  • -s, msgunfmt option
+
  • -s, msguniq option
+
  • -s, xgettext option
+
  • -t, msgcat option
+
  • -t, msgconv option
+
  • -T, msggrep option
+
  • -t, msguniq option
+
  • -T, xgettext option
+
  • -u, msgcat option
+
  • -u, msgcomm option
+
  • -U, msgmerge option
+
  • -u, msguniq option
+
  • -v, envsubst option
+
  • -V, envsubst option
+
  • -V, gettext option
+
  • -V, msgattrib option
+
  • -V, msgcat option
+
  • -V, msgcmp option
+
  • -V, msgcomm option
+
  • -V, msgconv option
+
  • -V, msgen option
+
  • -V, msgexec option
+
  • -V, msgfilter option
+
  • -V, msgfmt option
+
  • -v, msgfmt option
+
  • -V, msggrep option
+
  • -v, msggrep option
+
  • -V, msginit option
+
  • -v, msgmerge option
+
  • -V, msgmerge option
+
  • -v, msgunfmt option
+
  • -V, msgunfmt option
+
  • -V, msguniq option
+
  • -V, ngettext option
+
  • -V, xgettext option
+
  • -w, msgattrib option
+
  • -w, msgcat option
+
  • -w, msgcomm option
+
  • -w, msgconv option
+
  • -w, msgen option
+
  • -w, msgfilter option
+
  • -w, msggrep option
+
  • -w, msginit option
+
  • -w, msgmerge option
+
  • -w, msgunfmt option
+
  • -w, msguniq option
+
  • -w, xgettext option
+
  • -X, msggrep option
+
  • -x, xgettext option
 
    • 
 
 
    
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_22.html b/gettext-tools/doc/gettext_22.html
index d3a23ce0d..c86b8b440 100644
--- a/gettext-tools/doc/gettext_22.html
+++ b/gettext-tools/doc/gettext_22.html
@@ -1,118 +1,59 @@
 
 
-
+
 
-GNU gettext utilities - PO Mode Index
+
+GNU gettext utilities - Variable Index
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
-
    PO Mode Index
    
+
    Variable Index
    
 
 
    
 Jump to:
-.
+g
 -
-a
+l
 -
-c
+m
 -
-e
--
-f
--
-i
--
-l
--
-m
--
-o
--
-p
--
-s
--
-t
--
-u
+t
 
    
-
    .
    
-
-
  • `.emacs´ customizations
-
    • 
-
    a
    
-
-
  • auxiliary PO file
-
    • 
-
    c
    
-
-
  • commands
-
  • comment out PO file entry
-
  • consulting program sources
-
  • consulting translations to other languages
-
  • current entry of a PO file
-
  • cut and paste for translated strings
-
    • 
-
    e
    
-
-
  • editing comments
-
  • editing multiple entries
-
  • editing translations
-
  • etags, using for marking strings
-
  • exiting PO subedit
-
    • 
-
    f
    
-
-
  • find source fragment for a PO file entry
-
    • 
-
    i
    
-
-
  • installing PO mode
-
    • 
-
    l
    
-
-
  • looking at the source to aid translation
-
    • 
-
    m
    
-
-
  • marking strings for translation
-
  • moving by fuzzy entries
-
  • moving by obsolete entries
-
  • moving by translated entries
-
  • moving by untranslated entries
-
  • moving through a PO file
-
    • 
-
    o
    
-
-
  • obsolete active entry
-
    • 
-
    p
    
+
    g
    
 
-
  • pending subedits
+
  • GETTEXT_LOG_UNTRANSLATED, environment variable
 
    • 
-
    s
    
+
    l
    
 
-
  • starting a string translation
-
  • string normalization in entries
-
  • subedit minor mode
+
  • LANG, environment variable, LANG, environment variable
+
  • LANGUAGE, environment variable, LANGUAGE, environment variable
+
  • LC_ALL, environment variable
+
  • LC_COLLATE, environment variable
+
  • LC_CTYPE, environment variable
+
  • LC_MESSAGES, environment variable
+
  • LC_MONETARY, environment variable
+
  • LC_NUMERIC, environment variable
+
  • LC_TIME, environment variable
+
  • LINGUAS, environment variable
 
    • 
-
    t
    
+
    m
    
 
-
  • `TAGS´, and marking translatable strings
+
  • MSGEXEC_LOCATION, environment variable
+
  • MSGEXEC_MSGCTXT, environment variable
+
  • MSGEXEC_MSGID, environment variable
 
    • 
-
    u
    
+
    t
    
 
-
  • use the source, Luke
-
  • using obsolete translations to make new entries
-
  • using translation compendia
+
  • TEXTDOMAIN, environment variable
+
  • TEXTDOMAINDIR, environment variable
 
    • 
 
 
    
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_23.html b/gettext-tools/doc/gettext_23.html
index a055aff7f..91e1e7994 100644
--- a/gettext-tools/doc/gettext_23.html
+++ b/gettext-tools/doc/gettext_23.html
@@ -1,31 +1,114 @@
 
 
-
+
 
-GNU gettext utilities - Autoconf Macro Index
+
+GNU gettext utilities - PO Mode Index
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
-
    Autoconf Macro Index
    
+
    PO Mode Index
    
 
 
    
 Jump to:
-a
+&
+-
+a
+-
+c
+-
+e
+-
+f
+-
+i
+-
+l
+-
+m
+-
+o
+-
+p
+-
+s
+-
+u
 
    
-
    a
    
+
    &
    
 
-
  • AM_GNU_GETTEXT
-
  • AM_GNU_GETTEXT_VERSION
-
  • AM_ICONV
-
  • AM_PO_SUBDIRS
+
  • ‘.emacs’ customizations
+
  • ‘TAGS’, and marking translatable strings
+
    • 
+
    a
    
+
+
  • auxiliary PO file
+
    • 
+
    c
    
+
+
  • commands
+
  • comment out PO file entry
+
  • consulting program sources
+
  • consulting translations to other languages
+
  • current entry of a PO file
+
  • cut and paste for translated strings
+
    • 
+
    e
    
+
+
  • editing comments
+
  • editing multiple entries
+
  • editing translations
+
  • etags, using for marking strings
+
  • exiting PO subedit
+
    • 
+
    f
    
+
+
  • find source fragment for a PO file entry
+
    • 
+
    i
    
+
+
  • installing PO mode
+
    • 
+
    l
    
+
+
  • looking at the source to aid translation
+
    • 
+
    m
    
+
+
  • marking strings for translation
+
  • moving by fuzzy entries
+
  • moving by obsolete entries
+
  • moving by translated entries
+
  • moving by untranslated entries
+
  • moving through a PO file
+
    • 
+
    o
    
+
+
  • obsolete active entry
+
    • 
+
    p
    
+
+
  • pending subedits
+
    • 
+
    s
    
+
+
  • starting a string translation
+
  • string normalization in entries
+
  • subedit minor mode
+
    • 
+
    u
    
+
+
  • use the source, Luke
+
  • using obsolete translations to make new entries
+
  • using translation compendia
 
    • 
 
 
    
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_24.html b/gettext-tools/doc/gettext_24.html
index eae087475..efedebdad 100644
--- a/gettext-tools/doc/gettext_24.html
+++ b/gettext-tools/doc/gettext_24.html
@@ -1,473 +1,32 @@
 
 
-
+
 
-GNU gettext utilities - General Index
+
+GNU gettext utilities - Autoconf Macro Index
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
-
    General Index
    
+
    Autoconf Macro Index
    
 
 
    
 Jump to:
-_
--
-a
--
-b
--
-c
--
-d
--
-e
--
-f
--
-g
--
-h
--
-i
--
-j
--
-k
--
-l
--
-m
--
-n
--
-o
--
-p
--
-q
--
-r
--
-s
--
-t
--
-u
--
-v
--
-w
--
-x
--
-y
+a
 
    
-
    _
    
+
    a
    
 
-
  • _, a macro to mark strings for translation
-
  • _nl_msg_cat_cntr
-
    • 
-
    a
    
-
-
  • `ABOUT-NLS´ file
-
  • `acconfig.h´ file
-
  • accumulating translations
-
  • `aclocal.m4´ file
-
  • adding keywords, xgettext
-
  • ambiguities
-
  • apply a filter to translations
-
  • apply command to all translations in a catalog
-
  • Arabic digits
-
  • attribute manipulation
-
  • attribute, fuzzy
-
  • attributes of a PO file entry
-
  • attributes, manipulating
-
  • autoconf macros for gettext
-
  • autopoint program, usage
-
  • auxiliary PO file
-
  • available translations
-
  • awk
-
    • 
-
    b
    
-
-
  • backup old file, and msgmerge program
-
  • bash
-
  • bibliography
-
  • big picture
-
  • bind_textdomain_codeset
-
  • bug report address
-
    • 
-
    c
    
-
-
  • C and C-like languages
-
  • C trigraphs
-
  • C#
-
  • C# mode, and msgfmt program
-
  • C# mode, and msgunfmt program
-
  • C# resources mode, and msgfmt program
-
  • C# resources mode, and msgunfmt program
-
  • C#, string concatenation
-
  • catalog encoding and msgexec output
-
  • catclose, a catgets function
-
  • catgets, X/Open specification
-
  • catgets, a catgets function
-
  • catopen, a catgets function
-
  • character encoding
-
  • charset conversion at runtime
-
  • charset of PO files
-
  • check format strings
-
  • checking of translations
-
  • clisp
-
  • clisp C sources
-
  • codeset
-
  • comments in PO files
-
  • Common Lisp
-
  • compare PO files
-
  • comparison of interfaces
-
  • compatibility with X/Open msgfmt
-
  • compendium
-
  • compendium, creating
-
  • concatenate PO files
-
  • concatenating PO files into a compendium
-
  • concatenation of strings
-
  • `config.h.in´ file
-
  • convert binary message catalog into PO file
-
  • convert translations to a different encoding
-
  • converting a package to use gettext
-
  • country codes
-
  • create new PO file
-
  • creating a new PO file
-
  • creating compendia
-
  • currency symbols
-
    • 
-
    d
    
-
-
  • date format
-
  • dcngettext
-
  • debugging messages marked as format strings
-
  • dialect
-
  • disabling NLS
-
  • distribution tarball
-
  • dngettext
-
  • dollar substitution
-
  • domain ambiguities
-
  • duplicate elimination
-
  • duplicate removal
-
    • 
-
    e
    
-
-
  • editing comments in PO files
-
  • Editing PO Files
-
  • editing translations
-
  • Emacs Lisp
-
  • Emacs PO Mode
-
  • encoding
-
  • encoding conversion
-
  • encoding conversion at runtime
-
  • encoding for your language
-
  • encoding list
-
  • encoding of PO files
-
  • environment variables
-
  • envsubst program, usage
-
  • eval_gettext function, usage
-
  • eval_ngettext function, usage
-
  • evolution of packages
-
  • extracting parts of a PO file into a compendium
-
    • 
-
    f
    
-
-
  • file format, `.mo´
-
  • file format, `.po´
-
  • files, `.po´ and `.mo´
-
  • files, `.pot´
-
  • filter messages according to attributes
-
  • find common messages
-
  • force use of fuzzy entries
-
  • format strings
-
  • Free Pascal
-
  • function attribute, __format__
-
  • function attribute, __format_arg__
-
  • fuzzy entries
-
    • 
-
    g
    
-
-
  • gawk
-
  • GCC-source
-
  • generate binary message catalog from PO file
-
  • generate translation catalog in English
-
  • gettext files
-
  • gettext installation
-
  • gettext interface
-
  • gettext program, usage
-
  • gettext, a programmer's view
-
  • `gettext.h´ file
-
  • gettext vs catgets
-
  • gettextize program, usage
-
  • GNOME PO file editor
-
  • GUI programs
-
  • guile
-
    • 
-
    h
    
-
-
  • hash table, inside MO files
-
  • he, she, and they
-
  • header entry of a PO file
-
  • help option
-
  • history of GNU gettext
-
    • 
-
    i
    
-
-
  • i18n
-
  • importing PO files
-
  • include file `libintl.h´, include file `libintl.h´, include file `libintl.h´, include file `libintl.h´
-
  • initialization
-
  • initialize new PO file
-
  • initialize translations from a compendium
-
  • installing gettext
-
  • interface to catgets
-
  • internationalization
-
  • inttypes.h
-
  • ISO 3166
-
  • ISO 639
-
    • 
-
    j
    
-
-
  • Java
-
  • Java mode, and msgfmt program
-
  • Java mode, and msgunfmt program
-
  • Java, string concatenation
-
    • 
-
    k
    
-
-
  • KDE PO file editor
-
  • keyboard accelerator checking
-
    • 
-
    l
    
-
-
  • l10n
-
  • language codes
-
  • language selection
-
  • language selection at runtime
-
  • large package
-
  • libiconv library
-
  • libintl for C#
-
  • libintl for Java
-
  • libintl library
-
  • librep Lisp
-
  • `LINGUAS´ file
-
  • link with `libintl´
-
  • Linux, Linux, Linux
-
  • Lisp
-
  • list of translation teams, where to find
-
  • locale facet, LC_ALL
-
  • locale facet, LC_COLLATE
-
  • locale facet, LC_CTYPE, locale facet, LC_CTYPE, locale facet, LC_CTYPE
-
  • locale facet, LC_MESSAGES, locale facet, LC_MESSAGES
-
  • locale facet, LC_MONETARY, locale facet, LC_MONETARY
-
  • locale facet, LC_NUMERIC, locale facet, LC_NUMERIC
-
  • locale facet, LC_RESPONSES
-
  • locale facet, LC_TIME, locale facet, LC_TIME
-
  • locale facets
-
  • locale program
-
  • localization
-
  • lookup message translation, lookup message translation
-
  • lookup plural message translation, lookup plural message translation
-
    • 
-
    m
    
-
-
  • magic signature of MO files
-
  • `Makevars´ file
-
  • manipulating PO files
-
  • marking Perl sources
-
  • marking string initializers
-
  • marking strings that require translation
-
  • marking strings, preparations
-
  • marking translatable strings
-
  • menu entries
-
  • menu, keyboard accelerator support
-
  • merge PO files
-
  • merging two PO files
-
  • message catalog files location
-
  • messages
-
  • migration from earlier versions of gettext
-
  • `mkinstalldirs´ file
-
  • mnemonics of menu entries
-
  • MO file's format
-
  • modify message attrributes
-
  • msgattrib program, usage
-
  • msgcat program, usage
-
  • msgcmp program, usage
-
  • msgcomm program, usage
-
  • msgconv program, usage
-
  • msgen program, usage
-
  • msgexec program, usage
-
  • msgfilter filter and catalog encoding
-
  • msgfilter program, usage
-
  • msgfmt program, usage
-
  • msggrep program, usage
-
  • msginit program, usage
-
  • msgmerge program, usage
-
  • msgunfmt program, usage
-
  • msguniq program, usage
-
  • multi-line strings
-
    • 
-
    n
    
-
-
  • N_, a convenience macro
-
  • Native Language Support
-
  • Natural Language Support
-
  • newlines in PO files
-
  • ngettext
-
  • ngettext program, usage
-
  • NLS
-
  • number format
-
    • 
-
    o
    
-
-
  • Object Pascal
-
  • obsolete entries
-
  • optimization of gettext functions
-
  • orthography
-
  • outdigits
-
  • output to stdout, xgettext
-
  • overview of gettext
-
    • 
-
    p
    
-
-
  • package and version declaration in `configure.in´
-
  • package build and installation options
-
  • package distributor's view of gettext
-
  • package installer's view of gettext
-
  • package maintainer's view of gettext
-
  • paragraphs
-
  • Pascal
-
  • Perl
-
  • Perl default keywords
-
  • Perl invalid string interpolation
-
  • Perl long lines
-
  • Perl parentheses
-
  • Perl pitfalls
-
  • Perl quote-like expressions
-
  • Perl special keywords for hash-lookups
-
  • Perl valid string interpolation
-
  • PHP
-
  • Pike
-
  • plural form formulas
-
  • plural forms
-
  • plural forms, in MO files
-
  • plural forms, in PO files
-
  • PO files' format
-
  • PO mode (Emacs) commands
-
  • PO template file
-
  • po_file_domains
-
  • po_file_free
-
  • po_file_read
-
  • po_message_iterator
-
  • po_message_iterator_free
-
  • po_message_msgid
-
  • po_message_msgid_plural
-
  • po_message_msgstr
-
  • po_message_msgstr_plural
-
  • po_next_message
-
  • portability problems with sed
-
  • `POTFILES.in´ file
-
  • preparing programs for translation
-
  • preparing shell scripts for translation
-
  • problems with catgets interface
-
  • programming languages
-
  • Python
-
    • 
-
    q
    
-
-
  • Qt format strings
-
  • Qt mode, and msgfmt program
-
  • quotation marks, quotation marks
-
  • quote characters, use in PO files
-
    • 
-
    r
    
-
-
  • related reading
-
  • release
-
  • RST
-
    • 
-
    s
    
-
-
  • Scheme
-
  • scripting languages
-
  • search messages in a catalog
-
  • selecting message language
-
  • sentences
-
  • setting up gettext at build time
-
  • setting up gettext at run time
-
  • several domains
-
  • sex
-
  • sgettext
-
  • she, he, and they
-
  • shell format string
-
  • shell scripts
-
  • Smalltalk
-
  • sorting msgcat output
-
  • sorting msgmerge output
-
  • sorting msgunfmt output
-
  • sorting output of xgettext
-
  • specifying plural form in a PO file
-
  • standard output, and msgcat
-
  • standard output, and msgmerge program
-
  • string concatenation
-
  • string normalization in entries
-
  • style
-
  • supported languages, xgettext
-
    • 
-
    t
    
-
-
  • Tcl
-
  • Tcl mode, and msgfmt program
-
  • Tcl mode, and msgunfmt program
-
  • template PO file
-
  • testing `.po´ files for equivalence
-
  • Tk's scripting language
-
  • translated entries
-
  • translating menu entries
-
  • translation aspects
-
  • Translation Matrix
-
  • Translation Project
-
  • turning off NLS support
-
  • tutorial of gettext usage
-
    • 
-
    u
    
-
-
  • unify duplicate translations
-
  • untranslated entries
-
  • update translations from a compendium
-
  • upgrading to new versions of gettext
-
    • 
-
    v
    
-
-
  • version control for backup files, msgmerge
-
    • 
-
    w
    
-
-
  • wxWindows library
-
    • 
-
    x
    
-
-
  • xargs, and output from msgexec
-
  • xgettext program, usage
-
  • xmodmap program, and typing quotation marks
-
    • 
-
    y
    
-
-
  • YaST2 scripting language
-
  • YCP
+
  • AM_GNU_GETTEXT
+
  • AM_GNU_GETTEXT_VERSION
+
  • AM_ICONV
+
  • AM_PO_SUBDIRS
 
    • 
 
 
    
-
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_25.html b/gettext-tools/doc/gettext_25.html
new file mode 100644
index 000000000..c48685f36
--- /dev/null
+++ b/gettext-tools/doc/gettext_25.html
@@ -0,0 +1,501 @@
+
+
+
+
+
+GNU gettext utilities - General Index
+
+
+Go to the first, previous, next, last section, table of contents.
+
    
+
+
+
    General Index
    
+
+
    
+Jump to:
+&
+-
+_
+-
+a
+-
+b
+-
+c
+-
+d
+-
+e
+-
+f
+-
+g
+-
+h
+-
+i
+-
+j
+-
+k
+-
+l
+-
+m
+-
+n
+-
+o
+-
+p
+-
+q
+-
+r
+-
+s
+-
+t
+-
+u
+-
+v
+-
+w
+-
+x
+-
+y
+
    
+
    &
    
+
+
  • ‘ABOUT-NLS’ file
+
  • ‘acconfig.h’ file
+
  • ‘aclocal.m4’ file
+
  • ‘config.h.in’ file
+
  • ‘gettext.h’ file
+
  • ‘LINGUAS’ file
+
  • ‘Makefile.in.in’ extensions
+
  • ‘Makevars’ file
+
  • ‘mkinstalldirs’ file
+
  • ‘POTFILES.in’ file
+
    • 
+
    _
    
+
+
  • _, a macro to mark strings for translation
+
  • _nl_msg_cat_cntr
+
    • 
+
    a
    
+
+
  • accumulating translations
+
  • adding keywords, xgettext
+
  • ambiguities
+
  • apply a filter to translations
+
  • apply command to all translations in a catalog
+
  • Arabic digits
+
  • attribute manipulation
+
  • attribute, fuzzy
+
  • attributes of a PO file entry
+
  • attributes, manipulating
+
  • autoconf macros for gettext
+
  • autopoint program, usage
+
  • auxiliary PO file
+
  • available translations
+
  • awk
+
    • 
+
    b
    
+
+
  • backup old file, and msgmerge program
+
  • bash
+
  • bibliography
+
  • big picture
+
  • bind_textdomain_codeset
+
  • Boost format strings
+
  • bug report address
+
    • 
+
    c
    
+
+
  • C and C-like languages
+
  • C trigraphs
+
  • C#
+
  • C# mode, and msgfmt program
+
  • C# mode, and msgunfmt program
+
  • C# resources mode, and msgfmt program
+
  • C# resources mode, and msgunfmt program
+
  • C#, string concatenation
+
  • catalog encoding and msgexec output
+
  • catclose, a catgets function
+
  • catgets, X/Open specification
+
  • catgets, a catgets function
+
  • catopen, a catgets function
+
  • character encoding
+
  • charset conversion at runtime
+
  • charset of PO files
+
  • check format strings
+
  • checking of translations
+
  • clisp
+
  • clisp C sources
+
  • codeset
+
  • comments in PO files
+
  • comments, automatic
+
  • comments, extracted
+
  • comments, translator
+
  • Common Lisp
+
  • compare PO files
+
  • comparison of interfaces
+
  • compatibility with X/Open msgfmt
+
  • compendium
+
  • compendium, creating
+
  • concatenate PO files
+
  • concatenating PO files into a compendium
+
  • concatenation of strings
+
  • context
+
  • context, argument specification in xgettext
+
  • context, in MO files
+
  • context, in PO files
+
  • convert binary message catalog into PO file
+
  • convert translations to a different encoding
+
  • converting a package to use gettext
+
  • country codes
+
  • create new PO file
+
  • creating a new PO file
+
  • creating compendia
+
  • currency symbols
+
    • 
+
    d
    
+
+
  • date format
+
  • dcngettext
+
  • dcpgettext
+
  • dcpgettext_expr
+
  • debugging messages marked as format strings
+
  • dialect
+
  • disabling NLS
+
  • distribution tarball
+
  • dngettext
+
  • dollar substitution
+
  • domain ambiguities
+
  • dpgettext
+
  • dpgettext_expr
+
  • duplicate elimination
+
  • duplicate removal
+
    • 
+
    e
    
+
+
  • editing comments in PO files
+
  • Editing PO Files
+
  • editing translations
+
  • Emacs Lisp
+
  • Emacs PO Mode
+
  • encoding
+
  • encoding conversion
+
  • encoding conversion at runtime
+
  • encoding for your language
+
  • encoding list
+
  • encoding of PO files
+
  • environment variables
+
  • envsubst program, usage
+
  • eval_gettext function, usage
+
  • eval_ngettext function, usage
+
  • evolution of packages
+
  • extracting parts of a PO file into a compendium
+
    • 
+
    f
    
+
+
  • FDL, GNU Free Documentation License
+
  • file format, ‘.mo’
+
  • file format, ‘.po’
+
  • files, ‘.po’ and ‘.mo’
+
  • files, ‘.pot’
+
  • filter messages according to attributes
+
  • find common messages
+
  • force use of fuzzy entries
+
  • format strings
+
  • Free Pascal
+
  • function attribute, __format__
+
  • function attribute, __format_arg__
+
  • fuzzy entries
+
    • 
+
    g
    
+
+
  • gawk
+
  • GCC-source
+
  • generate binary message catalog from PO file
+
  • generate translation catalog in English
+
  • gettext files
+
  • gettext installation
+
  • gettext interface
+
  • gettext program, usage
+
  • gettext, a programmer's view
+
  • gettext vs catgets
+
  • gettextize program, usage
+
  • GNOME PO file editor
+
  • GPL, GNU General Public License
+
  • GUI programs
+
  • guile
+
    • 
+
    h
    
+
+
  • hash table, inside MO files
+
  • he, she, and they
+
  • header entry of a PO file
+
  • help option
+
  • history of GNU gettext
+
    • 
+
    i
    
+
+
  • i18n
+
  • importing PO files
+
  • include file ‘libintl.h’, include file ‘libintl.h’, include file ‘libintl.h’, include file ‘libintl.h’
+
  • initialization
+
  • initialize new PO file
+
  • initialize translations from a compendium
+
  • installing gettext
+
  • interface to catgets
+
  • internationalization
+
  • inttypes.h
+
  • ISO 3166
+
  • ISO 639
+
    • 
+
    j
    
+
+
  • Java
+
  • Java mode, and msgfmt program
+
  • Java mode, and msgunfmt program
+
  • Java, string concatenation
+
    • 
+
    k
    
+
+
  • KDE PO file editor
+
  • keyboard accelerator checking
+
    • 
+
    l
    
+
+
  • l10n
+
  • language codes
+
  • language selection
+
  • language selection at runtime
+
  • large package
+
  • LGPL, GNU Lesser General Public License
+
  • libiconv library
+
  • libintl for C#
+
  • libintl for Java
+
  • libintl library
+
  • librep Lisp
+
  • License, GNU FDL
+
  • License, GNU GPL
+
  • License, GNU LGPL
+
  • Licenses
+
  • link with ‘libintl’
+
  • Linux, Linux, Linux
+
  • Lisp
+
  • list of translation teams, where to find
+
  • locale facet, LC_ALL
+
  • locale facet, LC_COLLATE
+
  • locale facet, LC_CTYPE, locale facet, LC_CTYPE, locale facet, LC_CTYPE
+
  • locale facet, LC_MESSAGES, locale facet, LC_MESSAGES
+
  • locale facet, LC_MONETARY, locale facet, LC_MONETARY
+
  • locale facet, LC_NUMERIC, locale facet, LC_NUMERIC
+
  • locale facet, LC_RESPONSES
+
  • locale facet, LC_TIME, locale facet, LC_TIME
+
  • locale facets
+
  • locale program
+
  • localization
+
  • lookup message translation, lookup message translation
+
  • lookup plural message translation, lookup plural message translation
+
    • 
+
    m
    
+
+
  • magic signature of MO files
+
  • manipulating PO files
+
  • marking Perl sources
+
  • marking string initializers
+
  • marking strings that require translation
+
  • marking strings, preparations
+
  • marking translatable strings
+
  • menu entries
+
  • menu, keyboard accelerator support
+
  • merge PO files
+
  • merging two PO files
+
  • message catalog files location
+
  • messages
+
  • migration from earlier versions of gettext
+
  • mnemonics of menu entries
+
  • MO file's format
+
  • modify message attrributes
+
  • msgattrib program, usage
+
  • msgcat program, usage
+
  • msgcmp program, usage
+
  • msgcomm program, usage
+
  • msgconv program, usage
+
  • msgen program, usage
+
  • msgexec program, usage
+
  • msgfilter filter and catalog encoding
+
  • msgfilter program, usage
+
  • msgfmt program, usage
+
  • msggrep program, usage
+
  • msginit program, usage
+
  • msgmerge program, usage
+
  • msgunfmt program, usage
+
  • msguniq program, usage
+
  • multi-line strings
+
    • 
+
    n
    
+
+
  • N_, a convenience macro
+
  • Native Language Support
+
  • Natural Language Support
+
  • newlines in PO files
+
  • ngettext
+
  • ngettext program, usage
+
  • NLS
+
  • number format
+
    • 
+
    o
    
+
+
  • Object Pascal
+
  • obsolete entries
+
  • optimization of gettext functions
+
  • orthography
+
  • outdigits
+
  • output to stdout, xgettext
+
  • overview of gettext
+
    • 
+
    p
    
+
+
  • package and version declaration in ‘configure.in’
+
  • package build and installation options
+
  • package distributor's view of gettext
+
  • package installer's view of gettext
+
  • package maintainer's view of gettext
+
  • paragraphs
+
  • Pascal
+
  • Perl
+
  • Perl default keywords
+
  • Perl invalid string interpolation
+
  • Perl long lines
+
  • Perl parentheses
+
  • Perl pitfalls
+
  • Perl quote-like expressions
+
  • Perl special keywords for hash-lookups
+
  • Perl valid string interpolation
+
  • pgettext
+
  • pgettext_expr
+
  • PHP
+
  • Pike
+
  • plural form formulas
+
  • plural forms
+
  • plural forms, in MO files
+
  • plural forms, in PO files
+
  • PO files' format
+
  • PO mode (Emacs) commands
+
  • PO template file
+
  • po_file_domains
+
  • po_file_free
+
  • po_file_read
+
  • po_message_iterator
+
  • po_message_iterator_free
+
  • po_message_msgid
+
  • po_message_msgid_plural
+
  • po_message_msgstr
+
  • po_message_msgstr_plural
+
  • po_next_message
+
  • portability problems with sed
+
  • preparing programs for translation
+
  • preparing shell scripts for translation
+
  • problems with catgets interface
+
  • programming languages
+
  • Python
+
    • 
+
    q
    
+
+
  • Qt format strings
+
  • Qt mode, and msgfmt program
+
  • quotation marks, quotation marks
+
  • quote characters, use in PO files
+
    • 
+
    r
    
+
+
  • recode-sr-latin program
+
  • related reading
+
  • release
+
  • RST
+
    • 
+
    s
    
+
+
  • Scheme
+
  • scripting languages
+
  • search messages in a catalog
+
  • selecting message language
+
  • sentences
+
  • setting up gettext at build time
+
  • setting up gettext at run time
+
  • several domains
+
  • sex
+
  • she, he, and they
+
  • shell format string
+
  • shell scripts
+
  • Smalltalk
+
  • sorting msgcat output
+
  • sorting msgmerge output
+
  • sorting msgunfmt output
+
  • sorting output of xgettext
+
  • specifying plural form in a PO file
+
  • standard output, and msgcat
+
  • standard output, and msgmerge program
+
  • string concatenation
+
  • string normalization in entries
+
  • style
+
  • supported languages, xgettext
+
    • 
+
    t
    
+
+
  • Tcl
+
  • Tcl mode, and msgfmt program
+
  • Tcl mode, and msgunfmt program
+
  • template PO file
+
  • testing ‘.po’ files for equivalence
+
  • Tk's scripting language
+
  • translated entries
+
  • translating menu entries
+
  • translation aspects
+
  • Translation Matrix
+
  • Translation Project
+
  • turning off NLS support
+
  • tutorial of gettext usage
+
    • 
+
    u
    
+
+
  • unify duplicate translations
+
  • untranslated entries
+
  • update translations from a compendium
+
  • upgrading to new versions of gettext
+
    • 
+
    v
    
+
+
  • version control for backup files, msgmerge
+
    • 
+
    w
    
+
+
  • wxWidgets library
+
    • 
+
    x
    
+
+
  • xargs, and output from msgexec
+
  • xgettext program, usage
+
  • xmodmap program, and typing quotation marks
+
    • 
+
    y
    
+
+
  • YaST2 scripting language
+
  • YCP
+
    • 
+
+
    
+
+
    
+Go to the first, previous, next, last section, table of contents.
+
+
diff --git a/gettext-tools/doc/gettext_3.html b/gettext-tools/doc/gettext_3.html
index cb87aea40..1dde42fdb 100644
--- a/gettext-tools/doc/gettext_3.html
+++ b/gettext-tools/doc/gettext_3.html
@@ -1,12 +1,13 @@
 
 
-
+
 
+
 GNU gettext utilities - 3  The Format of PO Files
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
@@ -36,7 +37,7 @@ structure:
 
     white-space
 #  translator-comments
-#. automatic-comments
+#. extracted-comments
 #: reference...
 #, flag...
 msgid untranslated-string
@@ -61,20 +62,30 @@ msgstr "Error desconegut del sistema"
 
    
 
 
    
+
+
+
 Entries begin with some optional white space.  Usually, when generated
 through GNU gettext tools, there is exactly one blank line
 between entries.  Then comments follow, on lines all starting with the
 character #.  There are two kinds of comments: those which have
-some white space immediately following the #, which comments are
-created and maintained exclusively by the translator, and those which
-have some non-white character just after the #, which comments
-are created and maintained automatically by GNU gettext tools.
+some white space immediately following the # - the translator
+comments -, which comments are created and maintained exclusively by the
+translator, and those which have some non-white character just after the
+# - the automatic comments -, which comments are created and
+maintained automatically by GNU gettext tools.  Comment lines
+starting with #. contain comments given by the programmer, directed
+at the translator; these comments are called extracted comments
+because the xgettext program extracts them from the program's
+source code.  Comment lines starting with #: contain references to
+the program's source code.  Comment lines starting with #, contain
+flags; more about these below.
 All comments, of either kind, are optional.
 
 
    
 
    
-
-
+
+
 After white space and comments, entries show two strings, namely
 first the untranslated string as it appears in the original program
 sources, and then, the translation of this string.  The original
@@ -108,7 +119,7 @@ there are two forms of flags defined:
 
 
    fuzzy
 
    
-
+
 This flag can be generated by the msgmerge program or it can be
 inserted by the translator herself.  It shows that the msgstr
 string might not be a correct translation (anymore).  Only the translator
@@ -116,14 +127,14 @@ can judge if the translation requires further modification, or is
 acceptable as is.  Once satisfied with the translation, she then removes
 this fuzzy attribute.  The msgmerge program inserts this
 when it combined the msgid and msgstr entries after fuzzy
-search only.  See section 8.3.6  Fuzzy Entries.
+search only.  See section 8.3.6  Fuzzy Entries.
 
 
    c-format
 
    
-
+
 
    no-c-format
 
    
-
+
 These flags should not be added by a human.  Instead only the
 xgettext program adds them.  In an automated PO file processing
 system as proposed here the user changes would be thrown away again as
@@ -132,169 +143,204 @@ soon as the xgettext program generates a new template file.
 The c-format flag tells that the untranslated string and the
 translation are supposed to be C format strings.  The no-c-format
 flag tells that they are not C format strings, even though the untranslated
-string happens to look like a C format string (with `%´ directives).
+string happens to look like a C format string (with ‘%’ directives).
 
 In case the c-format flag is given for a string the msgfmt
 does some more tests to check to validity of the translation.
-See section 10.1  Invoking the msgfmt Program, section 4.5  Special Comments preceding Keywords and section 15.3.1  C Format Strings.
+See section 10.1  Invoking the msgfmt Program, section 4.6  Special Comments preceding Keywords and section 15.3.1  C Format Strings.
 
 
    objc-format
 
    
-
+
 
    no-objc-format
 
    
-
-Likewise for Objective C, see section 15.3.2  Objective C Format Strings.
+
+Likewise for Objective C, see section 15.3.2  Objective C Format Strings.
 
 
    sh-format
 
    
-
+
 
    no-sh-format
 
    
-
-Likewise for Shell, see section 15.3.3  Shell Format Strings.
+
+Likewise for Shell, see section 15.3.3  Shell Format Strings.
 
 
    python-format
 
    
-
+
 
    no-python-format
 
    
-
-Likewise for Python, see section 15.3.4  Python Format Strings.
+
+Likewise for Python, see section 15.3.4  Python Format Strings.
 
 
    lisp-format
 
    
-
+
 
    no-lisp-format
 
    
-
-Likewise for Lisp, see section 15.3.5  Lisp Format Strings.
+
+Likewise for Lisp, see section 15.3.5  Lisp Format Strings.
 
 
    elisp-format
 
    
-
+
 
    no-elisp-format
 
    
-
-Likewise for Emacs Lisp, see section 15.3.6  Emacs Lisp Format Strings.
+
+Likewise for Emacs Lisp, see section 15.3.6  Emacs Lisp Format Strings.
 
 
    librep-format
 
    
-
+
 
    no-librep-format
 
    
-
-Likewise for librep, see section 15.3.7  librep Format Strings.
+
+Likewise for librep, see section 15.3.7  librep Format Strings.
 
 
    scheme-format
 
    
-
+
 
    no-scheme-format
 
    
-
-Likewise for Scheme, see section 15.3.8  Scheme Format Strings.
+
+Likewise for Scheme, see section 15.3.8  Scheme Format Strings.
 
 
    smalltalk-format
 
    
-
+
 
    no-smalltalk-format
 
    
-
-Likewise for Smalltalk, see section 15.3.9  Smalltalk Format Strings.
+
+Likewise for Smalltalk, see section 15.3.9  Smalltalk Format Strings.
 
 
    java-format
 
    
-
+
 
    no-java-format
 
    
-
-Likewise for Java, see section 15.3.10  Java Format Strings.
+
+Likewise for Java, see section 15.3.10  Java Format Strings.
 
 
    csharp-format
 
    
-
+
 
    no-csharp-format
 
    
-
-Likewise for C#, see section 15.3.11  C# Format Strings.
+
+Likewise for C#, see section 15.3.11  C# Format Strings.
 
 
    awk-format
 
    
-
+
 
    no-awk-format
 
    
-
-Likewise for awk, see section 15.3.12  awk Format Strings.
+
+Likewise for awk, see section 15.3.12  awk Format Strings.
 
 
    object-pascal-format
 
    
-
+
 
    no-object-pascal-format
 
    
-
-Likewise for Object Pascal, see section 15.3.13  Object Pascal Format Strings.
+
+Likewise for Object Pascal, see section 15.3.13  Object Pascal Format Strings.
 
 
    ycp-format
 
    
-
+
 
    no-ycp-format
 
    
-
-Likewise for YCP, see section 15.3.14  YCP Format Strings.
+
+Likewise for YCP, see section 15.3.14  YCP Format Strings.
 
 
    tcl-format
 
    
-
+
 
    no-tcl-format
 
    
-
-Likewise for Tcl, see section 15.3.15  Tcl Format Strings.
+
+Likewise for Tcl, see section 15.3.15  Tcl Format Strings.
 
 
    perl-format
 
    
-
+
 
    no-perl-format
 
    
-
-Likewise for Perl, see section 15.3.16  Perl Format Strings.
+
+Likewise for Perl, see section 15.3.16  Perl Format Strings.
 
 
    perl-brace-format
 
    
-
+
 
    no-perl-brace-format
 
    
-
-Likewise for Perl brace, see section 15.3.16  Perl Format Strings.
+
+Likewise for Perl brace, see section 15.3.16  Perl Format Strings.
 
 
    php-format
 
    
-
+
 
    no-php-format
 
    
-
-Likewise for PHP, see section 15.3.17  PHP Format Strings.
+
+Likewise for PHP, see section 15.3.17  PHP Format Strings.
 
 
    gcc-internal-format
 
    
-
+
 
    no-gcc-internal-format
 
    
-
-Likewise for the GCC sources, see section 15.3.18  GCC internal Format Strings.
+
+Likewise for the GCC sources, see section 15.3.18  GCC internal Format Strings.
 
 
    qt-format
 
    
-
+
 
    no-qt-format
 
    
-
-Likewise for Qt, see section 15.3.19  Qt Format Strings.
+
+Likewise for Qt, see section 15.3.19  Qt Format Strings.
+
+
    boost-format
+
    
+
+
    no-boost-format
+
    
+
+Likewise for Boost, see section 15.3.20  Boost Format Strings.

    - - + + +It is also possible to have entries with a context specifier. They look like +this: + +

    + +
    +white-space
+#  translator-comments
+#. extracted-comments
+#: reference...
+#, flag...
+msgctxt context
+msgid untranslated-string
+msgstr translated-string
+
    + +

    +The context serves to disambiguate messages with the same +untranslated-string. It is possible to have several entries with +the same untranslated-string in a PO file, provided that they each +have a different context. Note that an empty context string +and an absent msgctxt line do not mean the same thing. + +

    +

    + + A different kind of entries is used for translations which involve plural forms. @@ -303,7 +349,7 @@ plural forms. 

     white-space
 #  translator-comments
-#. automatic-comments
+#. extracted-comments
 #: reference...
 #, flag...
 msgid untranslated-string-singular
@@ -328,19 +374,22 @@ msgstr[1] "s'han trobat %d errors fatals"

    - +Here also, a msgctxt context can be specified before msgid, +like above. + +

    +

    It happens that some lines, usually whitespace or comments, follow the very last entry of a PO file. Such lines are not part of any entry, -and PO mode is unable to take action on those lines. By using the -PO mode function M-x po-normalize, the translator may get -rid of those spurious lines. See section 8.3.4 Normalizing Strings in Entries. +and will be dropped when the PO file is processed by the tools, or may +disturb some PO file editors.

    The remainder of this section may be safely skipped by those using -PO mode, yet it may be interesting for everybody to have a better +a PO file editor, yet it may be interesting for everybody to have a better idea of the precise format of a PO file. On the other hand, those -not having Emacs handy should carefully continue reading on. +wishing to modify PO files by hand should carefully continue reading on.

    @@ -362,42 +411,42 @@ msgid ""

    In this example, the empty string is used on the first line, to -allow better alignment of the H from the word `Here´ -over the f from the word `for´. In this example, the +allow better alignment of the H from the word ‘Here’ +over the f from the word ‘for’. In this example, the msgid keyword is followed by three strings, which are meant to be concatenated. Concatenating the empty string does not change the resulting overall string, but it is a way for us to comply with the necessity of msgid to be followed by a string on the same line, while keeping the multi-line presentation left-justified, as we find this to be a cleaner disposition. The empty string could have -been omitted, but only if the string starting with `Here´ was +been omitted, but only if the string starting with ‘Here’ was promoted on the first line, right after msgid.(2) It was not really necessary either to switch between the two last quoted strings immediately after -the newline `\n´, the switch could have occurred after any +the newline ‘\n’, the switch could have occurred after any other character, we just did it this way because it is neater.

    - + One should carefully distinguish between end of lines marked as -`\n´ inside quotes, which are part of the represented +‘\n’ inside quotes, which are part of the represented string, and end of lines in the PO file itself, outside string quotes, which have no incidence on the represented string.

    - + Outside strings, white lines and comments may be used freely. -Comments start at the beginning of a line with `#´ and extend +Comments start at the beginning of a line with ‘#’ and extend until the end of the PO file line. Comments written by translators -should have the initial `#´ immediately followed by some white -space. If the `#´ is not immediately followed by white space, +should have the initial ‘#’ immediately followed by some white +space. If the ‘#’ is not immediately followed by white space, this comment is most likely generated and managed by specialized GNU tools, and might disappear or be replaced unexpectedly when the PO file is given to msgmerge.

    -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents. diff --git a/gettext-tools/doc/gettext_4.html b/gettext-tools/doc/gettext_4.html index f8e7d37f7..0d372d8bc 100644 --- a/gettext-tools/doc/gettext_4.html +++ b/gettext-tools/doc/gettext_4.html @@ -1,18 +1,19 @@ - + + GNU gettext utilities - 4 Preparing Program Sources -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents.

    4 Preparing Program Sources

    - +

    @@ -22,19 +23,24 @@ categories. First, you have to make the localization functions known to all modules needing message translation. Second, you should properly trigger the operation of GNU gettext when the program initializes, usually from the main function. Last, you should -identify and especially mark all constant strings in your program +identify, adjust and mark all constant strings in your program needing translation.

    + + + +

    4.1 Importing the gettext declaration

    +

    Presuming that your set of programs, or package, has been adjusted so all needed GNU gettext files are available, and your -`Makefile´ files are adjusted (see section 13 The Maintainer's View), each C module +‘Makefile’ files are adjusted (see section 13 The Maintainer's View), each C module having translated C strings should contain the line:

    - + 

     #include <libintl.h>
@@ -51,18 +57,12 @@ the C string comes from a different C module) should contain the line:
 #include <libintl.h>
    -

    -The remaining changes to your C sources are discussed in the further -sections of this chapter. - -

    - -

    4.1 Triggering gettext Operations

    +

    4.2 Triggering gettext Operations

    - + The initialization of locale data should be done with more or less the same code in every program, as demonstrated below: @@ -82,18 +82,18 @@ main (int argc, char *argv[])

    PACKAGE and LOCALEDIR should be provided either by -`config.h´ or by the Makefile. For now consult the gettext +‘config.h’ or by the Makefile. For now consult the gettext or hello sources for more information.

    - - + + The use of LC_ALL might not be appropriate for you. LC_ALL includes all locale categories and especially LC_CTYPE. This later category is responsible for determining character classes with the isalnum etc. functions from -`ctype.h´ which could especially for programs, which process some +‘ctype.h’ which could especially for programs, which process some kind of input language, be wrong. For example this would mean that a source code using the ç (c-cedilla character) is runnable in France but not in the U.S. @@ -129,13 +129,13 @@ code above by a sequence of setlocale lines

    - - - - - - + + + + + + On all POSIX conformant systems the locale categories LC_CTYPE, LC_MESSAGES, LC_COLLATE, LC_MONETARY, LC_NUMERIC, and LC_TIME are available. On some systems @@ -163,10 +163,10 @@ is not multithread-safe.

    -

    4.2 Preparing Translatable Strings

    +

    4.3 Preparing Translatable Strings

    - + Before strings can be marked for translations, they sometimes need to be adjusted. Usually preparing a string for translation is done right before marking it, during the marking phase which is described in the @@ -198,7 +198,7 @@ Let's look at some examples of these guidelines.

    - + Translatable strings should be in good English style. If slang language with abbreviations and shortcuts is used, often translators will not understand the message and will produce very inappropriate translations. @@ -227,13 +227,13 @@ of the objects"?

    - + In both cases, adding more words to the message will help both the translator and the English speaking user.

    - + Translatable strings should be entire sentences. It is often not possible to translate single verbs or adjectives in a substitutable way. @@ -257,7 +257,7 @@ printf (rw ? "File %s is write protected" : "File %s is read protected",

    This way the translator will not only understand the message, she will -also be able to find the appropriate grammatical construction. The French +also be able to find the appropriate grammatical construction. A French translator for example translates "write protected" like "protected against writing". @@ -319,7 +319,7 @@ combined by xgettext, so the translator has to handle them once only.)

    - + Translatable strings should be limited to one paragraph; don't let a single message be longer than ten lines. The reason is that when the translatable string changes, the translator is faced with the task of @@ -330,8 +330,8 @@ the entire message.

    - -Many GNU programs have a `--help´ output that extends over several + +Many GNU programs have a ‘--help’ output that extends over several screen pages. It is a courtesy towards the translators to split such a message into several ones of five to ten lines each. While doing that, you can also attempt to split the documented options into groups, @@ -341,8 +341,8 @@ looking for.

    - - + + Hardcoded string concatenation is sometimes used to construct English strings: @@ -369,10 +369,10 @@ sprintf (s, "Replace %s with %s?", object1, object2);

    - + A similar case is compile time concatenation of strings. The ISO C 99 include file <inttypes.h> contains a macro PRId64 that -can be used as a formatting directive for outputting an `int64_t´ +can be used as a formatting directive for outputting an ‘int64_t’ integer through printf. It expands to a constant string, usually "d" or "ld" or "lld" or something like this, depending on the platform. Assume you have code like @@ -402,7 +402,7 @@ contain the appropriate constant string, "d" or "ld" or "lld".

    This works only for the predefined <inttypes.h> macros. If -you have defined your own similar macros, let's say `MYPRId64´, +you have defined your own similar macros, let's say ‘MYPRId64’, that are not known to xgettext, the solution for this problem is to change the code like this: @@ -423,8 +423,8 @@ regardless whether in decimal, octal or hexadecimal.

    - - + + All this applies to other programming languages as well. For example, in Java and C#, string contenation is very frequently used, because it is a compiler built-in operator. Like in C, in Java, you would change @@ -467,9 +467,9 @@ Console.WriteLine( -

    4.3 How Marks Appear in Sources

    +

    4.4 How Marks Appear in Sources

    - +

    @@ -481,10 +481,10 @@ and their names are said to be marking keywords. The marking is attached to strings themselves, rather than to what we do with them. This approach has more uses. A blatant example is an error message produced by formatting. The format string needs translation, as -well as some strings inserted through some `%s´ specification +well as some strings inserted through some ‘%s’ specification in the format, while the result from sprintf may have so many different instances that it is impractical to list them all in some -`error_string_out()´ routine, say. +‘error_string_out()’ routine, say.

    @@ -495,7 +495,7 @@ return the proper translation, as far as possible or wanted, for the argument string. Most localizable strings are found in executable positions, that is, attached to variables or given as parameters to functions. But this is not universal usage, and some translatable -strings appear in structured initializations. See section 4.6 Special Cases of Translatable Strings. +strings appear in structured initializations. See section 4.7 Special Cases of Translatable Strings.

    @@ -506,8 +506,8 @@ of program sources and produces PO file templates.

    The canonical keyword for marking translatable strings is -`gettext´, it gave its name to the whole GNU gettext -package. For packages making only light use of the `gettext´ +‘gettext’, it gave its name to the whole GNU gettext +package. For packages making only light use of the ‘gettext’ keyword, macro or function, it is easily used as is. However, for packages using the gettext interface more heavily, it is usually more convenient to give the main keyword a shorter, less @@ -520,18 +520,18 @@ sources for those trying to keep them within 79 or 80 columns.

    - -Many packages use `_´ (a simple underline) as a keyword, -and write `_("Translatable string")´ instead of `gettext -("Translatable string")´. Further, the coding rule, from GNU standards, + +Many packages use ‘_’ (a simple underline) as a keyword, +and write ‘_("Translatable string")’ instead of ‘gettext +("Translatable string")’. Further, the coding rule, from GNU standards, wanting that there is a space between the keyword and the opening parenthesis is relaxed, in practice, for this particular usage. So, the textual overhead per translatable string is reduced to only three characters: the underline and the two parentheses. However, even if GNU gettext uses this convention internally, it does not offer it officially. The real, genuine keyword is truly -`gettext´ indeed. It is fairly easy for those wanting to use -`_´ instead of `gettext´ to declare: +‘gettext’ indeed. It is fairly easy for those wanting to use +‘_’ instead of ‘gettext’ to declare:

    @@ -541,22 +541,22 @@ it does not offer it officially. The real, genuine keyword is truly

    -instead of merely using `#include <libintl.h>´. +instead of merely using ‘#include <libintl.h>’.

    Later on, the maintenance is relatively easy. If, as a programmer, you add or modify a string, you will have to ask yourself if the new or altered string requires translation, and include it within -`_()´ if you think it should be translated. `"%s: %d"´ is +‘_()’ if you think it should be translated. ‘"%s: %d"’ is an example of string not requiring translation!

    -

    4.4 Marking Translatable Strings

    +

    4.5 Marking Translatable Strings

    - +

    @@ -573,7 +573,7 @@ translation in some language, for the package being internationalized.

    - + The set of program sources, targetted by the PO mode commands describe here, should have an Emacs tags table constructed for your project, prior to using these PO file commands. This is easy to do. In any @@ -587,22 +587,22 @@ etags src/*.[hc] lib/*.[hc]

    -presuming here you want to process all `.h´ and `.c´ files -from the `src/´ and `lib/´ directories. This command will -explore all said files and create a `TAGS´ file in your root +presuming here you want to process all ‘.h’ and ‘.c’ files +from the ‘src/’ and ‘lib/’ directories. This command will +explore all said files and create a ‘TAGS’ file in your root directory, somewhat summarizing the contents using a special file format Emacs can understand.

    - + For packages following the GNU coding standards, there is a make goal tags or TAGS which constructs the tag files in all directories and for all files containing source code.

    -Once your `TAGS´ file is ready, the following commands assist +Once your ‘TAGS’ file is ready, the following commands assist the programmer at marking translatable strings in his set of sources. But these commands are necessarily driven from within a PO file window, and it is likely that you do not even have such a PO file yet. @@ -615,18 +615,18 @@ fill in while you mark strings as translatable in your program sources.

    ,
    - + Search through program sources for a string which looks like a candidate for translation (po-tags-search).
    M-,
    - -Mark the last string found with `_()´ (po-mark-translatable). + +Mark the last string found with ‘_()’ (po-mark-translatable).
    M-.
    - + Mark the last string found with a keyword taken from a set of possible keywords. This command with a prefix allows some management of these keywords (po-select-mark-and-mark). @@ -634,7 +634,7 @@ keywords (po-select-mark-and-mark).

    - + The , (po-tags-search) command searches for the next occurrence of a string which looks like a possible candidate for translation, and displays the program source in another Emacs window, @@ -657,18 +657,18 @@ or strings already marked with some keyword PO mode knows (see below).

    -If you have never told Emacs about some `TAGS´ file to use, the +If you have never told Emacs about some ‘TAGS’ file to use, the command will request that you specify one from the minibuffer, the -first time you use the command. You may later change your `TAGS´ +first time you use the command. You may later change your ‘TAGS’ file by using the regular Emacs command M-x visit-tags-table, -which will ask you to name the precise `TAGS´ file you want -to use. See section `Tag Tables' in The Emacs Editor. +which will ask you to name the precise ‘TAGS’ file you want +to use. See section ‘Tag Tables’ in The Emacs Editor.

    Each time you use the , command, the search resumes from where it was left by the previous search, and goes through all program sources, -obeying the `TAGS´ file, until all sources have been processed. +obeying the ‘TAGS’ file, until all sources have been processed. However, by giving a prefix argument to the command (C-u ,), you may request that the search be restarted all over again from the first program source; but in this case, strings that you @@ -686,10 +686,10 @@ first tags file, this reinitialization might be considered spurious.

    - - + + The M-, (po-mark-translatable) command will mark the -recently found string with the `_´ keyword. The M-. +recently found string with the ‘_’ keyword. The M-. (po-select-mark-and-mark) command will request that you type one keyword from the minibuffer and use that keyword for marking the string. Both commands will automatically create a new PO file @@ -738,17 +738,17 @@ simultaneously, each one has its own independent set of known keywords. There is no provision in PO mode, currently, for deleting a known keyword, you have to quit the file (maybe using q) and reopen it afresh. When a PO file is newly brought up in an Emacs window, only -`gettext´ and `_´ are known as keywords, and `gettext´ +‘gettext’ and ‘_’ are known as keywords, and ‘gettext’ is preferred for the M-. command. In fact, this is not useful to -prefer `_´, as this one is already built in the M-, command. +prefer ‘_’, as this one is already built in the M-, command.

    -

    4.5 Special Comments preceding Keywords

    +

    4.6 Special Comments preceding Keywords

    - + In C programs strings are often used within calls of functions from the printf family. The special thing about these format strings is that they can contain format specifiers introduced with %. Assume @@ -781,9 +781,9 @@ string is regarded as the address. To prevent errors at runtime caused by translations the msgfmt tool can check statically whether the arguments in the original and the translation string match in type and number. If this is not the case -and the `-c´ option has been passed to msgfmt, msgfmt +and the ‘-c’ option has been passed to msgfmt, msgfmt will give an error and refuse to produce a MO file. Thus consequent -use of `msgfmt -c´ will catch the error, so that it cannot cause +use of ‘msgfmt -c’ will catch the error, so that it cannot cause cause problems at runtime.

    @@ -803,7 +803,7 @@ The routines in msgfmt know about this special notation.

    Because not all strings in a program must be format strings it is not -useful for msgfmt to test all the strings in the `.po´ file. +useful for msgfmt to test all the strings in the ‘.po’ file. This might cause problems because the string might contain what looks like a format specifier, but the string is not used in printf. @@ -811,13 +811,13 @@ like a format specifier, but the string is not used in printf.

    Therefore the xgettext adds a special tag to those messages it thinks might be a format string. There is no absolute rule for this, -only a heuristic. In the `.po´ file the entry is marked using the +only a heuristic. In the ‘.po’ file the entry is marked using the c-format flag in the #, comment line (see section 3 The Format of PO Files).

    - - + + The careful reader now might say that this again can cause problems. The heuristic might guess it wrong. This is true and therefore xgettext knows about a special kind of comment which lets @@ -846,7 +846,7 @@ exists because the original code does not pass any parameters. xgettext of course could make a wrong decision the other way round, i.e. a string marked as a format string actually is not a format string. In this case the msgfmt might give too many warnings and -would prevent translating the `.po´ file. The method to prevent +would prevent translating the ‘.po’ file. The method to prevent this wrong decision is similar to the one used above, only the comment to use must contain the string xgettext:no-c-format. @@ -854,16 +854,16 @@ to use must contain the string xgettext:no-c-format.

    If a string is marked with c-format and this is not correct the user can find out who is responsible for the decision. See -section 5.1 Invoking the xgettext Program to see how the --debug option can be +section 5.1 Invoking the xgettext Program to see how the --debug option can be used for solving this problem.

    -

    4.6 Special Cases of Translatable Strings

    +

    4.7 Special Cases of Translatable Strings

    - + The attentive reader might now point out that it is not always possible to mark translatable string with gettext or something like this. Consider the following case: @@ -890,7 +890,7 @@ Consider the following case: While it is no problem to mark the string "a default message" it is not possible to mark the string initializers for messages. What is to be done? We have to fulfill two tasks. First we have to mark the -strings so that the xgettext program (see section 5.1 Invoking the xgettext Program) +strings so that the xgettext program (see section 5.1 Invoking the xgettext Program) can find them, and second we have to translate the string at runtime before printing them. @@ -923,7 +923,7 @@ from the array. So one solution can look like this:

    Please convince yourself that the string which is written by fputs is translated in any case. How to get xgettext know -the additional keyword gettext_noop is explained in section 5.1 Invoking the xgettext Program. +the additional keyword gettext_noop is explained in section 5.1 Invoking the xgettext Program.

    @@ -965,12 +965,12 @@ use this second method in this situation.

    -

    4.7 Marking Proper Names for Translation

    +

    4.8 Marking Proper Names for Translation

    Should names of persons, cities, locations etc. be marked for translation or not? People who only know languages that can be written with Latin -letters (English, Spanish, French, German, etc.) are tempted to say "no", +letters (English, Spanish, French, German, etc.) are tempted to say “no”, because names usually do not change when transported between these languages. However, in general when translating from one script to another, names are translated too, usually phonetically or by transliteration. For @@ -1047,7 +1047,7 @@ for translators using GNU Emacs or XEmacs with po-mode.

    -

    4.8 Preparing Library Sources

    +

    4.9 Preparing Library Sources

    When you are preparing a library, not a program, for the use of @@ -1131,7 +1131,7 @@ foo_refcount (struct foo *argument)

  • -The usual declaration of the `_´ macro in each source file was +The usual declaration of the ‘_’ macro in each source file was 
    @@ -1154,6 +1154,6 @@ Similary, the dngettext function should be used in place of the
 
 
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_5.html b/gettext-tools/doc/gettext_5.html
index f6c4a860e..214c6705e 100644
--- a/gettext-tools/doc/gettext_5.html
+++ b/gettext-tools/doc/gettext_5.html
@@ -1,18 +1,19 @@
 
 
-
+
 
+
 GNU gettext utilities - 5  Making the PO Template File
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
-
    5  Making the PO Template File
    
+
    5  Making the PO Template File
    
 
    
-
+
 
 
    
 
    
@@ -21,22 +22,22 @@ This section explains how to use xgettext for this purpose.
 
 
    
 
    
-xgettext creates a file named `domainname.po´.  You
-should then rename it to `domainname.pot´.  (Why doesn't
-xgettext create it under the name `domainname.pot´
+xgettext creates a file named ‘domainname.po’.  You
+should then rename it to ‘domainname.pot’.  (Why doesn't
+xgettext create it under the name ‘domainname.pot’
 right away?  The answer is: for historical reasons.  When xgettext
 was specified, the distinction between a PO file and PO file template
-was fuzzy, and the suffix `.pot´ wasn't in use at that time.)
+was fuzzy, and the suffix ‘.pot’ wasn't in use at that time.)
 
 
    
 
 
 
-
    5.1  Invoking the xgettext Program
    
+
    5.1  Invoking the xgettext Program
    
 
 
    
-
-
+
+
 
 
     xgettext [option] [inputfile] ...
@@ -49,91 +50,91 @@ input files.
 
    
 
 
-
    5.1.1  Input file location
    
+
    5.1.1  Input file location
    
 
 
    
 
-
    `inputfile ...´
+
    ‘inputfile ...’
 
    
 Input files.
 
-
    `-f file´
+
    ‘-f file’
 
    
-
    `--files-from=file´
+
    ‘--files-from=file’
 
    
-
-
+
+
 Read the names of the input files from file instead of getting
 them from the command line.
 
-
    `-D directory´
+
    ‘-D directory’
 
    
-
    `--directory=directory´
+
    ‘--directory=directory’
 
    
-
-
+
+
 Add directory to the list of directories.  Source files are
-searched relative to this list of directories.  The resulting `.po´
+searched relative to this list of directories.  The resulting ‘.po’
 file will be written relative to the current directory, though.
 
 
    
 
 
    
-If inputfile is `-´, standard input is read.
+If inputfile is ‘-’, standard input is read.
 
 
    
 
 
-
    5.1.2  Output file location
    
+
    5.1.2  Output file location
    
 
 
    
 
-
    `-d name´
+
    ‘-d name’
 
    
-
    `--default-domain=name´
+
    ‘--default-domain=name’
 
    
-
-
-Use `name.po´ for output (instead of `messages.po´).
+
+
+Use ‘name.po’ for output (instead of ‘messages.po’).
 
-
    `-o file´
+
    ‘-o file’
 
    
-
    `--output=file´
+
    ‘--output=file’
 
    
-
-
-Write output to specified file (instead of `name.po´ or
-`messages.po´).
+
+
+Write output to specified file (instead of ‘name.po’ or
+‘messages.po’).
 
-
    `-p dir´
+
    ‘-p dir’
 
    
-
    `--output-dir=dir´
+
    ‘--output-dir=dir’
 
    
-
-
+
+
 Output files will be placed in directory dir.
 
 
    
 
 
    
-
-If the output file is `-´ or `/dev/stdout´, the output
+
+If the output file is ‘-’ or ‘/dev/stdout’, the output
 is written to standard output.
 
 
    
 
 
-
    5.1.3  Choice of input file language
    
+
    5.1.3  Choice of input file language
    
 
 
    
 
-
    `-L name´
+
    ‘-L name’
 
    
-
    `--language=name´
+
    ‘--language=name’
 
    
-
-
-
+
+
+
 Specifies the language of the input files.  The supported languages
 are C, C++, ObjectiveC, PO, Python,
 Lisp, EmacsLisp, librep, Scheme, Smalltalk,
@@ -141,12 +142,12 @@ are C, C++, ObjectiveC, PO,
 Tcl, Perl, PHP, GCC-source, NXStringTable,
 RST, Glade.
 
-
    `-C´
+
    ‘-C’
 
    
-
    `--c++´
+
    ‘--c++’
 
    
-
-
+
+
 This is a shorthand for --language=C++.
 
 
    
@@ -158,17 +159,17 @@ extension.
 
    
 
 
-
    5.1.4  Input file interpretation
    
+
    5.1.4  Input file interpretation
    
 
 
    
 
-
    `--from-code=name´
+
    ‘--from-code=name’
 
    
-
+
 Specifies the encoding of the input files.  This option is needed only
 if some untranslated message strings or their corresponding comments
-contain non-ASCII characters.  Note that Python, Tcl, and Glade input
-files are always assumed to be in UTF-8, regardless of this option.
+contain non-ASCII characters.  Note that Tcl and Glade input files are
+always assumed to be in UTF-8, regardless of this option.
 
 
    
 
@@ -178,33 +179,33 @@ By default the input files are assumed to be in ASCII.
 
    
 
 
-
    5.1.5  Operation mode
    
+
    5.1.5  Operation mode
    
 
 
    
 
-
    `-j´
+
    ‘-j’
 
    
-
    `--join-existing´
+
    ‘--join-existing’
 
    
-
-
+
+
 Join messages with existing file.
 
-
    `-x file´
+
    ‘-x file’
 
    
-
    `--exclude-file=file´
+
    ‘--exclude-file=file’
 
    
-
-
+
+
 Entries from file are not extracted.  file should be a PO or
 POT file.
 
-
    `-c [tag]´
+
    ‘-c [tag]’
 
    
-
    `--add-comments[=tag]´
+
    ‘--add-comments[=tag]’
 
    
-
-
+
+
 Place comment block with tag (or those preceding keyword lines)
 in output file.
 
@@ -212,93 +213,192 @@ in output file.
 
 
 
-
    5.1.6  Language specific options
    
+
    5.1.6  Language specific options
    
 
 
    
 
-
    `-a´
+
    ‘-a’
 
    
-
    `--extract-all´
+
    ‘--extract-all’
 
    
-
-
+
+
 Extract all strings.
 
 This option has an effect with most languages, namely C, C++, ObjectiveC,
 Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, Tcl, Perl, PHP,
 GCC-source, Glade.
 
-
    `-k keywordspec´
+
    ‘-k keywordspec’
 
    
-
    `--keyword[=keywordspec]´
+
    ‘--keyword[=keywordspec]’
 
    
-
-
+
+
 Additional keyword to be looked for (without keywordspec means not to
 use default keywords).
 
-
+
+
 If keywordspec is a C identifer id, xgettext looks
 for strings in the first argument of each call to the function or macro
 id.  If keywordspec is of the form
-`id:argnum´, xgettext looks for strings in the
+‘id:argnum’, xgettext looks for strings in the
 argnumth argument of the call.  If keywordspec is of the form
-`id:argnum1,argnum2´, xgettext looks for
+‘id:argnum1,argnum2’, xgettext looks for
 strings in the argnum1st argument and in the argnum2nd argument
 of the call, and treats them as singular/plural variants for a message
-with plural handling.
+with plural handling.  Also, if keywordspec is of the form
+‘id:contextargnumc,argnum’ or
+‘id:argnum,contextargnumc’, xgettext treats
+strings in the contextargnumth argument as a context specifier.
+And, as a special-purpose support for GNOME, if keywordspec is of the
+form ‘id:argnumg’, xgettext recognizes the
+argnumth argument as a string with context, using the GNOME glib
+syntax ‘"msgctxt|msgid"’.
 
    
-The default keyword specifications, which are always looked for if not
-explicitly disabled, are gettext, dgettext:2,
-dcgettext:2, ngettext:1,2, dngettext:2,3,
-dcngettext:2,3, and gettext_noop.
+Furthermore, if keywordspec is of the form
+‘id:...,totalnumargst’, xgettext recognizes this
+argument specification only if the number of actual arguments is equal to
+totalnumargs.  This is useful for disambiguating overloaded function
+calls in C++.
 
    
+Finally, if keywordspec is of the form
+‘id:argnum...,"xcomment"’, xgettext, when
+extracting a message from the specified argument strings, adds an extracted
+comment xcomment to the message.  Note that when used through a normal
+shell command line, the double-quotes around the xcomment need to be
+escaped.
+
 This option has an effect with most languages, namely C, C++, ObjectiveC,
 Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, Tcl, Perl, PHP,
 GCC-source, Glade.
 
-
    `--flag=word:arg:flag´
+The default keyword specifications, which are always looked for if not
+explicitly disabled, are language dependent.  They are:
+
+
+
      
+
    • 
+
+For C, C++, and GCC-source: gettext, dgettext:2,
+dcgettext:2, ngettext:1,2, dngettext:2,3,
+dcngettext:2,3, gettext_noop, and pgettext:1c,2,
+dpgettext:2c,3, dcpgettext:2c,3, npgettext:1c,2,3,
+dnpgettext:2c,3,4, dcnpgettext:2c,3,4.
+
+
    • 
+
+For Objective C: Like for C, and also NSLocalizedString, _,
+NSLocalizedStaticString, __.
+
+
    • 
+
+For Shell scripts: gettext, ngettext:1,2, eval_gettext,
+eval_ngettext:1,2.
+
+
    • 
+
+For Python: gettext, ugettext, dgettext:2,
+ngettext:1,2, ungettext:1,2, dngettext:2,3, _.
+
+
    • 
+
+For Lisp: gettext, ngettext:1,2, gettext-noop.
+
+
    • 
+
+For EmacsLisp: _.
+
+
    • 
+
+For librep: _.
+
+
    • 
+
+For Scheme: gettext, ngettext:1,2, gettext-noop.
+
+
    • 
+
+For Java: GettextResource.gettext:2,
+GettextResource.ngettext:2,3, gettext, ngettext:1,2,
+getString.
+
+
    • 
+
+For C#: GetString, GetPluralString:1,2.
+
+
    • 
+
+For awk: dcgettext, dcngettext:1,2.
+
+
    • 
+
+For Tcl: ::msgcat::mc.
+
+
    • 
+
+For Perl: gettext, %gettext, $gettext, dgettext:2,
+dcgettext:2, ngettext:1,2, dngettext:2,3,
+dcngettext:2,3, gettext_noop.
+
+
    • 
+
+For PHP: _, gettext, dgettext:2, dcgettext:2,
+ngettext:1,2, dngettext:2,3, dcngettext:2,3.
+
+
    • 
+
+For Glade 1: label, title, text, format,
+copyright, comments, preview_text, tooltip.
+
    
+
+To disable the default keyword specifications, the option ‘-k’ or
+‘--keyword’ or ‘--keyword=’, without a keywordspec, can be
+used.
+
+
    ‘--flag=word:arg:flag’
 
    
-
+
 Specifies additional flags for strings occurring as part of the argth
 argument of the function word.  The possible flags are the possible
-format string indicators, such as `c-format´, and their negations,
-such as `no-c-format´, possibly prefixed with `pass-´.
+format string indicators, such as ‘c-format’, and their negations,
+such as ‘no-c-format’, possibly prefixed with ‘pass-’.
 
    
-
+
 The meaning of --flag=function:arg:lang-format
 is that in language lang, the specified function expects as
 argth argument a format string.  (For those of you familiar with
 GCC function attributes, --flag=function:arg:c-format is
 roughly equivalent to the declaration
-`__attribute__ ((__format__ (__printf__, arg, ...)))´ attached
+‘__attribute__ ((__format__ (__printf__, arg, ...)))’ attached
 to function in a C source file.)
-For example, if you use the `error´ function from GNU libc, you can
+For example, if you use the ‘error’ function from GNU libc, you can
 specify its behaviour through --flag=error:3:c-format.  The effect of
 this specification is that xgettext will mark as format strings all
 gettext invocations that occur as argth argument of
 function.
 This is useful when such strings contain no format string directives:
-together with the checks done by `msgfmt -c´ it will ensure that
+together with the checks done by ‘msgfmt -c’ it will ensure that
 translators cannot accidentally use format string directives that would
 lead to a crash at runtime.
 
    
-
+
 The meaning of --flag=function:arg:pass-lang-format
 is that in language lang, if the function call occurs in a
 position that must yield a format string, then its argth argument
 must yield a format string of the same type as well.  (If you know GCC
 function attributes, the --flag=function:arg:pass-c-format
 option is roughly equivalent to the declaration
-`__attribute__ ((__format_arg__ (arg)))´ attached to function
+‘__attribute__ ((__format_arg__ (arg)))’ attached to function
 in a C source file.)
-For example, if you use the `_´ shortcut for the gettext function,
+For example, if you use the ‘_’ shortcut for the gettext function,
 you should use --flag=_:1:pass-c-format.  The effect of this
 specification is that xgettext will propagate a format string
 requirement for a _("string") call to its first argument, the literal
 "string", and thus mark it as a format string.
 This is useful when such strings contain no format string directives:
-together with the checks done by `msgfmt -c´ it will ensure that
+together with the checks done by ‘msgfmt -c’ it will ensure that
 translators cannot accidentally use format string directives that would
 lead to a crash at runtime.
 
    
@@ -306,29 +406,37 @@ This option has an effect with most languages, namely C, C++, ObjectiveC,
 Shell, Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, awk, YCP, Tcl, Perl, PHP,
 GCC-source.
 
-
    `-T´
+
    ‘-T’
 
    
-
    `--trigraphs´
+
    ‘--trigraphs’
 
    
-
-
-
+
+
+
 Understand ANSI C trigraphs for input.
 
    
 This option has an effect only with the languages C, C++, ObjectiveC.
 
-
    `--qt´
+
    ‘--qt’
 
    
-
-
+
+
 Recognize Qt format strings.
 
    
 This option has an effect only with the language C++.
 
-
    `--debug´
+
    ‘--boost’
 
    
-
-
+
+
+Recognize Boost format strings.
+
    
+This option has an effect only with the language C++.
+
+
    ‘--debug’
+
    
+
+
 Use the flags c-format and possible-c-format to show who was
 responsible for marking a message as a format string.  The latter form is
 used if the xgettext program decided, the format form is used if
@@ -347,105 +455,105 @@ adjacent strings, and escaped end of lines for continued strings.
 
    
 
 
-
    5.1.7  Output details
    
+
    5.1.7  Output details
    
 
 
    
 
-
    `--force-po´
+
    ‘--force-po’
 
    
-
+
 Always write an output file even if no message is defined.
 
-
    `-i´
+
    ‘-i’
 
    
-
    `--indent´
+
    ‘--indent’
 
    
-
-
+
+
 Write the .po file using indented style.
 
-
    `--no-location´
+
    ‘--no-location’
 
    
-
-Do not write `#: filename:line´ lines.
+
+Do not write ‘#: filename:line’ lines.
 
-
    `-n´
+
    ‘-n’
 
    
-
    `--add-location´
+
    ‘--add-location’
 
    
-
-
-Generate `#: filename:line´ lines (default).
+
+
+Generate ‘#: filename:line’ lines (default).
 
-
    `--strict´
+
    ‘--strict’
 
    
-
+
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
 
-
    `--properties-output´
+
    ‘--properties-output’
 
    
-
+
 Write out a Java ResourceBundle in Java .properties syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
-
    `--stringtable-output´
+
    ‘--stringtable-output’
 
    
-
+
 Write out a NeXTstep/GNUstep localized resource file in .strings syntax.
 Note that this file format doesn't support plural forms.
 
-
    `-w number´
+
    ‘-w number’
 
    
-
    `--width=number´
+
    ‘--width=number’
 
    
-
-
+
+
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given number.
 
-
    `--no-wrap´
+
    ‘--no-wrap’
 
    
-
+
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
 
-
    `-s´
+
    ‘-s’
 
    
-
    `--sort-output´
+
    ‘--sort-output’
 
    
-
-
-
+
+
+
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
-
    `-F´
+
    ‘-F’
 
    
-
    `--sort-by-file´
+
    ‘--sort-by-file’
 
    
-
-
+
+
 Sort output by file location.
 
-
    `--omit-header´
+
    ‘--omit-header’
 
    
-
-Don't write header with `msgid ""´ entry.
+
+Don't write header with ‘msgid ""’ entry.
 
-
+
 This is useful for testing purposes because it eliminates a source
 of variance for generated .gmo files.  With --omit-header,
 two invocations of xgettext on the same files with the same
 options at different times are guaranteed to produce the same results.
 
-
    `--copyright-holder=string´
+
    ‘--copyright-holder=string’
 
    
-
+
 Set the copyright holder in the output.  string should be the
 copyright holder of the surrounding package.  (Note that the msgstr
 strings, extracted from the package's sources, belong to the copyright
@@ -459,16 +567,16 @@ can distribute them without legal risk.
 The default value for string is the Free Software Foundation, Inc.,
 simply because xgettext was first used in the GNU project.
 
-
    `--foreign-user´
+
    ‘--foreign-user’
 
    
-
+
 Omit FSF copyright in output.  This option is equivalent to
-`--copyright-holder="´.  It can be useful for packages outside the GNU
+‘--copyright-holder=”’.  It can be useful for packages outside the GNU
 project that want their translations to be in the public domain.
 
-
    `--msgid-bugs-address=email@address´
+
    ‘--msgid-bugs-address=email@address’
 
    
-
+
 Set the reporting address for msgid bugs.  This is the email address or URL
 to which the translators shall report bugs in the untranslated strings:
 
@@ -476,7 +584,7 @@ to which the translators shall report bugs in the untranslated strings:
 
      
 
    • Strings which are not entire sentences, see the maintainer guidelines
 
-in section 4.2  Preparing Translatable Strings.
+in section 4.3  Preparing Translatable Strings.
 
    • Strings which use unclear terms or require additional context to be
 
 understood.
@@ -498,49 +606,49 @@ which the translators can contact you.
 The default value is empty, which means that translators will be clueless!
 Don't forget to specify this option.
 
-
      `-m [string]´
+
      ‘-m [string]’
 
      
-
      `--msgstr-prefix[=string]´
+
      ‘--msgstr-prefix[=string]’
 
      
-
-
+
+
 Use string (or "" if not specified) as prefix for msgstr entries.
 
-
      `-M [string]´
+
      ‘-M [string]’
 
      
-
      `--msgstr-suffix[=string]´
+
      ‘--msgstr-suffix[=string]’
 
      
-
-
+
+
 Use string (or "" if not specified) as suffix for msgstr entries.
 
 
    
 
 
 
-
    5.1.8  Informative output
    
+
    5.1.8  Informative output
    
 
 
    
 
-
    `-h´
+
    ‘-h’
 
    
-
    `--help´
+
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
-
    `-V´
+
    ‘-V’
 
    
-
    `--version´
+
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    
 
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_6.html b/gettext-tools/doc/gettext_6.html
index ec3912675..ffb4b5134 100644
--- a/gettext-tools/doc/gettext_6.html
+++ b/gettext-tools/doc/gettext_6.html
@@ -1,29 +1,30 @@
 
 
-
+
 
+
 GNU gettext utilities - 6  Creating a New PO File
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
-
    6  Creating a New PO File
    
+
    6  Creating a New PO File
    
 
    
-
+
 
 
    
 
    
 When starting a new translation, the translator creates a file called
-`LANG.po´, as a copy of the `package.pot´ template
+‘LANG.po’, as a copy of the ‘package.pot’ template
 file with modifications in the initial comments (at the beginning of the file)
 and in the header entry (the first entry, near the beginning of the file).
 
 
    
 
    
-The easiest way to do so is by use of the `msginit´ program.
+The easiest way to do so is by use of the ‘msginit’ program.
 For example:
 
 
    
@@ -36,92 +37,92 @@ $ msginit
 
 
    
 The alternative way is to do the copy and modifications by hand.
-To do so, the translator copies `package.pot´ to
-`LANG.po´.  Then she modifies the initial comments and
+To do so, the translator copies ‘package.pot’ to
+‘LANG.po’.  Then she modifies the initial comments and
 the header entry of this file.
 
 
    
 
 
 
-
    6.1  Invoking the msginit Program
    
+
    6.1  Invoking the msginit Program
    
 
 
    
-
-
+
+
 
 
     msginit [option]
 
    
 
 
    
-
-
+
+
 The msginit program creates a new PO file, initializing the meta
 information with values from the user's environment.
 
 
    
 
 
-
    6.1.1  Input file location
    
+
    6.1.1  Input file location
    
 
 
    
 
-
    `-i inputfile´
+
    ‘-i inputfile’
 
    
-
    `--input=inputfile´
+
    ‘--input=inputfile’
 
    
-
-
+
+
 Input POT file.
 
 
    
 
 
    
 If no inputfile is given, the current directory is searched for the
-POT file.  If it is `-´, standard input is read.
+POT file.  If it is ‘-’, standard input is read.
 
 
    
 
 
-
    6.1.2  Output file location
    
+
    6.1.2  Output file location
    
 
 
    
 
-
    `-o file´
+
    ‘-o file’
 
    
-
    `--output-file=file´
+
    ‘--output-file=file’
 
    
-
-
+
+
 Write output to specified PO file.
 
 
    
 
 
    
-If no output file is given, it depends on the `--locale´ option or the
-user's locale setting.  If it is `-´, the results are written to
+If no output file is given, it depends on the ‘--locale’ option or the
+user's locale setting.  If it is ‘-’, the results are written to
 standard output.
 
 
    
 
 
-
    6.1.3  Input file syntax
    
+
    6.1.3  Input file syntax
    
 
 
    
 
-
    `-P´
+
    ‘-P’
 
    
-
    `--properties-input´
+
    ‘--properties-input’
 
    
-
-
+
+
 Assume the input file is a Java ResourceBundle in Java .properties
 syntax, not in PO file syntax.
 
-
    `--stringtable-input´
+
    ‘--stringtable-input’
 
    
-
+
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 .strings syntax, not in PO file syntax.
 
@@ -129,55 +130,55 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 
 
 
-
    6.1.4  Output details
    
+
    6.1.4  Output details
    
 
 
    
 
-
    `-l ll_CC´
+
    ‘-l ll_CC’
 
    
-
    `--locale=ll_CC´
+
    ‘--locale=ll_CC’
 
    
-
-
+
+
 Set target locale.  ll should be a language code, and CC should
-be a country code.  The command `locale -a´ can be used to output a list
+be a country code.  The command ‘locale -a’ can be used to output a list
 of all installed locales.  The default is the user's locale setting.
 
-
    `--no-translator´
+
    ‘--no-translator’
 
    
-
+
 Declares that the PO file will not have a human translator and is instead
 automatically generated.
 
-
    `-p´
+
    ‘-p’
 
    
-
    `--properties-output´
+
    ‘--properties-output’
 
    
-
-
+
+
 Write out a Java ResourceBundle in Java .properties syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
-
    `--stringtable-output´
+
    ‘--stringtable-output’
 
    
-
+
 Write out a NeXTstep/GNUstep localized resource file in .strings syntax.
 Note that this file format doesn't support plural forms.
 
-
    `-w number´
+
    ‘-w number’
 
    
-
    `--width=number´
+
    ‘--width=number’
 
    
-
-
+
+
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given number.
 
-
    `--no-wrap´
+
    ‘--no-wrap’
 
    
-
+
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -186,33 +187,33 @@ lines which are wider than the output page width will be split.
 
 
 
-
    6.1.5  Informative output
    
+
    6.1.5  Informative output
    
 
 
    
 
-
    `-h´
+
    ‘-h’
 
    
-
    `--help´
+
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
-
    `-V´
+
    ‘-V’
 
    
-
    `--version´
+
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
 
    
 
 
 
-
    6.2  Filling in the Header Entry
    
+
    6.2  Filling in the Header Entry
    
 
    
-
+
 
 
    
 
    
@@ -244,7 +245,7 @@ address or URL where you can report bugs in the untranslated strings:
 
      
 
    • Strings which are not entire sentences, see the maintainer guidelines
 
-in section 4.2  Preparing Translatable Strings.
+in section 4.3  Preparing Translatable Strings.
 
    • Strings which use unclear terms or require additional context to be
 
 understood.
@@ -265,7 +266,7 @@ This has already been filled in by xgettext.
 
 
      PO-Revision-Date
 
      
-You don't need to fill this in.  It will be filled by the Emacs PO mode
+You don't need to fill this in.  It will be filled by the PO file editor
 when you save the file.
 
 
      Last-Translator
@@ -281,7 +282,7 @@ Before starting a translation, it is a good idea to get in touch with
 your translation team, not only to make sure you don't do duplicated work,
 but also to coordinate difficult linguistic issues.
 
-
+
 In the Free Translation Project, each translation team has its own mailing
 list.  The up-to-date list of teams can be found at the Free Translation
 Project's homepage, http://www.iro.umontreal.ca/contrib/po/HTML/,
@@ -289,22 +290,22 @@ in the "National teams" area.
 
 
      Content-Type
 
      
-
-
-Replace `CHARSET´ with the character encoding used for your language,
+
+
+Replace ‘CHARSET’ with the character encoding used for your language,
 in your locale, or UTF-8.  This field is needed for correct operation of the
 msgmerge and msgfmt programs, as well as for users whose
-locale's character encoding differs from yours (see section 11.2.4  How to specify the output character set gettext uses).
+locale's character encoding differs from yours (see section 11.2.4  How to specify the output character set gettext uses).
 
-
+
 You get the character encoding of your locale by running the shell command
-`locale charmap´.  If the result is `C´ or `ANSI_X3.4-1968´,
-which is equivalent to `ASCII´ (= `US-ASCII´), it means that your
+‘locale charmap’.  If the result is ‘C’ or ‘ANSI_X3.4-1968’,
+which is equivalent to ‘ASCII’ (= ‘US-ASCII’), it means that your
 locale is not correctly configured.  In this case, ask your translation
-team which charset to use.  `ASCII´ is not usable for any language
+team which charset to use.  ‘ASCII’ is not usable for any language
 except Latin.
 
-
+
 Because the PO files must be portable to operating systems with less advanced
 internationalization facilities, the character encodings that can be used
 are limited to those supported by both GNU libc and GNU
@@ -321,11 +322,11 @@ are limited to those supported by both GNU libc and GNU
 BIG5, BIG5-HKSCS, GBK, GB18030, SHIFT_JIS,
 JOHAB, TIS-620, VISCII, GEORGIAN-PS, UTF-8.
 
-
+
 In the GNU system, the following encodings are frequently used for the
 corresponding languages.
 
-
+
 
 
        
 
      • ISO-8859-1 for
@@ -385,8 +386,8 @@ for traditional writing of Chinese,
 
 
      
 
-
-
+
+
 When single quote characters or double quote characters are used in
 translations for your language, and your locale's encoding is one of the
 ISO-8859-* charsets, it is best if you create your PO files in UTF-8
@@ -398,7 +399,7 @@ real quote characters, whereas users in ISO-8859-* locales will see the
 vertical apostrophe and the vertical double quote instead (because that's
 what the character set conversion will transliterate them to).
 
-
+
 To enter such quote characters under X11, you can change your keyboard
 mapping using the xmodmap program.  The X11 names of the quote
 characters are "leftsinglequotemark", "rightsinglequotemark",
@@ -419,11 +420,11 @@ Set this to 8bit.
 
      Plural-Forms
 
      
 This field is optional.  It is only needed if the PO file has plural forms.
-You can find them by searching for the `msgid_plural´ keyword.  The
-format of the plural forms field is described in section 11.2.5  Additional functions for plural forms.
+You can find them by searching for the ‘msgid_plural’ keyword.  The
+format of the plural forms field is described in section 11.2.6  Additional functions for plural forms.
 
    
 
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_7.html b/gettext-tools/doc/gettext_7.html
index 3f571515a..e1c4971b4 100644
--- a/gettext-tools/doc/gettext_7.html
+++ b/gettext-tools/doc/gettext_7.html
@@ -1,24 +1,25 @@
 
 
-
+
 
+
 GNU gettext utilities - 7  Updating Existing PO Files
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
-
    7  Updating Existing PO Files
    
+
    7  Updating Existing PO Files
    
 
 
 
-
    7.1  Invoking the msgmerge Program
    
+
    7.1  Invoking the msgmerge Program
    
 
 
    
-
-
+
+
 
 
     msgmerge [option] def.po ref.pot
@@ -39,80 +40,80 @@ is used to produce better results.
 
    
 
 
-
    7.1.1  Input file location
    
+
    7.1.1  Input file location
    
 
 
    
 
-
    `def.po´
+
    ‘def.po’
 
    
 Translations referring to old sources.
 
-
    `ref.pot´
+
    ‘ref.pot’
 
    
 References to the new sources.
 
-
    `-D directory´
+
    ‘-D directory’
 
    
-
    `--directory=directory´
+
    ‘--directory=directory’
 
    
-
-
+
+
 Add directory to the list of directories.  Source files are
-searched relative to this list of directories.  The resulting `.po´
+searched relative to this list of directories.  The resulting ‘.po’
 file will be written relative to the current directory, though.
 
-
    `-C file´
+
    ‘-C file’
 
    
-
    `--compendium=file´
+
    ‘--compendium=file’
 
    
-
-
-Specify an additional library of message translations.  See section 8.3.14  Using Translation Compendia.
+
+
+Specify an additional library of message translations.  See section 8.3.14  Using Translation Compendia.
 This option may be specified more than once.
 
 
    
 
 
 
-
    7.1.2  Operation mode
    
+
    7.1.2  Operation mode
    
 
 
    
 
-
    `-U´
+
    ‘-U’
 
    
-
    `--update´
+
    ‘--update’
 
    
-
-
+
+
 Update def.po.  Do nothing if def.po is already up to date.
 
 
    
 
 
 
-
    7.1.3  Output file location
    
+
    7.1.3  Output file location
    
 
 
    
 
-
    `-o file´
+
    ‘-o file’
 
    
-
    `--output-file=file´
+
    ‘--output-file=file’
 
    
-
-
+
+
 Write output to specified file.
 
 
    
 
 
    
-
+
 The results are written to standard output if no output file is specified
-or if it is `-´.
+or if it is ‘-’.
 
 
    
 
 
-
    7.1.4  Output file location in update mode
    
+
    7.1.4  Output file location in update mode
    
 
 
    
 The result is written back to def.po.
@@ -120,21 +121,21 @@ The result is written back to def.po.
 
    
 
    
 
-
    `--backup=control´
+
    ‘--backup=control’
 
    
-
-
+
+
 Make a backup of def.po
 
-
    `--suffix=suffix´
+
    ‘--suffix=suffix’
 
    
-
+
 Override the usual backup suffix.
 
 
    
 
 
    
-
+
 The version control method may be selected via the --backup option
 or through the VERSION_CONTROL environment variable.  Here are the
 values:
@@ -142,80 +143,80 @@ values:
 
    
 
    
 
-
    `none´
+
    ‘none’
 
    
-
    `off´
+
    ‘off’
 
    
 Never make backups (even if --backup is given).
 
-
    `numbered´
+
    ‘numbered’
 
    
-
    `t´
+
    ‘t’
 
    
 Make numbered backups.
 
-
    `existing´
+
    ‘existing’
 
    
-
    `nil´
+
    ‘nil’
 
    
 Make numbered backups if numbered backups for this file already exist,
 otherwise make simple backups.
 
-
    `simple´
+
    ‘simple’
 
    
-
    `never´
+
    ‘never’
 
    
 Always make simple backups.
 
 
    
 
 
    
-The backup suffix is `~´, unless set with --suffix or the
+The backup suffix is ‘~’, unless set with --suffix or the
 SIMPLE_BACKUP_SUFFIX environment variable.
 
 
    
 
 
-
    7.1.5  Operation modifiers
    
+
    7.1.5  Operation modifiers
    
 
 
    
 
-
    `-m´
+
    ‘-m’
 
    
-
    `--multi-domain´
+
    ‘--multi-domain’
 
    
-
-
+
+
 Apply ref.pot to each of the domains in def.po.
 
-
    `-N´
+
    ‘-N’
 
    
-
    `--no-fuzzy-matching´
+
    ‘--no-fuzzy-matching’
 
    
-
-
+
+
 Do not use fuzzy matching when an exact match is not found.  This may speed
 up the operation considerably.
 
    
 
 
 
-
    7.1.6  Input file syntax
    
+
    7.1.6  Input file syntax
    
 
 
    
 
-
    `-P´
+
    ‘-P’
 
    
-
    `--properties-input´
+
    ‘--properties-input’
 
    
-
-
+
+
 Assume the input files are Java ResourceBundles in Java .properties
 syntax, not in PO file syntax.
 
-
    `--stringtable-input´
+
    ‘--stringtable-input’
 
    
-
+
 Assume the input files are NeXTstep/GNUstep localized resource files in
 .strings syntax, not in PO file syntax.
 
@@ -223,137 +224,137 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
 
 
 
-
    7.1.7  Output details
    
+
    7.1.7  Output details
    
 
 
    
 
-
    `--force-po´
+
    ‘--force-po’
 
    
-
+
 Always write an output file even if it contains no message.
 
-
    `-i´
+
    ‘-i’
 
    
-
    `--indent´
+
    ‘--indent’
 
    
-
-
+
+
 Write the .po file using indented style.
 
-
    `--no-location´
+
    ‘--no-location’
 
    
-
-Do not write `#: filename:line´ lines.
+
+Do not write ‘#: filename:line’ lines.
 
-
    `--add-location´
+
    ‘--add-location’
 
    
-
-Generate `#: filename:line´ lines (default).
+
+Generate ‘#: filename:line’ lines (default).
 
-
    `--strict´
+
    ‘--strict’
 
    
-
+
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
 
-
    `-p´
+
    ‘-p’
 
    
-
    `--properties-output´
+
    ‘--properties-output’
 
    
-
-
+
+
 Write out a Java ResourceBundle in Java .properties syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
-
    `--stringtable-output´
+
    ‘--stringtable-output’
 
    
-
+
 Write out a NeXTstep/GNUstep localized resource file in .strings syntax.
 Note that this file format doesn't support plural forms.
 
-
    `-w number´
+
    ‘-w number’
 
    
-
    `--width=number´
+
    ‘--width=number’
 
    
-
-
+
+
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given number.
 
-
    `--no-wrap´
+
    ‘--no-wrap’
 
    
-
+
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
 
-
    `-s´
+
    ‘-s’
 
    
-
    `--sort-output´
+
    ‘--sort-output’
 
    
-
-
-
+
+
+
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
-
    `-F´
+
    ‘-F’
 
    
-
    `--sort-by-file´
+
    ‘--sort-by-file’
 
    
-
-
+
+
 Sort output by file location.
 
 
    
 
 
 
-
    7.1.8  Informative output
    
+
    7.1.8  Informative output
    
 
 
    
 
-
    `-h´
+
    ‘-h’
 
    
-
    `--help´
+
    ‘--help’
 
    
-
-
+
+
 Display this help and exit.
 
-
    `-V´
+
    ‘-V’
 
    
-
    `--version´
+
    ‘--version’
 
    
-
-
+
+
 Output version information and exit.
 
-
    `-v´
+
    ‘-v’
 
    
-
    `--verbose´
+
    ‘--verbose’
 
    
-
-
+
+
 Increase verbosity level.
 
-
    `-q´
+
    ‘-q’
 
    
-
    `--quiet´
+
    ‘--quiet’
 
    
-
    `--silent´
+
    ‘--silent’
 
    
-
-
-
+
+
+
 Suppress progress indicators.
 
 
    
 
 
    
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
 
diff --git a/gettext-tools/doc/gettext_8.html b/gettext-tools/doc/gettext_8.html
index eef482f22..4c7df3ee9 100644
--- a/gettext-tools/doc/gettext_8.html
+++ b/gettext-tools/doc/gettext_8.html
@@ -1,52 +1,73 @@
 
 
-
+
 
+
 GNU gettext utilities - 8  Editing PO Files
 
 
-Go to the first, previous, next, last section, table of contents.
+Go to the first, previous, next, last section, table of contents.
 
    
 
 
-
    8  Editing PO Files
    
+
    8  Editing PO Files
    
 
    
-
+
 
 
    
 
 
 
-
    8.1  KDE's PO File Editor
    
+
    8.1  KDE's PO File Editor
    
 
    
-
+
 
 
    
 
 
-
    8.2  GNOME's PO File Editor
    
+
    8.2  GNOME's PO File Editor
    
 
    
-
+
 
 
    
 
 
-
    8.3  Emacs's PO File Editor
    
+
    8.3  Emacs's PO File Editor
    
 
    
-
+
 
 
    
 
+
    
+For those of you being
+the lucky users of Emacs, PO mode has been specifically created
+for providing a cozy environment for editing or modifying PO files.
+While editing a PO file, PO mode allows for the easy browsing of
+auxiliary and compendium PO files, as well as for following references into
+the set of C program sources from which PO files have been derived.
+It has a few special features, among which are the interactive marking
+of program strings as translatable, and the validation of PO files
+with easy repositioning to PO file lines showing errors.
+
+
    
+
    
+For the beginning, besides main PO mode commands
+(see section 8.3.2  Main PO mode Commands), you should know how to move between entries
+(see section 8.3.3  Entry Positioning), and how to handle untranslated entries
+(see section 8.3.7  Untranslated Entries).
+
+
    
 
 
-
    8.3.1  Completing GNU gettext Installation
    
+
+
    8.3.1  Completing GNU gettext Installation
    
 
 
    
-
-
+
+
 Once you have received, unpacked, configured and compiled the GNU
-gettext distribution, the `make install´ command puts in
+gettext distribution, the ‘make install’ command puts in
 place the programs xgettext, msgfmt, gettext, and
 msgmerge, as well as their available message catalogs.  To
 top off a comfortable installation, you might also want to make the
@@ -54,10 +75,10 @@ PO mode available to your Emacs users.
 
 
    
 
    
-
-
+
+
 During the installation of the PO mode, you might want to modify your
-file `.emacs´, once and for all, so it contains a few lines looking
+file ‘.emacs’, once and for all, so it contains a few lines looking
 like:
 
 
    
@@ -69,9 +90,9 @@ like:
 
    
 
 
    
-Later, whenever you edit some `.po´
-file, or any file having the string `.po.´ within its name,
-Emacs loads `po-mode.elc´ (or `po-mode.el´) as needed, and
+Later, whenever you edit some ‘.po’
+file, or any file having the string ‘.po.’ within its name,
+Emacs loads ‘po-mode.elc’ (or ‘po-mode.el’) as needed, and
 automatically activates PO mode commands for the associated buffer.
 The string PO appears in the mode line for any buffer for
 which PO mode is active.  Many PO files may be active at once in a
@@ -95,20 +116,20 @@ to happen, add the lines:
 
    
 
 
    
-to your `.emacs´ file.  If, with this, you still see boxes instead
+to your ‘.emacs’ file.  If, with this, you still see boxes instead
 of international characters, try a different font set (via Shift Mouse
 button 1).
 
 
    
 
 
-
    8.3.2  Main PO mode Commands
    
+
    8.3.2  Main PO mode Commands
    
 
 
    
-
-
+
+
 After setting up Emacs with something similar to the lines in
-section 8.3.1  Completing GNU gettext Installation, PO mode is activated for a window when Emacs finds a
+section 8.3.1  Completing GNU gettext Installation, PO mode is activated for a window when Emacs finds a
 PO file in that window.  This puts the window read-only and establishes a
 po-mode-map, which is a genuine Emacs mode, in a way that is not derived
 from text mode in any way.  Functions found on po-mode-hook,
@@ -116,16 +137,16 @@ if any, will be executed.
 
 
    
 
    
-When PO mode is active in a window, the letters `PO´ appear
+When PO mode is active in a window, the letters ‘PO’ appear
 in the mode line for that window.  The mode line also displays how
 many entries of each kind are held in the PO file.  For example,
-the string `132t+3f+10u+2o´ would tell the translator that the
-PO mode contains 132 translated entries (see section 8.3.5  Translated Entries,
-3 fuzzy entries (see section 8.3.6  Fuzzy Entries), 10 untranslated entries
-(see section 8.3.7  Untranslated Entries) and 2 obsolete entries (see section 8.3.8  Obsolete Entries).  Zero-coefficients items are not shown.  So, in this example, if
+the string ‘132t+3f+10u+2o’ would tell the translator that the
+PO mode contains 132 translated entries (see section 8.3.5  Translated Entries,
+3 fuzzy entries (see section 8.3.6  Fuzzy Entries), 10 untranslated entries
+(see section 8.3.7  Untranslated Entries) and 2 obsolete entries (see section 8.3.8  Obsolete Entries).  Zero-coefficients items are not shown.  So, in this example, if
 the fuzzy entries were unfuzzied, the untranslated entries were translated
 and the obsolete entries were deleted, the mode line would merely display
-`145t´ for the counters.
+‘145t’ for the counters.
 
 
    
 
    
@@ -138,49 +159,49 @@ in special ways.
 
 
    _
 
    
-
+
 Undo last modification to the PO file (po-undo).
 
 
    Q
 
    
-
+
 Quit processing and save the PO file (po-quit).
 
 
    q
 
    
-
+
 Quit processing, possibly after confirmation (po-confirm-and-quit).
 
 
    0
 
    
-
+
 Temporary leave the PO file window (po-other-window).
 
 
    ?
 
    
 
    h
 
    
-
-
+
+
 Show help about PO mode (po-help).
 
 
    =
 
    
-
+
 Give some PO file statistics (po-statistics).
 
 
    V
 
    
-
+
 Batch validate the format of the whole PO file (po-validate).

    • - - + + The command _ (po-undo) interfaces to the Emacs -undo facility. See section `Undoing Changes' in The Emacs Editor. Each time U is typed, modifications which the translator +undo facility. See section ‘Undoing Changes’ in The Emacs Editor. Each time U is typed, modifications which the translator did to the PO file are undone a little more. For the purpose of undoing, each PO mode command is atomic. This is especially true for the RET command: the whole edition made by using a single @@ -190,10 +211,10 @@ can undo the edition work quite parsimoniously.

    - - - - + + + + The commands Q (po-quit) and q (po-confirm-and-quit) are used when the translator is done with the PO file. The former is a bit less verbose than the latter. If the file @@ -206,8 +227,8 @@ of an Emacs PO file buffer. Merely killing it through the usual command

    - - + + The command 0 (po-other-window) is another, softer way, to leave PO mode, temporarily. It just moves the cursor to some other Emacs window, and pops one if necessary. For example, if the translator @@ -221,9 +242,9 @@ PO mode is then recovered.

    - - - + + + The command h (po-help) displays a summary of all available PO mode commands. The translator should then type any character to resume normal PO mode operations. The command ? has the same effect @@ -231,8 +252,8 @@ as h.

    - - + + The command = (po-statistics) computes the total number of entries in the PO file, the ordinal of the current entry (counted from 1), the number of untranslated entries, the number of obsolete entries, @@ -240,8 +261,8 @@ and displays all these numbers.

    - - + + The command V (po-validate) launches msgfmt in checking and verbose mode over the current PO file. This command first offers to save the @@ -252,10 +273,10 @@ as well as all individual entries.

    - + The program msgfmt runs asynchronously with Emacs, so the translator regains control immediately while her PO file is being studied. -Error output is collected in the Emacs `*compilation*´ buffer, +Error output is collected in the Emacs ‘*compilation*’ buffer, displayed in another window. The regular Emacs command C-x` (next-error), as well as other usual compile commands, allow the translator to reposition quickly to the offending parts of the PO file. @@ -265,10 +286,10 @@ any PO mode action which would help correcting the error.

    -

    8.3.3 Entry Positioning

    +

    8.3.3 Entry Positioning

    - + The cursor in a PO file window is almost always part of an entry. The only exceptions are the special case when the cursor is after the last entry in the file, or when the PO file is @@ -279,7 +300,7 @@ the PO file, this also selects on which entry commands operate.

    - + Some PO mode commands alter the position of the cursor in a specialized way. A few of those special purpose positioning are described here, the others are described in following sections (for a complete list try @@ -290,51 +311,51 @@ the others are described in following sections (for a complete list try

    .
    - + Redisplay the current entry (po-current-entry).
    n
    - + Select the entry after the current one (po-next-entry).
    p
    - + Select the entry before the current one (po-previous-entry).
    <
    - + Select the first entry in the PO file (po-first-entry).
    >
    - + Select the last entry in the PO file (po-last-entry).
    m
    - + Record the location of the current entry for later use (po-push-location).
    r
    - + Return to a previously saved entry location (po-pop-location).
    x
    - + Exchange the current entry location with the previously saved one (po-exchange-location).

    - - + + Any Emacs command able to reposition the cursor may be used to select the current entry in PO mode, including commands which move by characters, lines, paragraphs, screens or pages, and search @@ -363,10 +384,10 @@ how others should do translation.

    - - - - + + + + The commands n (po-next-entry) and p (po-previous-entry) move the cursor the entry following, or preceding, the current one. If n is given while the @@ -375,20 +396,20 @@ is given while the cursor is on the first entry, no move is done.

    - - - - + + + + The commands < (po-first-entry) and > (po-last-entry) move the cursor to the first entry, or last entry, of the PO file. When the cursor is located past the last entry in a PO file, most PO mode commands will return an error saying -`After last entry´. Moreover, the commands < and > +‘After last entry’. Moreover, the commands < and > have the special property of being able to work even when the cursor is not into some PO file entry, and one may use them for nicely correcting this situation. But even these commands will fail on a truly empty PO file. There are development plans for the PO mode for it -to interactively fill an empty PO file from sources. See section 4.4 Marking Translatable Strings. +to interactively fill an empty PO file from sources. See section 4.5 Marking Translatable Strings.

    @@ -401,10 +422,10 @@ register for getting back, or else, use the location ring.

    - - - - + + + + PO mode offers another approach, by which cursor locations may be saved onto a special stack. The command m (po-push-location) merely adds the location of current entry to the stack, pushing @@ -424,8 +445,8 @@ ought to use m immediately after r.

    - - + + The command x (po-exchange-location) simultaneously repositions the cursor to the entry associated with the top element of the stack of saved locations, and replaces that top element with the @@ -438,9 +459,9 @@ merely use x for making the switch.

    -

    8.3.4 Normalizing Strings in Entries

    +

    8.3.4 Normalizing Strings in Entries

    - +

    @@ -474,12 +495,12 @@ command is available:

    - +

    M-x po-normalize
    - + Tidy the whole PO file by making entries more uniform.
    @@ -511,7 +532,7 @@ for continued lines.

    - + Having such an explicit normalizing command allows for importing PO files from other sources, but also eases the evolution of the current convention, evolution driven mostly by aesthetic concerns, as of now. @@ -524,10 +545,10 @@ their PO files in nice ways.

    - + Right now, in PO mode, strings are single line or multi-line. A string goes multi-line if and only if it has embedded newlines, that -is, if it matches `[^\n]\n+[^\n]´. So, we would have: +is, if it matches ‘[^\n]\n+[^\n]’. So, we would have:

    @@ -575,21 +596,21 @@ to be documented in this manual, once these questions settle.

    -

    8.3.5 Translated Entries

    +

    8.3.5 Translated Entries

    - +

    Each PO file entry for which the msgstr field has been filled with -a translation, and which is not marked as fuzzy (see section 8.3.6 Fuzzy Entries), +a translation, and which is not marked as fuzzy (see section 8.3.6 Fuzzy Entries), is said to be a translated entry. Only translated entries will later be compiled by GNU msgfmt and become usable in programs. Other entry types will be excluded; translation will not occur for them.

    - + Some commands are more specifically related to translated entry processing.

    @@ -597,21 +618,21 @@ Some commands are more specifically related to translated entry processing.
    t
    - + Find the next translated entry (po-next-translated-entry).
    T
    - + Find the previous translated entry (po-previous-translated-entry).

    - - - - + + + + The commands t (po-next-translated-entry) and T (po-previous-translated-entry) move forwards or backwards, chasing for an translated entry. If none is found, the search is extended and @@ -619,25 +640,25 @@ wraps around in the PO file buffer.

    - + Translated entries usually result from the translator having edited in -a translation for them, section 8.3.9 Modifying Translations. However, if the +a translation for them, section 8.3.9 Modifying Translations. However, if the variable po-auto-fuzzy-on-edit is not nil, the entry having received a new translation first becomes a fuzzy entry, which ought to be later unfuzzied before becoming an official, genuine translated entry. -See section 8.3.6 Fuzzy Entries. +See section 8.3.6 Fuzzy Entries.

    -

    8.3.6 Fuzzy Entries

    +

    8.3.6 Fuzzy Entries

    - +

    - - + + Each PO file entry may have a set of attributes, which are qualities given a name and explicitly associated with the translation, using a special system comment. One of these attributes @@ -660,7 +681,7 @@ might mark some entries as being fuzzy.

    - + Also, the translator may decide herself to mark an entry as fuzzy for her own convenience, when she wants to remember that the entry has to be later revisited. So, some commands are more specifically @@ -671,26 +692,26 @@ related to fuzzy entry processing.

    z
    - + Find the next fuzzy entry (po-next-fuzzy-entry).
    Z
    - + Find the previous fuzzy entry (po-previous-fuzzy-entry).
    TAB
    - + Remove the fuzzy attribute of the current entry (po-unfuzzy).

    - - - - + + + + The commands z (po-next-fuzzy-entry) and Z (po-previous-fuzzy-entry) move forwards or backwards, chasing for a fuzzy entry. If none is found, the search is extended and wraps @@ -698,9 +719,9 @@ around in the PO file buffer.

    - - - + + + The command TAB (po-unfuzzy) removes the fuzzy attribute associated with an entry, usually leaving it translated. Further, if the variable po-auto-select-on-unfuzzy has not @@ -722,8 +743,8 @@ to chase another entry, leaving the entry fuzzy.

    - - + + The translator may also use the DEL command (po-fade-out-entry) over any translated entry to mark it as being fuzzy, when she wants to easily leave a trace she wants to later return @@ -738,9 +759,9 @@ still exists.

    -

    8.3.7 Untranslated Entries

    +

    8.3.7 Untranslated Entries

    - +

    @@ -756,11 +777,11 @@ by the appearance of a new untranslated entry for the modified string.

    The usual commands moving from entry to entry consider untranslated entries on the same level as active entries. Untranslated entries -are easily recognizable by the fact they end with `msgstr ""´. +are easily recognizable by the fact they end with ‘msgstr ""’.

    - + The work of the translator might be (quite naively) seen as the process of seeking for an untranslated entry, editing a translation for it, and repeating these actions until no untranslated entries remain. @@ -772,26 +793,26 @@ processing.

    u
    - + Find the next untranslated entry (po-next-untranslated-entry).
    U
    - + Find the previous untranslated entry (po-previous-untransted-entry).
    k
    - + Turn the current entry into an untranslated one (po-kill-msgstr).

    - - - - + + + + The commands u (po-next-untranslated-entry) and U (po-previous-untransted-entry) move forwards or backwards, chasing for an untranslated entry. If none is found, the search is @@ -799,11 +820,11 @@ extended and wraps around in the PO file buffer.

    - - + + An entry can be turned back into an untranslated entry by merely emptying its translation, using the command k -(po-kill-msgstr). See section 8.3.9 Modifying Translations. +(po-kill-msgstr). See section 8.3.9 Modifying Translations.

    @@ -814,9 +835,9 @@ if some untranslated string still exists.

    -

    8.3.8 Obsolete Entries

    +

    8.3.8 Obsolete Entries

    - +

    @@ -842,7 +863,7 @@ after the fact.

    - + Moreover, some commands are more specifically related to obsolete entry processing. @@ -851,27 +872,27 @@ entry processing.

    o
    - + Find the next obsolete entry (po-next-obsolete-entry).
    O
    - + Find the previous obsolete entry (po-previous-obsolete-entry).
    DEL
    - + Make an active entry obsolete, or zap out an obsolete entry (po-fade-out-entry).

    - - - - + + + + The commands o (po-next-obsolete-entry) and O (po-previous-obsolete-entry) move forwards or backwards, chasing for an obsolete entry. If none is found, the search is @@ -887,10 +908,10 @@ introducing useless msgid values.

    - - - - + + + + However, it is possible to comment out an active entry, so making it obsolete. GNU gettext utilities will later react to the disappearance of a translation by using the untranslated string. @@ -900,7 +921,7 @@ translated entry), then it is first made fuzzy. If it is already fuzzy, then the entry is merely commented out, with confirmation. If the entry is already obsolete, then it is completely deleted from the PO file. It is easy to recycle the translation so deleted into some other PO file -entry, usually one which is untranslated. See section 8.3.9 Modifying Translations. +entry, usually one which is untranslated. See section 8.3.9 Modifying Translations.

    @@ -918,10 +939,10 @@ merely tries to provide handy tools for helping her to do so.

    -

    8.3.9 Modifying Translations

    +

    8.3.9 Modifying Translations

    - - + +

    @@ -947,40 +968,40 @@ using the following commands for modifying the translations.

    RET
    - + Interactively edit the translation (po-edit-msgstr).
    LFD
    C-j
    - - + + Reinitialize the translation with the original, untranslated string (po-msgid-to-msgstr).
    k
    - + Save the translation on the kill ring, and delete it (po-kill-msgstr).
    w
    - + Save the translation on the kill ring, without deleting it (po-kill-ring-save-msgstr).
    y
    - + Replace the translation, taking the new from the kill ring (po-yank-msgstr).

    - - + + The command RET (po-edit-msgstr) opens a new Emacs window meant to edit in a new translation, or to modify an already existing translation. The new window contains a copy of the translation taken from @@ -988,14 +1009,14 @@ the current PO file entry, all ready for edition, expunged of all quoting marks, fully modifiable and with the complete extent of Emacs modifying commands. When the translator is done with her modifications, she may use C-c C-c to close the subedit window with the automatically requoted -results, or C-c C-k to abort her modifications. See section 8.3.11 Details of Sub Edition, +results, or C-c C-k to abort her modifications. See section 8.3.11 Details of Sub Edition, for more information.

    - - - + + + The command LFD (po-msgid-to-msgstr) initializes, or reinitializes the translation with the original string. This command is normally used when the translator wants to redo a fresh translation of @@ -1003,7 +1024,7 @@ the original string, disregarding any previous work.

    - + It is possible to arrange so, whenever editing an untranslated entry, the LFD command be automatically executed. If you set po-auto-edit-with-msgid to t, the translation gets @@ -1012,7 +1033,7 @@ The default value for po-auto-edit-with-msgid is nil.

    - + In fact, whether it is best to start a translation with an empty string, or rather with a copy of the original string, is a matter of taste or habit. Sometimes, the source language and the @@ -1026,11 +1047,11 @@ if this requires some extra editing work to get rid of the original.

    - - - - - + + + + + The command k (po-kill-msgstr) merely empties the translation string, so turning the entry into an untranslated one. But while doing so, its previous contents is put apart in @@ -1062,13 +1083,13 @@ entries, the translation is also uncommented prior to saving.

    - - + + The command y (po-yank-msgstr) completely replaces the translation of the current entry by a string taken from the kill ring. Following Emacs terminology, we then say that the replacement string is yanked into the PO file buffer. -See section `Yanking' in The Emacs Editor. +See section ‘Yanking’ in The Emacs Editor. The first time y is used, the translation receives the value of the most recent addition to the kill ring. If y is typed once again, immediately, without intervening keystrokes, the translation @@ -1097,7 +1118,7 @@ yanking commands themselves.

    - + To better illustrate the operation of killing and yanking, let's use an actual example, taken from a common situation. When the programmer slightly modifies some string right in the program, his @@ -1130,15 +1151,15 @@ then m again, for going on with the next untranslated string. When some sequence of keys has to be typed over and over again, the translator may find it useful to become better acquainted with the Emacs capability of learning these sequences and playing them back under request. -See section `Keyboard Macros' in The Emacs Editor. +See section ‘Keyboard Macros’ in The Emacs Editor.

    -

    8.3.10 Modifying Comments

    +

    8.3.10 Modifying Comments

    - - + +

    @@ -1151,8 +1172,8 @@ be useful to herself when she returns to this PO file after a while.

    -Comments not having whitespace after the initial `#´, for example, -those beginning with `#.´ or `#:´, are not translator +Comments not having whitespace after the initial ‘#’, for example, +those beginning with ‘#.’ or ‘#:’, are not translator comments, they are exclusively created by other gettext tools. So, the commands below will never alter such system added comments, they are not meant for the translator to modify. See section 3 The Format of PO Files. @@ -1160,31 +1181,31 @@ they are not meant for the translator to modify. See section 8.3.9 Modifying Translations. +so the general indications given for those apply here. See section 8.3.9 Modifying Translations.

    #
    - + Interactively edit the translator comments (po-edit-comment).
    K
    - + Save the translator comments on the kill ring, and delete it (po-kill-comment).
    W
    - + Save the translator comments on the kill ring, without deleting it (po-kill-ring-save-comment).
    Y
    - + Replace the translator comments, taking the new from the kill ring (po-yank-comment). @@ -1196,12 +1217,12 @@ strings, and behave much the same way as they do, except that they handle this part of PO file comments meant for translator usage, rather than the translation strings. So, if the descriptions given below are slightly succinct, it is because the full details have already been given. -See section 8.3.9 Modifying Translations. +See section 8.3.9 Modifying Translations.

    - - + + The command # (po-edit-comment) opens a new Emacs window containing a copy of the translator comments on the current PO file entry. If there are no such comments, PO mode understands that the translator wants @@ -1211,22 +1232,22 @@ removed before edition, and reinstated after. For translator comments pertaining to obsolete entries, the uncommenting and recommenting operations are done twice. Once in the editing window, the keys C-c C-c allow the translator to tell she is finished with editing the comment. -See section 8.3.11 Details of Sub Edition, for further details. +See section 8.3.11 Details of Sub Edition, for further details.

    - + Functions found on po-subedit-mode-hook, if any, are executed after the string has been inserted in the edit buffer.

    - - - - - - + + + + + + The command K (po-kill-comment) gets rid of all translator comments, while saving those comments on the kill ring. The command W (po-kill-ring-save-comment) takes @@ -1265,9 +1286,9 @@ regular Emacs commands C-y (yank) and M-y

    -

    8.3.11 Details of Sub Edition

    +

    8.3.11 Details of Sub Edition

    - +

    @@ -1280,25 +1301,25 @@ of Emacs, which are described below.

    C-c C-c
    - + Complete edition (po-subedit-exit).
    C-c C-k
    - + Abort edition (po-subedit-abort).
    C-c C-a
    - + Consult auxiliary PO files (po-subedit-cycle-auxiliary).

    - - - + + + The window's contents represents a translation for a given message, or a translator comment. The translator may modify this window to her heart's content. Once this is done, the command C-c C-c @@ -1308,8 +1329,8 @@ sight or if buffers were switched.

    - - + + If the translator becomes unsatisfied with her translation or comment, to the extent she prefers keeping what was existent prior to the RET or # command, she may use the command C-c C-k @@ -1320,14 +1341,14 @@ whole effect of last edition.

    - - + + The command C-c C-a (po-subedit-cycle-auxiliary) allows for glancing through translations already achieved in other languages, directly while editing the current translation. This may be quite convenient when the translator is fluent at many languages, but of course, only makes sense when such completed -auxiliary PO files are already available to her (see section 8.3.13 Consulting Auxiliary PO Files). +auxiliary PO files are already available to her (see section 8.3.13 Consulting Auxiliary PO Files).

    @@ -1355,7 +1376,7 @@ in the editing window, as ending with two < in a row.

    - + When a translation (or a comment) is being edited, the translator may move the cursor back into the PO file buffer and freely move to other entries, browsing at will. If, with an edition pending, the translator wanders in the @@ -1368,7 +1389,7 @@ the translator should better be comfortable at handling many Emacs windows!

    - + Pending subedits may be completed or aborted in any order, regardless of how or when they were started. When many subedits are pending and the translator asks for quitting the PO file (with the q command), subedits @@ -1377,11 +1398,11 @@ are automatically resumed one at a time, so she may decide for each of them.

    -

    8.3.12 C Sources Context

    +

    8.3.12 C Sources Context

    - - - + + +

    @@ -1418,7 +1439,7 @@ overall organization, than to the program code itself.

    - + The following commands are meant to help the translator at getting program source context for a PO file entry. @@ -1427,35 +1448,35 @@ program source context for a PO file entry.

    s
    - + Resume the display of a program source context, or cycle through them (po-cycle-source-reference).
    M-s
    - + Display of a program source context selected by menu (po-select-source-reference).
    S
    - + Add a directory to the search path for source files (po-consider-source-path).
    M-S
    - + Delete a directory from the search path for source files (po-ignore-source-path).

    - - - - + + + + The commands s (po-cycle-source-reference) and M-s (po-select-source-reference) both open another window displaying some source program file, and already positioned in such a way that @@ -1500,10 +1521,10 @@ available for a single string to translate.

    - - - - + + + + Program source files are usually found relative to where the PO file stands. As a special provision, when this fails, the file is also looked for, but relative to the directory immediately above it. @@ -1521,9 +1542,9 @@ one of the directories she does not want anymore on the search path.

    -

    8.3.13 Consulting Auxiliary PO Files

    +

    8.3.13 Consulting Auxiliary PO Files

    - +

    @@ -1536,8 +1557,8 @@ at once, for translators preferring to work in this way.

    - - + + An auxiliary PO file is an existing PO file meant for the same package the translator is working on, but targeted to a different mother tongue language. Commands exist for declaring and handling auxiliary @@ -1552,41 +1573,41 @@ Here are the auxiliary file commands available in PO mode.

    a
    - + Seek auxiliary files for another translation for the same entry (po-cycle-auxiliary).
    C-c C-a
    - + Switch to a particular auxiliary file (po-select-auxiliary).
    A
    - + Declare this PO file as an auxiliary file (po-consider-as-auxiliary).
    M-A
    - + Remove this PO file from the list of auxiliary files (po-ignore-as-auxiliary).

    - - - - + + + + Command A (po-consider-as-auxiliary) adds the current PO file to the list of auxiliary files, while command M-A (po-ignore-as-auxiliary just removes it.

    - - + + The command a (po-cycle-auxiliary) seeks all auxiliary PO files, round-robin, searching for a translated entry in some other language having an msgid field identical as the one for the current entry. @@ -1598,8 +1619,8 @@ so repeating a will eventually yield back the original PO file.

    - - + + The command C-c C-a (po-select-auxiliary) asks the translator for her choice of a particular auxiliary file, with completion, and then switches to that selected PO file. The command also checks if @@ -1619,23 +1640,23 @@ their msgid entries written by the same GNU gettext to

    - + However, PO files initially created by PO mode itself, while marking strings in source files, are normalised differently. So are PO -files resulting of the the `M-x normalize´ command. Until these +files resulting of the the ‘M-x normalize’ command. Until these discrepancies between PO mode and other GNU gettext tools get fully resolved, the translator should stay aware of normalisation issues.

    -

    8.3.14 Using Translation Compendia

    +

    8.3.14 Using Translation Compendia

    - +

    - + A compendium is a special PO file containing a set of translations recurring in many different packages. The translator can use gettext tools to build a new compendium, to add entries to her @@ -1646,10 +1667,10 @@ already translated entries, from translations kept in the compendium. -

    8.3.14.1 Creating Compendia

    +

    8.3.14.1 Creating Compendia

    - - + +

    @@ -1661,13 +1682,13 @@ files and extracting a message subset from a PO file.

    -

    8.3.14.2 Concatenate PO Files

    +

    8.3.14.2 Concatenate PO Files

    - - + + To concatenate several valid PO files into one compendium file you can -use `msgcomm´ or `msgcat´ (the latter preferred): +use ‘msgcomm’ or ‘msgcat’ (the latter preferred):

    @@ -1679,7 +1700,7 @@ msgcat -o compendium.po file1.po file2.po By default, msgcat will accumulate divergent translations for the same string. Those occurences will be marked as fuzzy and highly visible decorated; calling msgcat on -`file1.po´: +‘file1.po’:

    @@ -1691,7 +1712,7 @@ msgstr "Comunicar `bugs' a <%s>.\n"

    -and `file2.po´: +and ‘file2.po’:

    @@ -1719,16 +1740,16 @@ msgstr ""

    -The translator will have to resolve this "conflict" manually; she +The translator will have to resolve this “conflict” manually; she has to decide whether the first or the second version is appropriate -(or provide a new translation), to delete the "marker lines", and +(or provide a new translation), to delete the “marker lines”, and finally to remove the fuzzy mark.

    If the translator knows in advance the first found translation of a message is always the best translation she can make use to the -`--use-first´ switch: +‘--use-first’ switch:

    @@ -1738,25 +1759,25 @@ msgcat --use-first -o compendium.po file1.po file2.po

    A good compendium file must not contain fuzzy or untranslated -entries. If input files are "dirty" you must preprocess the input -files or postprocess the result using `msgattrib --translated --no-fuzzy´. +entries. If input files are “dirty” you must preprocess the input +files or postprocess the result using ‘msgattrib --translated --no-fuzzy’.

    -

    8.3.14.3 Extract a Message Subset from a PO File

    +

    8.3.14.3 Extract a Message Subset from a PO File

    - +

    Nobody wants to translate the same messages again and again; thus you -may wish to have a compendium file containing `getopt.c´ messages. +may wish to have a compendium file containing ‘getopt.c’ messages.

    -To extract a message subset (e.g., all `getopt.c´ messages) from an -existing PO file into one compendium file you can use `msggrep´: +To extract a message subset (e.g., all ‘getopt.c’ messages) from an +existing PO file into one compendium file you can use ‘msggrep’:

    @@ -1766,7 +1787,7 @@ msggrep --location src/getopt.c -o compendium.po file.po -

    8.3.14.4 Using Compendia

    +

    8.3.14.4 Using Compendia

    You can use a compendium file to initialize a translation from scratch @@ -1775,14 +1796,14 @@ or to update an already existing translation.

    -

    8.3.14.5 Initialize a New Translation File

    +

    8.3.14.5 Initialize a New Translation File

    - +

    Since a PO file with translations does not exist the translator can -merely use `/dev/null´ to fake the "old" translation file. +merely use ‘/dev/null’ to fake the “old” translation file.

    @@ -1792,15 +1813,15 @@ msgmerge --compendium compendium.po -o file.po /dev/null file.pot -

    8.3.14.6 Update an Existing Translation File

    +

    8.3.14.6 Update an Existing Translation File

    - +

    Concatenate the compendium file(s) and the existing PO, merge the result with the POT file and remove the obsolete entries (optional, -here done using `sed´): +here done using ‘sed’):

    @@ -1810,6 +1831,6 @@ msgmerge update.po file.pot | sed -e '/^#~/d' > file.po

    -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents. diff --git a/gettext-tools/doc/gettext_9.html b/gettext-tools/doc/gettext_9.html index e88fe4a37..b665c685c 100644 --- a/gettext-tools/doc/gettext_9.html +++ b/gettext-tools/doc/gettext_9.html @@ -1,18 +1,19 @@ - + + GNU gettext utilities - 9 Manipulating PO Files -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents.

    -

    9 Manipulating PO Files

    +

    9 Manipulating PO Files

    - +

    @@ -22,113 +23,113 @@ complete set of tools for this purpose.

    - + When merging two packages into a single package, the resulting POT file will be the concatenation of the two packages' POT files. Thus the maintainer must concatenate the two existing package translations into a single translation catalog, for each language. This is best performed -using `msgcat´. It is then the translators' duty to deal with any +using ‘msgcat’. It is then the translators' duty to deal with any possible conflicts that arose during the merge.

    - + When a translator takes over the translation job from another translator, but she uses a different character encoding in her locale, she will convert the catalog to her character encoding. This is best done through -the `msgconv´ program. +the ‘msgconv’ program.

    When a maintainer takes a source file with tagged messages from another package, he should also take the existing translations for this source file (and not let the translators do the same job twice). One way to do -this is through `msggrep´, another is to create a POT file for -that source file and use `msgmerge´. +this is through ‘msggrep’, another is to create a POT file for +that source file and use ‘msgmerge’.

    - - + + When a translator wants to adjust some translation catalog for a special dialect or orthography -- for example, German as written in Switzerland versus German as written in Germany -- she needs to apply some text processing to every message in the catalog. The tool for doing this is -`msgfilter´. +‘msgfilter’.

    Another use of msgfilter is to produce approximately the POT file for which a given PO file was made. This can be done through a filter command -like `msgfilter sed -e d | sed -e '/^# /d'´. Note that the original +like ‘msgfilter sed -e d | sed -e '/^# /d'’. Note that the original POT file may have had different comments and different plural message counts, that's why it's better to use the original POT file if available.

    - + When a translator wants to check her translations, for example according to orthography rules or using a non-interactive spell checker, she can do -so using the `msgexec´ program. +so using the ‘msgexec’ program.

    - + When third party tools create PO or POT files, sometimes duplicates cannot be avoided. But the GNU gettext tools give an error when they encounter duplicate msgids in the same file and in the same domain. -To merge duplicates, the `msguniq´ program can be used. +To merge duplicates, the ‘msguniq’ program can be used.

    -`msgcomm´ is a more general tool for keeping or throwing away +‘msgcomm’ is a more general tool for keeping or throwing away duplicates, occurring in different files.

    -`msgcmp´ can be used to check whether a translation catalog is +‘msgcmp’ can be used to check whether a translation catalog is completely translated.

    - -`msgattrib´ can be used to select and extract only the fuzzy + +‘msgattrib’ can be used to select and extract only the fuzzy or untranslated messages of a translation catalog.

    -`msgen´ is useful as a first step for preparing English translation +‘msgen’ is useful as a first step for preparing English translation catalogs. It copies each message's msgid to its msgstr.

    Finally, for those applications where all these various programs are not -sufficient, a library `libgettextpo´ is provided that can be used to +sufficient, a library ‘libgettextpo’ is provided that can be used to write other specialized programs that process PO files.

    -

    9.1 Invoking the msgcat Program

    +

    9.1 Invoking the msgcat Program

    - - + + 

     msgcat [option] [inputfile]...

    - - + + The msgcat program concatenates and merges the specified PO files. It finds messages which are common to two or more of the specified PO files. By using the --more-than option, greater commonality may be requested before messages are printed. Conversely, the --less-than option may be used to specify less commonality before messages are printed (i.e. -`--less-than=2´ will only print the unique messages). Translations, +‘--less-than=2’ will only print the unique messages). Translations, comments and extract comments will be cumulated, except that if --use-first is specified, they will be taken from the first PO file to define them. File positions from all PO files will be cumulated. @@ -136,114 +137,114 @@ to define them. File positions from all PO files will be cumulated.

    -

    9.1.1 Input file location

    +

    9.1.1 Input file location

    -
    `inputfile ...´ +
    ‘inputfile ...’
    Input files. -
    `-f file´ +
    ‘-f file’
    -
    `--files-from=file´ +
    ‘--files-from=file’
    - - + + Read the names of the input files from file instead of getting them from the command line. -
    `-D directory´ +
    ‘-D directory’
    -
    `--directory=directory´ +
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are -searched relative to this list of directories. The resulting `.po´ +searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though.

    -If inputfile is `-´, standard input is read. +If inputfile is ‘-’, standard input is read.

    -

    9.1.2 Output file location

    +

    9.1.2 Output file location

    -
    `-o file´ +
    ‘-o file’
    -
    `--output-file=file´ +
    ‘--output-file=file’
    - - + + Write output to specified file.

    - + The results are written to standard output if no output file is specified -or if it is `-´. +or if it is ‘-’.

    -

    9.1.3 Message selection

    +

    9.1.3 Message selection

    -
    `-< number´ +
    ‘-< number’
    -
    `--less-than=number´ +
    ‘--less-than=number’
    - - + + Print messages with less than number definitions, defaults to infinite if not set. -
    `-> number´ +
    ‘-> number’
    -
    `--more-than=number´ +
    ‘--more-than=number’
    - - + + Print messages with more than number definitions, defaults to 0 if not set. -
    `-u´ +
    ‘-u’
    -
    `--unique´ +
    ‘--unique’
    - - -Shorthand for `--less-than=2´. Requests that only unique messages be + + +Shorthand for ‘--less-than=2’. Requests that only unique messages be printed.
    -

    9.1.4 Input file syntax

    +

    9.1.4 Input file syntax

    -
    `-P´ +
    ‘-P’
    -
    `--properties-input´ +
    ‘--properties-input’
    - - + + Assume the input files are Java ResourceBundles in Java .properties syntax, not in PO file syntax. -
    `--stringtable-input´ +
    ‘--stringtable-input’
    - + Assume the input files are NeXTstep/GNUstep localized resource files in .strings syntax, not in PO file syntax. @@ -251,211 +252,211 @@ Assume the input files are NeXTstep/GNUstep localized resource files in -

    9.1.5 Output details

    +

    9.1.5 Output details

    -
    `-t´ +
    ‘-t’
    -
    `--to-code=name´ +
    ‘--to-code=name’
    - - + + Specify encoding for output. -
    `--use-first´ +
    ‘--use-first’
    - + Use first available translation for each message. Don't merge several translations into one. -
    `--force-po´ +
    ‘--force-po’
    - + Always write an output file even if it contains no message. -
    `-i´ +
    ‘-i’
    -
    `--indent´ +
    ‘--indent’
    - - + + Write the .po file using indented style. -
    `--no-location´ +
    ‘--no-location’
    - -Do not write `#: filename:line´ lines. + +Do not write ‘#: filename:line’ lines. -
    `-n´ +
    ‘-n’
    -
    `--add-location´ +
    ‘--add-location’
    - - -Generate `#: filename:line´ lines (default). + + +Generate ‘#: filename:line’ lines (default). -
    `--strict´ +
    ‘--strict’
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. -
    `-p´ +
    ‘-p’
    -
    `--properties-output´ +
    ‘--properties-output’
    - - + + Write out a Java ResourceBundle in Java .properties syntax. Note that this file format doesn't support plural forms and silently drops obsolete messages. -
    `--stringtable-output´ +
    ‘--stringtable-output’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. -
    `-w number´ +
    ‘-w number’
    -
    `--width=number´ +
    ‘--width=number’
    - - + + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number. -
    `--no-wrap´ +
    ‘--no-wrap’
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. -
    `-s´ +
    ‘-s’
    -
    `--sort-output´ +
    ‘--sort-output’
    - - - + + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. -
    `-F´ +
    ‘-F’
    -
    `--sort-by-file´ +
    ‘--sort-by-file’
    - - + + Sort output by file location.
    -

    9.1.6 Informative output

    +

    9.1.6 Informative output

    -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit.
    -

    9.2 Invoking the msgconv Program

    +

    9.2 Invoking the msgconv Program

    - - + + 

     msgconv [option] [inputfile]

    - + The msgconv program converts a translation catalog to a different character encoding.

    -

    9.2.1 Input file location

    +

    9.2.1 Input file location

    -
    `inputfile´ +
    ‘inputfile’
    Input PO file. -
    `-D directory´ +
    ‘-D directory’
    -
    `--directory=directory´ +
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are -searched relative to this list of directories. The resulting `.po´ +searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though.

    -If no inputfile is given or if it is `-´, standard input is read. +If no inputfile is given or if it is ‘-’, standard input is read.

    -

    9.2.2 Output file location

    +

    9.2.2 Output file location

    -
    `-o file´ +
    ‘-o file’
    -
    `--output-file=file´ +
    ‘--output-file=file’
    - - + + Write output to specified file.

    The results are written to standard output if no output file is specified -or if it is `-´. +or if it is ‘-’.

    -

    9.2.3 Conversion target

    +

    9.2.3 Conversion target

    -
    `-t´ +
    ‘-t’
    -
    `--to-code=name´ +
    ‘--to-code=name’
    - - + + Specify encoding for output.
    @@ -466,22 +467,22 @@ The default encoding is the current locale's encoding.

    -

    9.2.4 Input file syntax

    +

    9.2.4 Input file syntax

    -
    `-P´ +
    ‘-P’
    -
    `--properties-input´ +
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax. -
    `--stringtable-input´ +
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -489,189 +490,190 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in -

    9.2.5 Output details

    +

    9.2.5 Output details

    -
    `--force-po´ +
    ‘--force-po’
    - + Always write an output file even if it contains no message. -
    `-i´ +
    ‘-i’
    -
    `--indent´ +
    ‘--indent’
    - - + + Write the .po file using indented style. -
    `--no-location´ +
    ‘--no-location’
    - -Do not write `#: filename:line´ lines. + +Do not write ‘#: filename:line’ lines. -
    `--add-location´ +
    ‘--add-location’
    - -Generate `#: filename:line´ lines (default). + +Generate ‘#: filename:line’ lines (default). -
    `--strict´ +
    ‘--strict’
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. -
    `-p´ +
    ‘-p’
    -
    `--properties-output´ +
    ‘--properties-output’
    - - + + Write out a Java ResourceBundle in Java .properties syntax. Note that this file format doesn't support plural forms and silently drops obsolete messages. -
    `--stringtable-output´ +
    ‘--stringtable-output’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. -
    `-w number´ +
    ‘-w number’
    -
    `--width=number´ +
    ‘--width=number’
    - - + + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number. -
    `--no-wrap´ +
    ‘--no-wrap’
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. -
    `-s´ +
    ‘-s’
    -
    `--sort-output´ +
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. -
    `-F´ +
    ‘-F’
    -
    `--sort-by-file´ +
    ‘--sort-by-file’
    - - + + Sort output by file location.
    -

    9.2.6 Informative output

    +

    9.2.6 Informative output

    -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit.
    -

    9.3 Invoking the msggrep Program

    +

    9.3 Invoking the msggrep Program

    - - + + 

     msggrep [option] [inputfile]

    - + The msggrep program extracts all messages of a translation catalog that match a given pattern or belong to some given source files.

    -

    9.3.1 Input file location

    +

    9.3.1 Input file location

    -
    `inputfile´ +
    ‘inputfile’
    Input PO file. -
    `-D directory´ +
    ‘-D directory’
    -
    `--directory=directory´ +
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are -searched relative to this list of directories. The resulting `.po´ +searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though.

    -If no inputfile is given or if it is `-´, standard input is read. +If no inputfile is given or if it is ‘-’, standard input is read.

    -

    9.3.2 Output file location

    +

    9.3.2 Output file location

    -
    `-o file´ +
    ‘-o file’
    -
    `--output-file=file´ +
    ‘--output-file=file’
    - - + + Write output to specified file.

    The results are written to standard output if no output file is specified -or if it is `-´. +or if it is ‘-’.

    -

    9.3.3 Message selection

    +

    9.3.3 Message selection

       [-N sourcefile]... [-M domainname]...
-  [-K msgid-pattern] [-T msgstr-pattern] [-C comment-pattern]
+  [-J msgctxt-pattern [-K msgid-pattern] [-T msgstr-pattern]
+  [-C comment-pattern]

    @@ -682,13 +684,16 @@ A message is selected if

  • or if it comes from one of the specified domains, -
  • or if `-K´ is given and its key (msgid or msgid_plural) matches +
  • or if ‘-J’ is given and its context (msgctxt) matches + + msgctxt-pattern, +
  • or if ‘-K’ is given and its key (msgid or msgid_plural) matches msgid-pattern, -
  • or if `-T´ is given and its translation (msgstr) matches +
  • or if ‘-T’ is given and its translation (msgstr) matches msgstr-pattern, -
  • or if `-C´ is given and the translator's comment matches +
  • or if ‘-C’ is given and the translator's comment matches comment-pattern. @@ -712,107 +717,132 @@ expressions if -E is given, or fixed strings if -F is given.

    -
    `-N sourcefile´ +
    ‘-N sourcefile’
    -
    `--location=sourcefile´ +
    ‘--location=sourcefile’
    - - + + Select messages extracted from sourcefile. sourcefile can be either a literal file name or a wildcard pattern. -
    `-M domainname´ +
    ‘-M domainname’
    -
    `--domain=domainname´ +
    ‘--domain=domainname’
    - - + + Select messages belonging to domain domainname. -
    `-K´ +
    ‘-J’
    -
    `--msgid´ +
    ‘--msgctxt’
    - - + + +Start of patterns for the msgctxt. + +
    ‘-K’ +
    +
    ‘--msgid’ +
    + + Start of patterns for the msgid. -
    `-T´ +
    ‘-T’
    -
    `--msgstr´ +
    ‘--msgstr’
    - - + + Start of patterns for the msgstr. -
    `-C´ +
    ‘-C’
    -
    `--comment´ +
    ‘--comment’
    - - + + Start of patterns for the translator's comment. -
    `-E´ +
    ‘-X’
    -
    `--extended-regexp´ +
    ‘--extracted-comment’
    - - + + +Start of patterns for the extracted comments. + +
    ‘-E’ +
    +
    ‘--extended-regexp’ +
    + + Specify that pattern is an extended regular expression. -
    `-F´ +
    ‘-F’
    -
    `--fixed-strings´ +
    ‘--fixed-strings’
    - - + + Specify that pattern is a set of newline-separated strings. -
    `-e pattern´ +
    ‘-e pattern’
    -
    `--regexp=pattern´ +
    ‘--regexp=pattern’
    - - + + Use pattern as a regular expression. -
    `-f file´ +
    ‘-f file’
    -
    `--file=file´ +
    ‘--file=file’
    - - + + Obtain pattern from file. -
    `-i´ +
    ‘-i’
    -
    `--ignore-case´ +
    ‘--ignore-case’
    - - + + Ignore case distinctions. +
    ‘-v’ +
    +
    ‘--invert-match’ +
    + + +Output only the messages that do not match any selection criterion, instead +of the messages that match a selection criterion. +
    -

    9.3.4 Input file syntax

    +

    9.3.4 Input file syntax

    -
    `-P´ +
    ‘-P’
    -
    `--properties-input´ +
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax. -
    `--stringtable-input´ +
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -820,205 +850,207 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in -

    9.3.5 Output details

    +

    9.3.5 Output details

    -
    `--force-po´ +
    ‘--force-po’
    - + Always write an output file even if it contains no message. -
    `--indent´ +
    ‘--indent’
    - + Write the .po file using indented style. -
    `--no-location´ +
    ‘--no-location’
    - -Do not write `#: filename:line´ lines. + +Do not write ‘#: filename:line’ lines. -
    `--add-location´ +
    ‘--add-location’
    - -Generate `#: filename:line´ lines (default). + +Generate ‘#: filename:line’ lines (default). -
    `--strict´ +
    ‘--strict’
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. -
    `-p´ +
    ‘-p’
    -
    `--properties-output´ +
    ‘--properties-output’
    - - + + Write out a Java ResourceBundle in Java .properties syntax. Note that this file format doesn't support plural forms and silently drops obsolete messages. -
    `--stringtable-output´ +
    ‘--stringtable-output’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. -
    `-w number´ +
    ‘-w number’
    -
    `--width=number´ +
    ‘--width=number’
    - - + + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number. -
    `--no-wrap´ +
    ‘--no-wrap’
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. -
    `--sort-output´ +
    ‘--sort-output’
    - + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. -
    `--sort-by-file´ +
    ‘--sort-by-file’
    - + Sort output by file location.
    -

    9.3.6 Informative output

    +

    9.3.6 Informative output

    -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit.
    -

    9.4 Invoking the msgfilter Program

    +

    9.4 Invoking the msgfilter Program

    - - + + 

     msgfilter [option] filter [filter-option]

    - + The msgfilter program applies a filter to all translations of a translation catalog.

    -

    9.4.1 Input file location

    +

    9.4.1 Input file location

    -
    `-i inputfile´ +
    ‘-i inputfile’
    -
    `--input=inputfile´ +
    ‘--input=inputfile’
    - - + + Input PO file. -
    `-D directory´ +
    ‘-D directory’
    -
    `--directory=directory´ +
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are -searched relative to this list of directories. The resulting `.po´ +searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though.

    -If no inputfile is given or if it is `-´, standard input is read. +If no inputfile is given or if it is ‘-’, standard input is read.

    -

    9.4.2 Output file location

    +

    9.4.2 Output file location

    -
    `-o file´ +
    ‘-o file’
    -
    `--output-file=file´ +
    ‘--output-file=file’
    - - + + Write output to specified file.

    The results are written to standard output if no output file is specified -or if it is `-´. +or if it is ‘-’.

    -

    9.4.3 The filter

    +

    9.4.3 The filter

    The filter can be any program that reads a translation from standard input and writes a modified translation to standard output. A frequently -used filter is `sed´. +used filter is ‘sed’. A few particular built-in filters are also +recognized.

    - -Note: It is your responsibility to ensure that the filter can cope + +Note: If the filter is not a built-in filter, you have to care about encodings: +It is your responsibility to ensure that the filter can cope with input encoded in the translation catalog's encoding. If the filter wants input in a particular encoding, you can in a first step -convert the translation catalog to that encoding using the `msgconv´ -program, before invoking `msgfilter´. If the filter wants input +convert the translation catalog to that encoding using the ‘msgconv’ +program, before invoking ‘msgfilter’. If the filter wants input in the locale's encoding, but you want to avoid the locale's encoding, then you can first convert the translation catalog to UTF-8 using the -`msgconv´ program and then make `msgfilter´ work in an UTF-8 +‘msgconv’ program and then make ‘msgfilter’ work in an UTF-8 locale, by using the LC_ALL environment variable.

    - + Note: Most translations in a translation catalog don't end with a newline character. For this reason, it is important that the filter recognizes its last input line even if it ends without a newline, and that -it doesn't add an undesired trailing newline at the end. The `sed´ +it doesn't add an undesired trailing newline at the end. The ‘sed’ program on some platforms is known to ignore the last line of input if it is not terminated with a newline. You can use GNU sed instead; it does not have this limitation. @@ -1026,57 +1058,78 @@ does not have this limitation.

    -

    9.4.4 Useful filter-options when the filter is `sed´

    +

    9.4.4 Useful filter-options when the filter is ‘sed’

    -
    `-e script´ +
    ‘-e script’
    -
    `--expression=script´ +
    ‘--expression=script’
    - - + + Add script to the commands to be executed. -
    `-f scriptfile´ +
    ‘-f scriptfile’
    -
    `--file=scriptfile´ +
    ‘--file=scriptfile’
    - - + + Add the contents of scriptfile to the commands to be executed. -
    `-n´ +
    ‘-n’
    -
    `--quiet´ +
    ‘--quiet’
    -
    `--silent´ +
    ‘--silent’
    - - - + + + Suppress automatic printing of pattern space.
    -

    9.4.5 Input file syntax

    +

    9.4.5 Built-in filters

    + +

    + + +The filter ‘recode-sr-latin’ is recognized as a built-in filter. +The command ‘recode-sr-latin’ converts Serbian text, written in the +Cyrillic script, to the Latin script. +The command ‘msgfilter recode-sr-latin’ applies this conversion to the +translations of a PO file. Thus, it can be used to convert an ‘sr.po’ +file to an ‘sr@latin.po’ file. + +

    +

    +The use of built-in filters is not sensitive to the current locale's encoding. +Moreover, when used with a built-in filter, ‘msgfilter’ can automatically +convert the message catalog to the UTF-8 encoding when needed. + +

    + + +

    9.4.6 Input file syntax

    -
    `-P´ +
    ‘-P’
    -
    `--properties-input´ +
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax. -
    `--stringtable-input´ +
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -1084,236 +1137,236 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in -

    9.4.6 Output details

    +

    9.4.7 Output details

    -
    `--force-po´ +
    ‘--force-po’
    - + Always write an output file even if it contains no message. -
    `--indent´ +
    ‘--indent’
    - + Write the .po file using indented style. -
    `--keep-header´ +
    ‘--keep-header’
    - -Keep the header entry, i.e. the message with `msgid ""´, unmodified, + +Keep the header entry, i.e. the message with ‘msgid ""’, unmodified, instead of filtering it. By default, the header entry is subject to filtering like any other message. -
    `--no-location´ +
    ‘--no-location’
    - -Do not write `#: filename:line´ lines. + +Do not write ‘#: filename:line’ lines. -
    `--add-location´ +
    ‘--add-location’
    - -Generate `#: filename:line´ lines (default). + +Generate ‘#: filename:line’ lines (default). -
    `--strict´ +
    ‘--strict’
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. -
    `-p´ +
    ‘-p’
    -
    `--properties-output´ +
    ‘--properties-output’
    - - + + Write out a Java ResourceBundle in Java .properties syntax. Note that this file format doesn't support plural forms and silently drops obsolete messages. -
    `--stringtable-output´ +
    ‘--stringtable-output’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. -
    `-w number´ +
    ‘-w number’
    -
    `--width=number´ +
    ‘--width=number’
    - - + + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number. -
    `--no-wrap´ +
    ‘--no-wrap’
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. -
    `-s´ +
    ‘-s’
    -
    `--sort-output´ +
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. -
    `-F´ +
    ‘-F’
    -
    `--sort-by-file´ +
    ‘--sort-by-file’
    - - + + Sort output by file location.
    -

    9.4.7 Informative output

    +

    9.4.8 Informative output

    -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit.
    -

    9.5 Invoking the msguniq Program

    +

    9.5 Invoking the msguniq Program

    - - + + 

     msguniq [option] [inputfile]

    - - + + The msguniq program unifies duplicate translations in a translation catalog. It finds duplicate translations of the same message ID. Such duplicates are invalid input for other programs like msgfmt, msgmerge or msgcat. By default, duplicates are merged -together. When using the `--repeated´ option, only duplicates are +together. When using the ‘--repeated’ option, only duplicates are output, and all other messages are discarded. Comments and extracted -comments will be cumulated, except that if `--use-first´ is +comments will be cumulated, except that if ‘--use-first’ is specified, they will be taken from the first translation. File positions -will be cumulated. When using the `--unique´ option, duplicates are +will be cumulated. When using the ‘--unique’ option, duplicates are discarded.

    -

    9.5.1 Input file location

    +

    9.5.1 Input file location

    -
    `inputfile´ +
    ‘inputfile’
    Input PO file. -
    `-D directory´ +
    ‘-D directory’
    -
    `--directory=directory´ +
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are -searched relative to this list of directories. The resulting `.po´ +searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though.

    -If no inputfile is given or if it is `-´, standard input is read. +If no inputfile is given or if it is ‘-’, standard input is read.

    -

    9.5.2 Output file location

    +

    9.5.2 Output file location

    -
    `-o file´ +
    ‘-o file’
    -
    `--output-file=file´ +
    ‘--output-file=file’
    - - + + Write output to specified file.

    The results are written to standard output if no output file is specified -or if it is `-´. +or if it is ‘-’.

    -

    9.5.3 Message selection

    +

    9.5.3 Message selection

    -
    `-d´ +
    ‘-d’
    -
    `--repeated´ +
    ‘--repeated’
    - - + + Print only duplicates. -
    `-u´ +
    ‘-u’
    -
    `--unique´ +
    ‘--unique’
    - - + + Print only unique messages, discard duplicates.
    -

    9.5.4 Input file syntax

    +

    9.5.4 Input file syntax

    -
    `-P´ +
    ‘-P’
    -
    `--properties-input´ +
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax. -
    `--stringtable-input´ +
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -1321,153 +1374,153 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in -

    9.5.5 Output details

    +

    9.5.5 Output details

    -
    `-t´ +
    ‘-t’
    -
    `--to-code=name´ +
    ‘--to-code=name’
    - - + + Specify encoding for output. -
    `--use-first´ +
    ‘--use-first’
    - + Use first available translation for each message. Don't merge several translations into one. -
    `--force-po´ +
    ‘--force-po’
    - + Always write an output file even if it contains no message. -
    `-i´ +
    ‘-i’
    -
    `--indent´ +
    ‘--indent’
    - - + + Write the .po file using indented style. -
    `--no-location´ +
    ‘--no-location’
    - -Do not write `#: filename:line´ lines. + +Do not write ‘#: filename:line’ lines. -
    `-n´ +
    ‘-n’
    -
    `--add-location´ +
    ‘--add-location’
    - - -Generate `#: filename:line´ lines (default). + + +Generate ‘#: filename:line’ lines (default). -
    `--strict´ +
    ‘--strict’
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. -
    `-p´ +
    ‘-p’
    -
    `--properties-output´ +
    ‘--properties-output’
    - - + + Write out a Java ResourceBundle in Java .properties syntax. Note that this file format doesn't support plural forms and silently drops obsolete messages. -
    `--stringtable-output´ +
    ‘--stringtable-output’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. -
    `-w number´ +
    ‘-w number’
    -
    `--width=number´ +
    ‘--width=number’
    - - + + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number. -
    `--no-wrap´ +
    ‘--no-wrap’
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. -
    `-s´ +
    ‘-s’
    -
    `--sort-output´ +
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. -
    `-F´ +
    ‘-F’
    -
    `--sort-by-file´ +
    ‘--sort-by-file’
    - - + + Sort output by file location.
    -

    9.5.6 Informative output

    +

    9.5.6 Informative output

    -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit.
    -

    9.6 Invoking the msgcomm Program

    +

    9.6 Invoking the msgcomm Program

    - - + + 

     msgcomm [option] [inputfile]...

    - + The msgcomm program finds messages which are common to two or more of the specified PO files. By using the --more-than option, greater commonality may be requested before messages are printed. Conversely, the --less-than option may be used to specify less commonality before messages are printed (i.e. -`--less-than=2´ will only print the unique messages). Translations, +‘--less-than=2’ will only print the unique messages). Translations, comments and extract comments will be preserved, but only from the first PO file to define them. File positions from all PO files will be cumulated. @@ -1475,113 +1528,113 @@ cumulated.

    -

    9.6.1 Input file location

    +

    9.6.1 Input file location

    -
    `inputfile ...´ +
    ‘inputfile ...’
    Input files. -
    `-f file´ +
    ‘-f file’
    -
    `--files-from=file´ +
    ‘--files-from=file’
    - - + + Read the names of the input files from file instead of getting them from the command line. -
    `-D directory´ +
    ‘-D directory’
    -
    `--directory=directory´ +
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are -searched relative to this list of directories. The resulting `.po´ +searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though.

    -If inputfile is `-´, standard input is read. +If inputfile is ‘-’, standard input is read.

    -

    9.6.2 Output file location

    +

    9.6.2 Output file location

    -
    `-o file´ +
    ‘-o file’
    -
    `--output-file=file´ +
    ‘--output-file=file’
    - - + + Write output to specified file.

    The results are written to standard output if no output file is specified -or if it is `-´. +or if it is ‘-’.

    -

    9.6.3 Message selection

    +

    9.6.3 Message selection

    -
    `-< number´ +
    ‘-< number’
    -
    `--less-than=number´ +
    ‘--less-than=number’
    - - + + Print messages with less than number definitions, defaults to infinite if not set. -
    `-> number´ +
    ‘-> number’
    -
    `--more-than=number´ +
    ‘--more-than=number’
    - - + + Print messages with more than number definitions, defaults to 1 if not set. -
    `-u´ +
    ‘-u’
    -
    `--unique´ +
    ‘--unique’
    - - -Shorthand for `--less-than=2´. Requests that only unique messages be + + +Shorthand for ‘--less-than=2’. Requests that only unique messages be printed.
    -

    9.6.4 Input file syntax

    +

    9.6.4 Input file syntax

    -
    `-P´ +
    ‘-P’
    -
    `--properties-input´ +
    ‘--properties-input’
    - - + + Assume the input files are Java ResourceBundles in Java .properties syntax, not in PO file syntax. -
    `--stringtable-input´ +
    ‘--stringtable-input’
    - + Assume the input files are NeXTstep/GNUstep localized resource files in .strings syntax, not in PO file syntax. @@ -1589,138 +1642,138 @@ Assume the input files are NeXTstep/GNUstep localized resource files in -

    9.6.5 Output details

    +

    9.6.5 Output details

    -
    `--force-po´ +
    ‘--force-po’
    - + Always write an output file even if it contains no message. -
    `-i´ +
    ‘-i’
    -
    `--indent´ +
    ‘--indent’
    - - + + Write the .po file using indented style. -
    `--no-location´ +
    ‘--no-location’
    - -Do not write `#: filename:line´ lines. + +Do not write ‘#: filename:line’ lines. -
    `-n´ +
    ‘-n’
    -
    `--add-location´ +
    ‘--add-location’
    - - -Generate `#: filename:line´ lines (default). + + +Generate ‘#: filename:line’ lines (default). -
    `--strict´ +
    ‘--strict’
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. -
    `-p´ +
    ‘-p’
    -
    `--properties-output´ +
    ‘--properties-output’
    - - + + Write out a Java ResourceBundle in Java .properties syntax. Note that this file format doesn't support plural forms and silently drops obsolete messages. -
    `--stringtable-output´ +
    ‘--stringtable-output’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. -
    `-w number´ +
    ‘-w number’
    -
    `--width=number´ +
    ‘--width=number’
    - - + + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number. -
    `--no-wrap´ +
    ‘--no-wrap’
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. -
    `-s´ +
    ‘-s’
    -
    `--sort-output´ +
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. -
    `-F´ +
    ‘-F’
    -
    `--sort-by-file´ +
    ‘--sort-by-file’
    - - + + Sort output by file location. -
    `--omit-header´ +
    ‘--omit-header’
    - -Don't write header with `msgid ""´ entry. + +Don't write header with ‘msgid ""’ entry.
    -

    9.6.6 Informative output

    +

    9.6.6 Informative output

    -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit.
    -

    9.7 Invoking the msgcmp Program

    +

    9.7 Invoking the msgcmp Program

    - - + + 

     msgcmp [option] def.po ref.pot

    - + The msgcmp program compares two Uniforum style .po files to check that both contain the same set of msgid strings. The def.po file is an existing PO file with the translations. The ref.pot file is the last @@ -1732,24 +1785,24 @@ used to produce better diagnostics.

    -

    9.7.1 Input file location

    +

    9.7.1 Input file location

    -
    `def.po´ +
    ‘def.po’
    Translations. -
    `ref.pot´ +
    ‘ref.pot’
    References to the sources. -
    `-D directory´ +
    ‘-D directory’
    -
    `--directory=directory´ +
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are searched relative to this list of directories. @@ -1757,38 +1810,38 @@ searched relative to this list of directories. -

    9.7.2 Operation modifiers

    +

    9.7.2 Operation modifiers

    -
    `-m´ +
    ‘-m’
    -
    `--multi-domain´ +
    ‘--multi-domain’
    - - + + Apply ref.pot to each of the domains in def.po.
    -

    9.7.3 Input file syntax

    +

    9.7.3 Input file syntax

    -
    `-P´ +
    ‘-P’
    -
    `--properties-input´ +
    ‘--properties-input’
    - - + + Assume the input files are Java ResourceBundles in Java .properties syntax, not in PO file syntax. -
    `--stringtable-input´ +
    ‘--stringtable-input’
    - + Assume the input files are NeXTstep/GNUstep localized resource files in .strings syntax, not in PO file syntax. @@ -1796,140 +1849,144 @@ Assume the input files are NeXTstep/GNUstep localized resource files in -

    9.7.4 Informative output

    +

    9.7.4 Informative output

    -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit.
    -

    9.8 Invoking the msgattrib Program

    +

    9.8 Invoking the msgattrib Program

    - - + + 

     msgattrib [option] [inputfile]

    - - + + The msgattrib program filters the messages of a translation catalog according to their attributes, and manipulates the attributes.

    -

    9.8.1 Input file location

    +

    9.8.1 Input file location

    -
    `inputfile´ +
    ‘inputfile’
    Input PO file. -
    `-D directory´ +
    ‘-D directory’
    -
    `--directory=directory´ +
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are -searched relative to this list of directories. The resulting `.po´ +searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though.

    -If no inputfile is given or if it is `-´, standard input is read. +If no inputfile is given or if it is ‘-’, standard input is read.

    -

    9.8.2 Output file location

    +

    9.8.2 Output file location

    -
    `-o file´ +
    ‘-o file’
    -
    `--output-file=file´ +
    ‘--output-file=file’
    - - + + Write output to specified file.

    The results are written to standard output if no output file is specified -or if it is `-´. +or if it is ‘-’.

    -

    9.8.3 Message selection

    +

    9.8.3 Message selection

    -
    `--translated´ +
    ‘--translated’
    - + Keep translated messages, remove untranslated messages. -
    `--untranslated´ +
    ‘--untranslated’
    - + Keep untranslated messages, remove translated messages. -
    `--no-fuzzy´ +
    ‘--no-fuzzy’
    - -Remove `fuzzy' marked messages. + +Remove +‘fuzzy’ +marked messages. -
    `--only-fuzzy´ +
    ‘--only-fuzzy’
    - -Keep `fuzzy' marked messages, remove all other messsages. + +Keep +‘fuzzy’ +marked messages, remove all other messsages. -
    `--no-obsolete´ +
    ‘--no-obsolete’
    - + Remove obsolete #~ messages. -
    `--only-obsolete´ +
    ‘--only-obsolete’
    - + Keep obsolete #~ messages, remove all other messages.
    -

    9.8.4 Attribute manipulation

    +

    9.8.4 Attribute manipulation

    - + Attributes are modified after the message selection/removal has been -performed. If the `--only-file´ or `--ignore-file´ option is +performed. If the ‘--only-file’ or ‘--ignore-file’ option is specified, the attribute modification is applied only to those messages that are listed in the only-file and not listed in the ignore-file. @@ -1937,70 +1994,74 @@ that are listed in the only-file and not listed in the

    -
    `--set-fuzzy´ +
    ‘--set-fuzzy’
    - -Set all messages `fuzzy'. + +Set all messages +‘fuzzy’. -
    `--clear-fuzzy´ +
    ‘--clear-fuzzy’
    - -Set all messages non-`fuzzy'. + +Set all messages +non-‘fuzzy’. -
    `--set-obsolete´ +
    ‘--set-obsolete’
    - + Set all messages obsolete. -
    `--clear-obsolete´ +
    ‘--clear-obsolete’
    - + Set all messages non-obsolete. -
    `--only-file=file´ +
    ‘--only-file=file’
    - + Limit the attribute changes to entries that are listed in file. file should be a PO or POT file. -
    `--ignore-file=file´ +
    ‘--ignore-file=file’
    - + Limit the attribute changes to entries that are not listed in file. file should be a PO or POT file. -
    `--fuzzy´ +
    ‘--fuzzy’
    - -Synonym for `--only-fuzzy --clear-fuzzy´: It keeps only the fuzzy -messages and removes their `fuzzy' mark. + +Synonym for ‘--only-fuzzy --clear-fuzzy’: It keeps only the fuzzy +messages and removes their +‘fuzzy’ +mark. -
    `--obsolete´ +
    ‘--obsolete’
    - -Synonym for `--only-obsolete --clear-obsolete´: It keeps only the + +Synonym for ‘--only-obsolete --clear-obsolete’: It keeps only the obsolete messages and makes them non-obsolete.
    -

    9.8.5 Input file syntax

    +

    9.8.5 Input file syntax

    -
    `-P´ +
    ‘-P’
    -
    `--properties-input´ +
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax. -
    `--stringtable-input´ +
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -2008,133 +2069,133 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in -

    9.8.6 Output details

    +

    9.8.6 Output details

    -
    `--force-po´ +
    ‘--force-po’
    - + Always write an output file even if it contains no message. -
    `-i´ +
    ‘-i’
    -
    `--indent´ +
    ‘--indent’
    - - + + Write the .po file using indented style. -
    `--no-location´ +
    ‘--no-location’
    - -Do not write `#: filename:line´ lines. + +Do not write ‘#: filename:line’ lines. -
    `-n´ +
    ‘-n’
    -
    `--add-location´ +
    ‘--add-location’
    - - -Generate `#: filename:line´ lines (default). + + +Generate ‘#: filename:line’ lines (default). -
    `--strict´ +
    ‘--strict’
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. -
    `-p´ +
    ‘-p’
    -
    `--properties-output´ +
    ‘--properties-output’
    - - + + Write out a Java ResourceBundle in Java .properties syntax. Note that this file format doesn't support plural forms and silently drops obsolete messages. -
    `--stringtable-output´ +
    ‘--stringtable-output’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. -
    `-w number´ +
    ‘-w number’
    -
    `--width=number´ +
    ‘--width=number’
    - - + + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number. -
    `--no-wrap´ +
    ‘--no-wrap’
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. -
    `-s´ +
    ‘-s’
    -
    `--sort-output´ +
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. -
    `-F´ +
    ‘-F’
    -
    `--sort-by-file´ +
    ‘--sort-by-file’
    - - + + Sort output by file location.
    -

    9.8.7 Informative output

    +

    9.8.7 Informative output

    -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit.
    -

    9.9 Invoking the msgen Program

    +

    9.9 Invoking the msgen Program

    - - + + 

     msgen [option] inputfile

    - + The msgen program creates an English translation catalog. The input file is the last created English PO file, or a PO Template file (generally created by xgettext). Untranslated entries are assigned a @@ -2142,76 +2203,76 @@ translation that is identical to the msgid.

    -Note: `msginit --no-translator --locale=en´ performs a very similar +Note: ‘msginit --no-translator --locale=en’ performs a very similar task. The main difference is that msginit cares specially about the header entry, whereas msgen doesn't.

    -

    9.9.1 Input file location

    +

    9.9.1 Input file location

    -
    `inputfile´ +
    ‘inputfile’
    Input PO or POT file. -
    `-D directory´ +
    ‘-D directory’
    -
    `--directory=directory´ +
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are -searched relative to this list of directories. The resulting `.po´ +searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though.

    -If inputfile is `-´, standard input is read. +If inputfile is ‘-’, standard input is read.

    -

    9.9.2 Output file location

    +

    9.9.2 Output file location

    -
    `-o file´ +
    ‘-o file’
    -
    `--output-file=file´ +
    ‘--output-file=file’
    - - + + Write output to specified file.

    The results are written to standard output if no output file is specified -or if it is `-´. +or if it is ‘-’.

    -

    9.9.3 Input file syntax

    +

    9.9.3 Input file syntax

    -
    `-P´ +
    ‘-P’
    -
    `--properties-input´ +
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax. -
    `--stringtable-input´ +
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -2219,130 +2280,130 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in -

    9.9.4 Output details

    +

    9.9.4 Output details

    -
    `--force-po´ +
    ‘--force-po’
    - + Always write an output file even if it contains no message. -
    `-i´ +
    ‘-i’
    -
    `--indent´ +
    ‘--indent’
    - - + + Write the .po file using indented style. -
    `--no-location´ +
    ‘--no-location’
    - -Do not write `#: filename:line´ lines. + +Do not write ‘#: filename:line’ lines. -
    `--add-location´ +
    ‘--add-location’
    - -Generate `#: filename:line´ lines (default). + +Generate ‘#: filename:line’ lines (default). -
    `--strict´ +
    ‘--strict’
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. -
    `-p´ +
    ‘-p’
    -
    `--properties-output´ +
    ‘--properties-output’
    - - + + Write out a Java ResourceBundle in Java .properties syntax. Note that this file format doesn't support plural forms and silently drops obsolete messages. -
    `--stringtable-output´ +
    ‘--stringtable-output’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. -
    `-w number´ +
    ‘-w number’
    -
    `--width=number´ +
    ‘--width=number’
    - - + + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number. -
    `--no-wrap´ +
    ‘--no-wrap’
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. -
    `-s´ +
    ‘-s’
    -
    `--sort-output´ +
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. -
    `-F´ +
    ‘-F’
    -
    `--sort-by-file´ +
    ‘--sort-by-file’
    - - + + Sort output by file location.
    -

    9.9.5 Informative output

    +

    9.9.5 Informative output

    -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit.
    -

    9.10 Invoking the msgexec Program

    +

    9.10 Invoking the msgexec Program

    - - + + 

     msgexec [option] command [command-option]

    - + The msgexec program applies a command to all translations of a translation catalog. The command can be any program that reads a translation from standard @@ -2352,82 +2413,85 @@ across all invocations.

    - -A special builtin command called `0´ outputs the translation, followed -by a null byte. The output of `msgexec 0´ is suitable as input for -`xargs -0´. + +A special builtin command called ‘0’ outputs the translation, followed +by a null byte. The output of ‘msgexec 0’ is suitable as input for +‘xargs -0’.

    - - + + + During each command invocation, the environment variable MSGEXEC_MSGID is bound to the message's msgid, and the environment variable MSGEXEC_LOCATION is bound to the location in the PO file -of the message. +of the message. If the message has a context, the environment variable +MSGEXEC_MSGCTXT is bound to the message's msgctxt, otherwise it is +unbound.

    - + Note: It is your responsibility to ensure that the command can cope with input encoded in the translation catalog's encoding. If the command wants input in a particular encoding, you can in a first step -convert the translation catalog to that encoding using the `msgconv´ -program, before invoking `msgexec´. If the command wants input +convert the translation catalog to that encoding using the ‘msgconv’ +program, before invoking ‘msgexec’. If the command wants input in the locale's encoding, but you want to avoid the locale's encoding, then you can first convert the translation catalog to UTF-8 using the -`msgconv´ program and then make `msgexec´ work in an UTF-8 +‘msgconv’ program and then make ‘msgexec’ work in an UTF-8 locale, by using the LC_ALL environment variable.

    -

    9.10.1 Input file location

    +

    9.10.1 Input file location

    -
    `-i inputfile´ +
    ‘-i inputfile’
    -
    `--input=inputfile´ +
    ‘--input=inputfile’
    - - + + Input PO file. -
    `-D directory´ +
    ‘-D directory’
    -
    `--directory=directory´ +
    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are -searched relative to this list of directories. The resulting `.po´ +searched relative to this list of directories. The resulting ‘.po’ file will be written relative to the current directory, though.

    -If no inputfile is given or if it is `-´, standard input is read. +If no inputfile is given or if it is ‘-’, standard input is read.

    -

    9.10.2 Input file syntax

    +

    9.10.2 Input file syntax

    -
    `-P´ +
    ‘-P’
    -
    `--properties-input´ +
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax. -
    `--stringtable-input´ +
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -2435,34 +2499,34 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in -

    9.10.3 Informative output

    +

    9.10.3 Informative output

    -
    `-h´ +
    ‘-h’
    -
    `--help´ +
    ‘--help’
    - - + + Display this help and exit. -
    `-V´ +
    ‘-V’
    -
    `--version´ +
    ‘--version’
    - - + + Output version information and exit.
    -

    9.11 Writing your own programs that process PO files

    +

    9.11 Writing your own programs that process PO files

    -For the tasks for which a combination of `msgattrib´, `msgcat´ etc. +For the tasks for which a combination of ‘msgattrib’, ‘msgcat’ etc. is not sufficient, a set of C functions is provided in a library, to make it possible to process PO files in your own programs. When you use this library, you don't need to write routines to parse the PO file; instead, you retreive @@ -2471,14 +2535,14 @@ for writing PO files are not provided at this time.

    -The functions are declared in the header file `<gettext-po.h>´, and are -defined in a library called `libgettextpo´. +The functions are declared in the header file ‘<gettext-po.h>’, and are +defined in a library called ‘libgettextpo’.

    Data Type: po_file_t -
    +
    This is a pointer type that refers to the contents of a PO file, after it has been read into memory.
    @@ -2487,7 +2551,7 @@ been read into memory.

    Data Type: po_message_iterator_t -
    +
    This is a pointer type that refers to an iterator that produces a sequence of messages.
    @@ -2496,7 +2560,7 @@ messages.

    Data Type: po_message_t -
    +
    This is a pointer type that refers to a message of a PO file, including its translation.
    @@ -2505,7 +2569,7 @@ translation.

    Function: po_file_t po_file_read (const char *filename) -
    +
    The po_file_read function reads a PO file into memory. The file name is given as argument. The return value is a handle to the PO file's contents, valid until po_file_free is called on it. In case of error, the return @@ -2516,7 +2580,7 @@ value is NULL, and errno is set.

    Function: void po_file_free (po_file_t file) -
    +
    The po_file_free function frees a PO file's contents from memory, including all messages that are only implicitly accessible through iterators.
    @@ -2525,11 +2589,11 @@ including all messages that are only implicitly accessible through iterators.

    Function: const char * const * po_file_domains (po_file_t file) -
    +
    The po_file_domains function returns the domains for which the given PO file has messages. The return value is a NULL terminated array which is valid as long as the file handle is valid. For PO files which -contain no `domain´ directive, the return value contains only one domain, +contain no ‘domain’ directive, the return value contains only one domain, namely the default domain "messages".
    @@ -2537,7 +2601,7 @@ namely the default domain "messages".

    Function: po_message_iterator_t po_message_iterator (po_file_t file, const char *domain) -
    +
    The po_message_iterator returns an iterator that will produce the messages of file that belong to the given domain. If domain is NULL, the default domain is used instead. To list the messages, @@ -2548,7 +2612,7 @@ use the function po_next_message repeatedly.

    Function: void po_message_iterator_free (po_message_iterator_t iterator) -
    +
    The po_message_iterator_free function frees an iterator previously allocated through the po_message_iterator function.
    @@ -2557,7 +2621,7 @@ allocated through the po_message_iterator function.

    Function: po_message_t po_next_message (po_message_iterator_t iterator) -
    +
    The po_next_message function returns the next message from iterator and advances the iterator. It returns NULL when the iterator has reached the end of its message list. @@ -2572,7 +2636,7 @@ that the results are valid as long as the file handle is valid.

    Function: const char * po_message_msgid (po_message_t message) -
    +
    The po_message_msgid function returns the msgid (untranslated English string) of a message. This is guaranteed to be non-NULL.
    @@ -2581,7 +2645,7 @@ English string) of a message. This is guaranteed to be non-NULL.

    Function: const char * po_message_msgid_plural (po_message_t message) -
    +
    The po_message_msgid_plural function returns the msgid_plural (untranslated English plural string) of a message with plurals, or NULL for a message without plural. @@ -2591,7 +2655,7 @@ for a message without plural.

    Function: const char * po_message_msgstr (po_message_t message) -
    +
    The po_message_msgstr function returns the msgstr (translation) of a message. For an untranslated message, the return value is an empty string. @@ -2601,7 +2665,7 @@ string.

    Function: const char * po_message_msgstr_plural (po_message_t message, int index) -
    +
    The po_message_msgstr_plural function returns the msgstr[index] of a message with plurals, or NULL when the index is out of range or for a message without plural. @@ -2648,6 +2712,6 @@ po_file_free (file);

    -Go to the first, previous, next, last section, table of contents. +Go to the first, previous, next, last section, table of contents. diff --git a/gettext-tools/doc/gettext_foot.html b/gettext-tools/doc/gettext_foot.html index 658b8428d..97037e98d 100644 --- a/gettext-tools/doc/gettext_foot.html +++ b/gettext-tools/doc/gettext_foot.html @@ -1,14 +1,15 @@ - + + GNU gettext utilities - Footnotes -

    GNU gettext tools, version 0.14.4

    +

    GNU gettext tools, version 0.15

    Native Language Support Library and Tools

    -

    Edition 0.14.4, 8 March 2005

    +

    Edition 0.15, 30 June 2006

    Ulrich Drepper
    Jim Meyering
    François Pinard
    @@ -19,25 +20,25 @@

    In this manual, all mentions of Emacs refers to either GNU Emacs or to XEmacs, which people sometimes call FSF Emacs and Lucid Emacs, respectively. -

    (2)

    +

    (2)

    This limitation is not imposed by GNU gettext, but is for compatibility with the msgfmt implementation on Solaris. -

    (3)

    +

    (3)

    Some system, eg Ultrix, don't have LC_MESSAGES. Here we use a more or less arbitrary value for it, namely 1729, the smallest positive integer which can be represented in two different ways as the sum of two cubes. -

    (4)

    +

    (4)

    When the system does not support setlocale its behavior in setting the locale values is simulated by looking at the environment variables. -

    (5)

    +

    (5)

    Additions are welcome. Send appropriate information to bug-glibc-manual@gnu.org.

    -This document was generated on 11 April 2005 using the +This document was generated on 20 July 2006 using the texi2html -translator version 1.52a.

    +translator version 1.52b.

    diff --git a/gettext-tools/doc/gettext_toc.html b/gettext-tools/doc/gettext_toc.html index b615ef679..778189803 100644 --- a/gettext-tools/doc/gettext_toc.html +++ b/gettext-tools/doc/gettext_toc.html @@ -1,14 +1,15 @@ - + + GNU gettext utilities - Table of Contents -

    GNU gettext tools, version 0.14.4

    +

    GNU gettext tools, version 0.15

    Native Language Support Library and Tools

    -

    Edition 0.14.4, 8 March 2005

    +

    Edition 0.15, 30 June 2006

    Ulrich Drepper
    Jim Meyering
    François Pinard
    @@ -24,391 +25,413 @@
  • 1.4 Files Conveying Translations
  • 1.5 Overview of GNU gettext -
  • 2 PO Files and PO Mode Basics +
  • 2 The User's View -
  • 3 Preparing Program Sources +
  • 3 The Format of PO Files +
  • 4 Preparing Program Sources -
  • 4 Making the PO Template File +
  • 5 Making the PO Template File -
  • 5 Creating a New PO File +
  • 6 Creating a New PO File -
  • 6 Updating Existing PO Files - +
  • 7 Updating Existing PO Files
      -
    • 7.1 Invoking the msgcat Program +
    • 7.1 Invoking the msgmerge Program -
    • 7.2 Invoking the msgconv Program - -
    • 7.3 Invoking the msggrep Program +
    • 8 Editing PO Files +

      -This document was generated on 11 April 2005 using the +This document was generated on 20 July 2006 using the texi2html -translator version 1.52a.

      +translator version 1.52b.

      diff --git a/gettext-tools/doc/version.texi b/gettext-tools/doc/version.texi index 390433578..38521fddd 100644 --- a/gettext-tools/doc/version.texi +++ b/gettext-tools/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 8 March 2005 -@set UPDATED-MONTH March 2005 -@set EDITION 0.14.4 -@set VERSION 0.14.4 +@set UPDATED 30 June 2006 +@set UPDATED-MONTH June 2006 +@set EDITION 0.15 +@set VERSION 0.15 diff --git a/gettext-tools/examples/po/Makefile.in b/gettext-tools/examples/po/Makefile.in index 6747f7d61..42aefc5d7 100644 --- a/gettext-tools/examples/po/Makefile.in +++ b/gettext-tools/examples/po/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,7 +19,7 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. +top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -33,214 +33,45 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = examples/po +subdir = po DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ - $(top_srcdir)/../m4/libtool.m4 \ - $(top_srcdir)/../autoconf-lib-link/m4/lib-ld.m4 \ - $(top_srcdir)/../autoconf-lib-link/m4/lib-link.m4 \ - $(top_srcdir)/../autoconf-lib-link/m4/lib-prefix.m4 \ - $(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \ - $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \ - $(top_srcdir)/../gettext-runtime/m4/gettext.m4 \ - $(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \ - $(top_srcdir)/../gettext-runtime/m4/glibc21.m4 \ - $(top_srcdir)/../gettext-runtime/m4/iconv.m4 \ - $(top_srcdir)/../gettext-runtime/m4/intdiv0.m4 \ - $(top_srcdir)/../gettext-runtime/m4/intmax.m4 \ - $(top_srcdir)/../gettext-runtime/m4/inttypes-pri.m4 \ - $(top_srcdir)/../gettext-runtime/m4/inttypes.m4 \ - $(top_srcdir)/../gettext-runtime/m4/inttypes_h.m4 \ - $(top_srcdir)/../gettext-runtime/m4/lcmessage.m4 \ - $(top_srcdir)/../gettext-runtime/m4/lock.m4 \ - $(top_srcdir)/../gettext-runtime/m4/longdouble.m4 \ - $(top_srcdir)/../gettext-runtime/m4/longlong.m4 \ - $(top_srcdir)/../gettext-runtime/m4/nls.m4 \ - $(top_srcdir)/../gettext-runtime/m4/po.m4 \ - $(top_srcdir)/../gettext-runtime/m4/printf-posix.m4 \ - $(top_srcdir)/../gettext-runtime/m4/progtest.m4 \ - $(top_srcdir)/../gettext-runtime/m4/signed.m4 \ - $(top_srcdir)/../gettext-runtime/m4/size_max.m4 \ - $(top_srcdir)/../gettext-runtime/m4/stdint_h.m4 \ - $(top_srcdir)/../gettext-runtime/m4/uintmax_t.m4 \ - $(top_srcdir)/../gettext-runtime/m4/ulonglong.m4 \ - $(top_srcdir)/../gettext-runtime/m4/visibility.m4 \ - $(top_srcdir)/../gettext-runtime/m4/wchar_t.m4 \ - $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ - $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ - $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ - $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ - $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ - $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exitfail.m4 \ - $(top_srcdir)/m4/extensions.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ - $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ - $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ - $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ - $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ - $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ - $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ - $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ - $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ - $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ - $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/xreadlink.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../../m4/fixautomake.m4 \ + $(top_srcdir)/../../gettext-runtime/m4/nls.m4 \ + $(top_srcdir)/../../gettext-runtime/m4/po.m4 \ + $(top_srcdir)/../../gettext-runtime/m4/progtest.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h +mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -ALLOCA_H = @ALLOCA_H@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILDCSHARP = @BUILDCSHARP@ -BUILDJAVA = @BUILDJAVA@ -BUILDJAVAEXE = @BUILDJAVAEXE@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -BYTESWAP_H = @BYTESWAP_H@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ -CLASSPATH = @CLASSPATH@ -CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CROSS_COMPILING = @CROSS_COMPILING@ -CSHARP_CHOICE = @CSHARP_CHOICE@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EMACS = @EMACS@ -EMACSLOADPATH = @EMACSLOADPATH@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FNMATCH_H = @FNMATCH_H@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GENCAT = @GENCAT@ -GETOPT_H = @GETOPT_H@ -GLIBC2 = @GLIBC2@ -GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ -HAVE_ASPRINTF = @HAVE_ASPRINTF@ -HAVE_CSC = @HAVE_CSC@ -HAVE_CSCC = @HAVE_CSCC@ -HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@ -HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@ -HAVE_GCJ = @HAVE_GCJ@ -HAVE_GCJ_C = @HAVE_GCJ_C@ -HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@ -HAVE_GIJ = @HAVE_GIJ@ -HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@ -HAVE_ILRUN = @HAVE_ILRUN@ -HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@ -HAVE_JAVA = @HAVE_JAVA@ -HAVE_JAVAC = @HAVE_JAVAC@ -HAVE_JAVAC_IN_PATH = @HAVE_JAVAC_IN_PATH@ -HAVE_JAVA_IN_PATH = @HAVE_JAVA_IN_PATH@ -HAVE_JIKES = @HAVE_JIKES@ -HAVE_JIKES_IN_PATH = @HAVE_JIKES_IN_PATH@ -HAVE_JRE = @HAVE_JRE@ -HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@ -HAVE_JVIEW = @HAVE_JVIEW@ -HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@ -HAVE_LIBEXPAT = @HAVE_LIBEXPAT@ -HAVE_MCS = @HAVE_MCS@ -HAVE_MCS_IN_PATH = @HAVE_MCS_IN_PATH@ -HAVE_MONO = @HAVE_MONO@ -HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@ -HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ -HAVE_SNPRINTF = @HAVE_SNPRINTF@ -HAVE_VISIBILITY = @HAVE_VISIBILITY@ -HAVE_WPRINTF = @HAVE_WPRINTF@ -HAVE__BOOL = @HAVE__BOOL@ +GMSGFMT_015 = @GMSGFMT_015@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -JAR = @JAR@ -JAVA = @JAVA@ -JAVAC = @JAVAC@ -JAVA_CHOICE = @JAVA_CHOICE@ -LDFLAGS = @LDFLAGS@ -LIBEXPAT = @LIBEXPAT@ -LIBGREPOBJS = @LIBGREPOBJS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ -LIBPTH = @LIBPTH@ LIBS = @LIBS@ -LIBTHREAD = @LIBTHREAD@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LOCALE_FR = @LOCALE_FR@ -LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ -LTLIBEXPAT = @LTLIBEXPAT@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ -LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ -LTNOUNDEF = @LTNOUNDEF@ MAKEINFO = @MAKEINFO@ -MINGW_FALSE = @MINGW_FALSE@ -MINGW_TRUE = @MINGW_TRUE@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MONO_PATH = @MONO_PATH@ -MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@ MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = msgmerge -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -248,72 +79,40 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -RELOCATABLE = @RELOCATABLE@ -RELOCATABLE_VIA_LD_FALSE = @RELOCATABLE_VIA_LD_FALSE@ -RELOCATABLE_VIA_LD_TRUE = @RELOCATABLE_VIA_LD_TRUE@ SET_MAKE = @SET_MAKE@ -SET_RELOCATABLE = @SET_RELOCATABLE@ SHELL = @SHELL@ -STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ -TESTCSHARP = @TESTCSHARP@ -TESTJAVA = @TESTJAVA@ -TESTLIBASPRINTF = @TESTLIBASPRINTF@ -TEXI2PDF = @TEXI2PDF@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -YACC = @YACC@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ +XGETTEXT_015 = @XGETTEXT_015@ aclocaldir = @aclocaldir@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ -build = @build@ build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ -host = @host@ host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -lispdir = @lispdir@ -localedir = $(datadir)/locale +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -322,40 +121,41 @@ AUTOMAKE_OPTIONS = 1.5 gnits # List of files which contain translatable strings. POTFILES = \ - examples/hello-c/hello.c \ - examples/hello-c-gnome/hello.c \ - examples/hello-c++/hello.cc \ - examples/hello-c++-qt/hello.cc \ - examples/hello-c++-kde/hello.cc \ - examples/hello-c++-kde/hellowindow.h \ - examples/hello-c++-kde/hellowindow.cc \ - examples/hello-c++-gnome/hello.cc \ - examples/hello-objc/hello.m \ - examples/hello-objc-gnustep/main.m \ - examples/hello-objc-gnustep/AppController.h \ - examples/hello-objc-gnustep/AppController.m \ - examples/hello-objc-gnustep/Hello.h \ - examples/hello-objc-gnustep/Hello.m \ - examples/hello-objc-gnome/hello.m \ - examples/hello-sh/hello.sh \ - examples/hello-python/hello.py.in \ - examples/hello-clisp/hello.lisp.in \ - examples/hello-librep/hello.jl.in \ - examples/hello-guile/hello.scm \ - examples/hello-smalltalk/hello.st.in \ - examples/hello-java/Hello.java \ - examples/hello-java-awt/Hello.java \ - examples/hello-java-swing/Hello.java \ - examples/hello-csharp/hello.cs \ - examples/hello-csharp-forms/hello.cs \ - examples/hello-gawk/hello.awk \ - examples/hello-pascal/hello.pas \ - examples/hello-ycp/hello.ycp \ - examples/hello-tcl/hello.tcl \ - examples/hello-tcl-tk/hello.tcl \ - examples/hello-perl/hello-1.pl.in \ - examples/hello-perl/hello-2.pl.in \ - examples/hello-php/hello.php + hello-c/hello.c \ + hello-c-gnome/hello.c \ + hello-c++/hello.cc \ + hello-c++-qt/hello.cc \ + hello-c++-kde/hello.cc \ + hello-c++-kde/hellowindow.h \ + hello-c++-kde/hellowindow.cc \ + hello-c++-gnome/hello.cc \ + hello-c++-wxwidgets/hello.cc \ + hello-objc/hello.m \ + hello-objc-gnustep/main.m \ + hello-objc-gnustep/AppController.h \ + hello-objc-gnustep/AppController.m \ + hello-objc-gnustep/Hello.h \ + hello-objc-gnustep/Hello.m \ + hello-objc-gnome/hello.m \ + hello-sh/hello.sh \ + hello-python/hello.py.in \ + hello-clisp/hello.lisp.in \ + hello-librep/hello.jl.in \ + hello-guile/hello.scm \ + hello-smalltalk/hello.st.in \ + hello-java/Hello.java \ + hello-java-awt/Hello.java \ + hello-java-swing/Hello.java \ + hello-csharp/hello.cs \ + hello-csharp-forms/hello.cs \ + hello-gawk/hello.awk \ + hello-pascal/hello.pas \ + hello-ycp/hello.ycp \ + hello-tcl/hello.tcl \ + hello-tcl-tk/hello.tcl \ + hello-perl/hello-1.pl.in \ + hello-perl/hello-2.pl.in \ + hello-php/hello.php # List of small POT files. @@ -366,6 +166,7 @@ SMALLPOTS = \ hello-c++-qt.pot \ hello-c++-kde.pot \ hello-c++-gnome.pot \ + hello-c++-wxwidgets.pot \ hello-objc.pot \ hello-objc-gnustep.pot \ hello-objc-gnome.pot \ @@ -437,7 +238,8 @@ UPDATEPOFILES = @UPDATEPOFILES@ DUMMYPOFILES = @DUMMYPOFILES@ SUFFIXES = .po .sed .sin .nop .po-update MOSTLYCLEANFILES = remove-potcdate.sed stamp-poT core core.* \ - $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po *.o + *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po \ + *.o DISTCLEANFILES = $(SMALLPOTS) MAINTAINERCLEANFILES = stamp-po EXTRA_DIST = remove-potcdate.sin xsmallpot.sh mmsmallpo.sh LINGUAS \ @@ -453,6 +255,7 @@ SMALLPOFILES_FOR_lang = \ ../hello-c++-qt/po/$$lang.po \ ../hello-c++-kde/po/$$lang.po \ ../hello-c++-gnome/po/$$lang.po \ + ../hello-c++-wxwidgets/po/$$lang.po \ ../hello-objc/po/$$lang.po \ ../hello-objc-gnustep/po/$$lang.po \ ../hello-objc-gnome/po/$$lang.po \ @@ -488,9 +291,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits examples/po/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits po/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnits examples/po/Makefile + $(AUTOMAKE) --gnits po/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -508,15 +311,6 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool uninstall-info-am: tags: TAGS TAGS: @@ -585,11 +379,11 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am -clean-am: clean-generic clean-libtool mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -617,7 +411,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic mostlyclean-libtool +mostlyclean-am: mostlyclean-generic pdf: pdf-am @@ -630,14 +424,13 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-info-am + distclean distclean-generic distdir dvi dvi-am html html-am \ + info info-am install install-am install-data install-data-am \ + install-exec install-exec-am install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ + uninstall-am uninstall-info-am .sin.sed: @@ -720,6 +513,9 @@ hello-c++-kde.pot : $(POTFILES_DEPS) hello-c++-gnome.pot : $(POTFILES_DEPS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c++-gnome +hello-c++-wxwidgets.pot : $(POTFILES_DEPS) + $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-c++-wxwidgets + hello-objc.pot : $(POTFILES_DEPS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-objc @@ -860,6 +656,9 @@ $(DUMMYPOFILES): ../hello-c++-gnome/po/$(LL).po: hello-c++-gnome.pot $(LL).po $(SHELL) mmsmallpo.sh hello-c++-gnome $(LL) +../hello-c++-wxwidgets/po/$(LL).po: hello-c++-wxwidgets.pot $(LL).po + $(SHELL) mmsmallpo.sh hello-c++-wxwidgets $(LL) + ../hello-objc/po/$(LL).po: hello-objc.pot $(LL).po $(SHELL) mmsmallpo.sh hello-objc $(LL) diff --git a/gettext-tools/examples/po/hello-c++-gnome.pot b/gettext-tools/examples/po/hello-c++-gnome.pot index fe554b84c..321296f7e 100644 --- a/gettext-tools/examples/po/hello-c++-gnome.pot +++ b/gettext-tools/examples/po/hello-c++-gnome.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:50+0200\n" +"POT-Creation-Date: 2006-07-21 16:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-c++-kde.pot b/gettext-tools/examples/po/hello-c++-kde.pot index a4ea04ed5..56b382e81 100644 --- a/gettext-tools/examples/po/hello-c++-kde.pot +++ b/gettext-tools/examples/po/hello-c++-kde.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:50+0200\n" +"POT-Creation-Date: 2006-07-21 16:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-c++-qt.pot b/gettext-tools/examples/po/hello-c++-qt.pot index 2f2560414..39f581070 100644 --- a/gettext-tools/examples/po/hello-c++-qt.pot +++ b/gettext-tools/examples/po/hello-c++-qt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:50+0200\n" +"POT-Creation-Date: 2006-07-21 16:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-c++-wxwidgets.pot b/gettext-tools/examples/po/hello-c++-wxwidgets.pot index ccedf28d9..5aa3a4068 100644 --- a/gettext-tools/examples/po/hello-c++-wxwidgets.pot +++ b/gettext-tools/examples/po/hello-c++-wxwidgets.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:50+0200\n" +"POT-Creation-Date: 2006-07-21 16:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-c++.pot b/gettext-tools/examples/po/hello-c++.pot index 58a277dcd..a01624d2e 100644 --- a/gettext-tools/examples/po/hello-c++.pot +++ b/gettext-tools/examples/po/hello-c++.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:50+0200\n" +"POT-Creation-Date: 2006-07-21 16:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-c-gnome.pot b/gettext-tools/examples/po/hello-c-gnome.pot index 2bbc7707e..0cec4f5d1 100644 --- a/gettext-tools/examples/po/hello-c-gnome.pot +++ b/gettext-tools/examples/po/hello-c-gnome.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:49+0200\n" +"POT-Creation-Date: 2006-07-21 16:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-c.pot b/gettext-tools/examples/po/hello-c.pot index 2f4577ec8..45f786a82 100644 --- a/gettext-tools/examples/po/hello-c.pot +++ b/gettext-tools/examples/po/hello-c.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:49+0200\n" +"POT-Creation-Date: 2006-07-21 16:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-clisp.pot b/gettext-tools/examples/po/hello-clisp.pot index 5b3cf610b..4a6df5f9e 100644 --- a/gettext-tools/examples/po/hello-clisp.pot +++ b/gettext-tools/examples/po/hello-clisp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:51+0200\n" +"POT-Creation-Date: 2006-07-21 16:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-csharp-forms.pot b/gettext-tools/examples/po/hello-csharp-forms.pot index 3dc12e58c..d1e6d23e0 100644 --- a/gettext-tools/examples/po/hello-csharp-forms.pot +++ b/gettext-tools/examples/po/hello-csharp-forms.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:52+0200\n" +"POT-Creation-Date: 2006-07-21 16:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-csharp.pot b/gettext-tools/examples/po/hello-csharp.pot index 1781ea132..0b902a6eb 100644 --- a/gettext-tools/examples/po/hello-csharp.pot +++ b/gettext-tools/examples/po/hello-csharp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:52+0200\n" +"POT-Creation-Date: 2006-07-21 16:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-gawk.pot b/gettext-tools/examples/po/hello-gawk.pot index 6d85bb2dd..2b306bc9f 100644 --- a/gettext-tools/examples/po/hello-gawk.pot +++ b/gettext-tools/examples/po/hello-gawk.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:52+0200\n" +"POT-Creation-Date: 2006-07-21 16:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-guile.pot b/gettext-tools/examples/po/hello-guile.pot index 8281a74b9..e84fe99e0 100644 --- a/gettext-tools/examples/po/hello-guile.pot +++ b/gettext-tools/examples/po/hello-guile.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:51+0200\n" +"POT-Creation-Date: 2006-07-21 16:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-java-awt.pot b/gettext-tools/examples/po/hello-java-awt.pot index 18b47967e..460e5a5f7 100644 --- a/gettext-tools/examples/po/hello-java-awt.pot +++ b/gettext-tools/examples/po/hello-java-awt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:52+0200\n" +"POT-Creation-Date: 2006-07-21 16:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-java-swing.pot b/gettext-tools/examples/po/hello-java-swing.pot index 90d86efd5..3e2673549 100644 --- a/gettext-tools/examples/po/hello-java-swing.pot +++ b/gettext-tools/examples/po/hello-java-swing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:52+0200\n" +"POT-Creation-Date: 2006-07-21 16:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-java.pot b/gettext-tools/examples/po/hello-java.pot index a3663a18a..54d62393a 100644 --- a/gettext-tools/examples/po/hello-java.pot +++ b/gettext-tools/examples/po/hello-java.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:51+0200\n" +"POT-Creation-Date: 2006-07-21 16:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-librep.pot b/gettext-tools/examples/po/hello-librep.pot index 5a27dc315..d51a0425b 100644 --- a/gettext-tools/examples/po/hello-librep.pot +++ b/gettext-tools/examples/po/hello-librep.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:51+0200\n" +"POT-Creation-Date: 2006-07-21 16:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-objc-gnome.pot b/gettext-tools/examples/po/hello-objc-gnome.pot index 1236d5cbb..d1add1903 100644 --- a/gettext-tools/examples/po/hello-objc-gnome.pot +++ b/gettext-tools/examples/po/hello-objc-gnome.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:51+0200\n" +"POT-Creation-Date: 2006-07-21 16:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-objc-gnustep.pot b/gettext-tools/examples/po/hello-objc-gnustep.pot index 8400df8a0..bb46e7277 100644 --- a/gettext-tools/examples/po/hello-objc-gnustep.pot +++ b/gettext-tools/examples/po/hello-objc-gnustep.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:51+0200\n" +"POT-Creation-Date: 2006-07-21 16:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-objc.pot b/gettext-tools/examples/po/hello-objc.pot index aa9d76a46..ff5535076 100644 --- a/gettext-tools/examples/po/hello-objc.pot +++ b/gettext-tools/examples/po/hello-objc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:51+0200\n" +"POT-Creation-Date: 2006-07-21 16:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-pascal.pot b/gettext-tools/examples/po/hello-pascal.pot index fde55a512..e283e92ef 100644 --- a/gettext-tools/examples/po/hello-pascal.pot +++ b/gettext-tools/examples/po/hello-pascal.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:52+0200\n" +"POT-Creation-Date: 2006-07-21 16:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-perl.pot b/gettext-tools/examples/po/hello-perl.pot index 545f3045f..4915b715a 100644 --- a/gettext-tools/examples/po/hello-perl.pot +++ b/gettext-tools/examples/po/hello-perl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:53+0200\n" +"POT-Creation-Date: 2006-07-21 16:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-php.pot b/gettext-tools/examples/po/hello-php.pot index 6a3f6496d..c2ab1fc46 100644 --- a/gettext-tools/examples/po/hello-php.pot +++ b/gettext-tools/examples/po/hello-php.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:53+0200\n" +"POT-Creation-Date: 2006-07-21 16:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-python.pot b/gettext-tools/examples/po/hello-python.pot index ff2e45615..f7addde61 100644 --- a/gettext-tools/examples/po/hello-python.pot +++ b/gettext-tools/examples/po/hello-python.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:51+0200\n" +"POT-Creation-Date: 2006-07-21 16:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-sh.pot b/gettext-tools/examples/po/hello-sh.pot index ae11f4b56..2421c0518 100644 --- a/gettext-tools/examples/po/hello-sh.pot +++ b/gettext-tools/examples/po/hello-sh.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:51+0200\n" +"POT-Creation-Date: 2006-07-21 16:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-smalltalk.pot b/gettext-tools/examples/po/hello-smalltalk.pot index 200b40138..25ba0fc16 100644 --- a/gettext-tools/examples/po/hello-smalltalk.pot +++ b/gettext-tools/examples/po/hello-smalltalk.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:51+0200\n" +"POT-Creation-Date: 2006-07-21 16:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-tcl-tk.pot b/gettext-tools/examples/po/hello-tcl-tk.pot index cd883d575..6a7b80f99 100644 --- a/gettext-tools/examples/po/hello-tcl-tk.pot +++ b/gettext-tools/examples/po/hello-tcl-tk.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:52+0200\n" +"POT-Creation-Date: 2006-07-21 16:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-tcl.pot b/gettext-tools/examples/po/hello-tcl.pot index 7d8215644..868045540 100644 --- a/gettext-tools/examples/po/hello-tcl.pot +++ b/gettext-tools/examples/po/hello-tcl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:52+0200\n" +"POT-Creation-Date: 2006-07-21 16:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/examples/po/hello-ycp.pot b/gettext-tools/examples/po/hello-ycp.pot index e2addd493..340577f29 100644 --- a/gettext-tools/examples/po/hello-ycp.pot +++ b/gettext-tools/examples/po/hello-ycp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2006-04-20 15:52+0200\n" +"POT-Creation-Date: 2006-07-21 16:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/gettext-tools/man/autopoint.1 b/gettext-tools/man/autopoint.1 index 755042522..2fbc04337 100644 --- a/gettext-tools/man/autopoint.1 +++ b/gettext-tools/man/autopoint.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH AUTOPOINT "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH AUTOPOINT "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME autopoint \- copies standard gettext infrastructure .SH SYNOPSIS @@ -27,7 +27,7 @@ Written by Bruno Haible .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 2002-2005 Free Software Foundation, Inc. +Copyright \(co 2002-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/autopoint.1.html b/gettext-tools/man/autopoint.1.html index 81f9970ca..76db50f58 100644 --- a/gettext-tools/man/autopoint.1.html +++ b/gettext-tools/man/autopoint.1.html @@ -115,7 +115,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 2002-2005 Free Software Foundation, Inc.
      +Copyright 2002-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/gettext-tools/man/gettextize.1 b/gettext-tools/man/gettextize.1 index 5634d8210..083c64a09 100644 --- a/gettext-tools/man/gettextize.1 +++ b/gettext-tools/man/gettextize.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH GETTEXTIZE "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH GETTEXTIZE "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME gettextize \- install or upgrade gettext infrastructure .SH SYNOPSIS @@ -36,7 +36,7 @@ Written by Ulrich Drepper .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1995-1998, 2000-2005 Free Software Foundation, Inc. +Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/gettextize.1.html b/gettext-tools/man/gettextize.1.html index ebc45379d..fb9cd27e6 100644 --- a/gettext-tools/man/gettextize.1.html +++ b/gettext-tools/man/gettextize.1.html @@ -151,7 +151,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 1995-1998, 2000-2005 Free Software Foundation, +Copyright 1995-1998, 2000-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for diff --git a/gettext-tools/man/msgattrib.1 b/gettext-tools/man/msgattrib.1 index ad8bcd2d4..ff425951c 100644 --- a/gettext-tools/man/msgattrib.1 +++ b/gettext-tools/man/msgattrib.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGATTRIB "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGATTRIB "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msgattrib \- attribute matching and manipulation on message catalog .SH SYNOPSIS @@ -132,7 +132,7 @@ Written by Bruno Haible. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 2001-2005 Free Software Foundation, Inc. +Copyright \(co 2001-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msgattrib.1.html b/gettext-tools/man/msgattrib.1.html index 9c33cc582..020eb4e62 100644 --- a/gettext-tools/man/msgattrib.1.html +++ b/gettext-tools/man/msgattrib.1.html @@ -540,7 +540,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 2001-2005 Free Software Foundation, Inc.
      +Copyright 2001-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/gettext-tools/man/msgcat.1 b/gettext-tools/man/msgcat.1 index 1c5ad1bc4..e3a3d67bc 100644 --- a/gettext-tools/man/msgcat.1 +++ b/gettext-tools/man/msgcat.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGCAT "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGCAT "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msgcat \- combines several message catalogs .SH SYNOPSIS @@ -119,7 +119,7 @@ Written by Bruno Haible. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 2001-2005 Free Software Foundation, Inc. +Copyright \(co 2001-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msgcat.1.html b/gettext-tools/man/msgcat.1.html index ea37f5f5e..d90a892b1 100644 --- a/gettext-tools/man/msgcat.1.html +++ b/gettext-tools/man/msgcat.1.html @@ -449,7 +449,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 2001-2005 Free Software Foundation, Inc.
      +Copyright 2001-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/gettext-tools/man/msgcmp.1 b/gettext-tools/man/msgcmp.1 index d33f089c4..64bcbe854 100644 --- a/gettext-tools/man/msgcmp.1 +++ b/gettext-tools/man/msgcmp.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGCMP "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGCMP "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msgcmp \- compare message catalog and template .SH SYNOPSIS @@ -50,7 +50,7 @@ Written by Peter Miller. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1995-1998, 2000-2005 Free Software Foundation, Inc. +Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msgcmp.1.html b/gettext-tools/man/msgcmp.1.html index 91eb76942..4732e9025 100644 --- a/gettext-tools/man/msgcmp.1.html +++ b/gettext-tools/man/msgcmp.1.html @@ -199,7 +199,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 1995-1998, 2000-2005 Free Software Foundation, +Copyright 1995-1998, 2000-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for diff --git a/gettext-tools/man/msgcomm.1 b/gettext-tools/man/msgcomm.1 index ad3aefd9b..1e4716c64 100644 --- a/gettext-tools/man/msgcomm.1 +++ b/gettext-tools/man/msgcomm.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGCOMM "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGCOMM "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msgcomm \- match two message catalogs .SH SYNOPSIS @@ -114,7 +114,7 @@ Written by Peter Miller. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1995-1998, 2000-2005 Free Software Foundation, Inc. +Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msgcomm.1.html b/gettext-tools/man/msgcomm.1.html index b1044a160..3ca43284d 100644 --- a/gettext-tools/man/msgcomm.1.html +++ b/gettext-tools/man/msgcomm.1.html @@ -435,7 +435,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 1995-1998, 2000-2005 Free Software Foundation, +Copyright 1995-1998, 2000-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for diff --git a/gettext-tools/man/msgconv.1 b/gettext-tools/man/msgconv.1 index 6fcb9600e..ceefc2a1f 100644 --- a/gettext-tools/man/msgconv.1 +++ b/gettext-tools/man/msgconv.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGCONV "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGCONV "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msgconv \- character set conversion for message catalog .SH SYNOPSIS @@ -93,7 +93,7 @@ Written by Bruno Haible. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 2001-2005 Free Software Foundation, Inc. +Copyright \(co 2001-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msgconv.1.html b/gettext-tools/man/msgconv.1.html index 747e167f6..b4e6206fd 100644 --- a/gettext-tools/man/msgconv.1.html +++ b/gettext-tools/man/msgconv.1.html @@ -383,7 +383,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 2001-2005 Free Software Foundation, Inc.
      +Copyright 2001-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/gettext-tools/man/msgen.1 b/gettext-tools/man/msgen.1 index 6c5b630db..167b2309c 100644 --- a/gettext-tools/man/msgen.1 +++ b/gettext-tools/man/msgen.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGEN "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGEN "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msgen \- create English message catalog .SH SYNOPSIS @@ -90,7 +90,7 @@ Written by Bruno Haible. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 2001-2005 Free Software Foundation, Inc. +Copyright \(co 2001-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msgen.1.html b/gettext-tools/man/msgen.1.html index 64387b723..1cdd38dc1 100644 --- a/gettext-tools/man/msgen.1.html +++ b/gettext-tools/man/msgen.1.html @@ -359,7 +359,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 2001-2005 Free Software Foundation, Inc.
      +Copyright 2001-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/gettext-tools/man/msgexec.1 b/gettext-tools/man/msgexec.1 index 4819125c9..b36155d11 100644 --- a/gettext-tools/man/msgexec.1 +++ b/gettext-tools/man/msgexec.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGEXEC "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGEXEC "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msgexec \- process translations of message catalog .SH SYNOPSIS @@ -46,7 +46,7 @@ Written by Bruno Haible. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 2001-2005 Free Software Foundation, Inc. +Copyright \(co 2001-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msgexec.1.html b/gettext-tools/man/msgexec.1.html index ce462e891..dac9145a8 100644 --- a/gettext-tools/man/msgexec.1.html +++ b/gettext-tools/man/msgexec.1.html @@ -183,7 +183,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 2001-2005 Free Software Foundation, Inc.
      +Copyright 2001-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/gettext-tools/man/msgfilter.1 b/gettext-tools/man/msgfilter.1 index f61d6ad4e..c8881b7a8 100644 --- a/gettext-tools/man/msgfilter.1 +++ b/gettext-tools/man/msgfilter.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGFILTER "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGFILTER "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msgfilter \- edit translations of message catalog .SH SYNOPSIS @@ -104,7 +104,7 @@ Written by Bruno Haible. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 2001-2005 Free Software Foundation, Inc. +Copyright \(co 2001-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msgfilter.1.html b/gettext-tools/man/msgfilter.1.html index df25198b7..90fac1f86 100644 --- a/gettext-tools/man/msgfilter.1.html +++ b/gettext-tools/man/msgfilter.1.html @@ -422,7 +422,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 2001-2005 Free Software Foundation, Inc.
      +Copyright 2001-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/gettext-tools/man/msgfmt.1 b/gettext-tools/man/msgfmt.1 index b5490f3ca..09ab9c3d2 100644 --- a/gettext-tools/man/msgfmt.1 +++ b/gettext-tools/man/msgfmt.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGFMT "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGFMT "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msgfmt \- compile message catalog to binary format .SH SYNOPSIS @@ -144,7 +144,7 @@ Written by Ulrich Drepper. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1995-1998, 2000-2005 Free Software Foundation, Inc. +Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msgfmt.1.html b/gettext-tools/man/msgfmt.1.html index ae82bbab2..f97040a48 100644 --- a/gettext-tools/man/msgfmt.1.html +++ b/gettext-tools/man/msgfmt.1.html @@ -576,7 +576,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 1995-1998, 2000-2005 Free Software Foundation, +Copyright 1995-1998, 2000-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for diff --git a/gettext-tools/man/msggrep.1 b/gettext-tools/man/msggrep.1 index 369abb97b..41fe4f1a3 100644 --- a/gettext-tools/man/msggrep.1 +++ b/gettext-tools/man/msggrep.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGGREP "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGGREP "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msggrep \- pattern matching on message catalog .SH SYNOPSIS @@ -31,17 +31,22 @@ or if it is -. .SS "Message selection:" .IP [-N SOURCEFILE]... [-M DOMAINNAME]... -[-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C COMMENT-PATTERN] +[-J MSGCTXT-PATTERN] [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] +[-C COMMENT-PATTERN] [-X EXTRACTED-COMMENT-PATTERN] .PP A message is selected if it comes from one of the specified source files, or if it comes from one of the specified domains, +or if \fB\-J\fR is given and its context (msgctxt) matches MSGCTXT-PATTERN, or if \fB\-K\fR is given and its key (msgid or msgid_plural) matches MSGID-PATTERN, or if \fB\-T\fR is given and its translation (msgstr) matches MSGSTR-PATTERN, -or if \fB\-C\fR is given and the translator's comment matches COMMENT-PATTERN. +or if \fB\-C\fR is given and the translator's comment matches COMMENT-PATTERN, +or if \fB\-X\fR is given and the extracted comment matches EXTRACTED-COMMENT-PATTERN. .PP When more than one selection criterion is specified, the set of selected messages is the union of the selected messages of each criterion. -.SS "MSGID-PATTERN or MSGSTR-PATTERN or COMMENT-PATTERN syntax:" +.PP +MSGCTXT-PATTERN or MSGID-PATTERN or MSGSTR-PATTERN or COMMENT-PATTERN or +EXTRACTED-COMMENT-PATTERN syntax: .IP [-E | \fB\-F]\fR [-e PATTERN | \fB\-f\fR FILE]... .PP @@ -54,6 +59,9 @@ select messages extracted from SOURCEFILE \fB\-M\fR, \fB\-\-domain\fR=\fIDOMAINNAME\fR select messages belonging to domain DOMAINNAME .TP +\fB\-J\fR, \fB\-\-msgctxt\fR +start of patterns for the msgctxt +.TP \fB\-K\fR, \fB\-\-msgid\fR start of patterns for the msgid .TP @@ -63,6 +71,9 @@ start of patterns for the msgstr \fB\-C\fR, \fB\-\-comment\fR start of patterns for the translator's comment .TP +\fB\-X\fR, \fB\-\-extracted\-comment\fR +start of patterns for the extracted comment +.TP \fB\-E\fR, \fB\-\-extended\-regexp\fR PATTERN is an extended regular expression .TP @@ -77,6 +88,10 @@ obtain PATTERN from FILE .TP \fB\-i\fR, \fB\-\-ignore\-case\fR ignore case distinctions +.TP +\fB\-v\fR, \fB\-\-invert\-match\fR +output only the messages that do not match any +selection criterion .SS "Input file syntax:" .TP \fB\-P\fR, \fB\-\-properties\-input\fR @@ -137,7 +152,7 @@ Written by Bruno Haible. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 2001-2005 Free Software Foundation, Inc. +Copyright \(co 2001-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msggrep.1.html b/gettext-tools/man/msggrep.1.html index 686f959fd..6e5ac133e 100644 --- a/gettext-tools/man/msggrep.1.html +++ b/gettext-tools/man/msggrep.1.html @@ -123,8 +123,9 @@ is specified or if it is -. cols="2" cellspacing="0" cellpadding="0"> -[-N SOURCEFILE]... [-M DOMAINNAME]... [-K MSGID-PATTERN] [-T -MSGSTR-PATTERN] [-C COMMENT-PATTERN] +[-N SOURCEFILE]... [-M DOMAINNAME]... [-J MSGCTXT-PATTERN] +[-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C COMMENT-PATTERN] +[-X EXTRACTED-COMMENT-PATTERN] @@ -132,11 +133,14 @@ MSGSTR-PATTERN] [-C COMMENT-PATTERN]
      A message is selected if it comes from one of the specified source files, or if it comes from one of the specified -domains, or if -K is given and its key (msgid or -msgid_plural) matches MSGID-PATTERN, or if -T is -given and its translation (msgstr) matches MSGSTR-PATTERN, -or if -C is given and the translator's comment -matches COMMENT-PATTERN. +domains, or if -J is given and its context (msgctxt) +matches MSGCTXT-PATTERN, or if -K is given and its +key (msgid or msgid_plural) matches MSGID-PATTERN, or if +-T is given and its translation (msgstr) matches +MSGSTR-PATTERN, or if -C is given and the +translator's comment matches COMMENT-PATTERN, or if +-X is given and the extracted comment matches +EXTRACTED-COMMENT-PATTERN. @@ -149,9 +153,10 @@ of each criterion.
      -
      -MSGID-PATTERN or MSGSTR-PATTERN or COMMENT-PATTERN -syntax:
      + +MSGCTXT-PATTERN or MSGID-PATTERN or MSGSTR-PATTERN or +COMMENT-PATTERN or EXTRACTED-COMMENT-PATTERN +syntax: @@ -192,6 +197,18 @@ select messages extracted from SOURCEFILE
      select messages belonging to domain DOMAINNAME + + +
      +-J, --msgctxt
      + + + +
      +start of patterns for the msgctxt
      + @@ -228,6 +245,18 @@ start of patterns for the msgstr
      start of patterns for the translator's comment + + +
      +-X, --extracted-comment
      + + + +
      +start of patterns for the extracted comment
      + @@ -288,6 +317,19 @@ obtain PATTERN from FILE
      ignore case distinctions + + +
      +-v, --invert-match
      + + + +
      +output only the messages that do not match any selection +criterion
      + @@ -534,7 +576,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
      cols="2" cellspacing="0" cellpadding="0"> -Copyright 2001-2005 Free Software Foundation, Inc.
      +Copyright 2001-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/gettext-tools/man/msginit.1 b/gettext-tools/man/msginit.1 index 4e8bdc0f1..127202487 100644 --- a/gettext-tools/man/msginit.1 +++ b/gettext-tools/man/msginit.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGINIT "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGINIT "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msginit \- initialize a message catalog .SH SYNOPSIS @@ -65,7 +65,7 @@ Written by Bruno Haible. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 2001-2005 Free Software Foundation, Inc. +Copyright \(co 2001-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msginit.1.html b/gettext-tools/man/msginit.1.html index b1eecb1b0..b1fbc556f 100644 --- a/gettext-tools/man/msginit.1.html +++ b/gettext-tools/man/msginit.1.html @@ -264,7 +264,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 2001-2005 Free Software Foundation, Inc.
      +Copyright 2001-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/gettext-tools/man/msgmerge.1 b/gettext-tools/man/msgmerge.1 index d6f2dcd39..968caff05 100644 --- a/gettext-tools/man/msgmerge.1 +++ b/gettext-tools/man/msgmerge.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGMERGE "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGMERGE "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msgmerge \- merge message catalog and template .SH SYNOPSIS @@ -146,7 +146,7 @@ Written by Peter Miller. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1995-1998, 2000-2005 Free Software Foundation, Inc. +Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msgmerge.1.html b/gettext-tools/man/msgmerge.1.html index afb9d1174..3f24a29d8 100644 --- a/gettext-tools/man/msgmerge.1.html +++ b/gettext-tools/man/msgmerge.1.html @@ -555,7 +555,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 1995-1998, 2000-2005 Free Software Foundation, +Copyright 1995-1998, 2000-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for diff --git a/gettext-tools/man/msgunfmt.1 b/gettext-tools/man/msgunfmt.1 index 72e9729b2..bf0c5b074 100644 --- a/gettext-tools/man/msgunfmt.1 +++ b/gettext-tools/man/msgunfmt.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGUNFMT "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGUNFMT "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msgunfmt \- uncompile message catalog from binary format .SH SYNOPSIS @@ -117,7 +117,7 @@ Written by Ulrich Drepper. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1995-1998, 2000-2005 Free Software Foundation, Inc. +Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msgunfmt.1.html b/gettext-tools/man/msgunfmt.1.html index f85872d76..ef16540c1 100644 --- a/gettext-tools/man/msgunfmt.1.html +++ b/gettext-tools/man/msgunfmt.1.html @@ -474,7 +474,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 1995-1998, 2000-2005 Free Software Foundation, +Copyright 1995-1998, 2000-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for diff --git a/gettext-tools/man/msguniq.1 b/gettext-tools/man/msguniq.1 index 6411d0714..c078f9cd9 100644 --- a/gettext-tools/man/msguniq.1 +++ b/gettext-tools/man/msguniq.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGUNIQ "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH MSGUNIQ "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME msguniq \- unify duplicate translations in message catalog .SH SYNOPSIS @@ -108,7 +108,7 @@ Written by Bruno Haible. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 2001-2005 Free Software Foundation, Inc. +Copyright \(co 2001-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/msguniq.1.html b/gettext-tools/man/msguniq.1.html index 7b4b169e7..e3cb06c7c 100644 --- a/gettext-tools/man/msguniq.1.html +++ b/gettext-tools/man/msguniq.1.html @@ -422,7 +422,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>. cols="2" cellspacing="0" cellpadding="0"> -Copyright 2001-2005 Free Software Foundation, Inc.
      +Copyright 2001-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/gettext-tools/man/xgettext.1 b/gettext-tools/man/xgettext.1 index 17b856ab6..1b2ee8795 100644 --- a/gettext-tools/man/xgettext.1 +++ b/gettext-tools/man/xgettext.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH XGETTEXT "1" "April 2005" "GNU gettext-tools 0.14.4" GNU +.TH XGETTEXT "1" "July 2006" "GNU gettext-tools 0.15" GNU .SH NAME xgettext \- extract gettext strings from source .SH SYNOPSIS @@ -99,6 +99,10 @@ understand ANSI C trigraphs for input recognize Qt format strings (only language C++) .TP +\fB\-\-boost\fR +recognize Boost format strings +(only language C++) +.TP \fB\-\-debug\fR more detailed formatstring recognition result .SS "Output details:" @@ -172,7 +176,7 @@ Written by Ulrich Drepper. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1995-1998, 2000-2005 Free Software Foundation, Inc. +Copyright \(co 1995-1998, 2000-2006 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/gettext-tools/man/xgettext.1.html b/gettext-tools/man/xgettext.1.html index 7a52dd09d..be1bb7d9e 100644 --- a/gettext-tools/man/xgettext.1.html +++ b/gettext-tools/man/xgettext.1.html @@ -343,6 +343,19 @@ C++, ObjectiveC) recognize Qt format strings (only language C++) + + +
      +--boost
      + + + +
      +recognize Boost format strings (only language +C++)
      + @@ -648,7 +661,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
      cols="2" cellspacing="0" cellpadding="0"> -Copyright 1995-1998, 2000-2005 Free Software Foundation, +Copyright 1995-1998, 2000-2006 Free Software Foundation, Inc.
      This is free software; see the source for copying conditions. There is NO warranty; not even for diff --git a/gettext-tools/po/gettext-tools.pot b/gettext-tools/po/gettext-tools.pot index 55068de5b..385c2bc62 100644 --- a/gettext-tools/po/gettext-tools.pot +++ b/gettext-tools/po/gettext-tools.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n" -"POT-Creation-Date: 2005-02-12 20:12+0100\n" +"POT-Creation-Date: 2006-07-01 00:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,17 +17,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: lib/argmatch.c:137 +#: lib/argmatch.c:136 #, c-format msgid "invalid argument %s for %s" msgstr "" -#: lib/argmatch.c:138 +#: lib/argmatch.c:137 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:157 +#: lib/argmatch.c:156 #, c-format msgid "Valid arguments are:" msgstr "" @@ -36,47 +36,47 @@ msgstr "" msgid "write error" msgstr "" -#: lib/copy-file.c:65 src/file-list.c:56 src/msggrep.c:231 src/open-po.c:118 -#: src/read-mo.c:245 src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1569 -#: src/xgettext.c:1582 src/xgettext.c:1592 +#: lib/copy-file.c:62 src/file-list.c:56 src/msggrep.c:238 src/open-po.c:122 +#: src/read-mo.c:245 src/read-tcl.c:125 src/urlget.c:198 src/xgettext.c:1754 +#: src/xgettext.c:1767 src/xgettext.c:1777 #, c-format msgid "error while opening \"%s\" for reading" msgstr "" -#: lib/copy-file.c:72 +#: lib/copy-file.c:69 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "" -#: lib/copy-file.c:80 src/urlget.c:212 +#: lib/copy-file.c:77 src/urlget.c:210 #, c-format msgid "error reading \"%s\"" msgstr "" -#: lib/copy-file.c:85 lib/copy-file.c:89 +#: lib/copy-file.c:82 lib/copy-file.c:86 #, c-format msgid "error writing \"%s\"" msgstr "" -#: lib/copy-file.c:91 src/urlget.c:222 +#: lib/copy-file.c:88 src/urlget.c:220 #, c-format msgid "error after reading \"%s\"" msgstr "" -#: lib/csharpcomp.c:273 src/msginit.c:970 src/msginit.c:1037 -#: src/msginit.c:1195 src/msginit.c:1277 src/read-csharp.c:73 -#: src/read-java.c:71 src/read-resources.c:74 src/read-tcl.c:111 -#: src/write-resources.c:79 +#: lib/csharpcomp.c:282 lib/javaversion.c:77 src/msginit.c:773 +#: src/msginit.c:841 src/msginit.c:1000 src/msginit.c:1083 +#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74 +#: src/read-tcl.c:111 src/write-resources.c:79 #, c-format msgid "fdopen() failed" msgstr "" -#: lib/csharpcomp.c:526 +#: lib/csharpcomp.c:541 #, c-format msgid "C# compiler not found, try installing pnet" msgstr "" -#: lib/csharpexec.c:251 +#: lib/csharpexec.c:346 #, c-format msgid "C# virtual machine not found, try installing pnet" msgstr "" @@ -85,8 +85,8 @@ msgstr "" msgid "Unknown system error" msgstr "" -#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231 -#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403 +#: lib/execute.c:183 lib/execute.c:259 lib/execute.c:301 lib/pipe.c:228 +#: lib/pipe.c:346 lib/pipe.c:406 lib/wait-process.c:336 lib/wait-process.c:403 #, c-format msgid "%s subprocess failed" msgstr "" @@ -146,7 +146,30 @@ msgstr "" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "" -#: lib/javacomp.c:467 +#: lib/javacomp.c:125 lib/javacomp.c:139 lib/javacomp.c:155 +#, c-format +msgid "invalid source_version argument to compile_java_class" +msgstr "" + +#: lib/javacomp.c:170 lib/javacomp.c:191 +#, c-format +msgid "invalid target_version argument to compile_java_class" +msgstr "" + +#: lib/javacomp.c:475 src/write-csharp.c:721 src/write-java.c:996 +#: src/write-java.c:1008 +#, c-format +msgid "failed to create \"%s\"" +msgstr "" + +#: lib/javacomp.c:482 src/write-csharp.c:730 src/write-java.c:1017 +#: src/write-mo.c:819 src/write-po.c:1214 src/write-qt.c:752 +#: src/write-tcl.c:223 +#, c-format +msgid "error while writing \"%s\" file" +msgstr "" + +#: lib/javacomp.c:1797 #, c-format msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" @@ -156,18 +179,31 @@ msgstr "" msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" -#: lib/obstack.c:438 lib/obstack.c:441 lib/xerror.c:51 lib/xmalloc.c:41 -#: lib/xsetenv.c:40 src/gettext-po.c:901 src/po-lex.c:89 src/po-lex.c:118 -#: src/x-glade.c:390 +#: lib/javaversion.c:85 src/msginit.c:781 src/msginit.c:849 src/msginit.c:1008 +#, c-format +msgid "%s subprocess I/O error" +msgstr "" + +#: lib/obstack.c:438 lib/obstack.c:441 lib/xmalloc.c:41 lib/xsetenv.c:40 +#: src/gettext-po.c:1140 src/msgl-check.c:450 src/po-lex.c:86 src/po-lex.c:105 +#: src/x-glade.c:406 #, c-format msgid "memory exhausted" msgstr "" -#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267 +#: lib/pipe.c:154 lib/pipe.c:157 lib/pipe.c:261 lib/pipe.c:264 #, c-format msgid "cannot create pipe" msgstr "" +#: lib/quotearg.c:239 +msgid "`" +msgstr "" + +#: lib/quotearg.c:240 +msgid "'" +msgstr "" + #: lib/w32spawn.h:48 #, c-format msgid "DuplicateHandle failed with error code 0x%08x" @@ -188,12 +224,13 @@ msgstr "" msgid "%s subprocess got fatal signal %d" msgstr "" -#: src/format.c:127 +#: src/format.c:149 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s" msgstr "" -#: src/format-awk.c:489 src/format-elisp.c:337 src/format-librep.c:301 +#: src/format-awk.c:489 src/format-boost.c:589 src/format-elisp.c:337 +#: src/format-gcc-internal.c:582 src/format-librep.c:301 #: src/format-pascal.c:390 src/format-perl.c:567 src/format-php.c:337 #: src/format-qt.c:132 src/format-tcl.c:376 src/format-ycp.c:133 #, c-format @@ -201,41 +238,46 @@ msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "" -#: src/format-awk.c:499 src/format-elisp.c:347 src/format-librep.c:311 +#: src/format-awk.c:499 src/format-boost.c:599 src/format-elisp.c:347 +#: src/format-gcc-internal.c:592 src/format-librep.c:311 #: src/format-pascal.c:400 src/format-perl.c:577 src/format-php.c:347 #: src/format-qt.c:131 src/format-tcl.c:386 src/format-ycp.c:132 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "" -#: src/format-awk.c:519 src/format-c.c:856 src/format-elisp.c:367 -#: src/format-gcc-internal.c:274 src/format-librep.c:331 -#: src/format-pascal.c:420 src/format-perl.c:597 src/format-php.c:367 -#: src/format-python.c:494 src/format-tcl.c:406 +#: src/format-awk.c:519 src/format-boost.c:619 src/format-c.c:873 +#: src/format-elisp.c:367 src/format-gcc-internal.c:612 +#: src/format-librep.c:331 src/format-pascal.c:420 src/format-perl.c:597 +#: src/format-php.c:367 src/format-python.c:494 src/format-tcl.c:406 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "" -#: src/format-c.c:176 +#: src/format-boost.c:427 +#, c-format +msgid "The directive number %u starts with | but does not end with |." +msgstr "" + +#: src/format-c.c:177 #, c-format msgid "" "In the directive number %u, the token after '<' is not the name of a format " "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1." msgstr "" -#: src/format-c.c:563 +#: src/format-c.c:565 #, c-format msgid "In the directive number %u, the token after '<' is not followed by '>'." msgstr "" -#: src/format-c.c:770 +#: src/format-c.c:779 #, c-format msgid "The string refers to argument number %u but ignores argument number %u." msgstr "" -#: src/format-c.c:847 src/format-csharp.c:195 src/format-gcc-internal.c:265 -#: src/format-python.c:485 +#: src/format-c.c:864 src/format-csharp.c:195 src/format-python.c:485 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "" @@ -277,11 +319,43 @@ msgstr "" msgid "The string contains a lone '}' after directive number %u." msgstr "" -#: src/format-gcc-internal.c:202 +#: src/format-gcc-internal.c:245 +#, c-format +msgid "In the directive number %u, the flags combination is invalid." +msgstr "" + +#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370 +#, c-format +msgid "In the directive number %u, a precision is not allowed before '%c'." +msgstr "" + +#: src/format-gcc-internal.c:314 +#, c-format +msgid "" +"In the directive number %u, the argument number for the precision must be " +"equal to %u." +msgstr "" + +#: src/format-gcc-internal.c:376 +#, c-format +msgid "In the directive number %u, the precision specification is invalid." +msgstr "" + +#: src/format-gcc-internal.c:424 #, c-format msgid "In the directive number %u, flags are not allowed before '%c'." msgstr "" +#: src/format-gcc-internal.c:630 +#, c-format +msgid "'msgid' uses %%m but '%s' doesn't" +msgstr "" + +#: src/format-gcc-internal.c:633 +#, c-format +msgid "'msgid' does not use %%m but '%s' uses %%m" +msgstr "" + #: src/format-invalid.h:23 msgid "The string ends in the middle of a directive." msgstr "" @@ -386,14 +460,15 @@ msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "" -#: src/format-lisp.c:2352 src/format-lisp.c:2364 +#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378 +#: src/format-scheme.c:2390 #, c-format msgid "" "In the directive number %u, parameter %u is of type '%s' but a parameter of " "type '%s' is expected." msgstr "" -#: src/format-lisp.c:2387 +#: src/format-lisp.c:2387 src/format-scheme.c:2413 #, c-format msgid "" "In the directive number %u, too many parameters are given; expected at most %" @@ -404,12 +479,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/format-lisp.c:2502 +#: src/format-lisp.c:2502 src/format-scheme.c:2505 #, c-format msgid "In the directive number %u, '%c' is not followed by a digit." msgstr "" -#: src/format-lisp.c:2700 +#: src/format-lisp.c:2700 src/format-scheme.c:2715 #, c-format msgid "In the directive number %u, the argument %d is negative." msgstr "" @@ -419,38 +494,39 @@ msgid "The string ends in the middle of a ~/.../ directive." msgstr "" #: src/format-lisp.c:2792 src/format-lisp.c:3025 src/format-lisp.c:3131 -#: src/format-lisp.c:3180 src/format-lisp.c:3266 +#: src/format-lisp.c:3180 src/format-lisp.c:3266 src/format-scheme.c:2790 +#: src/format-scheme.c:3023 src/format-scheme.c:3129 src/format-scheme.c:3204 #, c-format msgid "Found '~%c' without matching '~%c'." msgstr "" -#: src/format-lisp.c:2808 +#: src/format-lisp.c:2808 src/format-scheme.c:2806 #, c-format msgid "In the directive number %u, both the @ and the : modifiers are given." msgstr "" -#: src/format-lisp.c:2906 +#: src/format-lisp.c:2906 src/format-scheme.c:2904 #, c-format msgid "" "In the directive number %u, '~:[' is not followed by two clauses, separated " "by '~;'." msgstr "" -#: src/format-lisp.c:3214 +#: src/format-lisp.c:3214 src/format-scheme.c:3163 #, c-format msgid "In the directive number %u, '~;' is used in an invalid position." msgstr "" -#: src/format-lisp.c:3300 +#: src/format-lisp.c:3300 src/format-scheme.c:3238 msgid "The string refers to some argument in incompatible ways." msgstr "" -#: src/format-lisp.c:3342 +#: src/format-lisp.c:3342 src/format-scheme.c:3280 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "" -#: src/format-lisp.c:3358 +#: src/format-lisp.c:3358 src/format-scheme.c:3296 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "" @@ -544,19 +620,20 @@ msgid "" "1 and 9." msgstr "" -#: src/gettext-po.c:80 +#: src/gettext-po.c:83 msgid "" msgstr "" -#: src/gettext-po.c:98 src/gettext-po.c:141 src/open-po.c:55 +#: src/gettext-po.c:101 src/gettext-po.c:145 src/gettext-po.c:189 +#: src/open-po.c:56 msgid "" msgstr "" -#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140 -#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177 -#: src/msgfilter.c:270 src/msgfmt.c:361 src/msggrep.c:373 src/msginit.c:268 -#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134 -#: src/xgettext.c:503 +#: src/hostname.c:180 src/msgattrib.c:313 src/msgcat.c:265 src/msgcmp.c:142 +#: src/msgcomm.c:262 src/msgconv.c:219 src/msgen.c:205 src/msgexec.c:176 +#: src/msgfilter.c:278 src/msgfmt.c:362 src/msggrep.c:392 src/msginit.c:252 +#: src/msgmerge.c:304 src/msgunfmt.c:248 src/msguniq.c:241 +#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:515 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -564,50 +641,58 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145 -#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182 -#: src/msgfilter.c:275 src/msgfmt.c:366 src/msggrep.c:378 src/msginit.c:273 -#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139 -#: src/xgettext.c:508 +#: src/hostname.c:185 src/msgattrib.c:318 src/msgcat.c:270 src/msgcmp.c:147 +#: src/msgcomm.c:267 src/msgconv.c:224 src/msgen.c:210 src/msgexec.c:181 +#: src/msgfilter.c:283 src/msgfmt.c:367 src/msggrep.c:397 src/msginit.c:257 +#: src/msgmerge.c:309 src/msgunfmt.c:253 src/msguniq.c:246 src/urlget.c:137 +#: src/xgettext.c:520 #, c-format msgid "Written by %s.\n" msgstr "" -#: src/hostname.c:197 src/msginit.c:283 +#. This is a proper name. See the gettext manual, section Names. +#: src/hostname.c:185 src/msgattrib.c:318 src/msgcat.c:270 src/msgconv.c:224 +#: src/msgen.c:210 src/msgexec.c:181 src/msgfilter.c:283 src/msggrep.c:397 +#: src/msginit.c:257 src/msguniq.c:246 src/recode-sr-latin.c:122 +#: src/urlget.c:137 +msgid "Bruno Haible" +msgstr "" + +#: src/hostname.c:195 src/msginit.c:267 src/recode-sr-latin.c:131 #, c-format msgid "too many arguments" msgstr "" -#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176 -#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234 -#: src/msgfilter.c:367 src/msgfmt.c:607 src/msggrep.c:467 src/msginit.c:361 -#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162 -#: src/xgettext.c:717 +#: src/hostname.c:208 src/msgattrib.c:374 src/msgcat.c:329 src/msgcmp.c:178 +#: src/msgcomm.c:335 src/msgconv.c:282 src/msgen.c:260 src/msgexec.c:233 +#: src/msgfilter.c:388 src/msgfmt.c:625 src/msggrep.c:488 src/msginit.c:341 +#: src/msgmerge.c:428 src/msgunfmt.c:408 src/msguniq.c:302 +#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:736 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/hostname.c:214 src/msginit.c:365 -#, c-format +#: src/hostname.c:212 src/msginit.c:345 src/recode-sr-latin.c:149 +#, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:218 +#: src/hostname.c:216 #, c-format msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:221 +#: src/hostname.c:219 #, c-format msgid "Output format:\n" msgstr "" -#: src/hostname.c:223 +#: src/hostname.c:221 #, c-format msgid " -s, --short short host name\n" msgstr "" -#: src/hostname.c:225 +#: src/hostname.c:223 #, c-format msgid "" " -f, --fqdn, --long long host name, includes fully qualified " @@ -615,362 +700,362 @@ msgid "" " name, and aliases\n" msgstr "" -#: src/hostname.c:228 +#: src/hostname.c:226 #, c-format msgid " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219 -#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276 -#: src/msgfilter.c:453 src/msgfmt.c:729 src/msggrep.c:569 src/msginit.c:417 -#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176 -#: src/xgettext.c:863 -#, c-format +#: src/hostname.c:229 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221 +#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:275 +#: src/msgfilter.c:474 src/msgfmt.c:747 src/msggrep.c:598 src/msginit.c:397 +#: src/msgmerge.c:543 src/msgunfmt.c:506 src/msguniq.c:391 +#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:886 +#, c-format, no-wrap msgid "Informative output:\n" msgstr "" -#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221 -#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278 -#: src/msgfilter.c:455 src/msgfmt.c:731 src/msggrep.c:571 src/msginit.c:419 -#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178 -#: src/xgettext.c:865 -#, c-format +#: src/hostname.c:231 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223 +#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:277 +#: src/msgfilter.c:476 src/msgfmt.c:749 src/msggrep.c:600 src/msginit.c:399 +#: src/msgmerge.c:545 src/msgunfmt.c:508 src/msguniq.c:393 +#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:888 +#, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr "" -#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223 -#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280 -#: src/msgfilter.c:457 src/msgfmt.c:733 src/msggrep.c:573 src/msginit.c:421 -#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180 -#: src/xgettext.c:867 -#, c-format +#: src/hostname.c:233 src/msgattrib.c:482 src/msgcat.c:431 src/msgcmp.c:225 +#: src/msgcomm.c:433 src/msgconv.c:362 src/msgen.c:337 src/msgexec.c:279 +#: src/msgfilter.c:478 src/msgfmt.c:751 src/msggrep.c:602 src/msginit.c:401 +#: src/msgmerge.c:547 src/msgunfmt.c:510 src/msguniq.c:395 +#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:890 +#, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226 -#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283 -#: src/msgfilter.c:460 src/msgfmt.c:740 src/msggrep.c:576 src/msginit.c:424 -#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183 -#: src/xgettext.c:870 +#: src/hostname.c:236 src/msgattrib.c:485 src/msgcat.c:434 src/msgcmp.c:228 +#: src/msgcomm.c:436 src/msgconv.c:365 src/msgen.c:340 src/msgexec.c:282 +#: src/msgfilter.c:481 src/msgfmt.c:758 src/msggrep.c:605 src/msginit.c:404 +#: src/msgmerge.c:554 src/msgunfmt.c:515 src/msguniq.c:398 +#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:893 msgid "Report bugs to .\n" msgstr "" -#: src/hostname.c:254 src/hostname.c:260 src/hostname.c:267 +#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265 #, c-format msgid "could not get host name" msgstr "" -#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200 -#: src/msggrep.c:393 src/msginit.c:206 src/msguniq.c:259 +#: src/msgattrib.c:333 src/msgconv.c:239 src/msgexec.c:148 src/msgfilter.c:208 +#: src/msggrep.c:412 src/msginit.c:190 src/msguniq.c:261 #, c-format msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282 -#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247 -#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294 -#: src/msgfmt.c:405 src/msgfmt.c:413 src/msgfmt.c:428 src/msgfmt.c:450 -#: src/msggrep.c:399 src/msggrep.c:403 src/msgmerge.c:327 src/msgmerge.c:348 -#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269 -#: src/xgettext.c:518 src/xgettext.c:522 +#: src/msgattrib.c:339 src/msgattrib.c:343 src/msgcat.c:280 src/msgcat.c:284 +#: src/msgcomm.c:277 src/msgcomm.c:281 src/msgconv.c:245 src/msgconv.c:249 +#: src/msgen.c:232 src/msgen.c:236 src/msgfilter.c:298 src/msgfilter.c:302 +#: src/msgfmt.c:406 src/msgfmt.c:414 src/msgfmt.c:429 src/msgfmt.c:451 +#: src/msggrep.c:418 src/msggrep.c:422 src/msgmerge.c:334 src/msgmerge.c:355 +#: src/msgmerge.c:359 src/msgunfmt.c:284 src/msguniq.c:267 src/msguniq.c:271 +#: src/xgettext.c:530 src/xgettext.c:534 src/xgettext.c:541 #, c-format msgid "%s and %s are mutually exclusive" msgstr "" -#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:471 src/msguniq.c:304 +#: src/msgattrib.c:378 src/msgconv.c:286 src/msggrep.c:492 src/msguniq.c:306 #, c-format msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:381 +#: src/msgattrib.c:383 #, c-format, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353 -#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379 -#: src/msggrep.c:481 src/msginit.c:375 src/msgmerge.c:442 src/msgunfmt.c:418 -#: src/msguniq.c:320 +#: src/msgattrib.c:387 src/msgcat.c:350 src/msgcmp.c:196 src/msgcomm.c:355 +#: src/msgconv.c:294 src/msgen.c:276 src/msgexec.c:256 src/msgfilter.c:400 +#: src/msggrep.c:502 src/msginit.c:355 src/msgmerge.c:449 src/msgunfmt.c:420 +#: src/msguniq.c:322 #, c-format msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356 -#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382 -#: src/msgfmt.c:625 src/msggrep.c:484 src/msginit.c:378 src/msgmerge.c:445 -#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:735 +#: src/msgattrib.c:390 src/msgcat.c:353 src/msgcmp.c:199 src/msgcomm.c:358 +#: src/msgconv.c:297 src/msgen.c:279 src/msgexec.c:259 src/msgfilter.c:403 +#: src/msgfmt.c:643 src/msggrep.c:505 src/msginit.c:358 src/msgmerge.c:452 +#: src/msgunfmt.c:434 src/msguniq.c:325 src/xgettext.c:754 #, c-format msgid "Input file location:\n" msgstr "" -#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:486 src/msguniq.c:325 +#: src/msgattrib.c:392 src/msgconv.c:299 src/msggrep.c:507 src/msguniq.c:327 #, c-format msgid " INPUTFILE input PO file\n" msgstr "" -#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362 -#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386 -#: src/msgfmt.c:629 src/msggrep.c:488 src/msgmerge.c:451 src/msguniq.c:327 -#: src/xgettext.c:741 +#: src/msgattrib.c:394 src/msgcat.c:359 src/msgcmp.c:205 src/msgcomm.c:364 +#: src/msgconv.c:301 src/msgen.c:283 src/msgexec.c:263 src/msgfilter.c:407 +#: src/msgfmt.c:647 src/msggrep.c:509 src/msgmerge.c:458 src/msguniq.c:329 +#: src/xgettext.c:760 #, c-format msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388 -#: src/msggrep.c:490 src/msgunfmt.c:436 src/msguniq.c:329 +#: src/msgattrib.c:396 src/msgconv.c:303 src/msgexec.c:265 src/msgfilter.c:409 +#: src/msggrep.c:511 src/msgunfmt.c:438 src/msguniq.c:331 #, c-format msgid "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304 -#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:649 src/msggrep.c:493 -#: src/msginit.c:386 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332 -#: src/xgettext.c:746 +#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306 +#: src/msgen.c:288 src/msgfilter.c:412 src/msgfmt.c:667 src/msggrep.c:514 +#: src/msginit.c:366 src/msgmerge.c:470 src/msgunfmt.c:474 src/msguniq.c:334 +#: src/xgettext.c:765 #, c-format msgid "Output file location:\n" msgstr "" -#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306 -#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:651 src/msggrep.c:495 -#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334 +#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308 +#: src/msgen.c:290 src/msgfilter.c:414 src/msgfmt.c:669 src/msggrep.c:516 +#: src/msgmerge.c:472 src/msgunfmt.c:476 src/msguniq.c:336 #, c-format msgid " -o, --output-file=FILE write output to specified file\n" msgstr "" -#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308 -#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:497 src/msgmerge.c:467 -#: src/msgunfmt.c:476 src/msguniq.c:336 +#: src/msgattrib.c:403 src/msgcat.c:368 src/msgcomm.c:373 src/msgconv.c:310 +#: src/msgen.c:292 src/msgfilter.c:416 src/msggrep.c:518 src/msgmerge.c:474 +#: src/msgunfmt.c:478 src/msguniq.c:338 #, c-format msgid "" "The results are written to standard output if no output file is specified\n" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:405 src/msgcat.c:370 src/msgcomm.c:375 src/msguniq.c:340 +#: src/msgattrib.c:407 src/msgcat.c:372 src/msgcomm.c:377 src/msguniq.c:342 #, c-format msgid "Message selection:\n" msgstr "" -#: src/msgattrib.c:407 +#: src/msgattrib.c:409 #, c-format msgid "" " --translated keep translated, remove untranslated messages\n" msgstr "" -#: src/msgattrib.c:409 +#: src/msgattrib.c:411 #, c-format msgid "" " --untranslated keep untranslated, remove translated messages\n" msgstr "" -#: src/msgattrib.c:411 +#: src/msgattrib.c:413 #, c-format msgid " --no-fuzzy remove 'fuzzy' marked messages\n" msgstr "" -#: src/msgattrib.c:413 +#: src/msgattrib.c:415 #, c-format msgid " --only-fuzzy keep 'fuzzy' marked messages\n" msgstr "" -#: src/msgattrib.c:415 +#: src/msgattrib.c:417 #, c-format msgid " --no-obsolete remove obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:417 +#: src/msgattrib.c:419 #, c-format msgid " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:420 +#: src/msgattrib.c:422 #, c-format msgid "Attribute manipulation:\n" msgstr "" -#: src/msgattrib.c:422 +#: src/msgattrib.c:424 #, c-format msgid " --set-fuzzy set all messages 'fuzzy'\n" msgstr "" -#: src/msgattrib.c:424 +#: src/msgattrib.c:426 #, c-format msgid " --clear-fuzzy set all messages non-'fuzzy'\n" msgstr "" -#: src/msgattrib.c:426 +#: src/msgattrib.c:428 #, c-format msgid " --set-obsolete set all messages obsolete\n" msgstr "" -#: src/msgattrib.c:428 +#: src/msgattrib.c:430 #, c-format msgid " --clear-obsolete set all messages non-obsolete\n" msgstr "" -#: src/msgattrib.c:430 +#: src/msgattrib.c:432 #, c-format msgid "" " --only-file=FILE.po manipulate only entries listed in FILE.po\n" msgstr "" -#: src/msgattrib.c:432 +#: src/msgattrib.c:434 #, c-format msgid "" " --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n" msgstr "" -#: src/msgattrib.c:434 +#: src/msgattrib.c:436 #, c-format msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n" msgstr "" -#: src/msgattrib.c:436 +#: src/msgattrib.c:438 #, c-format msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387 -#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414 -#: src/msgfmt.c:694 src/msggrep.c:532 src/msginit.c:394 src/msgmerge.c:498 -#: src/msguniq.c:347 +#: src/msgattrib.c:441 src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 +#: src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:268 src/msgfilter.c:435 +#: src/msgfmt.c:712 src/msggrep.c:561 src/msginit.c:374 src/msgmerge.c:505 +#: src/msguniq.c:349 #, c-format msgid "Input file syntax:\n" msgstr "" -#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271 -#: src/msgfilter.c:416 src/msggrep.c:534 src/msginit.c:396 src/msguniq.c:349 +#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:270 +#: src/msgfilter.c:437 src/msggrep.c:563 src/msginit.c:376 src/msguniq.c:351 #, c-format msgid "" " -P, --properties-input input file is in Java .properties syntax\n" msgstr "" -#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273 -#: src/msgfilter.c:418 src/msggrep.c:536 src/msginit.c:398 src/msguniq.c:351 +#: src/msgattrib.c:445 src/msgconv.c:325 src/msgen.c:300 src/msgexec.c:272 +#: src/msgfilter.c:439 src/msggrep.c:565 src/msginit.c:378 src/msguniq.c:353 #, c-format msgid "" " --stringtable-input input file is in NeXTstep/GNUstep .strings " "syntax\n" msgstr "" -#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326 -#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:722 src/msggrep.c:539 -#: src/msginit.c:401 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354 -#: src/xgettext.c:821 +#: src/msgattrib.c:448 src/msgcat.c:392 src/msgcomm.c:397 src/msgconv.c:328 +#: src/msgen.c:303 src/msgfilter.c:442 src/msgfmt.c:740 src/msggrep.c:568 +#: src/msginit.c:381 src/msgmerge.c:513 src/msgunfmt.c:482 src/msguniq.c:356 +#: src/xgettext.c:844 #, c-format msgid "Output details:\n" msgstr "" -#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328 -#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361 -#: src/xgettext.c:823 +#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330 +#: src/msgen.c:305 src/msgmerge.c:515 src/msgunfmt.c:484 src/msguniq.c:363 +#: src/xgettext.c:846 #, c-format msgid "" " -e, --no-escape do not use C escapes in output (default)\n" msgstr "" -#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330 -#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484 -#: src/msguniq.c:363 src/xgettext.c:825 +#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332 +#: src/msgen.c:307 src/msgfilter.c:446 src/msgmerge.c:517 src/msgunfmt.c:486 +#: src/msguniq.c:365 src/xgettext.c:848 #, c-format msgid "" " -E, --escape use C escapes in output, no extended chars\n" msgstr "" -#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332 -#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:545 src/msgmerge.c:512 -#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:827 +#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msgconv.c:334 +#: src/msgen.c:309 src/msgfilter.c:448 src/msggrep.c:574 src/msgmerge.c:519 +#: src/msgunfmt.c:488 src/msguniq.c:367 src/xgettext.c:850 #, c-format msgid " --force-po write PO file even if empty\n" msgstr "" -#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367 -#: src/xgettext.c:829 +#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369 +#: src/xgettext.c:852 #, c-format msgid " -i, --indent write the .po file using indented style\n" msgstr "" -#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369 -#: src/xgettext.c:831 +#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371 +#: src/xgettext.c:854 #, c-format msgid " --no-location do not write '#: filename:line' lines\n" msgstr "" -#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371 -#: src/xgettext.c:833 +#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373 +#: src/xgettext.c:856 #, c-format msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" msgstr "" -#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373 -#: src/xgettext.c:835 +#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msguniq.c:375 +#: src/xgettext.c:858 #, c-format msgid "" " --strict write out strict Uniforum conforming .po file\n" msgstr "" -#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342 -#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:555 src/msginit.c:407 -#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375 +#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344 +#: src/msgen.c:319 src/msgfilter.c:460 src/msggrep.c:584 src/msginit.c:387 +#: src/msgmerge.c:529 src/msgunfmt.c:494 src/msguniq.c:377 #, c-format msgid " -p, --properties-output write out a Java .properties file\n" msgstr "" -#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344 -#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:557 src/msginit.c:409 -#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:839 +#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346 +#: src/msgen.c:321 src/msgfilter.c:462 src/msggrep.c:586 src/msginit.c:389 +#: src/msgmerge.c:531 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:862 #, c-format msgid "" " --stringtable-output write out a NeXTstep/GNUstep .strings file\n" msgstr "" -#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346 -#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:559 src/msginit.c:411 -#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:841 +#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348 +#: src/msgen.c:323 src/msgfilter.c:464 src/msggrep.c:588 src/msginit.c:391 +#: src/msgmerge.c:533 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:864 #, c-format msgid " -w, --width=NUMBER set output page width\n" msgstr "" -#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348 -#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:561 src/msginit.c:413 -#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:843 +#: src/msgattrib.c:470 src/msgcat.c:419 src/msgcomm.c:419 src/msgconv.c:350 +#: src/msgen.c:325 src/msgfilter.c:466 src/msggrep.c:590 src/msginit.c:393 +#: src/msgmerge.c:535 src/msgunfmt.c:500 src/msguniq.c:383 src/xgettext.c:866 #, c-format msgid "" " --no-wrap do not break long message lines, longer than\n" " the output page width, into several lines\n" msgstr "" -#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351 -#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501 -#: src/msguniq.c:384 src/xgettext.c:846 +#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353 +#: src/msgen.c:328 src/msgfilter.c:469 src/msgmerge.c:538 src/msgunfmt.c:503 +#: src/msguniq.c:386 src/xgettext.c:869 #, c-format msgid " -s, --sort-output generate sorted output\n" msgstr "" -#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353 -#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386 -#: src/xgettext.c:848 +#: src/msgattrib.c:475 src/msgcat.c:424 src/msgcomm.c:424 src/msgconv.c:355 +#: src/msgen.c:330 src/msgfilter.c:471 src/msgmerge.c:540 src/msguniq.c:388 +#: src/xgettext.c:871 #, c-format msgid " -F, --sort-by-file sort output by file location\n" msgstr "" -#: src/msgcat.c:288 src/msgcomm.c:305 +#: src/msgcat.c:290 src/msgcomm.c:307 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "" -#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:721 +#: src/msgcat.c:333 src/msgcomm.c:339 src/xgettext.c:740 #, c-format msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" -#: src/msgcat.c:336 +#: src/msgcat.c:338 #, c-format, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -984,86 +1069,91 @@ msgid "" "File positions from all PO files will be cumulated.\n" msgstr "" -#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:737 +#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:756 #, c-format msgid " INPUTFILE ... input files\n" msgstr "" -#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:739 +#: src/msgcat.c:357 src/msgcomm.c:362 src/xgettext.c:758 #, c-format msgid " -f, --files-from=FILE get list of input files from FILE\n" msgstr "" -#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:631 -#: src/xgettext.c:743 +#: src/msgcat.c:361 src/msgcomm.c:366 src/msgen.c:285 src/msgfmt.c:649 +#: src/xgettext.c:762 #, c-format msgid "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:372 src/msgcomm.c:377 +#: src/msgcat.c:374 src/msgcomm.c:379 #, c-format msgid "" " -<, --less-than=NUMBER print messages with less than this many\n" " definitions, defaults to infinite if not set\n" msgstr "" -#: src/msgcat.c:375 +#: src/msgcat.c:377 #, c-format msgid "" " ->, --more-than=NUMBER print messages with more than this many\n" " definitions, defaults to 0 if not set\n" msgstr "" -#: src/msgcat.c:378 src/msgcomm.c:383 +#: src/msgcat.c:380 src/msgcomm.c:385 #, c-format msgid "" " -u, --unique shorthand for --less-than=2, requests\n" " that only unique messages be printed\n" msgstr "" -#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:696 -#: src/msgmerge.c:500 +#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:714 +#: src/msgmerge.c:507 #, c-format msgid "" " -P, --properties-input input files are in Java .properties syntax\n" msgstr "" -#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:698 -#: src/msgmerge.c:502 +#: src/msgcat.c:388 src/msgcmp.c:217 src/msgcomm.c:393 src/msgfmt.c:716 +#: src/msgmerge.c:509 #, c-format msgid "" " --stringtable-input input files are in NeXTstep/GNUstep .strings\n" " syntax\n" msgstr "" -#: src/msgcat.c:392 src/msgconv.c:314 src/msguniq.c:356 +#: src/msgcat.c:394 src/msgconv.c:316 src/msguniq.c:358 #, c-format msgid " -t, --to-code=NAME encoding for output\n" msgstr "" -#: src/msgcat.c:394 src/msguniq.c:358 +#: src/msgcat.c:396 src/msguniq.c:360 #, c-format msgid "" " --use-first use first available translation for each\n" " message, don't merge several translations\n" msgstr "" -#: src/msgcmp.c:156 src/msgmerge.c:313 +#. This is a proper name. See the gettext manual, section Names. +#: src/msgcmp.c:147 src/msgcomm.c:267 src/msgmerge.c:309 +msgid "Peter Miller" +msgstr "" + +#: src/msgcmp.c:158 src/msgmerge.c:320 #, c-format msgid "no input files given" msgstr "" -#: src/msgcmp.c:161 src/msgmerge.c:318 +#: src/msgcmp.c:163 src/msgmerge.c:325 #, c-format msgid "exactly 2 input files required" msgstr "" -#: src/msgcmp.c:180 src/msgmerge.c:425 +#: src/msgcmp.c:182 src/msgmerge.c:432 #, c-format msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" -#: src/msgcmp.c:185 +#: src/msgcmp.c:187 #, c-format, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -1074,61 +1164,61 @@ msgid "" "match cannot be found, fuzzy matching is used to produce better diagnostics.\n" msgstr "" -#: src/msgcmp.c:199 +#: src/msgcmp.c:201 #, c-format msgid " def.po translations\n" msgstr "" -#: src/msgcmp.c:201 +#: src/msgcmp.c:203 #, c-format msgid " ref.pot references to the sources\n" msgstr "" -#: src/msgcmp.c:206 src/msgmerge.c:491 +#: src/msgcmp.c:208 src/msgmerge.c:498 #, c-format msgid "Operation modifiers:\n" msgstr "" -#: src/msgcmp.c:208 src/msgmerge.c:493 +#: src/msgcmp.c:210 src/msgmerge.c:500 #, c-format msgid "" " -m, --multi-domain apply ref.pot to each of the domains in def." "po\n" msgstr "" -#: src/msgcmp.c:285 src/msgmerge.c:965 +#: src/msgcmp.c:288 src/msgmerge.c:1097 #, c-format msgid "this message is used but not defined..." msgstr "" -#: src/msgcmp.c:287 src/msgmerge.c:967 +#: src/msgcmp.c:291 src/msgmerge.c:1100 #, c-format msgid "...but this definition is similar" msgstr "" -#: src/msgcmp.c:292 src/msgmerge.c:997 +#: src/msgcmp.c:296 src/msgmerge.c:1130 #, c-format msgid "this message is used but not defined in %s" msgstr "" -#: src/msgcmp.c:396 +#: src/msgcmp.c:400 #, c-format msgid "warning: this message is not used" msgstr "" -#: src/msgcmp.c:403 +#: src/msgcmp.c:407 src/msgfmt.c:541 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "" msgstr[1] "" -#: src/msgcomm.c:294 +#: src/msgcomm.c:296 #, c-format msgid "at least two files must be specified" msgstr "" -#: src/msgcomm.c:342 +#: src/msgcomm.c:344 #, c-format, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -1141,74 +1231,74 @@ msgid "" "cumulated.\n" msgstr "" -#: src/msgcomm.c:380 +#: src/msgcomm.c:382 #, c-format msgid "" " ->, --more-than=NUMBER print messages with more than this many\n" " definitions, defaults to 1 if not set\n" msgstr "" -#: src/msgcomm.c:424 src/xgettext.c:850 +#: src/msgcomm.c:426 src/xgettext.c:873 #, c-format msgid "" " --omit-header don't write header with `msgid \"\"' entry\n" msgstr "" -#: src/msgconv.c:288 +#: src/msgconv.c:290 #, c-format msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" -#: src/msgconv.c:312 +#: src/msgconv.c:314 #, c-format msgid "Conversion target:\n" msgstr "" -#: src/msgconv.c:316 +#: src/msgconv.c:318 #, c-format msgid "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514 +#: src/msgconv.c:336 src/msgen.c:311 src/msgmerge.c:521 #, c-format msgid " -i, --indent indented output style\n" msgstr "" -#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:549 -#: src/msgmerge.c:516 +#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:454 src/msggrep.c:578 +#: src/msgmerge.c:523 #, c-format msgid " --no-location suppress '#: filename:line' lines\n" msgstr "" -#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:551 -#: src/msgmerge.c:518 +#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:456 src/msggrep.c:580 +#: src/msgmerge.c:525 #, c-format msgid "" " --add-location preserve '#: filename:line' lines (default)\n" msgstr "" -#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:553 -#: src/msgmerge.c:520 +#: src/msgconv.c:342 src/msgen.c:317 src/msgfilter.c:458 src/msggrep.c:582 +#: src/msgmerge.c:527 #, c-format msgid " --strict strict Uniforum output style\n" msgstr "" -#: src/msgen.c:219 src/msgfmt.c:377 src/xgettext.c:539 +#: src/msgen.c:221 src/msgfmt.c:378 src/xgettext.c:558 #, c-format msgid "no input file given" msgstr "" -#: src/msgen.c:224 +#: src/msgen.c:226 #, c-format msgid "exactly one input file required" msgstr "" -#: src/msgen.c:262 +#: src/msgen.c:264 #, c-format msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "" -#: src/msgen.c:267 +#: src/msgen.c:269 #, c-format, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -1217,22 +1307,22 @@ msgid "" "identical to the msgid.\n" msgstr "" -#: src/msgen.c:279 +#: src/msgen.c:281 #, c-format msgid " INPUTFILE input PO or POT file\n" msgstr "" -#: src/msgexec.c:192 +#: src/msgexec.c:191 #, c-format msgid "missing command name" msgstr "" -#: src/msgexec.c:238 +#: src/msgexec.c:237 #, c-format msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:243 +#: src/msgexec.c:242 #, c-format, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -1242,67 +1332,67 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:252 +#: src/msgexec.c:251 #, c-format, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:262 src/msgfilter.c:384 +#: src/msgexec.c:261 src/msgfilter.c:405 #, c-format msgid " -i, --input=INPUTFILE input PO file\n" msgstr "" -#: src/msgexec.c:322 +#: src/msgexec.c:321 #, c-format msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:345 src/msgfilter.c:637 +#: src/msgexec.c:348 src/msgfilter.c:657 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:285 +#: src/msgfilter.c:293 #, c-format msgid "missing filter name" msgstr "" -#: src/msgfilter.c:309 +#: src/msgfilter.c:317 #, c-format msgid "at least one sed script must be specified" msgstr "" -#: src/msgfilter.c:371 +#: src/msgfilter.c:392 #, c-format msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:375 +#: src/msgfilter.c:396 #, c-format msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:399 +#: src/msgfilter.c:420 #, c-format msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:404 +#: src/msgfilter.c:425 #, c-format msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" msgstr "" -#: src/msgfilter.c:406 +#: src/msgfilter.c:427 #, c-format msgid "" " -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n" msgstr "" -#: src/msgfilter.c:408 +#: src/msgfilter.c:429 #, c-format msgid "" " -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the " @@ -1310,200 +1400,210 @@ msgid "" " to be executed\n" msgstr "" -#: src/msgfilter.c:411 +#: src/msgfilter.c:432 #, c-format msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:423 src/msggrep.c:541 +#: src/msgfilter.c:444 src/msggrep.c:570 #, c-format msgid "" " --no-escape do not use C escapes in output (default)\n" msgstr "" -#: src/msgfilter.c:429 src/msggrep.c:547 +#: src/msgfilter.c:450 src/msggrep.c:576 #, c-format msgid " --indent indented output style\n" msgstr "" -#: src/msgfilter.c:431 +#: src/msgfilter.c:452 #, c-format msgid "" " --keep-header keep header entry unmodified, don't filter it\n" msgstr "" -#: src/msgfilter.c:560 +#: src/msgfilter.c:580 #, c-format msgid "Not yet implemented." msgstr "" -#: src/msgfilter.c:589 +#: src/msgfilter.c:609 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:617 +#: src/msgfilter.c:637 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:668 +#: src/msgfilter.c:688 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:684 +#: src/msgfilter.c:704 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:316 +#: src/msgfmt.c:300 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:419 src/msgfmt.c:441 src/msgfmt.c:463 src/msgunfmt.c:313 -#: src/msgunfmt.c:336 +#: src/msgfmt.c:347 +#, c-format +msgid "invalid endianness: %s" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/msgfmt.c:367 src/msgunfmt.c:253 src/xgettext.c:520 +msgid "Ulrich Drepper" +msgstr "" + +#: src/msgfmt.c:420 src/msgfmt.c:442 src/msgfmt.c:464 src/msgunfmt.c:315 +#: src/msgunfmt.c:338 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:434 src/msgfmt.c:456 src/msgunfmt.c:306 src/msgunfmt.c:329 +#: src/msgfmt.c:435 src/msgfmt.c:457 src/msgunfmt.c:308 src/msgunfmt.c:331 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:472 src/msgunfmt.c:345 src/msgunfmt.c:351 +#: src/msgfmt.c:473 src/msgunfmt.c:347 src/msgunfmt.c:353 #, c-format msgid "%s is only valid with %s or %s" msgstr "" -#: src/msgfmt.c:478 src/msgfmt.c:484 +#: src/msgfmt.c:479 src/msgfmt.c:485 #, c-format msgid "%s is only valid with %s, %s or %s" msgstr "" -#: src/msgfmt.c:581 +#: src/msgfmt.c:599 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:586 +#: src/msgfmt.c:604 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:591 +#: src/msgfmt.c:609 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:611 +#: src/msgfmt.c:629 #, c-format msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:615 +#: src/msgfmt.c:633 #, c-format msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:620 src/xgettext.c:730 +#: src/msgfmt.c:638 src/xgettext.c:749 #, c-format, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/msgfmt.c:627 +#: src/msgfmt.c:645 #, c-format msgid " filename.po ... input files\n" msgstr "" -#: src/msgfmt.c:634 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:778 +#: src/msgfmt.c:652 src/msgmerge.c:464 src/msgunfmt.c:423 src/xgettext.c:797 #, c-format msgid "Operation mode:\n" msgstr "" -#: src/msgfmt.c:636 +#: src/msgfmt.c:654 #, c-format msgid "" " -j, --java Java mode: generate a Java ResourceBundle " "class\n" msgstr "" -#: src/msgfmt.c:638 +#: src/msgfmt.c:656 #, c-format msgid "" " --java2 like --java, and assume Java2 (JDK 1.2 or " "higher)\n" msgstr "" -#: src/msgfmt.c:640 +#: src/msgfmt.c:658 #, c-format msgid " --csharp C# mode: generate a .NET .dll file\n" msgstr "" -#: src/msgfmt.c:642 +#: src/msgfmt.c:660 #, c-format msgid "" " --csharp-resources C# resources mode: generate a .NET .resources " "file\n" msgstr "" -#: src/msgfmt.c:644 +#: src/msgfmt.c:662 #, c-format msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:646 +#: src/msgfmt.c:664 #, c-format msgid " --qt Qt mode: generate a Qt .qm file\n" msgstr "" -#: src/msgfmt.c:653 +#: src/msgfmt.c:671 #, c-format msgid " --strict enable strict Uniforum mode\n" msgstr "" -#: src/msgfmt.c:655 src/xgettext.c:754 +#: src/msgfmt.c:673 src/xgettext.c:773 #, c-format msgid "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:658 +#: src/msgfmt.c:676 #, c-format msgid "Output file location in Java mode:\n" msgstr "" -#: src/msgfmt.c:660 src/msgfmt.c:674 src/msgunfmt.c:441 src/msgunfmt.c:452 +#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:443 src/msgunfmt.c:454 #, c-format msgid " -r, --resource=RESOURCE resource name\n" msgstr "" -#: src/msgfmt.c:662 src/msgfmt.c:676 src/msgfmt.c:686 src/msgunfmt.c:443 -#: src/msgunfmt.c:454 src/msgunfmt.c:464 +#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:445 +#: src/msgunfmt.c:456 src/msgunfmt.c:466 #, c-format msgid "" " -l, --locale=LOCALE locale name, either language or " "language_COUNTRY\n" msgstr "" -#: src/msgfmt.c:664 +#: src/msgfmt.c:682 #, c-format msgid "" " -d DIRECTORY base directory of classes directory hierarchy\n" msgstr "" -#: src/msgfmt.c:666 +#: src/msgfmt.c:684 #, c-format msgid "" "The class name is determined by appending the locale name to the resource " @@ -1512,48 +1612,48 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:672 +#: src/msgfmt.c:690 #, c-format msgid "Output file location in C# mode:\n" msgstr "" -#: src/msgfmt.c:678 src/msgunfmt.c:456 +#: src/msgfmt.c:696 src/msgunfmt.c:458 #, c-format msgid "" " -d DIRECTORY base directory for locale dependent .dll " "files\n" msgstr "" -#: src/msgfmt.c:680 +#: src/msgfmt.c:698 #, c-format msgid "" "The -l and -d options are mandatory. The .dll file is written in a\n" "subdirectory of the specified directory whose name depends on the locale.\n" msgstr "" -#: src/msgfmt.c:684 +#: src/msgfmt.c:702 #, c-format msgid "Output file location in Tcl mode:\n" msgstr "" -#: src/msgfmt.c:688 src/msgunfmt.c:466 +#: src/msgfmt.c:706 src/msgunfmt.c:468 #, c-format msgid " -d DIRECTORY base directory of .msg message catalogs\n" msgstr "" -#: src/msgfmt.c:690 +#: src/msgfmt.c:708 #, c-format msgid "" "The -l and -d options are mandatory. The .msg file is written in the\n" "specified directory.\n" msgstr "" -#: src/msgfmt.c:702 src/xgettext.c:770 +#: src/msgfmt.c:720 src/xgettext.c:789 #, c-format msgid "Input file interpretation:\n" msgstr "" -#: src/msgfmt.c:704 +#: src/msgfmt.c:722 #, c-format msgid "" " -c, --check perform all the checks implied by\n" @@ -1561,33 +1661,33 @@ msgid "" "domain\n" msgstr "" -#: src/msgfmt.c:707 +#: src/msgfmt.c:725 #, c-format msgid " --check-format check language dependent format strings\n" msgstr "" -#: src/msgfmt.c:709 +#: src/msgfmt.c:727 #, c-format msgid "" " --check-header verify presence and contents of the header " "entry\n" msgstr "" -#: src/msgfmt.c:711 +#: src/msgfmt.c:729 #, c-format msgid "" " --check-domain check for conflicts between domain directives\n" " and the --output-file option\n" msgstr "" -#: src/msgfmt.c:714 +#: src/msgfmt.c:732 #, c-format msgid "" " -C, --check-compatibility check that GNU msgfmt behaves like X/Open " "msgfmt\n" msgstr "" -#: src/msgfmt.c:716 +#: src/msgfmt.c:734 #, c-format msgid "" " --check-accelerators[=CHAR] check presence of keyboard accelerators " @@ -1595,309 +1695,172 @@ msgid "" " menu items\n" msgstr "" -#: src/msgfmt.c:719 +#: src/msgfmt.c:737 #, c-format msgid " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:724 +#: src/msgfmt.c:742 #, c-format msgid "" " -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n" msgstr "" -#: src/msgfmt.c:726 +#: src/msgfmt.c:744 #, c-format msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:735 +#: src/msgfmt.c:753 #, c-format msgid " --statistics print statistics about translations\n" msgstr "" -#: src/msgfmt.c:737 src/msgmerge.c:542 src/msgunfmt.c:510 +#: src/msgfmt.c:755 src/msgmerge.c:549 src/msgunfmt.c:512 #, c-format msgid " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:875 -#, c-format -msgid "plural expression can produce negative values" -msgstr "" - -#: src/msgfmt.c:888 -#, c-format -msgid "nplurals = %lu but plural expression can produce values as large as %lu" -msgstr "" - -#: src/msgfmt.c:915 -#, c-format -msgid "plural expression can produce division by zero" -msgstr "" - -#: src/msgfmt.c:921 -#, c-format -msgid "plural expression can produce integer overflow" -msgstr "" - -#: src/msgfmt.c:927 -#, c-format -msgid "" -"plural expression can produce arithmetic exceptions, possibly division by " -"zero" -msgstr "" - -#: src/msgfmt.c:1005 src/msgfmt.c:1017 -#, c-format -msgid "message catalog has plural form translations..." -msgstr "" - -#: src/msgfmt.c:1008 -#, c-format -msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" -msgstr "" - -#: src/msgfmt.c:1020 -#, c-format -msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" -msgstr "" - -#: src/msgfmt.c:1045 -#, c-format -msgid "invalid nplurals value" -msgstr "" - -#: src/msgfmt.c:1059 -#, c-format -msgid "invalid plural expression" -msgstr "" - -#: src/msgfmt.c:1078 src/msgfmt.c:1093 -#, c-format -msgid "nplurals = %lu..." -msgstr "" - -#: src/msgfmt.c:1081 -#, c-format -msgid "...but some messages have only one plural form" -msgid_plural "...but some messages have only %lu plural forms" -msgstr[0] "" -msgstr[1] "" - -#: src/msgfmt.c:1096 -#, c-format -msgid "...but some messages have one plural form" -msgid_plural "...but some messages have %lu plural forms" -msgstr[0] "" -msgstr[1] "" - -#: src/msgfmt.c:1126 -#, c-format -msgid "Try using the following, valid for %s:\n" -msgstr "" - -#: src/msgfmt.c:1139 -#, c-format -msgid "" -"message catalog has plural form translations, but lacks a header entry with " -"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" -msgstr "" - -#: src/msgfmt.c:1191 -#, c-format -msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" -msgstr "" - -#: src/msgfmt.c:1201 -#, c-format -msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" -msgstr "" - -#: src/msgfmt.c:1213 -#, c-format -msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" -msgstr "" - -#: src/msgfmt.c:1230 -#, c-format -msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" -msgstr "" - -#: src/msgfmt.c:1240 -#, c-format -msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" -msgstr "" - -#: src/msgfmt.c:1252 -#, c-format -msgid "`msgid' and `msgstr' entries do not both end with '\\n'" -msgstr "" - -#: src/msgfmt.c:1264 -#, c-format -msgid "plural handling is a GNU gettext extension" -msgstr "" - -#: src/msgfmt.c:1305 -#, c-format -msgid "msgstr lacks the keyboard accelerator mark '%c'" -msgstr "" - -#: src/msgfmt.c:1313 -#, c-format -msgid "msgstr has too many keyboard accelerator marks '%c'" -msgstr "" - -#: src/msgfmt.c:1347 -#, c-format -msgid "headerfield `%s' missing in header\n" -msgstr "" - -#: src/msgfmt.c:1351 -#, c-format -msgid "header field `%s' should start at beginning of line\n" -msgstr "" - -#: src/msgfmt.c:1362 -msgid "some header fields still have the initial default value\n" -msgstr "" - -#: src/msgfmt.c:1374 -#, c-format -msgid "field `%s' still has initial default value\n" -msgstr "" - -#: src/msgfmt.c:1432 +#: src/msgfmt.c:865 #, c-format msgid "warning: PO file header missing or invalid\n" msgstr "" -#: src/msgfmt.c:1435 +#: src/msgfmt.c:868 #, c-format msgid "warning: charset conversion will not work\n" msgstr "" -#: src/msgfmt.c:1445 +#: src/msgfmt.c:878 #, c-format msgid "warning: PO file header fuzzy\n" msgstr "" -#: src/msgfmt.c:1447 +#: src/msgfmt.c:880 #, c-format msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1471 +#: src/msgfmt.c:904 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "" -#: src/msgfmt.c:1476 +#: src/msgfmt.c:909 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" -#: src/msgfmt.c:1490 +#: src/msgfmt.c:923 #, c-format msgid "`domain %s' directive ignored" msgstr "" -#: src/msgfmt.c:1544 +#: src/msgfmt.c:978 #, c-format msgid "empty `msgstr' entry ignored" msgstr "" -#: src/msgfmt.c:1545 +#: src/msgfmt.c:979 #, c-format msgid "fuzzy `msgstr' entry ignored" msgstr "" -#: src/msgfmt.c:1603 +#: src/msgfmt.c:1028 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "" -#: src/msggrep.c:242 src/po-lex.c:666 src/read-mo.c:79 -#: src/read-properties.c:80 src/read-stringtable.c:95 src/x-awk.c:143 -#: src/x-c.c:354 src/x-csharp.c:161 src/x-elisp.c:149 src/x-glade.c:406 -#: src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214 src/x-perl.c:230 -#: src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162 src/x-python.c:170 -#: src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91 src/x-tcl.c:152 -#: src/x-ycp.c:91 +#: src/msggrep.c:249 src/po-lex.c:657 src/read-mo.c:79 +#: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139 +#: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422 +#: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226 +#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:162 src/x-python.c:176 +#: src/x-rst.c:232 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91 +#: src/x-tcl.c:150 src/x-ycp.c:91 #, c-format msgid "error while reading \"%s\"" msgstr "" -#: src/msggrep.c:456 +#: src/msggrep.c:477 #, c-format -msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified" +msgid "" +"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been " +"specified" msgstr "" -#: src/msggrep.c:476 +#: src/msggrep.c:497 #, c-format, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:502 +#: src/msggrep.c:523 #, c-format, no-wrap msgid "" "Message selection:\n" " [-N SOURCEFILE]... [-M DOMAINNAME]...\n" -" [-K MSGID-PATTERN] [-T MSGSTR-PATTERN] [-C COMMENT-PATTERN]\n" +" [-J MSGCTXT-PATTERN] [-K MSGID-PATTERN] [-T MSGSTR-PATTERN]\n" +" [-C COMMENT-PATTERN] [-X EXTRACTED-COMMENT-PATTERN]\n" "A message is selected if it comes from one of the specified source files,\n" "or if it comes from one of the specified domains,\n" +"or if -J is given and its context (msgctxt) matches MSGCTXT-PATTERN,\n" "or if -K is given and its key (msgid or msgid_plural) matches MSGID-PATTERN,\n" "or if -T is given and its translation (msgstr) matches MSGSTR-PATTERN,\n" -"or if -C is given and the translator's comment matches COMMENT-PATTERN.\n" +"or if -C is given and the translator's comment matches COMMENT-PATTERN,\n" +"or if -X is given and the extracted comment matches EXTRACTED-COMMENT-PATTERN.\n" "\n" "When more than one selection criterion is specified, the set of selected\n" "messages is the union of the selected messages of each criterion.\n" "\n" -"MSGID-PATTERN or MSGSTR-PATTERN or COMMENT-PATTERN syntax:\n" +"MSGCTXT-PATTERN or MSGID-PATTERN or MSGSTR-PATTERN or COMMENT-PATTERN or\n" +"EXTRACTED-COMMENT-PATTERN syntax:\n" " [-E | -F] [-e PATTERN | -f FILE]...\n" "PATTERNs are basic regular expressions by default, or extended regular\n" "expressions if -E is given, or fixed strings if -F is given.\n" "\n" " -N, --location=SOURCEFILE select messages extracted from SOURCEFILE\n" " -M, --domain=DOMAINNAME select messages belonging to domain DOMAINNAME\n" +" -J, --msgctxt start of patterns for the msgctxt\n" " -K, --msgid start of patterns for the msgid\n" " -T, --msgstr start of patterns for the msgstr\n" " -C, --comment start of patterns for the translator's comment\n" +" -X, --extracted-comment start of patterns for the extracted comment\n" " -E, --extended-regexp PATTERN is an extended regular expression\n" " -F, --fixed-strings PATTERN is a set of newline-separated strings\n" " -e, --regexp=PATTERN use PATTERN as a regular expression\n" " -f, --file=FILE obtain PATTERN from FILE\n" " -i, --ignore-case ignore case distinctions\n" +" -v, --invert-match output only the messages that do not match any\n" +" selection criterion\n" msgstr "" -#: src/msggrep.c:543 +#: src/msggrep.c:572 #, c-format msgid "" " --escape use C escapes in output, no extended chars\n" msgstr "" -#: src/msggrep.c:564 +#: src/msggrep.c:593 #, c-format msgid " --sort-output generate sorted output\n" msgstr "" -#: src/msggrep.c:566 +#: src/msggrep.c:595 #, c-format msgid " --sort-by-file sort output by file location\n" msgstr "" -#: src/msginit.c:296 +#: src/msginit.c:280 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:324 +#: src/msginit.c:304 #, c-format msgid "" "Output file %s already exists.\n" @@ -1905,24 +1868,24 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:350 +#: src/msginit.c:330 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:370 +#: src/msginit.c:350 #, c-format, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:380 +#: src/msginit.c:360 #, c-format msgid " -i, --input=INPUTFILE input POT file\n" msgstr "" -#: src/msginit.c:382 +#: src/msginit.c:362 #, c-format msgid "" "If no input file is given, the current directory is searched for the POT " @@ -1930,59 +1893,54 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:388 +#: src/msginit.c:368 #, c-format msgid " -o, --output-file=FILE write output to specified PO file\n" msgstr "" -#: src/msginit.c:390 +#: src/msginit.c:370 #, c-format msgid "" "If no output file is given, it depends on the --locale option or the user's\n" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:403 +#: src/msginit.c:383 #, c-format msgid " -l, --locale=LL_CC set target locale\n" msgstr "" -#: src/msginit.c:405 +#: src/msginit.c:385 #, c-format msgid "" " --no-translator assume the PO file is automatically generated\n" msgstr "" -#: src/msginit.c:461 +#: src/msginit.c:441 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:469 src/msginit.c:474 +#: src/msginit.c:449 src/msginit.c:454 #, c-format msgid "error reading current directory" msgstr "" -#: src/msginit.c:482 +#: src/msginit.c:462 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:978 src/msginit.c:1045 src/msginit.c:1203 -#, c-format -msgid "%s subprocess I/O error" -msgstr "" - -#: src/msginit.c:990 src/msginit.c:1057 src/msginit.c:1215 src/msginit.c:1294 +#: src/msginit.c:794 src/msginit.c:862 src/msginit.c:1021 src/msginit.c:1100 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84 #: src/read-tcl.c:127 src/write-resources.c:105 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1181 +#: src/msginit.c:986 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1994,54 +1952,54 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1567 +#: src/msginit.c:1373 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305 +#: src/msgl-cat.c:177 src/msgl-charset.c:88 src/msgl-iconv.c:215 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:187 src/msgl-iconv.c:316 +#: src/msgl-cat.c:188 src/msgl-iconv.c:227 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:202 +#: src/msgl-cat.c:203 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:206 +#: src/msgl-cat.c:207 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:383 src/msgl-iconv.c:405 +#: src/msgl-cat.c:384 src/msgl-iconv.c:331 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917 -#: src/xgettext.c:2070 +#: src/msgl-cat.c:434 src/msgl-cat.c:440 src/msgl-charset.c:94 +#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148 +#: src/xgettext.c:2773 #, c-format msgid "warning: " msgstr "" -#: src/msgl-cat.c:434 +#: src/msgl-cat.c:435 #, c-format msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:440 +#: src/msgl-cat.c:441 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -2050,21 +2008,30 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-cat.c:479 #, c-format msgid "" -"Locale charset \"%s\" is different from\n" -"input file charset \"%s\".\n" -"Output of '%s' might be incorrect.\n" +"Conversion of file %s from %s encoding to %s encoding\n" +"changes some msgids or msgctxts.\n" +"Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n" +"UTF-8 encoded from the beginning, i.e. already in your source code files.\n" +msgstr "" + +#: src/msgl-charset.c:95 +#, c-format +msgid "" +"Locale charset \"%s\" is different from\n" +"input file charset \"%s\".\n" +"Output of '%s' might be incorrect.\n" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:102 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:107 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -2072,7 +2039,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:116 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -2081,7 +2048,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:130 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -2089,47 +2056,185 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:187 src/msgl-iconv.c:245 +#: src/msgl-check.c:92 +msgid "plural expression can produce negative values" +msgstr "" + +#: src/msgl-check.c:102 +#, c-format +msgid "nplurals = %lu but plural expression can produce values as large as %lu" +msgstr "" + +#: src/msgl-check.c:143 +msgid "plural expression can produce division by zero" +msgstr "" + +#: src/msgl-check.c:148 +msgid "plural expression can produce integer overflow" +msgstr "" + +#: src/msgl-check.c:153 +msgid "" +"plural expression can produce arithmetic exceptions, possibly division by " +"zero" +msgstr "" + +#: src/msgl-check.c:185 +#, c-format +msgid "Try using the following, valid for %s:" +msgstr "" + +#: src/msgl-check.c:268 src/msgl-check.c:292 +msgid "message catalog has plural form translations" +msgstr "" + +#: src/msgl-check.c:270 +msgid "but header entry lacks a \"plural=EXPRESSION\" attribute" +msgstr "" + +#: src/msgl-check.c:294 +msgid "but header entry lacks a \"nplurals=INTEGER\" attribute" +msgstr "" + +#: src/msgl-check.c:330 +msgid "invalid nplurals value" +msgstr "" + +#: src/msgl-check.c:352 +msgid "invalid plural expression" +msgstr "" + +#: src/msgl-check.c:382 src/msgl-check.c:398 +#, c-format +msgid "nplurals = %lu" +msgstr "" + +#: src/msgl-check.c:384 +#, c-format +msgid "but some messages have only one plural form" +msgid_plural "but some messages have only %lu plural forms" +msgstr[0] "" +msgstr[1] "" + +#: src/msgl-check.c:400 +#, c-format +msgid "but some messages have one plural form" +msgid_plural "but some messages have %lu plural forms" +msgstr[0] "" +msgstr[1] "" + +#: src/msgl-check.c:420 +msgid "" +"message catalog has plural form translations, but lacks a header entry with " +"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" +msgstr "" + +#: src/msgl-check.c:498 +msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" +msgstr "" + +#: src/msgl-check.c:506 +#, c-format +msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" +msgstr "" + +#: src/msgl-check.c:521 +msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" +msgstr "" + +#: src/msgl-check.c:537 +msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" +msgstr "" + +#: src/msgl-check.c:545 +#, c-format +msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" +msgstr "" + +#: src/msgl-check.c:560 +msgid "`msgid' and `msgstr' entries do not both end with '\\n'" +msgstr "" + +#: src/msgl-check.c:572 +msgid "plural handling is a GNU gettext extension" +msgstr "" + +#: src/msgl-check.c:614 #, c-format -msgid "conversion failure" +msgid "msgstr lacks the keyboard accelerator mark '%c'" +msgstr "" + +#: src/msgl-check.c:624 +#, c-format +msgid "msgstr has too many keyboard accelerator marks '%c'" +msgstr "" + +#: src/msgl-check.c:664 +#, c-format +msgid "headerfield `%s' missing in header\n" msgstr "" -#: src/msgl-iconv.c:339 +#: src/msgl-check.c:672 #, c-format +msgid "header field `%s' should start at beginning of line\n" +msgstr "" + +#: src/msgl-check.c:686 +msgid "some header fields still have the initial default value\n" +msgstr "" + +#: src/msgl-check.c:699 +#, c-format +msgid "field `%s' still has initial default value\n" +msgstr "" + +#: src/msgl-iconv.c:65 +#, c-format +msgid "%s: input is not valid in \"%s\" encoding" +msgstr "" + +#: src/msgl-iconv.c:69 +#, c-format +msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding" +msgstr "" + +#: src/msgl-iconv.c:251 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:358 src/xgettext.c:597 +#: src/msgl-iconv.c:273 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289 +#: src/x-python.c:618 src/xgettext.c:616 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " "not support this conversion." msgstr "" -#: src/msgl-iconv.c:380 +#: src/msgl-iconv.c:302 #, c-format msgid "" "Conversion from \"%s\" to \"%s\" introduces duplicates: some different " "msgids become equal." msgstr "" -#: src/msgl-iconv.c:385 src/xgettext.c:604 +#: src/msgl-iconv.c:308 src/recode-sr-latin.c:298 src/x-python.c:625 +#: src/xgettext.c:623 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " "built without iconv()." msgstr "" -#: src/msgmerge.c:335 src/msgmerge.c:341 +#: src/msgmerge.c:342 src/msgmerge.c:348 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgmerge.c:395 +#: src/msgmerge.c:402 msgid "backup type" msgstr "" -#: src/msgmerge.c:430 +#: src/msgmerge.c:437 #, c-format, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -2143,51 +2248,51 @@ msgid "" "cannot be found, fuzzy matching is used to produce better results.\n" msgstr "" -#: src/msgmerge.c:447 +#: src/msgmerge.c:454 #, c-format msgid " def.po translations referring to old sources\n" msgstr "" -#: src/msgmerge.c:449 +#: src/msgmerge.c:456 #, c-format msgid " ref.pot references to new sources\n" msgstr "" -#: src/msgmerge.c:453 +#: src/msgmerge.c:460 #, c-format msgid "" " -C, --compendium=FILE additional library of message translations,\n" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:459 +#: src/msgmerge.c:466 #, c-format msgid "" " -U, --update update def.po,\n" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:471 +#: src/msgmerge.c:478 #, c-format msgid "Output file location in update mode:\n" msgstr "" -#: src/msgmerge.c:473 +#: src/msgmerge.c:480 #, c-format msgid "The result is written back to def.po.\n" msgstr "" -#: src/msgmerge.c:475 +#: src/msgmerge.c:482 #, c-format msgid " --backup=CONTROL make a backup of def.po\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:484 #, c-format msgid " --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -#: src/msgmerge.c:479 +#: src/msgmerge.c:486 #, c-format msgid "" "The version control method may be selected via the --backup option or " @@ -2199,7 +2304,7 @@ msgid "" " simple, never always make simple backups\n" msgstr "" -#: src/msgmerge.c:486 +#: src/msgmerge.c:493 #, c-format msgid "" "The backup suffix is `~', unless set with --suffix or the " @@ -2207,88 +2312,88 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:495 +#: src/msgmerge.c:502 #, c-format msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n" msgstr "" -#: src/msgmerge.c:544 +#: src/msgmerge.c:551 #, c-format msgid " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:1067 +#: src/msgmerge.c:1201 #, c-format msgid "this message should define plural forms" msgstr "" -#: src/msgmerge.c:1090 +#: src/msgmerge.c:1224 #, c-format msgid "this message should not define plural forms" msgstr "" -#: src/msgmerge.c:1256 +#: src/msgmerge.c:1418 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " "obsolete %ld.\n" msgstr "" -#: src/msgmerge.c:1264 +#: src/msgmerge.c:1426 msgid " done.\n" msgstr "" -#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323 +#: src/msgunfmt.c:293 src/msgunfmt.c:302 src/msgunfmt.c:325 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "" -#: src/msgunfmt.c:410 +#: src/msgunfmt.c:412 #, c-format msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "" -#: src/msgunfmt.c:414 +#: src/msgunfmt.c:416 #, c-format msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" -#: src/msgunfmt.c:423 +#: src/msgunfmt.c:425 #, c-format msgid "" " -j, --java Java mode: input is a Java ResourceBundle " "class\n" msgstr "" -#: src/msgunfmt.c:425 +#: src/msgunfmt.c:427 #, c-format msgid " --csharp C# mode: input is a .NET .dll file\n" msgstr "" -#: src/msgunfmt.c:427 +#: src/msgunfmt.c:429 #, c-format msgid "" " --csharp-resources C# resources mode: input is a .NET .resources " "file\n" msgstr "" -#: src/msgunfmt.c:429 +#: src/msgunfmt.c:431 #, c-format msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr "" -#: src/msgunfmt.c:434 +#: src/msgunfmt.c:436 #, c-format msgid " FILE ... input .mo files\n" msgstr "" -#: src/msgunfmt.c:439 +#: src/msgunfmt.c:441 #, c-format msgid "Input file location in Java mode:\n" msgstr "" -#: src/msgunfmt.c:445 +#: src/msgunfmt.c:447 #, c-format msgid "" "The class name is determined by appending the locale name to the resource " @@ -2296,41 +2401,41 @@ msgid "" "separated with an underscore. The class is located using the CLASSPATH.\n" msgstr "" -#: src/msgunfmt.c:450 +#: src/msgunfmt.c:452 #, c-format msgid "Input file location in C# mode:\n" msgstr "" -#: src/msgunfmt.c:458 +#: src/msgunfmt.c:460 #, c-format msgid "" "The -l and -d options are mandatory. The .dll file is located in a\n" "subdirectory of the specified directory whose name depends on the locale.\n" msgstr "" -#: src/msgunfmt.c:462 +#: src/msgunfmt.c:464 #, c-format msgid "Input file location in Tcl mode:\n" msgstr "" -#: src/msgunfmt.c:468 +#: src/msgunfmt.c:470 #, c-format msgid "" "The -l and -d options are mandatory. The .msg file is located in the\n" "specified directory.\n" msgstr "" -#: src/msgunfmt.c:488 +#: src/msgunfmt.c:490 #, c-format msgid " -i, --indent write indented output style\n" msgstr "" -#: src/msgunfmt.c:490 +#: src/msgunfmt.c:492 #, c-format msgid " --strict write strict uniforum style\n" msgstr "" -#: src/msguniq.c:309 +#: src/msguniq.c:311 #, c-format, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2343,67 +2448,54 @@ msgid "" "will be cumulated. When using the --unique option, duplicates are discarded.\n" msgstr "" -#: src/msguniq.c:342 +#: src/msguniq.c:344 #, c-format msgid " -d, --repeated print only duplicates\n" msgstr "" -#: src/msguniq.c:344 +#: src/msguniq.c:346 #, c-format msgid "" " -u, --unique print only unique messages, discard " "duplicates\n" msgstr "" -#: src/po-charset.c:226 src/po-charset.c:296 src/po-charset.c:324 -#: src/po-charset.c:351 -#, c-format -msgid "%s: warning: " -msgstr "" - -#: src/po-charset.c:227 +#: src/po-charset.c:490 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" "Message conversion to user's charset might not work.\n" msgstr "" -#: src/po-charset.c:292 src/po-charset.c:322 -msgid "Continuing anyway, expect parse errors." -msgstr "" - -#: src/po-charset.c:294 -msgid "Continuing anyway." -msgstr "" - -#: src/po-charset.c:297 +#: src/po-charset.c:557 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" "and iconv() does not support \"%s\".\n" msgstr "" -#: src/po-charset.c:306 src/po-charset.c:332 -#, c-format +#: src/po-charset.c:564 src/po-charset.c:612 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" msgstr "" -#: src/po-charset.c:311 src/po-charset.c:336 -#, c-format -msgid "%s\n" +#: src/po-charset.c:578 src/po-charset.c:616 +msgid "Continuing anyway, expect parse errors." +msgstr "" + +#: src/po-charset.c:580 +msgid "Continuing anyway." msgstr "" -#: src/po-charset.c:325 +#: src/po-charset.c:607 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" "This version was built without iconv().\n" msgstr "" -#: src/po-charset.c:352 -#, c-format +#: src/po-charset.c:644 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2414,77 +2506,80 @@ msgstr "" msgid "inconsistent use of #~" msgstr "" -#: src/po-gram-gen.y:198 +#: src/po-gram-gen.y:201 #, c-format msgid "missing `msgstr[]' section" msgstr "" -#: src/po-gram-gen.y:206 +#: src/po-gram-gen.y:209 #, c-format msgid "missing `msgid_plural' section" msgstr "" -#: src/po-gram-gen.y:213 +#: src/po-gram-gen.y:216 #, c-format msgid "missing `msgstr' section" msgstr "" -#: src/po-gram-gen.y:258 +#: src/po-gram-gen.y:278 #, c-format msgid "first plural form has nonzero index" msgstr "" -#: src/po-gram-gen.y:260 +#: src/po-gram-gen.y:280 #, c-format msgid "plural form has wrong index" msgstr "" -#: src/po-lex.h:93 src/po-lex.h:108 src/po-lex.h:128 src/po-lex.h:143 -#: src/po-lex.c:103 src/po-lex.c:132 +#: src/po-lex.c:93 src/po-lex.c:112 #, c-format msgid "too many errors, aborting" msgstr "" -#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661 +#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:554 src/write-po.c:669 #, c-format msgid "invalid multibyte sequence" msgstr "" -#: src/po-lex.c:486 +#: src/po-lex.c:468 #, c-format msgid "incomplete multibyte sequence at end of file" msgstr "" -#: src/po-lex.c:496 +#: src/po-lex.c:478 #, c-format msgid "incomplete multibyte sequence at end of line" msgstr "" -#: src/po-lex.c:504 -#, c-format +#: src/po-lex.c:490 msgid "iconv failure" msgstr "" -#: src/po-lex.c:737 +#: src/po-lex.c:731 #, c-format msgid "keyword \"%s\" unknown" msgstr "" -#: src/po-lex.c:847 +#: src/po-lex.c:841 #, c-format msgid "invalid control sequence" msgstr "" -#: src/po-lex.c:955 +#: src/po-lex.c:949 #, c-format msgid "end-of-file within string" msgstr "" -#: src/po-lex.c:961 +#: src/po-lex.c:955 #, c-format msgid "end-of-line within string" msgstr "" +#: src/po-lex.c:976 +#, c-format +msgid "context separator within string" +msgstr "" + #: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192 #, c-format msgid "file \"%s\" is truncated" @@ -2505,126 +2600,153 @@ msgstr "" msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "" -#: src/read-po.c:318 src/xgettext.c:882 +#: src/read-po.c:322 src/xgettext.c:905 #, c-format msgid "this file may not contain domain directives" msgstr "" -#: src/read-po.c:357 -#, c-format +#: src/read-po.c:364 msgid "duplicate message definition" msgstr "" -#: src/read-po.c:358 -#, c-format -msgid "...this is the location of the first definition" +#: src/read-po.c:366 +msgid "this is the location of the first definition" msgstr "" -#: src/read-properties.c:215 -#, c-format -msgid "%s:%lu: warning: invalid \\uxxxx syntax for Unicode character" +#: src/read-properties.c:223 +msgid "warning: invalid \\uxxxx syntax for Unicode character" msgstr "" -#: src/read-stringtable.c:803 -#, c-format -msgid "%s:%lu: warning: unterminated string" +#: src/read-stringtable.c:804 +msgid "warning: unterminated string" msgstr "" -#: src/read-stringtable.c:814 -#, c-format -msgid "%s:%lu: warning: syntax error" +#: src/read-stringtable.c:812 +msgid "warning: syntax error" +msgstr "" + +#: src/read-stringtable.c:873 src/read-stringtable.c:894 +msgid "warning: unterminated key/value pair" +msgstr "" + +#: src/read-stringtable.c:939 +msgid "warning: syntax error, expected ';' after string" +msgstr "" + +#: src/read-stringtable.c:948 +msgid "warning: syntax error, expected '=' or ';' after string" msgstr "" -#: src/read-stringtable.c:877 src/read-stringtable.c:899 +#: src/recode-sr-latin.c:117 #, c-format -msgid "%s:%lu: warning: unterminated key/value pair" +msgid "Written by %s and %s.\n" +msgstr "" + +#. TRANSLATORS: This is a proper name. The last name is +#. (with Unicode escapes) "\u0160egan" or (with HTML entities) +#. "Šegan". +#. This is a proper name. See the gettext manual, section Names. +#: src/recode-sr-latin.c:121 +msgid "Danilo Segan" msgstr "" -#: src/read-stringtable.c:945 +#: src/recode-sr-latin.c:154 +#, c-format, no-wrap +msgid "Recode Serbian text from Cyrillic to Latin script.\n" +msgstr "" + +#: src/recode-sr-latin.c:157 +#, c-format, no-wrap +msgid "" +"The input text is read from standard input. The converted text is output to\n" +"standard output.\n" +msgstr "" + +#: src/recode-sr-latin.c:332 #, c-format -msgid "%s:%lu: warning: syntax error, expected ';' after string" +msgid "input is not valid in \"%s\" encoding" msgstr "" -#: src/read-stringtable.c:955 +#: src/recode-sr-latin.c:350 #, c-format -msgid "%s:%lu: warning: syntax error, expected '=' or ';' after string" +msgid "error while converting from \"%s\" encoding to \"%s\" encoding" msgstr "" -#: src/urlget.c:149 +#: src/urlget.c:147 #, c-format msgid "expected two arguments" msgstr "" -#: src/urlget.c:166 +#: src/urlget.c:164 #, c-format msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:171 +#: src/urlget.c:169 #, c-format, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:218 +#: src/urlget.c:216 #, c-format msgid "error writing stdout" msgstr "" -#: src/write-csharp.c:665 src/write-java.c:982 -#, c-format -msgid "cannot find a temporary directory, try setting $TMPDIR" -msgstr "" - -#: src/write-csharp.c:675 src/write-java.c:992 -#, c-format -msgid "cannot create a temporary directory using template \"%s\"" +#: src/write-csharp.c:618 +msgid "" +"message catalog has context dependent translations\n" +"but the C# .dll format doesn't support contexts\n" msgstr "" -#: src/write-csharp.c:726 +#: src/write-csharp.c:685 #, c-format msgid "failed to create directory \"%s\"" msgstr "" -#: src/write-csharp.c:761 src/write-java.c:1063 src/write-java.c:1076 +#: src/write-csharp.c:747 #, c-format -msgid "failed to create \"%s\"" -msgstr "" - -#: src/write-csharp.c:769 src/write-java.c:1084 src/write-mo.c:726 -#: src/write-po.c:1126 src/write-qt.c:530 src/write-tcl.c:204 -#, c-format -msgid "error while writing \"%s\" file" +msgid "compilation of C# class failed, please try --verbose" msgstr "" -#: src/write-csharp.c:787 -#, c-format -msgid "compilation of C# class failed, please try --verbose" +#: src/write-java.c:920 +msgid "" +"message catalog has context dependent translations\n" +"but the Java ResourceBundle format doesn't support contexts\n" msgstr "" -#: src/write-java.c:1005 +#: src/write-java.c:945 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1097 +#: src/write-java.c:1029 #, c-format msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" -#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194 +#: src/write-mo.c:807 src/write-qt.c:740 src/write-tcl.c:213 #, c-format msgid "error while opening \"%s\" for writing" msgstr "" -#: src/write-po.c:606 +#: src/write-po.c:609 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" -#: src/write-po.c:852 src/write-po.c:918 +#: src/write-po.c:861 src/write-po.c:951 +#, c-format +msgid "" +"The following msgctxt contains non-ASCII characters.\n" +"This will cause problems to translators who use a character encoding\n" +"different from yours. Consider using a pure ASCII msgctxt instead.\n" +"%s\n" +msgstr "" + +#: src/write-po.c:873 src/write-po.c:963 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2633,52 +2755,62 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:1063 -#, c-format +#: src/write-po.c:1114 msgid "" "Cannot output multiple translation domains into a single file with Java ." "properties syntax. Try using PO file syntax instead." msgstr "" -#: src/write-po.c:1065 -#, c-format +#: src/write-po.c:1117 msgid "" "Cannot output multiple translation domains into a single file with NeXTstep/" "GNUstep .strings syntax." msgstr "" -#: src/write-po.c:1091 -#, c-format +#: src/write-po.c:1144 +msgid "" +"message catalog has context dependent translations, but the output format " +"does not support them." +msgstr "" + +#: src/write-po.c:1167 msgid "" "message catalog has plural form translations, but the output format does not " "support them. Try generating a Java class using \"msgfmt --java\", instead " "of a properties file." msgstr "" -#: src/write-po.c:1095 -#, c-format +#: src/write-po.c:1172 msgid "" "message catalog has plural form translations, but the output format does not " "support them." msgstr "" -#: src/write-po.c:1107 +#: src/write-po.c:1189 #, c-format msgid "cannot create output file \"%s\"" msgstr "" -#: src/write-po.c:1114 +#: src/write-po.c:1198 #, no-c-format msgid "standard output" msgstr "" -#: src/write-qt.c:475 +#: src/write-qt.c:671 msgid "" "message catalog has plural form translations\n" "but the Qt message catalog format doesn't support plural handling\n" msgstr "" -#: src/write-qt.c:499 +#: src/write-qt.c:697 +msgid "" +"message catalog has msgctxt strings containing characters outside ISO-8859-" +"1\n" +"but the Qt message catalog format supports Unicode only in the translated\n" +"strings, not in the context strings\n" +msgstr "" + +#: src/write-qt.c:721 msgid "" "message catalog has msgid strings containing characters outside ISO-8859-1\n" "but the Qt message catalog format supports Unicode only in the translated\n" @@ -2692,153 +2824,213 @@ msgstr "" #: src/write-resources.c:132 msgid "" +"message catalog has context dependent translations\n" +"but the C# .resources format doesn't support contexts\n" +msgstr "" + +#: src/write-resources.c:151 +msgid "" "message catalog has plural form translations\n" "but the C# .resources format doesn't support plural handling\n" msgstr "" #: src/write-tcl.c:158 msgid "" +"message catalog has context dependent translations\n" +"but the Tcl message catalog format doesn't support contexts\n" +msgstr "" + +#: src/write-tcl.c:177 +msgid "" "message catalog has plural form translations\n" "but the Tcl message catalog format doesn't support plural handling\n" msgstr "" -#: src/x-awk.c:345 src/x-python.c:396 +#: src/x-awk.c:341 src/x-python.c:1059 #, c-format msgid "%s:%d: warning: unterminated string" msgstr "" -#: src/x-awk.c:596 +#: src/x-awk.c:592 #, c-format msgid "%s:%d: warning: unterminated regular expression" msgstr "" -#: src/x-c.c:1093 src/x-csharp.c:1498 src/x-java.c:826 +#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "" -#: src/x-c.c:1117 +#: src/x-c.c:1177 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "" -#: src/x-csharp.c:218 src/xgettext.c:1672 +#: src/x-csharp.c:216 src/xgettext.c:1849 #, c-format msgid "" "Non-ASCII string at %s%s.\n" "Please specify the source encoding through --from-code.\n" msgstr "" -#: src/x-csharp.c:260 +#: src/x-csharp.c:263 #, c-format msgid "" "%s:%d: Invalid multibyte sequence.\n" "Please specify the correct source encoding through --from-code.\n" msgstr "" -#: src/x-csharp.c:276 +#: src/x-csharp.c:279 #, c-format msgid "" "%s:%d: Long incomplete multibyte sequence.\n" "Please specify the correct source encoding through --from-code.\n" msgstr "" -#: src/x-csharp.c:288 +#: src/x-csharp.c:291 #, c-format msgid "" "%s:%d: Incomplete multibyte sequence at end of file.\n" "Please specify the correct source encoding through --from-code.\n" msgstr "" -#: src/x-csharp.c:297 +#: src/x-csharp.c:300 #, c-format msgid "" "%s:%d: Incomplete multibyte sequence at end of line.\n" "Please specify the correct source encoding through --from-code.\n" msgstr "" -#: src/x-csharp.c:306 +#: src/x-csharp.c:309 src/x-python.c:332 #, c-format msgid "%s:%d: iconv failure" msgstr "" -#: src/x-csharp.c:329 +#: src/x-csharp.c:332 #, c-format msgid "" "%s:%d: Invalid multibyte sequence.\n" "Please specify the source encoding through --from-code.\n" msgstr "" -#: src/x-csharp.c:1379 src/x-python.c:596 +#: src/x-csharp.c:1382 src/x-python.c:1259 #, c-format msgid "%s:%d: warning: invalid Unicode character" msgstr "" -#: src/x-csharp.c:1501 src/x-java.c:829 +#: src/x-csharp.c:1504 src/x-java.c:825 #, c-format msgid "%s:%d: warning: unterminated string constant" msgstr "" -#: src/x-csharp.c:2005 src/x-java.c:1323 +#: src/x-csharp.c:2008 src/x-java.c:1319 #, c-format msgid "%s:%d: warning: ')' found where '}' was expected" msgstr "" -#: src/x-csharp.c:2029 src/x-java.c:1347 +#: src/x-csharp.c:2042 src/x-java.c:1353 #, c-format msgid "%s:%d: warning: '}' found where ')' was expected" msgstr "" -#: src/x-glade.c:413 src/x-glade.c:420 +#: src/x-glade.c:429 src/x-glade.c:436 #, c-format -msgid "%s:%d:%d: %s" +msgid "%s:%lu:%lu: %s" msgstr "" -#: src/x-glade.c:447 +#: src/x-glade.c:463 #, c-format msgid "" "Language \"glade\" is not supported. %s relies on expat.\n" "This version was built without expat.\n" msgstr "" -#: src/x-perl.c:311 +#: src/x-perl.c:307 #, c-format msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF" msgstr "" -#: src/x-perl.c:1038 +#: src/x-perl.c:1032 #, c-format msgid "%s:%d: missing right brace on \\x{HEXNUMBER}" msgstr "" -#: src/x-perl.c:1158 +#: src/x-perl.c:1152 #, c-format msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\"" msgstr "" -#: src/x-perl.c:1178 +#: src/x-perl.c:1172 #, c-format msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\"" msgstr "" -#: src/x-perl.c:1212 +#: src/x-perl.c:1206 #, c-format msgid "%s:%d: invalid variable interpolation at \"%c\"" msgstr "" -#: src/x-perl.c:1225 +#: src/x-perl.c:1219 #, c-format msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\"" msgstr "" -#: src/x-perl.c:1242 +#: src/x-perl.c:1236 #, c-format msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\"" msgstr "" -#: src/x-perl.c:3006 +#: src/x-python.c:234 #, c-format -msgid "%s:%d: fatal: plural message seen before singular message\n" +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code or through a comment\n" +"as specified in http://www.python.org/peps/pep-0263.html.\n" +msgstr "" + +#: src/x-python.c:282 +#, c-format +msgid "" +"%s:%d: Invalid multibyte sequence.\n" +"Please specify the correct source encoding through --from-code or through a\n" +"comment as specified in http://www.python.org/peps/pep-0263.html.\n" +msgstr "" + +#: src/x-python.c:299 +#, c-format +msgid "" +"%s:%d: Long incomplete multibyte sequence.\n" +"Please specify the correct source encoding through --from-code or through a\n" +"comment as specified in http://www.python.org/peps/pep-0263.html.\n" +msgstr "" + +#: src/x-python.c:312 +#, c-format +msgid "" +"%s:%d: Incomplete multibyte sequence at end of file.\n" +"Please specify the correct source encoding through --from-code or through a\n" +"comment as specified in http://www.python.org/peps/pep-0263.html.\n" +msgstr "" + +#: src/x-python.c:322 +#, c-format +msgid "" +"%s:%d: Incomplete multibyte sequence at end of line.\n" +"Please specify the correct source encoding through --from-code or through a\n" +"comment as specified in http://www.python.org/peps/pep-0263.html.\n" +msgstr "" + +#: src/x-python.c:355 +#, c-format +msgid "" +"%s:%d: Invalid multibyte sequence.\n" +"Please specify the source encoding through --from-code or through a comment\n" +"as specified in http://www.python.org/peps/pep-0263.html.\n" +msgstr "" + +#: src/x-python.c:675 +#, c-format +msgid "Unknown encoding \"%s\". Proceeding with ASCII instead." msgstr "" #: src/x-rst.c:107 @@ -2856,57 +3048,57 @@ msgstr "" msgid "%s:%d: invalid string expression" msgstr "" -#: src/x-sh.c:1015 +#: src/x-sh.c:1074 #, c-format msgid "" "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; " "use eval_gettext instead" msgstr "" -#: src/xgettext.c:526 +#: src/xgettext.c:545 #, c-format msgid "--join-existing cannot be used when output is written to stdout" msgstr "" -#: src/xgettext.c:531 +#: src/xgettext.c:550 #, c-format msgid "xgettext cannot work without keywords to look for" msgstr "" -#: src/xgettext.c:674 +#: src/xgettext.c:693 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" -#: src/xgettext.c:725 +#: src/xgettext.c:744 #, c-format msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:748 +#: src/xgettext.c:767 #, c-format msgid "" " -d, --default-domain=NAME use NAME.po for output (instead of messages." "po)\n" msgstr "" -#: src/xgettext.c:750 +#: src/xgettext.c:769 #, c-format msgid " -o, --output=FILE write output to specified file\n" msgstr "" -#: src/xgettext.c:752 +#: src/xgettext.c:771 #, c-format msgid "" " -p, --output-dir=DIR output files will be placed in directory DIR\n" msgstr "" -#: src/xgettext.c:757 +#: src/xgettext.c:776 #, c-format msgid "Choice of input file language:\n" msgstr "" -#: src/xgettext.c:759 +#: src/xgettext.c:778 #, c-format msgid "" " -L, --language=NAME recognise the specified language\n" @@ -2918,58 +3110,58 @@ msgid "" " GCC-source, NXStringTable, RST, Glade)\n" msgstr "" -#: src/xgettext.c:765 +#: src/xgettext.c:784 #, c-format msgid " -C, --c++ shorthand for --language=C++\n" msgstr "" -#: src/xgettext.c:767 +#: src/xgettext.c:786 #, c-format msgid "" "By default the language is guessed depending on the input file name " "extension.\n" msgstr "" -#: src/xgettext.c:772 +#: src/xgettext.c:791 #, c-format msgid "" " --from-code=NAME encoding of input files\n" " (except for Python, Tcl, Glade)\n" msgstr "" -#: src/xgettext.c:775 +#: src/xgettext.c:794 #, c-format msgid "By default the input files are assumed to be in ASCII.\n" msgstr "" -#: src/xgettext.c:780 +#: src/xgettext.c:799 #, c-format msgid " -j, --join-existing join messages with existing file\n" msgstr "" -#: src/xgettext.c:782 +#: src/xgettext.c:801 #, c-format msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n" msgstr "" -#: src/xgettext.c:784 +#: src/xgettext.c:803 #, c-format msgid "" " -c, --add-comments[=TAG] place comment block with TAG (or those\n" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:788 +#: src/xgettext.c:807 #, c-format msgid "Language specific options:\n" msgstr "" -#: src/xgettext.c:790 +#: src/xgettext.c:809 #, c-format msgid " -a, --extract-all extract all strings\n" msgstr "" -#: src/xgettext.c:792 src/xgettext.c:799 +#: src/xgettext.c:811 src/xgettext.c:818 #, c-format msgid "" " (only languages C, C++, ObjectiveC, Shell,\n" @@ -2978,14 +3170,14 @@ msgid "" " C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n" msgstr "" -#: src/xgettext.c:796 +#: src/xgettext.c:815 #, c-format msgid "" " -k, --keyword[=WORD] additional keyword to be looked for (without\n" " WORD means not to use default keywords)\n" msgstr "" -#: src/xgettext.c:803 +#: src/xgettext.c:822 #, c-format msgid "" " --flag=WORD:ARG:FLAG additional flag for strings inside the " @@ -2993,7 +3185,7 @@ msgid "" " number ARG of keyword WORD\n" msgstr "" -#: src/xgettext.c:806 +#: src/xgettext.c:825 #, c-format msgid "" " (only languages C, C++, ObjectiveC, Shell,\n" @@ -3002,150 +3194,148 @@ msgid "" " C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n" msgstr "" -#: src/xgettext.c:810 +#: src/xgettext.c:829 #, c-format msgid " -T, --trigraphs understand ANSI C trigraphs for input\n" msgstr "" -#: src/xgettext.c:812 +#: src/xgettext.c:831 #, c-format msgid " (only languages C, C++, ObjectiveC)\n" msgstr "" -#: src/xgettext.c:814 +#: src/xgettext.c:833 #, c-format msgid " --qt recognize Qt format strings\n" msgstr "" -#: src/xgettext.c:816 +#: src/xgettext.c:835 src/xgettext.c:839 #, c-format msgid " (only language C++)\n" msgstr "" -#: src/xgettext.c:818 +#: src/xgettext.c:837 +#, c-format +msgid " --boost recognize Boost format strings\n" +msgstr "" + +#: src/xgettext.c:841 #, c-format msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:837 +#: src/xgettext.c:860 #, c-format msgid " --properties-output write out a Java .properties file\n" msgstr "" -#: src/xgettext.c:852 +#: src/xgettext.c:875 #, c-format msgid " --copyright-holder=STRING set copyright holder in output\n" msgstr "" -#: src/xgettext.c:854 +#: src/xgettext.c:877 #, c-format msgid "" " --foreign-user omit FSF copyright in output for foreign user\n" msgstr "" -#: src/xgettext.c:856 +#: src/xgettext.c:879 #, c-format msgid "" " --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n" msgstr "" -#: src/xgettext.c:858 +#: src/xgettext.c:881 #, c-format msgid "" " -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr " "entries\n" msgstr "" -#: src/xgettext.c:860 +#: src/xgettext.c:883 #, c-format msgid "" " -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr " "entries\n" msgstr "" -#: src/xgettext.c:1462 +#: src/xgettext.c:1644 #, c-format msgid "" "A --flag argument doesn't have the ::[pass-] syntax: %" "s" msgstr "" -#: src/xgettext.c:1560 +#: src/xgettext.c:1745 msgid "standard input" msgstr "" -#: src/xgettext.c:1731 src/xgettext.c:1786 +#: src/xgettext.c:1925 src/xgettext.c:1958 src/xgettext.c:2016 #, c-format msgid "%s%s: warning: " msgstr "" -#: src/xgettext.c:1733 +#: src/xgettext.c:1928 #, c-format msgid "" "Although being used in a format string position, the %s is not a valid %s " "format string. Reason: %s\n" msgstr "" -#: src/xgettext.c:1733 +#: src/xgettext.c:1929 #, c-format msgid "" "Although declared as such, the %s is not a valid %s format string. Reason: %" "s\n" msgstr "" -#: src/xgettext.c:1788 +#: src/xgettext.c:1960 +#, c-format msgid "" -"Empty msgid. It is reserved by GNU gettext:\n" -"gettext(\"\") returns the header entry with\n" -"meta information, not the empty string.\n" +"'%s' format string with unnamed arguments cannot be properly localized:\n" +"The translator cannot reorder the arguments.\n" +"Please consider using a format string with named arguments,\n" +"and a mapping instead of a tuple for the arguments.\n" msgstr "" -#: src/xgettext.c:2071 +#: src/xgettext.c:2018 msgid "" -"The option --msgid-bugs-address was not specified.\n" -"If you are using a `Makevars' file, please specify\n" -"the MSGID_BUGS_ADDRESS variable there; otherwise please\n" -"specify an --msgid-bugs-address command line option.\n" +"Empty msgid. It is reserved by GNU gettext:\n" +"gettext(\"\") returns the header entry with\n" +"meta information, not the empty string.\n" msgstr "" -#: src/xgettext.c:2262 +#: src/xgettext.c:2621 #, c-format -msgid "language `%s' unknown" -msgstr "" - -#: src/user-email.sh.in:340 -msgid "Which is your email address?" -msgstr "" - -#: src/user-email.sh.in:342 -msgid "Please choose the number, or enter your email address." -msgstr "" - -#: src/user-email.sh.in:360 src/user-email.sh.in:384 src/user-email.sh.in:403 -msgid "Invalid email address: invalid character." +msgid "ambiguous argument specification for keyword '%.*s'" msgstr "" -#: src/user-email.sh.in:362 src/user-email.sh.in:386 src/user-email.sh.in:405 -msgid "Invalid email address: need a fully qualified host name or domain name." -msgstr "" - -#: src/user-email.sh.in:363 src/user-email.sh.in:387 src/user-email.sh.in:406 -msgid "Invalid email address: missing @" +#: src/xgettext.c:2648 +#, c-format +msgid "warning: missing context for keyword '%.*s'" msgstr "" -#: src/user-email.sh.in:372 -msgid "Is the following your email address?" +#: src/xgettext.c:2673 +#, c-format +msgid "warning: missing context for plural argument of keyword '%.*s'" msgstr "" -#: src/user-email.sh.in:374 -msgid "Please confirm by pressing Return, or enter your email address." +#: src/xgettext.c:2694 +#, c-format +msgid "context mismatch between singular and plural form" msgstr "" -#: src/user-email.sh.in:395 -msgid "Couldn't find out about your email address." +#: src/xgettext.c:2774 +msgid "" +"The option --msgid-bugs-address was not specified.\n" +"If you are using a `Makevars' file, please specify\n" +"the MSGID_BUGS_ADDRESS variable there; otherwise please\n" +"specify an --msgid-bugs-address command line option.\n" msgstr "" -#: src/user-email.sh.in:397 -msgid "Please enter your email address." +#: src/xgettext.c:2975 +#, c-format +msgid "language `%s' unknown" msgstr "" diff --git a/gettext-tools/src/po-gram-gen.c b/gettext-tools/src/po-gram-gen.c index 434c09b90..ad4fefe44 100644 --- a/gettext-tools/src/po-gram-gen.c +++ b/gettext-tools/src/po-gram-gen.c @@ -6,12 +6,13 @@ # define COMMENT 257 # define DOMAIN 258 # define JUNK 259 -# define MSGID 260 -# define MSGID_PLURAL 261 -# define MSGSTR 262 -# define NAME 263 -# define NUMBER 264 -# define STRING 265 +# define MSGCTXT 260 +# define MSGID 261 +# define MSGID_PLURAL 262 +# define MSGSTR 263 +# define NAME 264 +# define NUMBER 265 +# define STRING 266 #line 20 "po-gram-gen.y" @@ -91,21 +92,23 @@ static long plural_counter; po_gram_error_at_line (&(value2).pos, _("inconsistent use of #~")); static inline void -do_callback_message (char *msgid, lex_pos_ty *msgid_pos, char *msgid_plural, +do_callback_message (char *msgctxt, + char *msgid, lex_pos_ty *msgid_pos, char *msgid_plural, char *msgstr, size_t msgstr_len, lex_pos_ty *msgstr_pos, bool obsolete) { /* Test for header entry. Ignore fuzziness of the header entry. */ - if (msgid[0] == '\0' && !obsolete) + if (msgctxt == NULL && msgid[0] == '\0' && !obsolete) po_lex_charset_set (msgstr, gram_pos.file_name); - po_callback_message (msgid, msgid_pos, msgid_plural, + po_callback_message (msgctxt, + msgid, msgid_pos, msgid_plural, msgstr, msgstr_len, msgstr_pos, false, obsolete); } -#line 123 "po-gram-gen.y" +#line 126 "po-gram-gen.y" #ifndef YYSTYPE typedef union { @@ -124,12 +127,12 @@ typedef union -#define YYFINAL 28 +#define YYFINAL 32 #define YYFLAG -32768 -#define YYNTBASE 14 +#define YYNTBASE 15 /* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */ -#define YYTRANSLATE(x) ((unsigned)(x) <= 265 ? yytranslate[x] : 22) +#define YYTRANSLATE(x) ((unsigned)(x) <= 266 ? yytranslate[x] : 24) /* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */ static const char yytranslate[] = @@ -143,7 +146,7 @@ static const char yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 10, 2, 11, 2, 2, 2, 2, 2, 2, + 2, 11, 2, 12, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -160,23 +163,25 @@ static const char yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 4, 5, - 6, 7, 8, 9, 12, 13 + 6, 7, 8, 9, 10, 13, 14 }; #if YYDEBUG static const short yyprhs[] = { 0, 0, 1, 4, 7, 10, 13, 16, 21, 26, - 30, 34, 37, 40, 42, 45, 51, 53, 56 + 30, 34, 37, 39, 43, 46, 48, 51, 57, 59, + 62 }; static const short yyrhs[] = { - -1, 14, 21, 0, 14, 15, 0, 14, 16, 0, - 14, 1, 0, 4, 13, 0, 6, 20, 8, 20, - 0, 6, 20, 17, 18, 0, 6, 20, 17, 0, - 6, 20, 18, 0, 6, 20, 0, 7, 20, 0, - 19, 0, 18, 19, 0, 8, 10, 12, 11, 20, - 0, 13, 0, 20, 13, 0, 3, 0 + -1, 15, 23, 0, 15, 16, 0, 15, 17, 0, + 15, 1, 0, 4, 14, 0, 18, 22, 9, 22, + 0, 18, 22, 19, 20, 0, 18, 22, 19, 0, + 18, 22, 20, 0, 18, 22, 0, 7, 0, 6, + 22, 7, 0, 8, 22, 0, 21, 0, 20, 21, + 0, 9, 11, 13, 12, 22, 0, 14, 0, 22, + 14, 0, 3, 0 }; #endif @@ -185,8 +190,9 @@ static const short yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const short yyrline[] = { - 0, 143, 144, 145, 146, 147, 151, 158, 176, 194, - 202, 210, 219, 230, 234, 249, 271, 278, 289 + 0, 146, 147, 148, 149, 150, 154, 161, 179, 197, + 205, 213, 222, 228, 239, 250, 254, 269, 291, 298, + 309 }; #endif @@ -196,25 +202,28 @@ static const short yyrline[] = /* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */ static const char *const yytname[] = { - "$", "error", "$undefined.", "COMMENT", "DOMAIN", "JUNK", "MSGID", - "MSGID_PLURAL", "MSGSTR", "NAME", "'['", "']'", "NUMBER", "STRING", - "msgfmt", "domain", "message", "msgid_pluralform", "pluralform_list", - "pluralform", "string_list", "comment", 0 + "$", "error", "$undefined.", "COMMENT", "DOMAIN", "JUNK", "MSGCTXT", + "MSGID", "MSGID_PLURAL", "MSGSTR", "NAME", "'['", "']'", "NUMBER", + "STRING", "msgfmt", "domain", "message", "message_intro", + "msgid_pluralform", "pluralform_list", "pluralform", "string_list", + "comment", 0 }; #endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const short yyr1[] = { - 0, 14, 14, 14, 14, 14, 15, 16, 16, 16, - 16, 16, 17, 18, 18, 19, 20, 20, 21 + 0, 15, 15, 15, 15, 15, 16, 17, 17, 17, + 17, 17, 18, 18, 19, 20, 20, 21, 22, 22, + 23 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const short yyr2[] = { 0, 0, 2, 2, 2, 2, 2, 4, 4, 3, - 3, 2, 2, 1, 2, 5, 1, 2, 1 + 3, 2, 1, 3, 2, 1, 2, 5, 1, 2, + 1 }; /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE @@ -222,47 +231,49 @@ static const short yyr2[] = error. */ static const short yydefact[] = { - 1, 0, 5, 18, 0, 0, 3, 4, 2, 6, - 16, 11, 0, 0, 17, 9, 10, 13, 12, 0, - 7, 0, 8, 14, 0, 0, 15, 0, 0 + 1, 0, 5, 20, 0, 0, 12, 3, 4, 0, + 2, 6, 18, 0, 11, 13, 19, 0, 0, 9, + 10, 15, 14, 0, 7, 0, 8, 16, 0, 0, + 17, 0, 0 }; static const short yydefgoto[] = { - 1, 6, 7, 15, 16, 17, 11, 8 + 1, 7, 8, 9, 19, 20, 21, 13, 10 }; static const short yypact[] = { - -32768, 2,-32768,-32768, -1, 1,-32768,-32768,-32768,-32768, - -32768, 3, 1, -6,-32768, 9, 9,-32768, 5, 7, - 5, 10, 9,-32768, 11, 1, 5, 21,-32768 + -32768, 10,-32768,-32768, -10, 4,-32768,-32768,-32768, 4, + -32768,-32768,-32768, -2, -7,-32768,-32768, 4, -8, 13, + 13,-32768, 5, 11, 5, 12, 13,-32768, 14, 4, + 5, 25,-32768 }; static const short yypgoto[] = { - -32768,-32768,-32768,-32768, 8, -7, -12,-32768 + -32768,-32768,-32768,-32768,-32768, 8, -5, -9,-32768 }; -#define YYLAST 23 +#define YYLAST 27 static const short yytable[] = { - 18, 20, 27, 2, 19, 3, 4, 10, 5, 23, - 12, 13, 9, 26, 10, 23, 14, 21, 14, 24, - 19, 28, 25, 22 + 14, 17, 18, 23, 11, 15, 12, 16, 22, 24, + 31, 2, 16, 3, 4, 27, 5, 6, 12, 16, + 30, 27, 25, 23, 28, 32, 29, 26 }; static const short yycheck[] = { - 12, 13, 0, 1, 10, 3, 4, 13, 6, 16, - 7, 8, 13, 25, 13, 22, 13, 8, 13, 12, - 10, 0, 11, 15 + 9, 8, 9, 11, 14, 7, 14, 14, 17, 18, + 0, 1, 14, 3, 4, 20, 6, 7, 14, 14, + 29, 26, 9, 11, 13, 0, 12, 19 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/local/share/bison/bison.simple" +#line 3 "bison.simple" /* Skeleton output parser for bison, @@ -575,7 +586,7 @@ yystpcpy (yydest, yysrc) # endif #endif -#line 315 "/usr/local/share/bison/bison.simple" +#line 315 "bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed @@ -969,24 +980,24 @@ yyreduce: switch (yyn) { case 6: -#line 152 "po-gram-gen.y" +#line 155 "po-gram-gen.y" { po_callback_domain (yyvsp[0].string.string); } break; case 7: -#line 159 "po-gram-gen.y" +#line 162 "po-gram-gen.y" { char *string2 = string_list_concat_destroy (&yyvsp[-2].stringlist.stringlist); char *string4 = string_list_concat_destroy (&yyvsp[0].stringlist.stringlist); - check_obsolete (yyvsp[-3].pos, yyvsp[-2].stringlist); - check_obsolete (yyvsp[-3].pos, yyvsp[-1].pos); - check_obsolete (yyvsp[-3].pos, yyvsp[0].stringlist); - if (!yyvsp[-3].pos.obsolete || pass_obsolete_entries) - do_callback_message (string2, &yyvsp[-3].pos.pos, NULL, + check_obsolete (yyvsp[-3].string, yyvsp[-2].stringlist); + check_obsolete (yyvsp[-3].string, yyvsp[-1].pos); + check_obsolete (yyvsp[-3].string, yyvsp[0].stringlist); + if (!yyvsp[-3].string.obsolete || pass_obsolete_entries) + do_callback_message (yyvsp[-3].string.string, string2, &yyvsp[-3].string.pos, NULL, string4, strlen (string4) + 1, &yyvsp[-1].pos.pos, - yyvsp[-3].pos.obsolete); + yyvsp[-3].string.obsolete); else { free (string2); @@ -995,17 +1006,17 @@ case 7: } break; case 8: -#line 177 "po-gram-gen.y" +#line 180 "po-gram-gen.y" { char *string2 = string_list_concat_destroy (&yyvsp[-2].stringlist.stringlist); - check_obsolete (yyvsp[-3].pos, yyvsp[-2].stringlist); - check_obsolete (yyvsp[-3].pos, yyvsp[-1].string); - check_obsolete (yyvsp[-3].pos, yyvsp[0].rhs); - if (!yyvsp[-3].pos.obsolete || pass_obsolete_entries) - do_callback_message (string2, &yyvsp[-3].pos.pos, yyvsp[-1].string.string, + check_obsolete (yyvsp[-3].string, yyvsp[-2].stringlist); + check_obsolete (yyvsp[-3].string, yyvsp[-1].string); + check_obsolete (yyvsp[-3].string, yyvsp[0].rhs); + if (!yyvsp[-3].string.obsolete || pass_obsolete_entries) + do_callback_message (yyvsp[-3].string.string, string2, &yyvsp[-3].string.pos, yyvsp[-1].string.string, yyvsp[0].rhs.rhs.msgstr, yyvsp[0].rhs.rhs.msgstr_len, &yyvsp[0].rhs.pos, - yyvsp[-3].pos.obsolete); + yyvsp[-3].string.obsolete); else { free (string2); @@ -1015,35 +1026,53 @@ case 8: } break; case 9: -#line 195 "po-gram-gen.y" +#line 198 "po-gram-gen.y" { - check_obsolete (yyvsp[-2].pos, yyvsp[-1].stringlist); - check_obsolete (yyvsp[-2].pos, yyvsp[0].string); - po_gram_error_at_line (&yyvsp[-2].pos.pos, _("missing `msgstr[]' section")); + check_obsolete (yyvsp[-2].string, yyvsp[-1].stringlist); + check_obsolete (yyvsp[-2].string, yyvsp[0].string); + po_gram_error_at_line (&yyvsp[-2].string.pos, _("missing `msgstr[]' section")); string_list_destroy (&yyvsp[-1].stringlist.stringlist); free (yyvsp[0].string.string); } break; case 10: -#line 203 "po-gram-gen.y" +#line 206 "po-gram-gen.y" { - check_obsolete (yyvsp[-2].pos, yyvsp[-1].stringlist); - check_obsolete (yyvsp[-2].pos, yyvsp[0].rhs); - po_gram_error_at_line (&yyvsp[-2].pos.pos, _("missing `msgid_plural' section")); + check_obsolete (yyvsp[-2].string, yyvsp[-1].stringlist); + check_obsolete (yyvsp[-2].string, yyvsp[0].rhs); + po_gram_error_at_line (&yyvsp[-2].string.pos, _("missing `msgid_plural' section")); string_list_destroy (&yyvsp[-1].stringlist.stringlist); free (yyvsp[0].rhs.rhs.msgstr); } break; case 11: -#line 211 "po-gram-gen.y" +#line 214 "po-gram-gen.y" { - check_obsolete (yyvsp[-1].pos, yyvsp[0].stringlist); - po_gram_error_at_line (&yyvsp[-1].pos.pos, _("missing `msgstr' section")); + check_obsolete (yyvsp[-1].string, yyvsp[0].stringlist); + po_gram_error_at_line (&yyvsp[-1].string.pos, _("missing `msgstr' section")); string_list_destroy (&yyvsp[0].stringlist.stringlist); } break; case 12: -#line 220 "po-gram-gen.y" +#line 223 "po-gram-gen.y" +{ + yyval.string.string = NULL; + yyval.string.pos = yyvsp[0].pos.pos; + yyval.string.obsolete = yyvsp[0].pos.obsolete; + } + break; +case 13: +#line 229 "po-gram-gen.y" +{ + check_obsolete (yyvsp[-2].pos, yyvsp[-1].stringlist); + check_obsolete (yyvsp[-2].pos, yyvsp[0].pos); + yyval.string.string = string_list_concat_destroy (&yyvsp[-1].stringlist.stringlist); + yyval.string.pos = yyvsp[0].pos.pos; + yyval.string.obsolete = yyvsp[0].pos.obsolete; + } + break; +case 14: +#line 240 "po-gram-gen.y" { check_obsolete (yyvsp[-1].pos, yyvsp[0].stringlist); plural_counter = 0; @@ -1052,14 +1081,14 @@ case 12: yyval.string.obsolete = yyvsp[-1].pos.obsolete; } break; -case 13: -#line 231 "po-gram-gen.y" +case 15: +#line 251 "po-gram-gen.y" { yyval.rhs = yyvsp[0].rhs; } break; -case 14: -#line 235 "po-gram-gen.y" +case 16: +#line 255 "po-gram-gen.y" { check_obsolete (yyvsp[-1].rhs, yyvsp[0].rhs); yyval.rhs.rhs.msgstr = (char *) xmalloc (yyvsp[-1].rhs.rhs.msgstr_len + yyvsp[0].rhs.rhs.msgstr_len); @@ -1072,8 +1101,8 @@ case 14: yyval.rhs.obsolete = yyvsp[-1].rhs.obsolete; } break; -case 15: -#line 250 "po-gram-gen.y" +case 17: +#line 270 "po-gram-gen.y" { check_obsolete (yyvsp[-4].pos, yyvsp[-3].pos); check_obsolete (yyvsp[-4].pos, yyvsp[-2].number); @@ -1093,8 +1122,8 @@ case 15: yyval.rhs.obsolete = yyvsp[-4].pos.obsolete; } break; -case 16: -#line 272 "po-gram-gen.y" +case 18: +#line 292 "po-gram-gen.y" { string_list_init (&yyval.stringlist.stringlist); string_list_append (&yyval.stringlist.stringlist, yyvsp[0].string.string); @@ -1102,8 +1131,8 @@ case 16: yyval.stringlist.obsolete = yyvsp[0].string.obsolete; } break; -case 17: -#line 279 "po-gram-gen.y" +case 19: +#line 299 "po-gram-gen.y" { check_obsolete (yyvsp[-1].stringlist, yyvsp[0].string); yyval.stringlist.stringlist = yyvsp[-1].stringlist.stringlist; @@ -1112,15 +1141,15 @@ case 17: yyval.stringlist.obsolete = yyvsp[-1].stringlist.obsolete; } break; -case 18: -#line 290 "po-gram-gen.y" +case 20: +#line 310 "po-gram-gen.y" { po_callback_comment_dispatcher (yyvsp[0].string.string); } break; } -#line 705 "/usr/local/share/bison/bison.simple" +#line 705 "bison.simple" yyvsp -= yylen; @@ -1351,4 +1380,4 @@ yyreturn: #endif return yyresult; } -#line 294 "po-gram-gen.y" +#line 314 "po-gram-gen.y" diff --git a/gettext-tools/src/po-gram-gen.h b/gettext-tools/src/po-gram-gen.h index 248473945..980a7c931 100644 --- a/gettext-tools/src/po-gram-gen.h +++ b/gettext-tools/src/po-gram-gen.h @@ -1,5 +1,5 @@ -#ifndef BISON_Y_TAB_H -# define BISON_Y_TAB_H +#ifndef BISON_PO_GRAM_GEN_H +# define BISON_PO_GRAM_GEN_H #ifndef YYSTYPE typedef union @@ -16,14 +16,15 @@ typedef union # define COMMENT 257 # define DOMAIN 258 # define JUNK 259 -# define MSGID 260 -# define MSGID_PLURAL 261 -# define MSGSTR 262 -# define NAME 263 -# define NUMBER 264 -# define STRING 265 +# define MSGCTXT 260 +# define MSGID 261 +# define MSGID_PLURAL 262 +# define MSGSTR 263 +# define NAME 264 +# define NUMBER 265 +# define STRING 266 extern YYSTYPE yylval; -#endif /* not BISON_Y_TAB_H */ +#endif /* not BISON_PO_GRAM_GEN_H */ diff --git a/gettext-tools/tests/xg-c-1.ok.po b/gettext-tools/tests/xg-c-1.ok.po index 07e2af094..302b64263 100644 --- a/gettext-tools/tests/xg-c-1.ok.po +++ b/gettext-tools/tests/xg-c-1.ok.po @@ -210,6 +210,10 @@ msgstr "" msgid " (only language C++)\n" msgstr "" +#, c-format +msgid " --boost recognize Boost format strings\n" +msgstr "" + #, c-format msgid "" " --debug more detailed formatstring recognition result\n" @@ -362,12 +366,35 @@ msgid "" "s\n" msgstr "" +#, c-format +msgid "" +"'%s' format string with unnamed arguments cannot be properly localized:\n" +"The translator cannot reorder the arguments.\n" +"Please consider using a format string with named arguments,\n" +"and a mapping instead of a tuple for the arguments.\n" +msgstr "" + msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" +#, c-format +msgid "ambiguous argument specification for keyword '%.*s'" +msgstr "" + +#, c-format +msgid "warning: missing context for keyword '%.*s'" +msgstr "" + +#, c-format +msgid "warning: missing context for plural argument of keyword '%.*s'" +msgstr "" + +msgid "context mismatch between singular and plural form" +msgstr "" + msgid "warning: " msgstr "" @@ -386,6 +413,10 @@ msgstr "" msgid "the argument to %s should be a single punctuation character" msgstr "" +#, c-format +msgid "invalid endianness: %s" +msgstr "" + #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" @@ -402,6 +433,12 @@ msgstr "" msgid "%s is only valid with %s, %s or %s" msgstr "" +#, c-format +msgid "found %d fatal error" +msgid_plural "found %d fatal errors" +msgstr[0] "" +msgstr[1] "" + #, c-format msgid "%d translated message" msgid_plural "%d translated messages" @@ -601,113 +638,6 @@ msgstr "" msgid " -v, --verbose increase verbosity level\n" msgstr "" -msgid "plural expression can produce negative values" -msgstr "" - -#, c-format -msgid "nplurals = %lu but plural expression can produce values as large as %lu" -msgstr "" - -#, c-format -msgid "plural expression can produce division by zero" -msgstr "" - -#, c-format -msgid "plural expression can produce integer overflow" -msgstr "" - -#, c-format -msgid "" -"plural expression can produce arithmetic exceptions, possibly division by " -"zero" -msgstr "" - -msgid "message catalog has plural form translations..." -msgstr "" - -msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" -msgstr "" - -msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" -msgstr "" - -msgid "invalid nplurals value" -msgstr "" - -msgid "invalid plural expression" -msgstr "" - -#, c-format -msgid "nplurals = %lu..." -msgstr "" - -#, c-format -msgid "...but some messages have only one plural form" -msgid_plural "...but some messages have only %lu plural forms" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "...but some messages have one plural form" -msgid_plural "...but some messages have %lu plural forms" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "Try using the following, valid for %s:\n" -msgstr "" - -msgid "" -"message catalog has plural form translations, but lacks a header entry with " -"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" -msgstr "" - -msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" -msgstr "" - -#, c-format -msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" -msgstr "" - -msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" -msgstr "" - -msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" -msgstr "" - -#, c-format -msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" -msgstr "" - -msgid "`msgid' and `msgstr' entries do not both end with '\\n'" -msgstr "" - -msgid "plural handling is a GNU gettext extension" -msgstr "" - -#, c-format -msgid "msgstr lacks the keyboard accelerator mark '%c'" -msgstr "" - -#, c-format -msgid "msgstr has too many keyboard accelerator marks '%c'" -msgstr "" - -#, c-format -msgid "headerfield `%s' missing in header\n" -msgstr "" - -#, c-format -msgid "header field `%s' should start at beginning of line\n" -msgstr "" - -msgid "some header fields still have the initial default value\n" -msgstr "" - -#, c-format -msgid "field `%s' still has initial default value\n" -msgstr "" - msgid "warning: PO file header missing or invalid\n" msgstr ""