From: Bruno Haible Date: Fri, 27 Oct 2006 12:01:31 +0000 (+0000) Subject: Regenerated for 0.16. X-Git-Tag: 0.16.x-branchpoint~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85e564e665d3cca0e13ddd4dae378a8cbc70969d;p=thirdparty%2Fgettext.git Regenerated for 0.16. --- diff --git a/gettext-runtime/libasprintf/autosprintf_all.html b/gettext-runtime/libasprintf/autosprintf_all.html index 6247b5c5d..670e067d0 100644 --- a/gettext-runtime/libasprintf/autosprintf_all.html +++ b/gettext-runtime/libasprintf/autosprintf_all.html @@ -1,7 +1,7 @@ + from autosprintf.texi on 22 August 2006 --> GNU autosprintf @@ -134,7 +134,7 @@ it provides.

-This document was generated on 20 April 2006 using the +This document was generated on 22 August 2006 using the texi2html translator version 1.52b.

diff --git a/gettext-runtime/man/bind_textdomain_codeset.3 b/gettext-runtime/man/bind_textdomain_codeset.3 index 2e732eaac..f894807c0 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.15" +.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.16" .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 6c8236542..afd3fe1e5 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.15" +.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.16" .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 925a861b1..295d06124 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" "July 2006" "GNU gettext-runtime 0.15" GNU +.TH ENVSUBST "1" "October 2006" "GNU gettext-runtime 0.16" GNU .SH NAME envsubst \- substitutes environment variables in shell format strings .SH SYNOPSIS diff --git a/gettext-runtime/man/gettext.1.in b/gettext-runtime/man/gettext.1.in index 0bb2df30b..d11d41b14 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" "July 2006" "GNU gettext-runtime 0.15" GNU +.TH GETTEXT "1" "October 2006" "GNU gettext-runtime 0.16" GNU .SH NAME gettext \- translate message .SH SYNOPSIS diff --git a/gettext-runtime/man/gettext.3 b/gettext-runtime/man/gettext.3 index 8dfeb71fa..9492d1458 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.15" +.TH GETTEXT 3 "May 2001" "GNU gettext 0.16" .SH NAME gettext, dgettext, dcgettext \- translate message .SH SYNOPSIS diff --git a/gettext-runtime/man/ngettext.1.in b/gettext-runtime/man/ngettext.1.in index 6890e021c..7968158e1 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" "July 2006" "GNU gettext-runtime 0.15" GNU +.TH NGETTEXT "1" "October 2006" "GNU gettext-runtime 0.16" GNU .SH NAME ngettext \- translate message and choose plural form .SH SYNOPSIS diff --git a/gettext-runtime/man/ngettext.3 b/gettext-runtime/man/ngettext.3 index b5ce428dc..7515cc747 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.15" +.TH NGETTEXT 3 "May 2001" "GNU gettext 0.16" .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 6399ef278..6d5b48fa7 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.15" +.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.16" .SH NAME textdomain \- set domain for future gettext() calls .SH SYNOPSIS diff --git a/gettext-tools/ABOUT-NLS b/gettext-tools/ABOUT-NLS index 3575535a8..ec20977e0 100644 --- a/gettext-tools/ABOUT-NLS +++ b/gettext-tools/ABOUT-NLS @@ -172,14 +172,14 @@ get started, please write to `translation@iro.umontreal.ca' to reach the coordinator for all translator teams. The English team is special. It works at improving and uniformizing -the terminology in use. Proven linguistic skill are praised more than -programming skill, here. +the terminology in use. Proven linguistic skills are praised more than +programming skills, here. 1.5 Available Packages ====================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of July +matrix shows the current state of internationalization, as of October 2006. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. @@ -192,19 +192,19 @@ translation percentage of at least 50%. ant-phone | () | anubis | [] | ap-utils | | - aspell | [] [] [] [] | + aspell | [] [] [] [] [] | bash | [] [] [] | batchelor | [] | bfd | | bibshelf | [] | binutils | [] | bison | [] [] | - bison-runtime | [] | + bison-runtime | | bluez-pin | [] [] [] [] [] | cflow | [] | clisp | [] [] | console-tools | [] [] | - coreutils | [] [] [] [] | + coreutils | [] [] [] | cpio | | cpplib | [] [] [] | cryptonit | [] | @@ -242,7 +242,7 @@ translation percentage of at least 50%. gnutls | | gpe-aerial | [] [] | gpe-beam | [] [] | - gpe-calendar | [] [] | + gpe-calendar | | gpe-clock | [] [] | gpe-conf | [] [] | gpe-contacts | | @@ -270,19 +270,17 @@ translation percentage of at least 50%. gst-plugins-base | [] [] [] | gst-plugins-good | [] [] [] [] [] [] [] | gstreamer | [] [] [] [] [] [] [] | - gtick | [] () | + gtick | () | gtkam | [] [] [] | gtkorphan | [] [] | gtkspell | [] [] [] [] | gutenprint | [] | - hello | [] [] [] [] [] | + hello | [] [] [] [] [] | id-utils | [] [] | impost | | indent | [] [] [] | iso_3166 | [] [] | - iso_3166_1 | [] [] [] [] [] | iso_3166_2 | | - iso_3166_3 | [] | iso_4217 | [] | iso_639 | [] [] | jpilot | [] | @@ -315,7 +313,7 @@ translation percentage of at least 50%. man-db | [] () [] [] | minicom | [] [] [] | mysecretdiary | [] [] | - nano | [] [] () [] | + nano | [] [] [] | nano_1_0 | [] () [] [] | opcodes | [] | parted | | @@ -331,7 +329,7 @@ translation percentage of at least 50%. scrollkeeper | [] [] [] [] [] [] [] [] | sed | [] [] [] | sh-utils | [] [] | - shared-mime-info | [] [] [] | + shared-mime-info | [] [] [] [] | sharutils | [] [] [] [] [] [] | shishi | | silky | | @@ -355,12 +353,12 @@ translation percentage of at least 50%. wastesedge | () | wdiff | [] [] [] [] | wget | [] [] | - xchat | [] [] [] [] [] | + xchat | [] [] [] [] [] [] | xkeyboard-config | | xpad | [] [] | +----------------------------------------------------+ af am ar az be bg bs ca cs cy da de el en en_GB eo - 11 0 1 2 8 21 1 42 43 2 62 99 18 1 16 16 + 10 0 1 2 9 22 1 42 41 2 60 95 16 1 17 16 es et eu fa fi fr ga gl gu he hi hr hu id is it +--------------------------------------------------+ @@ -379,7 +377,7 @@ translation percentage of at least 50%. bison | [] [] [] [] [] [] | bison-runtime | [] [] [] [] [] | bluez-pin | [] [] [] [] [] | - cflow | | + cflow | [] | clisp | [] [] | console-tools | | coreutils | [] [] [] [] [] [] | @@ -403,7 +401,7 @@ translation percentage of at least 50%. gbiff | [] | gcal | [] [] | gcc | [] | - gettext-examples | [] [] [] [] [] | + gettext-examples | [] [] [] [] [] [] | gettext-runtime | [] [] [] [] [] [] | gettext-tools | [] [] [] | gimp-print | [] [] | @@ -420,7 +418,7 @@ translation percentage of at least 50%. gnutls | | gpe-aerial | [] [] | gpe-beam | [] [] | - gpe-calendar | [] [] [] [] | + gpe-calendar | | gpe-clock | [] [] [] [] | gpe-conf | [] | gpe-contacts | [] [] | @@ -442,13 +440,13 @@ translation percentage of at least 50%. gramadoir | [] [] | grep | [] [] [] [] [] [] [] [] [] [] [] [] | gretl | [] [] [] | - gsasl | [] | + gsasl | [] [] | gss | [] | gst-plugins | [] [] [] | gst-plugins-base | [] [] | gst-plugins-good | [] [] [] | gstreamer | [] [] [] | - gtick | [] [] [] [] [] | + gtick | [] | gtkam | [] [] [] [] | gtkorphan | [] [] | gtkspell | [] [] [] [] [] [] | @@ -458,9 +456,7 @@ translation percentage of at least 50%. impost | [] [] | indent | [] [] [] [] [] [] [] [] [] [] | iso_3166 | [] [] [] | - iso_3166_1 | [] [] [] [] [] [] [] | iso_3166_2 | [] | - iso_3166_3 | [] | iso_4217 | [] [] [] [] | iso_639 | [] [] [] [] [] | jpilot | [] [] | @@ -481,7 +477,7 @@ translation percentage of at least 50%. libgphoto2 | [] [] [] | libgphoto2_port | [] [] | libgsasl | [] [] | - libiconv | [] | + libiconv | [] [] | libidn | [] [] | lifelines | () | lilypond | [] | @@ -493,7 +489,7 @@ translation percentage of at least 50%. man-db | () | minicom | [] [] [] [] | mysecretdiary | [] [] [] | - nano | [] () [] [] [] [] | + nano | [] [] [] [] [] [] | nano_1_0 | [] [] [] [] [] | opcodes | [] [] [] [] | parted | [] [] [] [] | @@ -501,7 +497,7 @@ translation percentage of at least 50%. psmisc | [] [] [] | pwdutils | | python | | - qof | | + qof | [] | radius | [] [] | recode | [] [] [] [] [] [] [] [] | rpm | [] [] | @@ -520,7 +516,7 @@ translation percentage of at least 50%. sp | [] | stardict | [] | system-tools-ba... | [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] [] | + tar | [] [] [] [] [] [] [] | texinfo | [] [] | textutils | [] [] [] [] [] | tin | [] () | @@ -538,185 +534,183 @@ translation percentage of at least 50%. xpad | [] [] [] | +--------------------------------------------------+ es et eu fa fi fr ga gl gu he hi hr hu id is it - 89 21 16 2 41 119 61 14 1 8 1 6 61 30 0 53 + 88 22 14 2 40 115 61 14 1 8 1 6 59 31 0 52 - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - +--------------------------------------------------+ - GNUnet | | - a2ps | () [] [] () | - aegis | () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | [] | - aspell | [] [] | - bash | [] | - batchelor | [] [] | - bfd | | - bibshelf | [] | - binutils | | - bison | [] [] [] | - bison-runtime | [] [] [] | - bluez-pin | [] [] [] | - cflow | | - clisp | [] | - console-tools | | - coreutils | [] | - cpio | | - cpplib | [] | - cryptonit | [] | - darkstat | [] [] | - dialog | [] [] | - diffutils | [] [] [] | - doodle | | - e2fsprogs | [] | - enscript | [] | - error | [] | - fetchmail | [] [] | - fileutils | [] [] | - findutils | [] | - flex | [] [] | - fslint | [] [] | - gas | | - gawk | [] [] | - gbiff | [] | - gcal | | - gcc | | - gettext-examples | [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] | - gip | [] [] | - gliv | [] | - glunarclock | [] [] | - gmult | [] [] | - gnubiff | | - gnucash | () () | - gnucash-glossary | [] | - gnuedu | | - gnulib | [] [] [] [] | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | [] | - gpe-edit | [] [] | - gpe-filemanager | [] | - gpe-go | [] [] | - gpe-login | [] [] | - gpe-ownerinfo | [] | - gpe-package | [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] [] | - gpe-timesheet | [] | - gpe-today | [] | - gpe-todo | | - gphoto2 | [] [] | - gprof | | - gpsdrive | () () () | - gramadoir | () | - grep | [] [] [] | - gretl | | - gsasl | [] | - gss | | - gst-plugins | [] | - gst-plugins-base | | - gst-plugins-good | [] | - gstreamer | [] | - gtick | [] | - gtkam | [] | - gtkorphan | [] | - gtkspell | [] [] | - gutenprint | | - hello | [] [] [] [] [] [] [] [] | - id-utils | [] | - impost | | - indent | [] [] | - iso_3166 | [] | - iso_3166_1 | [] [] | - iso_3166_2 | [] | - iso_3166_3 | [] | - iso_4217 | [] [] [] | - iso_639 | [] [] | - jpilot | () () () | - jtag | | - jwhois | [] | - kbd | [] | - keytouch | [] | - keytouch-editor | | - keytouch-keyboa... | | - latrine | [] | - ld | | - leafpad | [] [] | - libc | [] [] [] [] [] | - libexif | | - libextractor | | - libgpewidget | [] | - libgpg-error | | - libgphoto2 | [] | - libgphoto2_port | [] | - libgsasl | [] | - libiconv | | - libidn | [] [] | - lifelines | [] | - lilypond | | - lingoteach | [] | - lynx | [] [] | - m4 | [] [] | - mailutils | | - make | [] [] [] | - man-db | () | - minicom | [] | - mysecretdiary | [] | - nano | [] [] [] | - nano_1_0 | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - psmisc | [] [] [] | - pwdutils | | - python | | - qof | | - radius | | - recode | [] | - rpm | [] [] | - screem | [] | - scrollkeeper | [] [] [] [] | - sed | [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] | - shishi | | - silky | [] | - skencil | | - sketch | | - solfege | | - soundtracker | | - sp | () | - stardict | [] [] | - system-tools-ba... | [] [] [] [] | - tar | [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] | - tin | | - tp-robot | [] | - tuxpaint | [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] | - vorbis-tools | [] | - wastesedge | [] | - wdiff | [] [] | - wget | [] [] | - xchat | [] [] [] [] | - xkeyboard-config | [] | - xpad | [] [] [] | - +--------------------------------------------------+ - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - 40 24 2 1 1 3 1 2 3 21 0 15 1 101 5 3 + ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no + +-------------------------------------------------+ + GNUnet | | + a2ps | () [] [] () | + aegis | () | + ant-phone | [] | + anubis | [] [] [] | + ap-utils | [] | + aspell | [] [] | + bash | [] | + batchelor | [] [] | + bfd | | + bibshelf | [] | + binutils | | + bison | [] [] [] | + bison-runtime | [] [] [] | + bluez-pin | [] [] [] | + cflow | | + clisp | [] | + console-tools | | + coreutils | [] | + cpio | | + cpplib | [] | + cryptonit | [] | + darkstat | [] [] | + dialog | [] [] | + diffutils | [] [] [] | + doodle | | + e2fsprogs | [] | + enscript | [] | + error | [] | + fetchmail | [] [] | + fileutils | [] [] | + findutils | [] | + flex | [] [] | + fslint | [] [] | + gas | | + gawk | [] [] | + gbiff | [] | + gcal | | + gcc | | + gettext-examples | [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] | + gimp-print | [] [] | + gip | [] [] | + gliv | [] | + glunarclock | [] [] | + gmult | [] [] | + gnubiff | | + gnucash | () () | + gnucash-glossary | [] | + gnuedu | | + gnulib | [] [] [] [] | + gnunet-gtk | | + gnutls | | + gpe-aerial | [] | + gpe-beam | [] | + gpe-calendar | [] | + gpe-clock | [] [] [] | + gpe-conf | [] [] | + gpe-contacts | [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | [] | + gphoto2 | [] [] | + gprof | | + gpsdrive | () () () | + gramadoir | () | + grep | [] [] [] [] | + gretl | | + gsasl | [] | + gss | | + gst-plugins | [] | + gst-plugins-base | | + gst-plugins-good | [] | + gstreamer | [] | + gtick | | + gtkam | [] | + gtkorphan | [] | + gtkspell | [] [] | + gutenprint | | + hello | [] [] [] [] [] [] | + id-utils | [] | + impost | | + indent | [] [] | + iso_3166 | [] | + iso_3166_2 | [] | + iso_4217 | [] [] [] | + iso_639 | [] [] | + jpilot | () () () | + jtag | | + jwhois | [] | + kbd | [] | + keytouch | [] | + keytouch-editor | | + keytouch-keyboa... | | + latrine | [] | + ld | | + leafpad | [] [] | + libc | [] [] [] [] [] | + libexif | | + libextractor | | + libgpewidget | [] | + libgpg-error | | + libgphoto2 | [] | + libgphoto2_port | [] | + libgsasl | [] | + libiconv | | + libidn | [] [] | + lifelines | [] | + lilypond | | + lingoteach | [] | + lynx | [] [] | + m4 | [] [] | + mailutils | | + make | [] [] [] | + man-db | () | + minicom | [] | + mysecretdiary | [] | + nano | [] [] [] | + nano_1_0 | [] [] [] | + opcodes | [] | + parted | [] [] | + pilot-qof | | + psmisc | [] [] [] | + pwdutils | | + python | | + qof | | + radius | | + recode | [] | + rpm | [] [] | + screem | [] | + scrollkeeper | [] [] [] [] | + sed | [] [] | + sh-utils | [] [] | + shared-mime-info | [] [] [] [] [] | + sharutils | [] [] | + shishi | | + silky | [] | + skencil | | + sketch | | + solfege | | + soundtracker | | + sp | () | + stardict | [] [] | + system-tools-ba... | [] [] [] [] | + tar | [] [] [] | + texinfo | [] [] [] | + textutils | [] [] [] | + tin | | + tp-robot | [] | + tuxpaint | [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] | + vorbis-tools | [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] | + xchat | [] [] [] [] | + xkeyboard-config | [] | + xpad | [] [] [] | + +-------------------------------------------------+ + ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no + 52 24 2 2 1 3 0 2 3 21 0 15 1 97 5 1 nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta +------------------------------------------------------+ @@ -776,7 +770,7 @@ translation percentage of at least 50%. gnutls | [] [] | gpe-aerial | [] [] [] [] [] [] [] | gpe-beam | [] [] [] [] [] [] [] | - gpe-calendar | [] [] [] [] [] [] [] [] | + gpe-calendar | [] | gpe-clock | [] [] [] [] [] [] [] [] | gpe-conf | [] [] [] [] [] [] [] | gpe-contacts | [] [] [] [] [] | @@ -798,13 +792,13 @@ translation percentage of at least 50%. gramadoir | [] [] | grep | [] [] [] [] [] [] [] [] | gretl | [] | - gsasl | [] [] | + gsasl | [] [] [] | gss | [] [] [] | gst-plugins | [] [] [] [] | gst-plugins-base | [] | gst-plugins-good | [] [] [] [] | gstreamer | [] [] [] | - gtick | [] [] [] | + gtick | [] | gtkam | [] [] [] [] | gtkorphan | [] | gtkspell | [] [] [] [] [] [] [] [] | @@ -814,9 +808,7 @@ translation percentage of at least 50%. impost | [] | indent | [] [] [] [] [] [] | iso_3166 | [] [] [] [] [] [] | - iso_3166_1 | [] [] [] [] | iso_3166_2 | | - iso_3166_3 | [] [] [] [] | iso_4217 | [] [] [] [] | iso_639 | [] [] [] [] | jpilot | | @@ -837,7 +829,7 @@ translation percentage of at least 50%. libgphoto2 | [] | libgphoto2_port | [] [] [] | libgsasl | [] [] [] [] | - libiconv | | + libiconv | [] [] | libidn | [] [] () | lifelines | [] [] | lilypond | | @@ -849,7 +841,7 @@ translation percentage of at least 50%. man-db | [] [] | minicom | [] [] [] [] [] | mysecretdiary | [] [] [] [] | - nano | [] [] | + nano | [] [] [] | nano_1_0 | [] [] [] [] | opcodes | [] [] | parted | [] | @@ -857,7 +849,7 @@ translation percentage of at least 50%. psmisc | [] [] | pwdutils | [] [] | python | | - qof | [] | + qof | [] [] | radius | [] [] | recode | [] [] [] [] [] [] [] | rpm | [] [] [] [] | @@ -894,7 +886,7 @@ translation percentage of at least 50%. xpad | [] [] [] | +------------------------------------------------------+ nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 2 3 58 31 53 5 76 72 5 42 48 12 51 130 2 + 0 2 3 58 30 54 5 73 72 4 40 46 11 50 128 2 tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu +---------------------------------------------------+ @@ -904,19 +896,19 @@ translation percentage of at least 50%. ant-phone | [] [] | 6 anubis | [] [] [] | 11 ap-utils | () [] | 4 - aspell | [] [] [] | 14 + aspell | [] [] [] | 15 bash | [] | 11 batchelor | [] [] | 9 bfd | | 1 bibshelf | [] | 7 binutils | [] [] [] | 9 bison | [] [] [] | 19 - bison-runtime | [] [] [] | 16 + bison-runtime | [] [] [] | 15 bluez-pin | [] [] [] [] [] [] | 28 - cflow | [] [] | 4 + cflow | [] [] | 5 clisp | | 6 console-tools | [] [] | 5 - coreutils | [] [] | 17 + coreutils | [] [] | 16 cpio | [] [] [] | 9 cpplib | [] [] [] [] | 11 cryptonit | | 5 @@ -937,7 +929,7 @@ translation percentage of at least 50%. gbiff | [] | 5 gcal | [] | 5 gcc | [] [] [] | 6 - gettext-examples | [] [] [] [] [] [] | 26 + gettext-examples | [] [] [] [] [] [] | 27 gettext-runtime | [] [] [] [] [] [] | 28 gettext-tools | [] [] [] [] [] | 19 gimp-print | [] [] | 12 @@ -954,47 +946,45 @@ translation percentage of at least 50%. gnutls | | 2 gpe-aerial | [] [] | 14 gpe-beam | [] [] | 14 - gpe-calendar | [] [] [] [] | 19 - gpe-clock | [] [] [] [] | 20 + gpe-calendar | [] | 3 + gpe-clock | [] [] [] [] | 21 gpe-conf | [] [] | 14 gpe-contacts | [] [] | 10 - gpe-edit | [] [] [] [] | 19 - gpe-filemanager | [] | 5 - gpe-go | [] [] | 14 - gpe-login | [] [] [] [] [] | 20 - gpe-ownerinfo | [] [] [] [] | 20 - gpe-package | [] | 5 + gpe-edit | [] [] [] [] | 20 + gpe-filemanager | [] | 6 + gpe-go | [] [] | 15 + gpe-login | [] [] [] [] [] | 21 + gpe-ownerinfo | [] [] [] [] | 21 + gpe-package | [] | 6 gpe-sketchbook | [] [] | 16 - gpe-su | [] [] [] | 19 - gpe-taskmanager | [] [] [] | 19 + gpe-su | [] [] [] | 20 + gpe-taskmanager | [] [] [] | 20 gpe-timesheet | [] [] [] [] | 18 - gpe-today | [] [] [] [] [] | 20 - gpe-todo | [] | 6 + gpe-today | [] [] [] [] [] | 21 + gpe-todo | [] | 7 gphoto2 | [] [] [] [] | 20 gprof | [] [] | 11 gpsdrive | | 4 gramadoir | [] | 7 - grep | [] [] [] [] | 33 + grep | [] [] [] [] | 34 gretl | | 4 - gsasl | [] [] | 6 + gsasl | [] [] | 8 gss | [] | 5 gst-plugins | [] [] [] | 15 gst-plugins-base | [] [] [] | 9 - gst-plugins-good | [] [] [] | 18 + gst-plugins-good | [] [] [] [] [] | 20 gstreamer | [] [] [] | 17 - gtick | [] | 11 + gtick | [] | 3 gtkam | [] | 13 gtkorphan | [] | 7 gtkspell | [] [] [] [] [] [] | 26 gutenprint | | 3 - hello | [] [] [] [] [] | 39 + hello | [] [] [] [] [] | 37 id-utils | [] [] | 14 impost | [] | 4 indent | [] [] [] [] | 25 - iso_3166 | [] [] [] | 15 - iso_3166_1 | [] [] | 20 + iso_3166 | [] [] [] [] | 16 iso_3166_2 | | 2 - iso_3166_3 | [] [] | 9 iso_4217 | [] [] | 14 iso_639 | [] | 14 jpilot | [] [] [] [] | 7 @@ -1003,7 +993,7 @@ translation percentage of at least 50%. kbd | [] [] | 12 keytouch | [] | 4 keytouch-editor | | 2 - keytouch-keyboa... | | 2 + keytouch-keyboa... | [] | 3 latrine | [] [] | 8 ld | [] [] [] [] | 8 leafpad | [] [] [] [] | 23 @@ -1015,7 +1005,7 @@ translation percentage of at least 50%. libgphoto2 | [] | 8 libgphoto2_port | [] [] [] | 11 libgsasl | [] | 8 - libiconv | [] | 4 + libiconv | [] | 7 libidn | [] [] | 10 lifelines | | 4 lilypond | | 2 @@ -1027,7 +1017,7 @@ translation percentage of at least 50%. man-db | [] | 6 minicom | [] | 14 mysecretdiary | [] [] | 12 - nano | [] [] | 15 + nano | [] [] | 17 nano_1_0 | [] [] [] | 18 opcodes | [] [] | 10 parted | [] [] [] | 10 @@ -1035,7 +1025,7 @@ translation percentage of at least 50%. psmisc | [] | 10 pwdutils | [] | 3 python | | 0 - qof | [] | 2 + qof | [] | 4 radius | [] | 6 recode | [] [] [] | 25 rpm | [] [] [] [] | 14 @@ -1043,7 +1033,7 @@ translation percentage of at least 50%. scrollkeeper | [] [] [] [] | 26 sed | [] [] [] | 22 sh-utils | [] | 15 - shared-mime-info | [] [] [] [] | 23 + shared-mime-info | [] [] [] [] | 24 sharutils | [] [] [] | 23 shishi | | 1 silky | [] | 4 @@ -1054,7 +1044,7 @@ translation percentage of at least 50%. sp | [] | 3 stardict | [] [] [] [] | 11 system-tools-ba... | [] [] [] [] [] [] [] | 37 - tar | [] [] [] [] | 19 + tar | [] [] [] [] | 20 texinfo | [] [] [] | 15 textutils | [] [] [] | 17 tin | | 1 @@ -1067,12 +1057,12 @@ translation percentage of at least 50%. wastesedge | | 1 wdiff | [] [] | 22 wget | [] [] [] | 19 - xchat | [] [] [] [] | 28 + xchat | [] [] [] [] | 29 xkeyboard-config | [] [] [] [] | 11 xpad | [] [] [] | 14 +---------------------------------------------------+ 77 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - 172 domains 0 1 1 78 39 0 135 13 1 50 3 54 0 2054 + 170 domains 0 1 1 77 39 0 136 10 1 48 5 54 0 2028 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -1085,7 +1075,7 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If July 2006 seems to be old, you may fetch a more recent copy of + If October 2006 seems to be old, you may fetch a more recent copy of this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix with full percentage details can be found at `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. diff --git a/gettext-tools/doc/gettext.info b/gettext-tools/doc/gettext.info index eaac38fde..838b47350 100644 --- a/gettext-tools/doc/gettext.info +++ b/gettext-tools/doc/gettext.info @@ -57,7 +57,7 @@ GNU `gettext' utilities *********************** This manual documents the GNU gettext tools and the GNU libintl library, -version 0.15. +version 0.16. * Menu: @@ -258,6 +258,8 @@ Autoconf macros for use in `configure.in' * AM_GNU_GETTEXT:: AM_GNU_GETTEXT in `gettext.m4' * AM_GNU_GETTEXT_VERSION:: AM_GNU_GETTEXT_VERSION in `gettext.m4' +* AM_GNU_GETTEXT_NEED:: AM_GNU_GETTEXT_NEED in `gettext.m4' +* AM_GNU_GETTEXT_INTL_SUBDIR:: AM_GNU_GETTEXT_INTL_SUBDIR in `intldir.m4' * AM_PO_SUBDIRS:: AM_PO_SUBDIRS in `po.m4' * AM_ICONV:: AM_ICONV in `iconv.m4' @@ -356,6 +358,11 @@ Concluding Remarks * History:: History of GNU `gettext' * References:: Related Readings +Language Codes + +* Usual Language Codes:: Two-letter ISO 639 language codes +* Rare Language Codes:: Three-letter ISO 639 language codes + Licenses * GNU GPL:: GNU General Public License @@ -967,6 +974,7 @@ language. One PO file "entry" has the following schematic structure: #. EXTRACTED-COMMENTS #: REFERENCE... #, FLAG... + #| msgid PREVIOUS-UNTRANSLATED-STRING msgid UNTRANSLATED-STRING msgstr TRANSLATED-STRING @@ -994,7 +1002,11 @@ 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. +about these below. Comment lines starting with `#|' contain the +previous untranslated string for which the translator gave a +translation. + + 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 @@ -1137,6 +1149,8 @@ look like this: #. EXTRACTED-COMMENTS #: REFERENCE... #, FLAG... + #| msgctxt PREVIOUS-CONTEXT + #| msgid PREVIOUS-UNTRANSLATED-STRING msgctxt CONTEXT msgid UNTRANSLATED-STRING msgstr TRANSLATED-STRING @@ -1155,6 +1169,8 @@ plural forms. #. EXTRACTED-COMMENTS #: REFERENCE... #, FLAG... + #| msgid PREVIOUS-UNTRANSLATED-STRING-SINGULAR + #| msgid_plural PREVIOUS-UNTRANSLATED-STRING-PLURAL msgid UNTRANSLATED-STRING-SINGULAR msgid_plural UNTRANSLATED-STRING-PLURAL msgstr[0] TRANSLATED-STRING-CASE-0 @@ -1173,6 +1189,11 @@ plural forms. Here also, a `msgctxt' context can be specified before `msgid', like above. + The PREVIOUS-UNTRANSLATED-STRING is optionally inserted by the +`msgmerge' program, at the same time when it marks a message fuzzy. It +helps the translator to see which changes were done by the developers +on the UNTRANSLATED-STRING. + 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 will be dropped when the PO file is processed by the tools, or may @@ -1365,6 +1386,8 @@ following. * Use format strings instead of string concatenation. + * Avoid unusual markup and unusual control characters. + Let's look at some examples of these guidelines. Translatable strings should be in good English style. If slang @@ -1379,7 +1402,7 @@ _the_ parameter? "No match" -The ambiguity in this message makes it ununderstandable: Is the program +The ambiguity in this message makes it unintelligible: Is the program attempting to set something on fire? Does it mean "The given object does not match the template"? Does it mean "The template does not fit for any of the objects"? @@ -1512,7 +1535,7 @@ at most 54 characters, 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, +example, in Java and C#, string concatenation is very frequently used, because it is a compiler built-in operator. Like in C, in Java, you would change @@ -1533,6 +1556,30 @@ into a statement involving a format string: Console.WriteLine( String.Format("Replace {0} with {1}?", object1, object2)); + Unusual markup or control characters should not be used in +translatable strings. Translators will likely not understand the +particular meaning of the markup or control characters. + + For example, if you have a convention that `|' delimits the +left-hand and right-hand part of some GUI elements, translators will +often not understand it without specific comments. It might be better +to have the translator translate the left-hand and right-hand part +separately. + + Another example is the `argp' convention to use a single `\v' +(vertical tab) control character to delimit two sections inside a +string. This is flawed. Some translators may convert it to a simple +newline, some to blank lines. With some PO file editors it may not be +easy to even enter a vertical tab control character. So, you cannot be +sure that the translation will contain a `\v' character, at the +corresponding position. The solution is, again, to let the translator +translate two separate strings and combine at run-time the two +translated strings with the `\v' required by the convention. + + HTML markup, however, is common enough that it's probably ok to use +in translatable strings. But please bear in mind that the GNU gettext +tools don't verify that the translations are well-formed HTML. +  File: gettext.info, Node: Mark Keywords, Next: Marking, Prev: Preparing Strings, Up: Sources @@ -1554,7 +1601,7 @@ say. This marking operation has two goals. The first goal of marking is for triggering the retrieval of the translation, at run time. The -keyword are possibly resolved into a routine able to dynamically return +keyword is possibly resolved into a routine able to dynamically 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. @@ -1594,11 +1641,25 @@ those wanting to use `_' instead of `gettext' to declare: instead of merely using `#include '. + The marking keywords `gettext' and `_' take the translatable string +as sole argument. It is also possible to define marking functions that +take it at another argument position. It is even possible to make the +marked argument position depend on the total number of arguments of the +function call; this is useful in C++. All this is achieved using +`xgettext''s `--keyword' option. + + Note also that long strings can be split across lines, into multiple +adjacent string tokens. Automatic string concatenation is performed at +compile time according to ISO C and ISO C++; `xgettext' also supports +this syntax. + 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 an example of string -_not_ requiring translation! +think it should be translated. For example, `"%s"' is an example of +string _not_ requiring translation. But `"%s: %d"' _does_ require +translation, because in French, unlike in English, it's customary to +put a space before a colon.  File: gettext.info, Node: Marking, Next: c-format Flag, Prev: Mark Keywords, Up: Sources @@ -1617,11 +1678,11 @@ translators, a tool letting them work at marking translatable strings in the program sources, while simultaneously producing a set of 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 shell window, change the directory to the root of your project, -then execute a command resembling: + The set of program sources, targeted 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 +shell window, change the directory to the root of your project, then +execute a command resembling: etags src/*.[hc] lib/*.[hc] @@ -1936,7 +1997,7 @@ is a proper name and how to pronounce it. Like this: manual, section Names. Note this is actually a non-ASCII name: The first name is (with Unicode escapes) "Fran\u00e7ois" or (with HTML entities) "François". - Pronounciation is like "fraa-swa pee-nar". */ + Pronunciation is like "fraa-swa pee-nar". */ _("Francois Pinard")); As a translator, you should use some care when translating names, @@ -1955,7 +2016,7 @@ using Greek as the target script: #. manual, section Names. Note this is actually a non-ASCII #. name: The first name is (with Unicode escapes) #. "Fran\u00e7ois" or (with HTML entities) "François". - #. Pronounciation is like "fraa-swa pee-nar". + #. Pronunciation is like "fraa-swa pee-nar". msgid "Francois Pinard" msgstr "\phi\rho\alpha\sigma\omicron\alpha \pi\iota\nu\alpha\rho" " (Francois Pinard)" @@ -1968,7 +2029,7 @@ has set up a POT file and translation domain consisting of program author names, with better facilities for the translator than those presented here. Namely, there the original name is written directly in Unicode (rather than with Unicode escapes or HTML entities), and the -pronounciation is denoted using the International Phonetic Alphabet (see +pronunciation is denoted using the International Phonetic Alphabet (see `http://www.wikipedia.org/wiki/International_Phonetic_Alphabet'). However, we don't recommend this approach for all POT files in all @@ -2056,7 +2117,7 @@ previous sections apply without changes.) #define _(String) dgettext (PACKAGE, String) In other words, `dgettext' is used instead of `gettext'. - Similary, the `dngettext' function should be used in place of the + Similarly, the `dngettext' function should be used in place of the `ngettext' function.  @@ -2196,7 +2257,7 @@ extension. 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 + If KEYWORDSPEC is a C identifier 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 ARGNUMth argument of the call. If KEYWORDSPEC is @@ -2892,6 +2953,10 @@ values: Do not use fuzzy matching when an exact match is not found. This may speed up the operation considerably. +`--previous' + Keep the previous msgids of translated messages, marked with `#|', + when adding the fuzzy marker to such messages. + 7.1.6 Input file syntax ----------------------- @@ -4118,9 +4183,9 @@ have their `msgid' entries written by the same GNU `gettext' tools. 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 -discrepancies between PO mode and other GNU `gettext' tools get fully -resolved, the translator should stay aware of normalisation issues. +resulting of 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.  File: gettext.info, Node: Compendium, Prev: Auxiliary, Up: PO Mode @@ -4159,7 +4224,7 @@ use `msgcomm' or `msgcat' (the latter preferred): 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 +same string. Those occurrences will be marked as `fuzzy' and highly visible decorated; calling `msgcat' on `file1.po': #: src/hello.c:200 @@ -5316,6 +5381,16 @@ found, fuzzy matching is used to produce better diagnostics. `--multi-domain' Apply REF.pot to each of the domains in DEF.po. +`--use-fuzzy' + Consider fuzzy messages in the DEF.po file like translated + messages. Note that using this option is usually wrong, because + fuzzy messages are exactly those which have not been validated by + a human translator. + +`--use-untranslated' + Consider untranslated messages in the DEF.po file like translated + messages. Note that using this option is usually wrong. + 9.7.3 Input file syntax ----------------------- @@ -5392,7 +5467,7 @@ specified or if it is `-'. Remove `fuzzy' marked messages. `--only-fuzzy' - Keep `fuzzy' marked messages, remove all other messsages. + Keep `fuzzy' marked messages, remove all other messages. `--no-obsolete' Remove obsolete #~ messages. @@ -5421,6 +5496,9 @@ that are listed in the ONLY-FILE and not listed in the IGNORE-FILE. `--clear-obsolete' Set all messages non-obsolete. +`--clear-previous' + Remove the "previous msgid" (`#|') comments from all messages. + `--only-file=FILE' Limit the attribute changes to entries that are listed in FILE. FILE should be a PO or POT file. @@ -5726,7 +5804,7 @@ 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 a pointer in memory to each of messages contained +instead, you retrieve a pointer in memory to each of messages contained in the PO file. Functions for writing PO files are not provided at this time. @@ -6331,9 +6409,9 @@ However, the program interface currently used already presumes that strings are terminated, so embedded s are somewhat useless. But the MO file format is general enough so other interfaces would be later possible, if for example, we ever want to implement wide -characters right in MO files, where 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 +characters right in MO files, where bytes may accidentally +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 platform dependent as well.) This particular issue has been strongly debated in the GNU `gettext' @@ -6439,7 +6517,7 @@ implementation, an user can happily live with it. But programmers hate it (at least I and some others do...) But we must not forget one point: after all the trouble with -transfering the rights on Unix(tm) they at last came to X/Open, the +transferring the rights on Unix(tm) they at last came to X/Open, the very same who published this specification. This leads me to making the prediction that this interface will be in future Unix standards (e.g. Spec1170) and therefore part of all Unix implementation @@ -6967,6 +7045,23 @@ purpose. `printf' function as well. It is not sufficient to pass it only to `ngettext'. + In the English singular case, the number - always 1 - can be + replaced with "one": + + printf (ngettext ("One file removed", "%d files removed", n), n); + + This works because the `printf' function discards excess arguments + that are not consumed by the format string. + + It is also possible to use this function when the strings don't + contain a cardinal number: + + puts (ngettext ("Delete the selected file?", + "Delete the selected files?", + n)); + + In this case the number N is only used to choose the plural form. + -- 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 @@ -7028,9 +7123,6 @@ Only one form: Languages with this property include: - Finno-Ugric family - Hungarian - Asian family Japanese, Korean, Vietnamese @@ -7066,6 +7158,19 @@ Two forms, singular used for one only Artificial Esperanto + Another language using the same header entry is: + + Finno-Ugric family + Hungarian + + Hungarian does not appear to have a plural if you look at + sentences involving cardinal numbers. For example, "1 apple" is + "1 alma", and "123 apples" is "123 alma". But when the number is + not explicit, the distinction between singular and plural exists: + "the apple" is "az alma", and "the apples" is "az alma'k". Since + `ngettext' has to support both types of sentences, it is + classified here, under "two forms". + Two forms, singular used for zero and one Exceptional case in the language family. The header entry would be: @@ -7166,10 +7271,47 @@ Four forms, special case for one and all numbers ending in 02, 03, or 04 Slavic family Slovenian + You might now ask, `ngettext' handles only numbers N of type +`unsigned long'. What about larger integer types? What about negative +numbers? What about floating-point numbers? + + About larger integer types, such as `uintmax_t' or `unsigned long +long': they can be handled by reducing the value to a range that fits +in an `unsigned long'. Simply casting the value to `unsigned long' +would not do the right thing, since it would treat `ULONG_MAX + 1' like +zero, `ULONG_MAX + 2' like singular, and the like. Here you can +exploit the fact that all mentioned plural form formulas eventually +become periodic, with a period that is a divisor of 100 (or 1000 or +1000000). So, when you reduce a large value to another one in the +range [1000000, 1999999] that ends in the same 6 decimal digits, you +can assume that it will lead to the same plural form selection. This +code does this: + + #include + uintmax_t nbytes = ...; + printf (ngettext ("The file has %"PRIuMAX" byte.", + "The file has %"PRIuMAX" bytes.", + (nbytes > ULONG_MAX + ? (nbytes % 1000000) + 1000000 + : nbytes)), + nbytes); + + Negative and floating-point values usually represent physical +entities for which singular and plural don't clearly apply. In such +cases, there is no need to use `ngettext'; a simple `gettext' call with +a form suitable for all values will do. For example: + + printf (gettext ("Time elapsed: %.3f seconds"), + num_milliseconds * 0.001); + +Even if NUM_MILLISECONDS happens to be a multiple of 1000, the output + Time elapsed: 1.000 seconds + is acceptable in English, and similarly for other languages. + ---------- Footnotes ---------- (1) Additions are welcome. Send appropriate information to -. + and .  File: gettext.info, Node: Optimized gettext, Prev: Plural forms, Up: gettext @@ -8252,14 +8394,6 @@ used for two purposes: and accepts the following options: -`-c' -`--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' `--force' Force replacement of files which already exist. @@ -8277,6 +8411,14 @@ and accepts the following options: logs all changes (file additions, modifications and removals) in a file called `ChangeLog' in each affected directory. +`--symlink' + Make symbolic links instead of copying the needed files. This can + be useful to save a few kilobytes of disk space, but it requires + extra effort to create self-contained tarballs, it may disturb + some mechanism the maintainer applies to the sources, and it is + likely to introduce bugs when a newer version of `gettext' is + installed on the system. + `-n' `--dry-run' Print modifications but don't perform them. All actions that @@ -8387,7 +8529,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.15 distribution itself, or from the GNU `hello' +`gettext' 0.16 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 @@ -8540,7 +8682,7 @@ File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Rules-*, This is done by a set of lines like these: PACKAGE=gettext - VERSION=0.15 + VERSION=0.16 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -8548,12 +8690,12 @@ File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Rules-*, or, if you are using GNU `automake', by a line like this: - AM_INIT_AUTOMAKE(gettext, 0.15) + AM_INIT_AUTOMAKE(gettext, 0.16) Of course, you replace `gettext' with the name of your package, - and `0.15' by its version numbers, exactly as they should appear + and `0.16' by its version numbers, exactly as they should appear in the packaged `tar' file name of your distribution - (`gettext-0.15.tar.gz', here). + (`gettext-0.16.tar.gz', here). 2. Check for internationalization support. @@ -8654,16 +8796,20 @@ File: gettext.info, Node: aclocal, Next: acconfig, Prev: mkinstalldirs, Up: 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', +`glibc2.m4', `glibc21.m4', `iconv.m4', `intdiv0.m4', `intl.m4', +`intldir.m4', `intmax.m4', `inttypes_h.m4', `inttypes-pri.m4', +`lcmessage.m4', `lib-ld.m4', `lib-link.m4', `lib-prefix.m4', `lock.m4', +`longdouble.m4', `longlong.m4', `nls.m4', `po.m4', `printf-posix.m4', +`progtest.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. +`lib-ld.m4', `lib-link.m4', `lib-prefix.m4', `nls.m4', `po.m4', +`progtest.m4' need to be concatenated. + + If you are not using GNU `automake' 1.8 or newer, you will need to +add a file `mkdirp.m4' from a newer automake distribution to the list +of files above. 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 @@ -8935,7 +9081,7 @@ optional. It can be turned off in two situations: * When the package does not include the `intl/' subdirectory, and the libintl.h header (with its associated libintl library, if any) is - not already installed on the system, it is preferrable that the + not already installed on the system, it is preferable that the package builds without internationalization support, rather than to give a compilation error. @@ -8982,6 +9128,8 @@ is, of course, `AM_GNU_GETTEXT'. * AM_GNU_GETTEXT:: AM_GNU_GETTEXT in `gettext.m4' * AM_GNU_GETTEXT_VERSION:: AM_GNU_GETTEXT_VERSION in `gettext.m4' +* AM_GNU_GETTEXT_NEED:: AM_GNU_GETTEXT_NEED in `gettext.m4' +* AM_GNU_GETTEXT_INTL_SUBDIR:: AM_GNU_GETTEXT_INTL_SUBDIR in `intldir.m4' * AM_PO_SUBDIRS:: AM_PO_SUBDIRS in `po.m4' * AM_ICONV:: AM_ICONV in `iconv.m4' @@ -9004,19 +9152,24 @@ syntax is 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. +`external' for packages with no `intl/' directory. For packages with +an `intl/' directory, you can either use an INTLSYMBOL equal to +`no-libtool', or you can use `external' and override by using the macro +`AM_GNU_GETTEXT_INTL_SUBDIR' elsewhere. The two ways to specify the +existence of an `intl/' directory are equivalent. At build time, a +static library `$(top_builddir)/intl/libintl.a' will then be created. 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 `' 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'. +Only one NEEDSYMBOL can be specified. These requirements can also be +specified by using the macro `AM_GNU_GETTEXT_NEED' elsewhere. To +specify more than one requirement, just specify the strongest one among +them, or invoke the `AM_GNU_GETTEXT_NEED' macro several times. The +hierarchy among 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. @@ -9060,7 +9213,7 @@ empty and doesn't change `CPPFLAGS'. `LIBINTL' and `LTLIBINTL' variables.  -File: gettext.info, Node: AM_GNU_GETTEXT_VERSION, Next: AM_PO_SUBDIRS, Prev: AM_GNU_GETTEXT, Up: autoconf macros +File: gettext.info, Node: AM_GNU_GETTEXT_VERSION, Next: AM_GNU_GETTEXT_NEED, Prev: AM_GNU_GETTEXT, Up: autoconf macros 13.5.2 AM_GNU_GETTEXT_VERSION in `gettext.m4' --------------------------------------------- @@ -9072,9 +9225,48 @@ GNU gettext infrastructure that is used by the package. use of it (*note CVS Issues::).  -File: gettext.info, Node: AM_PO_SUBDIRS, Next: AM_ICONV, Prev: AM_GNU_GETTEXT_VERSION, Up: autoconf macros +File: gettext.info, Node: AM_GNU_GETTEXT_NEED, Next: AM_GNU_GETTEXT_INTL_SUBDIR, Prev: AM_GNU_GETTEXT_VERSION, Up: autoconf macros + +13.5.3 AM_GNU_GETTEXT_NEED in `gettext.m4' +------------------------------------------ + +The `AM_GNU_GETTEXT_NEED' macro declares a constraint regarding the GNU +gettext implementation. The syntax is + + AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) + + If NEEDSYMBOL is `need-ngettext', then GNU gettext implementations +(in libc or libintl) without the `ngettext()' function will be ignored. +If NEEDSYMBOL is `need-formatstring-macros', then GNU gettext +implementations that don't support the ISO C 99 `' +formatstring macros will be ignored. + + The optional second argument of `AM_GNU_GETTEXT' is also taken into +account. + + The `AM_GNU_GETTEXT_NEED' invocations can occur before or after the +`AM_GNU_GETTEXT' invocation; the order doesn't matter. + + +File: gettext.info, Node: AM_GNU_GETTEXT_INTL_SUBDIR, Next: AM_PO_SUBDIRS, Prev: AM_GNU_GETTEXT_NEED, Up: autoconf macros + +13.5.4 AM_GNU_GETTEXT_INTL_SUBDIR in `intldir.m4' +------------------------------------------------- + +The `AM_GNU_GETTEXT_INTL_SUBDIR' macro specifies that the +`AM_GNU_GETTEXT' macro, although invoked with the first argument +`external', should also prepare for building the `intl/' subdirectory. + + The `AM_GNU_GETTEXT_INTL_SUBDIR' invocation can occur before or after +the `AM_GNU_GETTEXT' invocation; the order doesn't matter. + + The use of this macro requires GNU automake 1.10 or newer and GNU +autoconf 2.61 or newer. + + +File: gettext.info, Node: AM_PO_SUBDIRS, Next: AM_ICONV, Prev: AM_GNU_GETTEXT_INTL_SUBDIR, Up: autoconf macros -13.5.3 AM_PO_SUBDIRS in `po.m4' +13.5.5 AM_PO_SUBDIRS in `po.m4' ------------------------------- The `AM_PO_SUBDIRS' macro prepares the `po/' directories of the package @@ -9092,7 +9284,7 @@ variables in each `po/' directory.  File: gettext.info, Node: AM_ICONV, Prev: AM_PO_SUBDIRS, Up: autoconf macros -13.5.4 AM_ICONV in `iconv.m4' +13.5.6 AM_ICONV in `iconv.m4' ----------------------------- The `AM_ICONV' macro tests for the presence of the POSIX/XSI `iconv' @@ -9238,7 +9430,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.15) + AM_GNU_GETTEXT_VERSION(0.16) and adds to the package's pre-build script an invocation of `autopoint'. For everyone who checks out the CVS, this `autopoint' @@ -9297,8 +9489,8 @@ into the package. `autopoint' supports the GNU `gettext' versions from 0.10.35 to 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 +current one, 0.16. In order to apply `autopoint' to a package using a +`gettext' version newer than 0.16, you need to install this same version of GNU `gettext' at least. In packages using GNU `automake', an invocation of `autopoint' @@ -10093,7 +10285,7 @@ textual message. 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. + interpreted like the System V `echo' program did. `-E' This option is only for compatibility with the `echo' program or @@ -10147,7 +10339,7 @@ textual message whose grammatical form depends on a number. 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. + System V `echo' program did. `-E' This option is only for compatibility with the `gettext' program. @@ -10281,7 +10473,7 @@ does. translator's encoding to the user's locale's encoding, produce the dangerous `\x60' bytes. - 2. A translator could - voluntarily or inadvertantly - use backquotes + 2. A translator could - voluntarily or inadvertently - use backquotes `"`...`"' or dollar-parentheses `"$(...)"' in her translations. The enclosed strings would be executed as command lists by the shell. @@ -11578,8 +11770,8 @@ the hash key (almost) whenever Perl itself allows it: print $gettext{Error}; The exact rule is: You can omit the surrounding quotes, when the hash -key is a valid C (!) identifier, i. e. when it starts with an -underscore or an ASCII letter and is followed by an arbitrary number of +key is a valid C (!) identifier, i.e. when it starts with an underscore +or an ASCII letter and is followed by an arbitrary number of underscores, ASCII letters or digits. Other Unicode characters are _not_ allowed, regardless of the `use utf8' pragma. @@ -11810,7 +12002,7 @@ File: gettext.info, Node: Parentheses, Next: Long Lines, Prev: Interpolation In Perl, parentheses around function arguments are mostly optional. `xgettext' will always assume that all recognized keywords (except for -hashs and hash references) are names of properly prototyped functions, +hashes and hash references) are names of properly prototyped functions, and will (hopefully) only require parentheses where Perl itself requires them. All constructs in the following example are therefore ok to use: @@ -11888,7 +12080,7 @@ feel like it: space character. EOF - Please do not forget, that the line breaks are real, i. e. they + Please do not forget that the line breaks are real, i.e. they translate into newline characters that will consequently show up in the resulting POT file. @@ -12250,7 +12442,7 @@ the `gettext' API over `glocale''s `catgets'-based API. While Jim took some distance and time and became dad for a second time, Roland wanted to get GNU `libc' internationalized, and got Ulrich Drepper involved in that project. Instead of starting from `glocale', -Ulrich rewrote something from scratch, but more conformant to the set +Ulrich rewrote something from scratch, but more conforming to the set of guidelines who emerged out of the `glocale' effort. Then, Ulrich got people from the previous forum to involve themselves into this new project, and the switch from `glocale' to what was first named @@ -12338,9 +12530,24 @@ File: gettext.info, Node: Language Codes, Next: Country Codes, Prev: Conclusi Appendix A Language Codes ************************* -The ISO 639 standard defines two character codes for many languages. -All abbreviations for languages used in the Translation Project should -come from this standard. +The ISO 639 standard defines two-letter codes for many languages, and +three-letter codes for more rarely used languages. All abbreviations +for languages used in the Translation Project should come from this +standard. + +* Menu: + +* Usual Language Codes:: Two-letter ISO 639 language codes +* Rare Language Codes:: Three-letter ISO 639 language codes + + +File: gettext.info, Node: Usual Language Codes, Next: Rare Language Codes, Prev: Language Codes, Up: Language Codes + +A.1 Usual Language Codes +======================== + +For the commonly used languages, the ISO 639-1 standard defines +two-letter codes. `aa' Afar. @@ -12348,6 +12555,9 @@ come from this standard. `ab' Abkhazian. +`ad' + Adangme. + `ae' Avestan. @@ -12442,7 +12652,7 @@ come from this standard. German. `dv' - Divehi. + Divehi; Maldivian. `dz' Dzongkha; Bhutani. @@ -12487,7 +12697,7 @@ come from this standard. French. `fy' - Frisian. + Western Frisian. `ga' Irish. @@ -12496,7 +12706,7 @@ come from this standard. Scots; Gaelic. `gl' - Gallegan; Galician. + Galician. `gn' Guarani. @@ -12508,7 +12718,7 @@ come from this standard. Manx. `ha' - Hausa (?). + Hausa. `he' Hebrew (formerly iw). @@ -12550,7 +12760,7 @@ come from this standard. Sichuan Yi. `ik' - Inupiak. + Inupiak; Inupiaq. `io' Ido. @@ -12577,10 +12787,10 @@ come from this standard. Kongo. `ki' - Kikuyu. + Kikuyu; Gikuyu. `kj' - Kuanyama. + Kuanyama; Kwanyama. `kk' Kazakh. @@ -12619,7 +12829,7 @@ come from this standard. Latin. `lb' - Letzeburgesch. + Letzeburgesch; Luxembourgish. `lg' Ganda. @@ -12646,7 +12856,7 @@ come from this standard. Malagasy. `mh' - Marshall. + Marshallese. `mi' Maori. @@ -12703,7 +12913,7 @@ come from this standard. Ndebele, South. `nv' - Navajo. + Navajo; Navaho. `ny' Chichewa; Nyanja. @@ -12772,7 +12982,7 @@ come from this standard. Sango; Sangro. `si' - Sinhalese. + Sinhala; Sinhalese. `sk' Slovak. @@ -12835,7 +13045,7 @@ come from this standard. Tswana; Setswana. `to' - Tonga (?). + Tonga. `tr' Turkish. @@ -12897,6 +13107,199 @@ come from this standard. `zu' Zulu. + +File: gettext.info, Node: Rare Language Codes, Prev: Usual Language Codes, Up: Language Codes + +A.2 Rare Language Codes +======================= + +For rarely used languages, the ISO 639-2 standard defines three-letter +codes. Here is the current list, reduced to only living languages with +at least one million of speakers. + +`ace' + Achinese. + +`awa' + Awadhi. + +`bad' + Banda. + +`bal' + Baluchi. + +`ban' + Balinese. + +`bem' + Bemba. + +`bho' + Bhojpuri. + +`bik' + Bikol. + +`bin' + Bini. + +`btk' + Batak (Indonesia). + +`bug' + Buginese. + +`ceb' + Cebuano. + +`din' + Dinka. + +`doi' + Dogri. + +`fil' + Filipino; Pilipino. + +`fon' + Fon. + +`gon' + Gondi. + +`gsw' + Alemani; Swiss German. + +`hil' + Hiligaynon. + +`hmn' + Hmong. + +`ilo' + Iloko. + +`kab' + Kabyle. + +`kam' + Kamba. + +`kbd' + Kabardian. + +`kmb' + Kimbundu. + +`kok' + Konkani. + +`kru' + Kurukh. + +`lua' + Luba-Lulua. + +`luo' + Luo (Kenya and Tanzania). + +`mad' + Madurese. + +`mag' + Magahi. + +`mai' + Maithili. + +`mak' + Makasar. + +`man' + Mandingo. + +`men' + Mende. + +`min' + Minangkabau. + +`mni' + Manipuri. + +`mos' + Mossi. + +`mwr' + Marwari. + +`nap' + Neapolitan. + +`nso' + Pedi; Sepedi; Northern Sotho. + +`nym' + Nyamwezi. + +`nyn' + Nyankole. + +`pag' + Pangasinan. + +`pam' + Pampanga. + +`raj' + Rajasthani. + +`sas' + Sasak. + +`sat' + Santali. + +`scn' + Sicilian. + +`shn' + Shan. + +`sid' + Sidamo. + +`srr' + Serer. + +`suk' + Sukuma. + +`sus' + Susu. + +`tem' + Timne. + +`tiv' + Tiv. + +`tum' + Tumbuka. + +`umb' + Umbundu. + +`wal' + Walamo. + +`war' + Waray. + +`yao' + Yao. +  File: gettext.info, Node: Country Codes, Next: Licenses, Prev: Language Codes, Up: Top @@ -12952,6 +13355,9 @@ Translation Project should come from this standard. `AW' Aruba. +`AX' + Aaland Islands. + `AZ' Azerbaijan. @@ -13022,7 +13428,7 @@ Translation Project should come from this standard. Congo (Dem. Rep.). `CF' - Central African Rep.. + Central African Republic. `CG' Congo (Rep.). @@ -13051,9 +13457,6 @@ Translation Project should come from this standard. `CR' Costa Rica. -`CS' - Serbia and Montenegro. - `CU' Cuba. @@ -13130,7 +13533,7 @@ Translation Project should come from this standard. Gabon. `GB' - Britain (UK). + Britain (United Kingdom). `GD' Grenada. @@ -13141,6 +13544,9 @@ Translation Project should come from this standard. `GF' French Guiana. +`GG' + Guernsey. + `GH' Ghana. @@ -13207,6 +13613,9 @@ Translation Project should come from this standard. `IL' Israel. +`IM' + Isle of Man. + `IN' India. @@ -13225,6 +13634,9 @@ Translation Project should come from this standard. `IT' Italy. +`JE' + Jersey. + `JM' Jamaica. @@ -13309,6 +13721,9 @@ Translation Project should come from this standard. `MD' Moldova. +`ME' + Montenegro. + `MG' Madagascar. @@ -13453,6 +13868,9 @@ Translation Project should come from this standard. `RO' Romania. +`RS' + Serbia. + `RU' Russia. @@ -13586,7 +14004,7 @@ Translation Project should come from this standard. Vatican City. `VC' - St Vincent. + St Vincent and the Grenadines. `VE' Venezuela. @@ -15029,7 +15447,7 @@ Option Index * --add-comments, xgettext option: xgettext Invocation. (line 97) * --add-location, msgattrib option: msgattrib Invocation. - (line 124) + (line 127) * --add-location, msgcat option: msgcat Invocation. (line 105) * --add-location, msgcomm option: msgcomm Invocation. (line 95) * --add-location, msgconv option: msgconv Invocation. (line 74) @@ -15037,7 +15455,7 @@ Option Index * --add-location, msgfilter option: msgfilter Invocation. (line 128) * --add-location, msggrep option: msggrep Invocation. (line 152) -* --add-location, msgmerge option: msgmerge Invocation. (line 135) +* --add-location, msgmerge option: msgmerge Invocation. (line 139) * --add-location, msguniq option: msguniq Invocation. (line 92) * --add-location, xgettext option: xgettext Invocation. (line 276) * --alignment, msgfmt option: msgfmt Invocation. (line 209) @@ -15054,10 +15472,10 @@ Option Index (line 71) * --clear-obsolete, msgattrib option: msgattrib Invocation. (line 77) +* --clear-previous, msgattrib option: msgattrib Invocation. + (line 80) * --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 323) * --csharp, msgfmt option: msgfmt Invocation. (line 36) * --csharp, msgunfmt option: msgunfmt Invocation. (line 19) @@ -15104,9 +15522,9 @@ Option Index * --force, autopoint option: autopoint Invocation. (line 20) * --force, gettextize option: gettextize Invocation. - (line 48) + (line 40) * --force-po, msgattrib option: msgattrib Invocation. - (line 113) + (line 116) * --force-po, msgcat option: msgcat Invocation. (line 94) * --force-po, msgcomm option: msgcomm Invocation. (line 84) * --force-po, msgconv option: msgconv Invocation. (line 64) @@ -15114,14 +15532,14 @@ Option Index * --force-po, msgfilter option: msgfilter Invocation. (line 114) * --force-po, msggrep option: msggrep Invocation. (line 143) -* --force-po, msgmerge option: msgmerge Invocation. (line 125) +* --force-po, msgmerge option: msgmerge Invocation. (line 129) * --force-po, msgunfmt option: msgunfmt Invocation. (line 108) * --force-po, msguniq option: msguniq Invocation. (line 81) * --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) + (line 91) * --help, autopoint option: autopoint Invocation. (line 33) * --help, envsubst option: envsubst Invocation. (line 22) @@ -15129,9 +15547,9 @@ Option Index * --help, gettextize option: gettextize Invocation. (line 70) * --help, msgattrib option: msgattrib Invocation. - (line 169) + (line 172) * --help, msgcat option: msgcat Invocation. (line 150) -* --help, msgcmp option: msgcmp Invocation. (line 57) +* --help, msgcmp option: msgcmp Invocation. (line 67) * --help, msgcomm option: msgcomm Invocation. (line 143) * --help, msgconv option: msgconv Invocation. (line 119) * --help, msgen option: msgen Invocation. (line 115) @@ -15141,16 +15559,16 @@ Option Index * --help, msgfmt option: msgfmt Invocation. (line 222) * --help, msggrep option: msggrep Invocation. (line 195) * --help, msginit option: msginit Invocation. (line 90) -* --help, msgmerge option: msgmerge Invocation. (line 180) +* --help, msgmerge option: msgmerge Invocation. (line 184) * --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 384) * --ignore-case, msggrep option: msggrep Invocation. (line 117) * --ignore-file, msgattrib option: msgattrib Invocation. - (line 84) + (line 87) * --indent, msgattrib option: msgattrib Invocation. - (line 117) + (line 120) * --indent, msgcat option: msgcat Invocation. (line 98) * --indent, msgcomm option: msgcomm Invocation. (line 88) * --indent, msgconv option: msgconv Invocation. (line 68) @@ -15158,7 +15576,7 @@ Option Index * --indent, msgfilter option: msgfilter Invocation. (line 117) * --indent, msggrep option: msggrep Invocation. (line 146) -* --indent, msgmerge option: msgmerge Invocation. (line 129) +* --indent, msgmerge option: msgmerge Invocation. (line 133) * --indent, msgunfmt option: msgunfmt Invocation. (line 112) * --indent, msguniq option: msguniq Invocation. (line 85) * --indent, xgettext option: xgettext Invocation. (line 269) @@ -15167,7 +15585,7 @@ Option Index (line 16) * --input, msginit option: msginit Invocation. (line 16) * --intl, gettextize option: gettextize Invocation. - (line 51) + (line 43) * --invert-match, msggrep option: msggrep Invocation. (line 121) * --java, msgfmt option: msgfmt Invocation. (line 30) * --java, msgunfmt option: msgunfmt Invocation. (line 16) @@ -15194,13 +15612,13 @@ Option Index * --multi-domain, msgcmp option: msgcmp Invocation. (line 36) * --multi-domain, msgmerge option: msgmerge Invocation. (line 101) * --no-changelog, gettextize option: gettextize Invocation. - (line 59) + (line 51) * --no-fuzzy, msgattrib option: msgattrib Invocation. (line 47) * --no-fuzzy-matching, msgmerge option: msgmerge Invocation. (line 105) * --no-hash, msgfmt option: msgfmt Invocation. (line 212) * --no-location, msgattrib option: msgattrib Invocation. - (line 120) + (line 123) * --no-location, msgcat option: msgcat Invocation. (line 101) * --no-location, msgcomm option: msgcomm Invocation. (line 91) * --no-location, msgconv option: msgconv Invocation. (line 71) @@ -15208,14 +15626,14 @@ Option Index * --no-location, msgfilter option: msgfilter Invocation. (line 125) * --no-location, msggrep option: msggrep Invocation. (line 149) -* --no-location, msgmerge option: msgmerge Invocation. (line 132) +* --no-location, msgmerge option: msgmerge Invocation. (line 136) * --no-location, msguniq option: msguniq Invocation. (line 88) * --no-location, xgettext option: xgettext Invocation. (line 272) * --no-obsolete, msgattrib option: msgattrib Invocation. (line 53) * --no-translator, msginit option: msginit Invocation. (line 58) * --no-wrap, msgattrib option: msgattrib Invocation. - (line 149) + (line 152) * --no-wrap, msgcat option: msgcat Invocation. (line 130) * --no-wrap, msgcomm option: msgcomm Invocation. (line 120) * --no-wrap, msgconv option: msgconv Invocation. (line 99) @@ -15224,16 +15642,16 @@ Option Index (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, msgmerge option: msgmerge Invocation. (line 164) * --no-wrap, msgunfmt option: msgunfmt Invocation. (line 137) * --no-wrap, msguniq option: msguniq Invocation. (line 117) * --no-wrap, xgettext option: xgettext Invocation. (line 300) * --obsolete, msgattrib option: msgattrib Invocation. - (line 92) + (line 95) * --omit-header, msgcomm option: msgcomm Invocation. (line 135) * --omit-header, xgettext option: xgettext Invocation. (line 315) * --only-file, msgattrib option: msgattrib Invocation. - (line 80) + (line 83) * --only-fuzzy, msgattrib option: msgattrib Invocation. (line 50) * --only-obsolete, msgattrib option: msgattrib Invocation. @@ -15254,10 +15672,11 @@ Option Index * --output-file, msgmerge option: msgmerge Invocation. (line 53) * --output-file, msgunfmt option: msgunfmt Invocation. (line 98) * --output-file, msguniq option: msguniq Invocation. (line 38) +* --previous, msgmerge option: msgmerge Invocation. (line 109) * --properties-input, msgattrib option: msgattrib Invocation. - (line 101) + (line 104) * --properties-input, msgcat option: msgcat Invocation. (line 74) -* --properties-input, msgcmp option: msgcmp Invocation. (line 44) +* --properties-input, msgcmp option: msgcmp Invocation. (line 54) * --properties-input, msgcomm option: msgcomm Invocation. (line 72) * --properties-input, msgconv option: msgconv Invocation. (line 52) * --properties-input, msgen option: msgen Invocation. (line 48) @@ -15267,10 +15686,10 @@ Option Index * --properties-input, msgfmt option: msgfmt Invocation. (line 133) * --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, msgmerge option: msgmerge Invocation. (line 117) * --properties-input, msguniq option: msguniq Invocation. (line 61) * --properties-output, msgattrib option: msgattrib Invocation. - (line 133) + (line 136) * --properties-output, msgcat option: msgcat Invocation. (line 114) * --properties-output, msgcomm option: msgcomm Invocation. (line 104) * --properties-output, msgconv option: msgconv Invocation. (line 83) @@ -15279,7 +15698,7 @@ Option Index (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, msgmerge option: msgmerge Invocation. (line 148) * --properties-output, msgunfmt option: msgunfmt Invocation. (line 121) * --properties-output, msguniq option: msguniq Invocation. (line 101) * --properties-output, xgettext option: xgettext Invocation. (line 284) @@ -15287,7 +15706,7 @@ Option Index * --qt, xgettext option: xgettext Invocation. (line 240) * --quiet, msgfilter option: msgfilter Invocation. (line 79) -* --quiet, msgmerge option: msgmerge Invocation. (line 193) +* --quiet, msgmerge option: msgmerge Invocation. (line 197) * --regexp=, msggrep option: msggrep Invocation. (line 109) * --repeated, msguniq option: msguniq Invocation. (line 49) * --resource, msgfmt option: msgfmt Invocation. (line 75) @@ -15298,9 +15717,9 @@ Option Index (line 74) * --silent, msgfilter option: msgfilter Invocation. (line 79) -* --silent, msgmerge option: msgmerge Invocation. (line 193) +* --silent, msgmerge option: msgmerge Invocation. (line 197) * --sort-by-file, msgattrib option: msgattrib Invocation. - (line 161) + (line 164) * --sort-by-file, msgcat option: msgcat Invocation. (line 142) * --sort-by-file, msgcomm option: msgcomm Invocation. (line 132) * --sort-by-file, msgconv option: msgconv Invocation. (line 111) @@ -15308,11 +15727,11 @@ Option Index * --sort-by-file, msgfilter option: msgfilter Invocation. (line 165) * --sort-by-file, msggrep option: msggrep Invocation. (line 187) -* --sort-by-file, msgmerge option: msgmerge Invocation. (line 172) +* --sort-by-file, msgmerge option: msgmerge Invocation. (line 176) * --sort-by-file, msguniq option: msguniq Invocation. (line 129) * --sort-by-file, xgettext option: xgettext Invocation. (line 312) * --sort-output, msgattrib option: msgattrib Invocation. - (line 156) + (line 159) * --sort-output, msgcat option: msgcat Invocation. (line 137) * --sort-output, msgcomm option: msgcomm Invocation. (line 127) * --sort-output, msgconv option: msgconv Invocation. (line 106) @@ -15320,13 +15739,13 @@ Option Index * --sort-output, msgfilter option: msgfilter Invocation. (line 160) * --sort-output, msggrep option: msggrep Invocation. (line 183) -* --sort-output, msgmerge option: msgmerge Invocation. (line 167) +* --sort-output, msgmerge option: msgmerge Invocation. (line 171) * --sort-output, msgunfmt option: msgunfmt Invocation. (line 144) * --sort-output, msguniq option: msguniq Invocation. (line 124) * --sort-output, xgettext option: xgettext Invocation. (line 307) * --statistics, msgfmt option: msgfmt Invocation. (line 229) * --strict, msgattrib option: msgattrib Invocation. - (line 127) + (line 130) * --strict, msgcat option: msgcat Invocation. (line 108) * --strict, msgcomm option: msgcomm Invocation. (line 98) * --strict, msgconv option: msgconv Invocation. (line 77) @@ -15335,14 +15754,14 @@ Option Index (line 131) * --strict, msgfmt option: msgfmt Invocation. (line 57) * --strict, msggrep option: msggrep Invocation. (line 155) -* --strict, msgmerge option: msgmerge Invocation. (line 138) +* --strict, msgmerge option: msgmerge Invocation. (line 142) * --strict, msgunfmt option: msgunfmt Invocation. (line 115) * --strict, msguniq option: msguniq Invocation. (line 95) * --strict, xgettext option: xgettext Invocation. (line 279) * --stringtable-input, msgattrib option: msgattrib Invocation. - (line 105) + (line 108) * --stringtable-input, msgcat option: msgcat Invocation. (line 78) -* --stringtable-input, msgcmp option: msgcmp Invocation. (line 48) +* --stringtable-input, msgcmp option: msgcmp Invocation. (line 58) * --stringtable-input, msgcomm option: msgcomm Invocation. (line 76) * --stringtable-input, msgen option: msgen Invocation. (line 52) * --stringtable-input, msgexec option: msgexec Invocation. (line 60) @@ -15351,11 +15770,11 @@ Option Index * --stringtable-input, msgfmt option: msgfmt Invocation. (line 137) * --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, msgmerge option: msgmerge Invocation. (line 121) * --stringtable-input, msgonv option: msgconv Invocation. (line 56) * --stringtable-input, msguniq option: msguniq Invocation. (line 65) * --stringtable-output, msgattrib option: msgattrib Invocation. - (line 138) + (line 141) * --stringtable-output, msgcat option: msgcat Invocation. (line 119) * --stringtable-output, msgcomm option: msgcomm Invocation. (line 109) * --stringtable-output, msgconv option: msgconv Invocation. (line 88) @@ -15364,11 +15783,13 @@ Option Index (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, msgmerge option: msgmerge Invocation. (line 153) * --stringtable-output, msgunfmt option: msgunfmt Invocation. (line 126) * --stringtable-output, msguniq option: msguniq Invocation. (line 106) * --stringtable-output, xgettext option: xgettext Invocation. (line 289) * --suffix, msgmerge option: msgmerge Invocation. (line 68) +* --symlink, gettextize option: gettextize Invocation. + (line 56) * --tcl, msgfmt option: msgfmt Invocation. (line 43) * --tcl, msgunfmt option: msgunfmt Invocation. (line 26) * --to-code, msgcat option: msgcat Invocation. (line 87) @@ -15385,10 +15806,12 @@ Option Index * --update, msgmerge option: msgmerge Invocation. (line 45) * --use-first, msgcat option: msgcat Invocation. (line 90) * --use-first, msguniq option: msguniq Invocation. (line 77) +* --use-fuzzy, msgcmp option: msgcmp Invocation. (line 39) * --use-fuzzy, msgfmt option: msgfmt Invocation. (line 199) +* --use-untranslated, msgcmp option: msgcmp Invocation. (line 45) * --variables, envsubst option: envsubst Invocation. (line 15) * --verbose, msgfmt option: msgfmt Invocation. (line 233) -* --verbose, msgmerge option: msgmerge Invocation. (line 188) +* --verbose, msgmerge option: msgmerge Invocation. (line 192) * --verbose, msgunfmt option: msgunfmt Invocation. (line 161) * --version, autopoint option: autopoint Invocation. (line 36) @@ -15397,9 +15820,9 @@ Option Index * --version, gettextize option: gettextize Invocation. (line 73) * --version, msgattrib option: msgattrib Invocation. - (line 173) + (line 176) * --version, msgcat option: msgcat Invocation. (line 154) -* --version, msgcmp option: msgcmp Invocation. (line 61) +* --version, msgcmp option: msgcmp Invocation. (line 71) * --version, msgcomm option: msgcomm Invocation. (line 147) * --version, msgconv option: msgconv Invocation. (line 123) * --version, msgen option: msgen Invocation. (line 119) @@ -15409,13 +15832,13 @@ Option Index * --version, msgfmt option: msgfmt Invocation. (line 226) * --version, msggrep option: msggrep Invocation. (line 199) * --version, msginit option: msginit Invocation. (line 94) -* --version, msgmerge option: msgmerge Invocation. (line 184) +* --version, msgmerge option: msgmerge Invocation. (line 188) * --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 388) * --width, msgattrib option: msgattrib Invocation. - (line 143) + (line 146) * --width, msgcat option: msgcat Invocation. (line 124) * --width, msgcomm option: msgcomm Invocation. (line 114) * --width, msgconv option: msgconv Invocation. (line 93) @@ -15424,7 +15847,7 @@ Option Index (line 147) * --width, msggrep option: msggrep Invocation. (line 171) * --width, msginit option: msginit Invocation. (line 73) -* --width, msgmerge option: msgmerge Invocation. (line 154) +* --width, msgmerge option: msgmerge Invocation. (line 158) * --width, msgunfmt option: msgunfmt Invocation. (line 131) * --width, msguniq option: msguniq Invocation. (line 111) * --width, xgettext option: xgettext Invocation. (line 294) @@ -15434,8 +15857,6 @@ Option Index * ->, msgcomm option: msgcomm Invocation. (line 58) * -a, msgfmt option: msgfmt Invocation. (line 209) * -a, xgettext option: xgettext Invocation. (line 106) -* -c, gettextize option: gettextize Invocation. - (line 40) * -C, msgfmt option: msgfmt Invocation. (line 183) * -c, msgfmt option: msgfmt Invocation. (line 146) * -C, msggrep option: msggrep Invocation. (line 93) @@ -15478,9 +15899,9 @@ Option Index * -f, autopoint option: autopoint Invocation. (line 20) * -f, gettextize option: gettextize Invocation. - (line 48) + (line 40) * -F, msgattrib option: msgattrib Invocation. - (line 161) + (line 164) * -F, msgcat option: msgcat Invocation. (line 142) * -f, msgcat option: msgcat Invocation. (line 27) * -F, msgcomm option: msgcomm Invocation. (line 132) @@ -15494,16 +15915,16 @@ Option Index * -f, msgfmt option: msgfmt Invocation. (line 199) * -f, msggrep option: msggrep Invocation. (line 113) * -F, msggrep option: msggrep Invocation. (line 105) -* -F, msgmerge option: msgmerge Invocation. (line 172) +* -F, msgmerge option: msgmerge Invocation. (line 176) * -F, msguniq option: msguniq Invocation. (line 129) * -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) * -h, msgattrib option: msgattrib Invocation. - (line 169) + (line 172) * -h, msgcat option: msgcat Invocation. (line 150) -* -h, msgcmp option: msgcmp Invocation. (line 57) +* -h, msgcmp option: msgcmp Invocation. (line 67) * -h, msgcomm option: msgcomm Invocation. (line 143) * -h, msgconv option: msgconv Invocation. (line 119) * -h, msgen option: msgen Invocation. (line 115) @@ -15513,13 +15934,13 @@ Option Index * -h, msgfmt option: msgfmt Invocation. (line 222) * -h, msggrep option: msggrep Invocation. (line 195) * -h, msginit option: msginit Invocation. (line 90) -* -h, msgmerge option: msgmerge Invocation. (line 180) +* -h, msgmerge option: msgmerge Invocation. (line 184) * -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 384) * -i, msgattrib option: msgattrib Invocation. - (line 117) + (line 120) * -i, msgcat option: msgcat Invocation. (line 98) * -i, msgcomm option: msgcomm Invocation. (line 88) * -i, msgconv option: msgconv Invocation. (line 68) @@ -15529,7 +15950,7 @@ Option Index (line 16) * -i, msggrep option: msggrep Invocation. (line 117) * -i, msginit option: msginit Invocation. (line 16) -* -i, msgmerge option: msgmerge Invocation. (line 129) +* -i, msgmerge option: msgmerge Invocation. (line 133) * -i, msgunfmt option: msgunfmt Invocation. (line 112) * -i, msguniq option: msguniq Invocation. (line 85) * -i, xgettext option: xgettext Invocation. (line 269) @@ -15550,7 +15971,7 @@ Option Index * -m, xgettext option: xgettext Invocation. (line 372) * -n, gettext option: gettext Invocation. (line 35) * -n, msgattrib option: msgattrib Invocation. - (line 124) + (line 127) * -n, msgcat option: msgcat Invocation. (line 105) * -n, msgcomm option: msgcomm Invocation. (line 95) * -n, msgfilter option: msgfilter Invocation. @@ -15575,12 +15996,12 @@ Option Index * -o, msguniq option: msguniq Invocation. (line 38) * -o, xgettext option: xgettext Invocation. (line 40) * -p, msgattrib option: msgattrib Invocation. - (line 133) + (line 136) * -P, msgattrib option: msgattrib Invocation. - (line 101) + (line 104) * -p, msgcat option: msgcat Invocation. (line 114) * -P, msgcat option: msgcat Invocation. (line 74) -* -P, msgcmp option: msgcmp Invocation. (line 44) +* -P, msgcmp option: msgcmp Invocation. (line 54) * -p, msgcomm option: msgcomm Invocation. (line 104) * -P, msgcomm option: msgcomm Invocation. (line 72) * -p, msgconv option: msgconv Invocation. (line 83) @@ -15597,24 +16018,24 @@ Option Index * -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) -* -P, msgmerge option: msgmerge Invocation. (line 113) +* -p, msgmerge option: msgmerge Invocation. (line 148) +* -P, msgmerge option: msgmerge Invocation. (line 117) * -p, msgunfmt option: msgunfmt Invocation. (line 121) * -p, msguniq option: msguniq Invocation. (line 101) * -P, msguniq option: msguniq Invocation. (line 61) * -p, xgettext option: xgettext Invocation. (line 45) -* -q, msgmerge option: msgmerge Invocation. (line 193) +* -q, msgmerge option: msgmerge Invocation. (line 197) * -r, msgfmt option: msgfmt Invocation. (line 75) * -r, msgunfmt option: msgunfmt Invocation. (line 43) * -s, msgattrib option: msgattrib Invocation. - (line 156) + (line 159) * -s, msgcat option: msgcat Invocation. (line 137) * -s, msgcomm option: msgcomm Invocation. (line 127) * -s, msgconv option: msgconv Invocation. (line 106) * -s, msgen option: msgen Invocation. (line 102) * -s, msgfilter option: msgfilter Invocation. (line 160) -* -s, msgmerge option: msgmerge Invocation. (line 167) +* -s, msgmerge option: msgmerge Invocation. (line 171) * -s, msgunfmt option: msgunfmt Invocation. (line 144) * -s, msguniq option: msguniq Invocation. (line 124) * -s, xgettext option: xgettext Invocation. (line 307) @@ -15631,9 +16052,9 @@ Option Index * -v, envsubst option: envsubst Invocation. (line 15) * -V, gettext option: gettext Invocation. (line 40) * -V, msgattrib option: msgattrib Invocation. - (line 173) + (line 176) * -V, msgcat option: msgcat Invocation. (line 154) -* -V, msgcmp option: msgcmp Invocation. (line 61) +* -V, msgcmp option: msgcmp Invocation. (line 71) * -V, msgcomm option: msgcomm Invocation. (line 147) * -V, msgconv option: msgconv Invocation. (line 123) * -V, msgen option: msgen Invocation. (line 119) @@ -15645,15 +16066,15 @@ Option Index * -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) +* -v, msgmerge option: msgmerge Invocation. (line 192) +* -V, msgmerge option: msgmerge Invocation. (line 188) * -v, msgunfmt option: msgunfmt Invocation. (line 161) * -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 388) * -w, msgattrib option: msgattrib Invocation. - (line 143) + (line 146) * -w, msgcat option: msgcat Invocation. (line 124) * -w, msgcomm option: msgcomm Invocation. (line 114) * -w, msgconv option: msgconv Invocation. (line 93) @@ -15662,7 +16083,7 @@ Option Index (line 147) * -w, msggrep option: msggrep Invocation. (line 171) * -w, msginit option: msginit Invocation. (line 73) -* -w, msgmerge option: msgmerge Invocation. (line 154) +* -w, msgmerge option: msgmerge Invocation. (line 158) * -w, msgunfmt option: msgunfmt Invocation. (line 131) * -w, msguniq option: msguniq Invocation. (line 111) * -w, xgettext option: xgettext Invocation. (line 294) @@ -15909,6 +16330,9 @@ Autoconf Macro Index * Menu: * AM_GNU_GETTEXT: AM_GNU_GETTEXT. (line 6) +* AM_GNU_GETTEXT_INTL_SUBDIR: AM_GNU_GETTEXT_INTL_SUBDIR. + (line 6) +* AM_GNU_GETTEXT_NEED: AM_GNU_GETTEXT_NEED. (line 6) * AM_GNU_GETTEXT_VERSION: AM_GNU_GETTEXT_VERSION. (line 6) * AM_ICONV: AM_ICONV. (line 6) @@ -15930,7 +16354,7 @@ General Index * accumulating translations: Creating Compendia. (line 14) * aclocal.m4 file: aclocal. (line 6) * adding keywords, xgettext: xgettext Invocation. (line 117) -* ambiguities: Preparing Strings. (line 39) +* ambiguities: Preparing Strings. (line 41) * apply a filter to translations: msgfilter Invocation. (line 8) * apply command to all translations in a catalog: msgexec Invocation. @@ -15947,14 +16371,14 @@ General Index * auxiliary PO file: Auxiliary. (line 13) * available translations: Matrix. (line 6) * awk: gawk. (line 6) -* awk-format flag: PO Files. (line 144) +* awk-format flag: PO Files. (line 149) * 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) * Boost format strings: xgettext Invocation. (line 244) -* boost-format flag: PO Files. (line 180) +* boost-format flag: PO Files. (line 185) * bug report address: Introduction. (line 24) * C and C-like languages: C. (line 6) * C trigraphs: xgettext Invocation. (line 235) @@ -15964,8 +16388,8 @@ General Index * C# resources mode, and msgfmt program: msgfmt Invocation. (line 40) * C# resources mode, and msgunfmt program: msgunfmt Invocation. (line 23) -* C#, string concatenation: Preparing Strings. (line 166) -* c-format flag: PO Files. (line 85) +* C#, string concatenation: Preparing Strings. (line 168) +* c-format flag: PO Files. (line 90) * c-format, and xgettext: c-format Flag. (line 48) * catalog encoding and msgexec output: msgexec Invocation. (line 25) * catclose, a catgets function: Interface to catgets. @@ -15983,10 +16407,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 270) -* comments, automatic: PO Files. (line 35) -* comments, extracted: PO Files. (line 35) -* comments, translator: PO Files. (line 35) +* comments in PO files: PO Files. (line 284) +* comments, automatic: PO Files. (line 36) +* comments, extracted: PO Files. (line 36) +* comments, translator: PO Files. (line 36) * Common Lisp: Common Lisp. (line 6) * compare PO files: msgcmp Invocation. (line 8) * comparison of interfaces: Comparison. (line 6) @@ -15996,13 +16420,14 @@ General Index * concatenate PO files: msgcat Invocation. (line 8) * concatenating PO files into a compendium: Creating Compendia. (line 14) -* concatenation of strings: Preparing Strings. (line 115) +* concatenation of strings: Preparing Strings. (line 117) * 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) +* context, in PO files: PO Files. (line 189) +* control characters: Preparing Strings. (line 190) * convert binary message catalog into PO file: msgunfmt Invocation. (line 8) * convert translations to a different encoding: msgconv Invocation. @@ -16012,10 +16437,10 @@ 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 140) +* csharp-format flag: PO Files. (line 145) * currency symbols: Aspects. (line 79) * date format: Aspects. (line 84) -* dcngettext: Plural forms. (line 111) +* dcngettext: Plural forms. (line 128) * dcpgettext: Contexts. (line 56) * dcpgettext_expr: Contexts. (line 112) * debugging messages marked as format strings: xgettext Invocation. @@ -16023,7 +16448,7 @@ General Index * dialect: Manipulating. (line 28) * disabling NLS: lib/gettext.h. (line 6) * distribution tarball: Release Management. (line 6) -* dngettext: Plural forms. (line 103) +* dngettext: Plural forms. (line 120) * dollar substitution: envsubst Invocation. (line 8) * domain ambiguities: Ambiguities. (line 6) * dpgettext: Contexts. (line 56) @@ -16034,7 +16459,7 @@ General Index * Editing PO Files: Editing. (line 6) * editing translations: Modifying Translations. (line 6) -* elisp-format flag: PO Files. (line 120) +* elisp-format flag: PO Files. (line 125) * Emacs Lisp: Emacs Lisp. (line 6) * Emacs PO Mode: PO Mode. (line 6) * encoding: Aspects. (line 67) @@ -16066,9 +16491,9 @@ General Index * 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 75) +* fuzzy flag: PO Files. (line 80) * gawk: gawk. (line 6) -* gcc-internal-format flag: PO Files. (line 172) +* gcc-internal-format flag: PO Files. (line 177) * GCC-source: GCC-source. (line 6) * generate binary message catalog from PO file: msgfmt Invocation. (line 8) @@ -16090,7 +16515,7 @@ General Index * hash table, inside MO files: MO Files. (line 47) * he, she, and they: Introduction. (line 15) * header entry of a PO file: Header Entry. (line 6) -* help option: Preparing Strings. (line 107) +* help option: Preparing Strings. (line 109) * history of GNU gettext: History. (line 6) * i18n: Concepts. (line 6) * importing PO files: Normalizing. (line 55) @@ -16105,14 +16530,14 @@ General Index * interface to catgets: Interface to catgets. (line 6) * internationalization: Concepts. (line 16) -* inttypes.h: Preparing Strings. (line 131) +* inttypes.h: Preparing Strings. (line 133) * ISO 3166: Country Codes. (line 6) * ISO 639: Language Codes. (line 6) * Java: Java. (line 6) * 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 136) +* Java, string concatenation: Preparing Strings. (line 168) +* java-format flag: PO Files. (line 141) * KDE PO file editor: KBabel. (line 6) * keyboard accelerator checking: msgfmt Invocation. (line 187) * l10n: Concepts. (line 6) @@ -16124,9 +16549,9 @@ General Index * 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) +* libintl library: AM_GNU_GETTEXT. (line 53) * librep Lisp: librep. (line 6) -* librep-format flag: PO Files. (line 124) +* librep-format flag: PO Files. (line 129) * License, GNU FDL: GNU FDL. (line 6) * License, GNU GPL: GNU GPL. (line 6) * License, GNU LGPL: GNU LGPL. (line 6) @@ -16137,7 +16562,7 @@ General Index * Linux <2>: Overview. (line 62) * Linux: Aspects. (line 114) * Lisp: Common Lisp. (line 6) -* lisp-format flag: PO Files. (line 116) +* lisp-format flag: PO Files. (line 121) * 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) @@ -16170,6 +16595,7 @@ General Index * marking strings that require translation: Mark Keywords. (line 6) * marking strings, preparations: Preparing Strings. (line 6) * marking translatable strings: Overview. (line 34) +* markup: Preparing Strings. (line 190) * menu entries: Contexts. (line 6) * menu, keyboard accelerator support: msgfmt Invocation. (line 187) * merge PO files: msgcat Invocation. (line 8) @@ -16180,7 +16606,7 @@ General Index * mkinstalldirs file: mkinstalldirs. (line 6) * mnemonics of menu entries: msgfmt Invocation. (line 187) * MO file's format: MO Files. (line 6) -* modify message attrributes: msgattrib Invocation. +* modify message attributes: msgattrib Invocation. (line 62) * msgattrib program, usage: msgattrib Invocation. (line 6) @@ -16188,7 +16614,7 @@ 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) +* msgctxt: PO Files. (line 189) * msgen program, usage: msgen Invocation. (line 6) * msgexec program, usage: msgexec Invocation. (line 6) * msgfilter filter and catalog encoding: msgfilter Invocation. @@ -16197,48 +16623,48 @@ General Index (line 6) * msgfmt program, usage: msgfmt Invocation. (line 6) * msggrep program, usage: msggrep Invocation. (line 6) -* msgid: PO Files. (line 51) -* msgid_plural: PO Files. (line 202) +* msgid: PO Files. (line 56) +* msgid_plural: PO Files. (line 209) * msginit program, usage: msginit Invocation. (line 6) * msgmerge program, usage: msgmerge Invocation. (line 6) -* msgstr: PO Files. (line 51) +* msgstr: PO Files. (line 56) * 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 265) +* newlines in PO files: PO Files. (line 279) * ngettext: Plural forms. (line 84) * ngettext program, usage: ngettext Invocation. (line 6) * NLS: Concepts. (line 51) -* 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-awk-format flag: PO Files. (line 150) +* no-boost-format flag: PO Files. (line 186) +* no-c-format flag: PO Files. (line 91) * no-c-format, and xgettext: c-format Flag. (line 48) -* 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) +* no-csharp-format flag: PO Files. (line 146) +* no-elisp-format flag: PO Files. (line 126) +* no-gcc-internal-format flag: PO Files. (line 178) +* no-java-format flag: PO Files. (line 142) +* no-librep-format flag: PO Files. (line 130) +* no-lisp-format flag: PO Files. (line 122) +* no-objc-format flag: PO Files. (line 110) +* no-object-pascal-format flag: PO Files. (line 154) +* no-perl-brace-format flag: PO Files. (line 170) +* no-perl-format flag: PO Files. (line 166) +* no-php-format flag: PO Files. (line 174) +* no-python-format flag: PO Files. (line 118) +* no-qt-format flag: PO Files. (line 182) +* no-scheme-format flag: PO Files. (line 134) +* no-sh-format flag: PO Files. (line 114) +* no-smalltalk-format flag: PO Files. (line 138) +* no-tcl-format flag: PO Files. (line 162) +* no-ycp-format flag: PO Files. (line 158) +* nplurals, in a PO file header: Plural forms. (line 145) * number format: Aspects. (line 94) -* objc-format flag: PO Files. (line 104) +* objc-format flag: PO Files. (line 109) * Object Pascal: Pascal. (line 6) -* object-pascal-format flag: PO Files. (line 148) +* object-pascal-format flag: PO Files. (line 153) * obsolete entries: Obsolete Entries. (line 6) * optimization of gettext functions: Optimized gettext. (line 6) * orthography: Manipulating. (line 28) @@ -16251,7 +16677,7 @@ General Index * 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) +* paragraphs: Preparing Strings. (line 101) * Pascal: Pascal. (line 6) * Perl: Perl. (line 6) * Perl default keywords: Default Keywords. (line 6) @@ -16263,18 +16689,18 @@ 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 164) -* perl-format flag: PO Files. (line 160) +* perl-brace-format flag: PO Files. (line 169) +* perl-format flag: PO Files. (line 165) * pgettext: Contexts. (line 33) * pgettext_expr: Contexts. (line 112) * PHP: PHP. (line 6) -* php-format flag: PO Files. (line 168) +* php-format flag: PO Files. (line 173) * Pike: Pike. (line 6) -* plural form formulas: Plural forms. (line 148) +* plural form formulas: Plural forms. (line 165) * plural forms: Plural forms. (line 6) * 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) +* plural forms, in PO files: PO Files. (line 209) +* plural, in a PO file header: Plural forms. (line 145) * PO files' format: PO Files. (line 6) * PO mode (Emacs) commands: Main PO Commands. (line 6) * PO template file: Template. (line 6) @@ -16299,10 +16725,10 @@ General Index * programming languages: Language Implementors. (line 6) * Python: Python. (line 6) -* python-format flag: PO Files. (line 112) +* python-format flag: PO Files. (line 117) * Qt format strings: xgettext Invocation. (line 240) * Qt mode, and msgfmt program: msgfmt Invocation. (line 46) -* qt-format flag: PO Files. (line 176) +* qt-format flag: PO Files. (line 181) * quotation marks <1>: po/Rules-*. (line 11) * quotation marks: Header Entry. (line 145) * quote characters, use in PO files: Header Entry. (line 145) @@ -16312,37 +16738,37 @@ General Index * release: Release Management. (line 6) * RST: RST. (line 6) * Scheme: Scheme. (line 6) -* scheme-format flag: PO Files. (line 128) +* scheme-format flag: PO Files. (line 133) * scripting languages: Language Implementors. (line 6) * search messages in a catalog: msggrep Invocation. (line 8) * selecting message language: End Users. (line 6) -* sentences: Preparing Strings. (line 42) +* sentences: Preparing Strings. (line 44) * 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 15) -* sh-format flag: PO Files. (line 108) +* sh-format flag: PO Files. (line 113) * 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 132) +* smalltalk-format flag: PO Files. (line 137) * sorting msgcat output: msgcat Invocation. (line 137) -* sorting msgmerge output: msgmerge Invocation. (line 167) +* sorting msgmerge output: msgmerge Invocation. (line 171) * sorting msgunfmt output: msgunfmt Invocation. (line 144) * sorting output of xgettext: xgettext Invocation. (line 307) -* specifying plural form in a PO file: Plural forms. (line 128) +* specifying plural form in a PO file: Plural forms. (line 145) * standard output, and msgcat: msgcat Invocation. (line 47) * standard output, and msgmerge program: msgmerge Invocation. (line 56) -* string concatenation: Preparing Strings. (line 115) +* string concatenation: Preparing Strings. (line 117) * string normalization in entries: Normalizing. (line 6) -* style: Preparing Strings. (line 22) +* style: Preparing Strings. (line 24) * supported languages, xgettext: xgettext Invocation. (line 56) * 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 156) +* tcl-format flag: PO Files. (line 161) * template PO file: Overview. (line 67) * testing .po files for equivalence: xgettext Invocation. (line 317) * Tk's scripting language: Tcl. (line 6) @@ -16366,222 +16792,226 @@ General Index * 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 152) +* ycp-format flag: PO Files. (line 157)  Tag Table: 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 +Node: Introduction16245 +Node: Why17865 +Ref: Why-Footnote-121075 +Node: Concepts21231 +Node: Aspects24649 +Node: Files30507 +Node: Overview32413 +Node: Users42331 +Node: Matrix43763 +Node: End Users44971 +Node: PO Files45620 +Ref: PO Files-Footnote-156968 +Node: Sources57095 +Node: Importing58248 +Node: Triggering58928 +Node: Preparing Strings61965 +Node: Mark Keywords71005 +Node: Marking75315 +Node: c-format Flag83042 +Node: Special cases86958 +Node: Names89684 +Node: Libraries93282 +Node: Template96314 +Node: xgettext Invocation97035 +Node: Creating111351 +Node: msginit Invocation112233 +Node: Header Entry114859 +Node: Updating121865 +Node: msgmerge Invocation122080 +Node: Editing127232 +Node: KBabel127530 +Node: Gtranslator127668 +Node: PO Mode127810 +Node: Installation129502 +Node: Main PO Commands131463 +Node: Entry Positioning136548 +Node: Normalizing142014 +Node: Translated Entries146505 +Node: Fuzzy Entries147860 +Node: Untranslated Entries151037 +Node: Obsolete Entries152966 +Node: Modifying Translations156188 +Node: Modifying Comments164154 +Node: Subedit168578 +Node: C Sources Context172471 +Node: Auxiliary177592 +Node: Compendium180824 +Node: Creating Compendia181444 +Node: Using Compendia183929 +Node: Manipulating184862 +Node: msgcat Invocation188624 +Node: msgconv Invocation192874 +Node: msggrep Invocation196053 +Node: msgfilter Invocation201234 +Node: msguniq Invocation206858 +Node: msgcomm Invocation210747 +Node: msgcmp Invocation214792 +Node: msgattrib Invocation216804 +Node: msgen Invocation221486 +Node: msgexec Invocation224821 +Node: libgettextpo227402 +Node: Binaries232524 +Node: msgfmt Invocation232868 +Node: msgunfmt Invocation239873 +Node: MO Files244035 +Node: Programmers252276 +Node: catgets253455 +Node: Interface to catgets254866 +Node: Problems with catgets256872 +Node: gettext257784 +Node: Interface to gettext259284 +Node: Ambiguities261641 +Node: Locating Catalogs264345 +Ref: Locating Catalogs-Footnote-1265503 +Ref: Locating Catalogs-Footnote-2265728 +Node: Charset conversion265877 +Node: Contexts268328 +Node: Plural forms273828 +Ref: Plural forms-Footnote-1288024 +Node: Optimized gettext288146 +Node: Comparison289482 +Node: Using libintl.a293749 +Node: gettext grok294189 +Node: Temp Programmers296818 +Node: Temp Implementations297343 +Node: Temp catgets298720 +Node: Temp WSI300418 +Node: Temp Notes302417 +Node: Translators302917 +Node: Trans Intro 0303380 +Node: Trans Intro 1306114 +Node: Discussions308063 +Node: Organization311718 +Node: Central Coordination313784 +Node: National Teams314923 +Node: Sub-Cultures317447 +Node: Organizational Ideas318381 +Node: Mailing Lists319399 +Node: Information Flow321213 +Node: Prioritizing messages323461 +Node: Maintainers327757 +Node: Flat and Non-Flat329710 +Node: Prerequisites331200 +Node: gettextize Invocation335347 +Node: Adjusting Files342311 +Node: po/POTFILES.in344095 +Node: po/LINGUAS345341 +Node: po/Makevars347030 +Node: po/Rules-*347778 +Node: configure.in349246 +Node: config.guess352257 +Node: mkinstalldirs353610 +Node: aclocal354012 +Node: acconfig356009 +Node: config.h.in356506 +Node: Makefile357971 +Node: src/Makefile360565 +Node: lib/gettext.h364952 +Node: autoconf macros367197 +Node: AM_GNU_GETTEXT367974 +Node: AM_GNU_GETTEXT_VERSION371936 +Node: AM_GNU_GETTEXT_NEED372388 +Node: AM_GNU_GETTEXT_INTL_SUBDIR373278 +Node: AM_PO_SUBDIRS373930 +Node: AM_ICONV374712 +Node: CVS Issues376919 +Node: Distributed CVS377507 +Node: Files under CVS379432 +Node: autopoint Invocation382703 +Node: Release Management384543 +Node: Installers385053 +Node: Programming Languages386277 +Node: Language Implementors387100 +Node: Programmers for other Languages391914 +Node: Translators for other Languages392495 +Node: c-format394021 +Node: objc-format395734 +Node: sh-format396086 +Node: python-format396888 +Node: lisp-format397326 +Node: elisp-format397652 +Node: librep-format398142 +Node: scheme-format398542 +Node: smalltalk-format398818 +Node: java-format399318 +Node: csharp-format399766 +Node: awk-format400141 +Node: object-pascal-format400466 +Node: ycp-format400695 +Node: tcl-format401094 +Node: perl-format401389 +Node: php-format402134 +Node: gcc-internal-format402499 +Node: qt-format403541 +Node: boost-format403975 +Node: Maintainers for other Languages404519 +Node: List of Programming Languages405754 +Node: C407037 +Node: sh408337 +Node: Preparing Shell Scripts409611 +Node: gettext.sh413000 +Node: gettext Invocation413547 +Node: ngettext Invocation415302 +Node: envsubst Invocation416890 +Node: eval_gettext Invocation418311 +Node: eval_ngettext Invocation418772 +Node: bash419286 +Node: Python421262 +Node: Common Lisp422412 +Node: clisp C423212 +Node: Emacs Lisp423927 +Node: librep424653 +Node: Scheme425388 +Node: Smalltalk426172 +Node: Java427206 +Node: C#432914 +Node: gawk441331 +Node: Pascal442243 +Node: wxWidgets443551 +Node: YCP444458 +Node: Tcl445197 +Node: Perl446607 +Node: General Problems449615 +Node: Default Keywords453273 +Node: Special Keywords454225 +Node: Quote-like Expressions455738 +Node: Interpolation I458013 +Node: Interpolation II461803 +Node: Parentheses464168 +Node: Long Lines465686 +Node: Perl Pitfalls467531 +Node: PHP471773 +Node: Pike472704 +Node: GCC-source473365 +Node: List of Data Formats474112 +Node: POT474578 +Node: RST474836 +Node: Glade475062 +Node: Conclusion475422 +Node: History475925 +Node: References480191 +Node: Language Codes481835 +Node: Usual Language Codes482347 +Node: Rare Language Codes486718 +Node: Country Codes488375 +Node: Licenses494261 +Node: GNU GPL496103 +Node: GNU LGPL515280 +Node: GNU FDL543413 +Node: Program Index565799 +Node: Option Index567685 +Node: Variable Index613915 +Node: PO Mode Index615453 +Node: Autoconf Macro Index629289 +Node: Index630023  End Tag Table diff --git a/gettext-tools/doc/gettext_1.html b/gettext-tools/doc/gettext_1.html index 2e096352b..227afdf20 100644 --- a/gettext-tools/doc/gettext_1.html +++ b/gettext-tools/doc/gettext_1.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - 1 Introduction diff --git a/gettext-tools/doc/gettext_10.html b/gettext-tools/doc/gettext_10.html index a10cd1b9a..58290c8b1 100644 --- a/gettext-tools/doc/gettext_10.html +++ b/gettext-tools/doc/gettext_10.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - 10 Producing Binary MO Files @@ -18,15 +18,15 @@ Go to the first, previous<

10.1 Invoking the msgfmt Program

- - + + 

 msgfmt [option] filename.po ...

- + The msgfmt programs generates a binary message catalog from a textual translation description. @@ -43,8 +43,8 @@ translation description.

‘--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. @@ -65,39 +65,39 @@ If an input file is ‘-’, standard input is read.
‘--java’
- - - + + + Java mode: generate a Java ResourceBundle class.
‘--java2’
- + Like --java, and assume Java2 (JDK 1.2 or higher).
‘--csharp’
- - + + C# mode: generate a .NET .dll file containing a subclass of GettextResourceSet.
‘--csharp-resources’
- - + + C# resources mode: generate a .NET ‘.resources’ file.
‘--tcl’
- - + + Tcl mode: generate a tcl/msgcat ‘.msg’ file.
‘--qt’
- - + + Qt mode: generate a Qt ‘.qm’ file. @@ -112,13 +112,13 @@ Qt mode: generate a Qt ‘.qm’ file.
‘--output-file=file’
- - + + Write output to specified file.
‘--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 @@ -145,22 +145,22 @@ If the output file is ‘-’, output is written
‘--resource=resource’
- - + + Specify the resource name.
‘-l 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’
- + Specify the base directory of classes directory hierarchy. @@ -181,22 +181,22 @@ is written under the specified directory.
‘--resource=resource’
- - + + Specify the resource name.
‘-l 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’
- + Specify the base directory for locale dependent ‘.dll’ files. @@ -217,14 +217,14 @@ 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’
- + Specify the base directory of ‘.msg’ message catalogs. @@ -244,14 +244,14 @@ written in the specified directory.
‘--properties-input’
- - + + Assume the input files are Java ResourceBundles in Java .properties syntax, not in PO file syntax.
‘--stringtable-input’
- + Assume the input files are NeXTstep/GNUstep localized resource files in .strings syntax, not in PO file syntax. @@ -267,15 +267,15 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
‘--check’
- - + + Perform all the checks implied by --check-format, --check-header, --check-domain.
‘--check-format’
- - + + Check language dependent format strings. If the string represents a format string used in a @@ -294,19 +294,19 @@ 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’
- + 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 for conflicts between domain directives and the --output-file option @@ -314,18 +314,18 @@ option
‘--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 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. @@ -340,9 +340,9 @@ instead of ‘&’.
‘--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. @@ -359,13 +359,13 @@ a human translator.
‘--alignment=number’
- - + + Align strings to number bytes (default: 1).
‘--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). @@ -381,29 +381,29 @@ at run time (binary search instead of hash table lookup).
‘--help’
- - + + Display this help and exit.
‘-V’
‘--version’
- - + + Output version information and exit.
‘--statistics’
- + Print statistics about translations.
‘-v’
‘--verbose’
- - + + Increase verbosity level. @@ -413,15 +413,15 @@ Increase verbosity level.

10.2 Invoking the msgunfmt Program

- - + + 

 msgunfmt [option] [file]...

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

‘--java’
- - - + + + Java mode: input is a Java ResourceBundle class.
‘--csharp’
- - + + C# mode: input is a .NET .dll file containing a subclass of GettextResourceSet.
‘--csharp-resources’
- - + + C# resources mode: input is a .NET ‘.resources’ file.
‘--tcl’
- - + + Tcl mode: input is a tcl/msgcat ‘.msg’ file. @@ -488,16 +488,16 @@ If no input file is given or if it is ‘-’, s
‘--resource=resource’
- - + + Specify the resource name.
‘-l 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. @@ -518,22 +518,22 @@ separated with an underscore. The class is located using the CLASSPATH
‘--resource=resource’
- - + + Specify the resource name.
‘-l 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’
- + Specify the base directory for locale dependent ‘.dll’ files. @@ -554,14 +554,14 @@ 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’
- + Specify the base directory of ‘.msg’ message catalogs. @@ -581,8 +581,8 @@ located in the specified directory.
‘--output-file=file’
- - + + Write output to specified file. @@ -600,20 +600,20 @@ or if it is ‘-’.
‘--force-po’
- + Always write an output file even if it contains no message.
‘-i’
‘--indent’
- - + + Write the .po file using indented style.
‘--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. @@ -622,15 +622,15 @@ GNU extensions.
‘--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’
- + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -638,15 +638,15 @@ Note that this file format doesn't support plural forms.
‘--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. @@ -655,9 +655,9 @@ lines which are wider than the output page width will be split.
‘--sort-output’
- - - + + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -673,24 +673,24 @@ for the translator to understand each message's context.
‘--help’
- - + + Display this help and exit.
‘-V’
‘--version’
- - + + Output version information and exit.
‘-v’
‘--verbose’
- - + + Increase verbosity level. @@ -699,8 +699,8 @@ Increase verbosity level.

10.3 The Format of GNU MO Files

- - + +

@@ -709,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 @@ -757,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 @@ -778,13 +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 @@ -802,7 +802,7 @@ that strings are NUL terminated, so embedded NULs are somewhat useless. But the MO file format is general enough so other 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 +accidentally 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 platform dependent as well.) diff --git a/gettext-tools/doc/gettext_11.html b/gettext-tools/doc/gettext_11.html index e74fa3fe0..1f53477bd 100644 --- a/gettext-tools/doc/gettext_11.html +++ b/gettext-tools/doc/gettext_11.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - 11 The Programmer's View @@ -31,7 +31,7 @@ later explain our solution of this dilemma.

11.1 About catgets

- +

@@ -53,7 +53,7 @@ some others do...)

-But we must not forget one point: after all the trouble with transfering +But we must not forget one point: after all the trouble with transferring the rights on Unix(tm) they at last came to X/Open, the very same who published this specification. This leads me to making the prediction that this interface will be in future Unix standards (e.g. Spec1170) and @@ -66,7 +66,7 @@ therefore part of all Unix implementation (implementations, which are

11.1.1 The Interface

- +

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

- + catopen is used like in this:

@@ -98,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: @@ -130,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:

@@ -147,7 +147,7 @@ After this no catgets call using the descriptor is legal anymore.

11.1.2 Problems with the catgets Interface?!

- +

@@ -168,7 +168,7 @@ more easy to manage.

11.2 About gettext

- +

@@ -199,7 +199,7 @@ in using this library will be interested in this description.

11.2.1 The Interface

- +

@@ -270,9 +270,9 @@ your language.

11.2.2 Solving Ambiguities

- - - + + +

@@ -348,7 +348,7 @@ unreliabilities.

11.2.3 Locating Message Catalog Files

- +

@@ -388,8 +388,8 @@ The value of the locale is determined through

11.2.4 How to specify the output character set gettext uses

- - + +

@@ -421,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 @@ -455,10 +455,10 @@ global variable errno is set accordingly.

11.2.5 Using contexts for solving ambiguities

- - - - + + + +

@@ -496,7 +496,7 @@ over the functions from <libintl.h>.

- + 

 const char *pgettext (const char *msgctxt, const char *msgid);
@@ -531,8 +531,8 @@ fetches a particular translation of the msgid.
 
 

 

-
-
+
+
 
 
 const char *dpgettext (const char *domain_name,
@@ -617,9 +617,9 @@ string literals, more general macros are available:
 
 

 

-
-
-
+
+
+
 
 
 const char *pgettext_expr (const char *msgctxt, const char *msgid);
@@ -641,7 +641,7 @@ efficient.
 
 
11.2.6  Additional functions for plural forms

 

-
+
 
 

 

@@ -764,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
@@ -788,13 +788,44 @@ printf (ngettext ("%d file removed", "%d files removed", n), n);
 Please note that the numeric value n has to be passed to the
 printf function as well.  It is not sufficient to pass it only to
 ngettext.
+
+

+

+In the English singular case, the number -- always 1 -- can be replaced with
+"one":
+
+

+
+
+printf (ngettext ("One file removed", "%d files removed", n), n);
+

+
+

+This works because the ‘printf’ function discards excess arguments that
+are not consumed by the format string.
+
+

+

+It is also possible to use this function when the strings don't contain a
+cardinal number:
+
+

+
+
+puts (ngettext ("Delete the selected file?",
+                "Delete the selected files?",
+                n));
+

+
+

+In this case the number n is only used to choose the plural form.
 

 
 

 

 

 
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
@@ -805,7 +836,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
@@ -830,9 +861,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:
@@ -860,7 +891,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
@@ -884,9 +915,6 @@ Languages with this property include:
 
 

 
-
Finno-Ugric family
-

-Hungarian
 
Asian family
 

 Japanese, Korean, Vietnamese
@@ -932,6 +960,22 @@ Italian, Portuguese, Spanish
 Esperanto
 

 
+Another language using the same header entry is:
+
+

+
+
Finno-Ugric family
+

+Hungarian
+

+
+Hungarian does not appear to have a plural if you look at sentences involving
+cardinal numbers.  For example, “1 apple” is “1 alma”, and “123 apples” is
+“123 alma”.  But when the number is not explicit, the distinction between
+singular and plural exists: “the apple” is “az alma”, and “the apples” is
+“az alm'{a}k”.  Since ngettext has to support both types of sentences,
+it is classified here, under “two forms”.
+
 
Two forms, singular used for zero and one
 

 Exceptional case in the language family.  The header entry would be:
@@ -1104,11 +1148,67 @@ Slovenian
 

 

 
+

+You might now ask, ngettext handles only numbers n of type
+‘unsigned long’.  What about larger integer types?  What about negative
+numbers?  What about floating-point numbers?
+
+

+

+About larger integer types, such as ‘uintmax_t’ or 
+‘unsigned long long’: they can be handled by reducing the value to a
+range that fits in an ‘unsigned long’.  Simply casting the value to
+‘unsigned long’ would not do the right thing, since it would treat
+ULONG_MAX + 1 like zero, ULONG_MAX + 2 like singular, and
+the like.  Here you can exploit the fact that all mentioned plural form
+formulas eventually become periodic, with a period that is a divisor of 100
+(or 1000 or 1000000).  So, when you reduce a large value to another one in
+the range [1000000, 1999999] that ends in the same 6 decimal digits, you
+can assume that it will lead to the same plural form selection.  This code
+does this:
+
+

+
+
+#include <inttypes.h>
+uintmax_t nbytes = ...;
+printf (ngettext ("The file has %"PRIuMAX" byte.",
+                  "The file has %"PRIuMAX" bytes.",
+                  (nbytes > ULONG_MAX
+                   ? (nbytes % 1000000) + 1000000
+                   : nbytes)),
+        nbytes);
+

+
+

+Negative and floating-point values usually represent physical entities for
+which singular and plural don't clearly apply.  In such cases, there is no
+need to use ngettext; a simple gettext call with a form suitable
+for all values will do.  For example:
+
+

+
+
+printf (gettext ("Time elapsed: %.3f seconds"),
+        num_milliseconds * 0.001);
+

+
+

+Even if num_milliseconds happens to be a multiple of 1000, the output
+
+
+Time elapsed: 1.000 seconds
+

+
+

+is acceptable in English, and similarly for other languages.
+
+

 
 
 
11.2.7  Optimization of the *gettext functions

 

-
+
 
 

 

@@ -1163,8 +1263,8 @@ find the result through a single cache lookup.
 
 
11.3  Comparing the Two Interfaces

 

-
-
+
+
 
 

 
@@ -1214,7 +1314,7 @@ by
 
 

 

-
+
 
 
 #include <libintl.h>
@@ -1229,7 +1329,7 @@ can use any that becomes available.
 
 

 

-
+
 The same procedure can be done for the gettext_noop invocations
 (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:
@@ -1342,7 +1442,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
@@ -1359,20 +1459,20 @@ priority:
 
      
 
    1. LANGUAGE
 
-
+
  
-
+
 
    2. LC_ALL
 
-
-
-
-
-
-
+
+
+
+
+
+
 
    3. LC_xxx, according to selected locale
 
-
+
 
    4. LANG
 
 
    
@@ -1406,7 +1506,7 @@ language switching function.
   }
 

 
-
+
 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
diff --git a/gettext-tools/doc/gettext_12.html b/gettext-tools/doc/gettext_12.html
index 7668f8d5c..e6f5f7d39 100644
--- a/gettext-tools/doc/gettext_12.html
+++ b/gettext-tools/doc/gettext_12.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 25 October 2006 -->
 
 
 GNU gettext utilities - 12  The Translator's View
@@ -564,7 +564,7 @@ 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
diff --git a/gettext-tools/doc/gettext_13.html b/gettext-tools/doc/gettext_13.html
index 4f0dacf5a..fd29fa78c 100644
--- a/gettext-tools/doc/gettext_13.html
+++ b/gettext-tools/doc/gettext_13.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 25 October 2006 -->
 
 
 GNU gettext utilities - 13  The Maintainer's View
@@ -13,7 +13,7 @@ Go to the first, previous
 
 
13  The Maintainer's View

 

-
+
 
 

 

@@ -88,9 +88,9 @@ use this as an opportunity to unflatten their package structure.
 
 
13.2  Prerequisite Works

 

-
-
-
+
+
+
 
 

 

@@ -239,8 +239,8 @@ It can be invoked as follows:
 
 

 

-
-
+
+
 
 
 gettextize [ option... ] [ directory ]
@@ -252,29 +252,17 @@ and accepts the following options:
 

 

 
-
‘-c’
-

-
‘--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’
 

 
‘--force’
 

-
-
+
+
 Force replacement of files which already exist.
 
 
‘--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,
@@ -284,29 +272,38 @@ be enabled on systems lacking GNU gettext.
 
 
‘--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.
 
+
‘--symlink’
+

+
+Make symbolic links instead of copying the needed files.  This can be
+useful to save a few kilobytes of disk space, but it requires extra
+effort to create self-contained tarballs, it may disturb some mechanism
+the maintainer applies to the sources, and it is likely to introduce
+bugs when a newer version of gettext is installed on the system.
+
 
‘-n’
 

 
‘--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’
 

-
+
 Display this help and exit.
 
 
‘--version’
 

-
+
 Output version information and exit.
 
 

@@ -424,14 +421,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

 

-
+
 
 

 

@@ -446,7 +443,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 distribution itself, or from the GNU
+gettext 0.16 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
@@ -459,7 +456,7 @@ gettext functionality.
 
 
13.4.1  ‘POTFILES.in’ in ‘po/’

 

-
+
 
 

 

@@ -505,7 +502,7 @@ case of bison), not the generated C file.
 
 
13.4.2  ‘LINGUAS’ in ‘po/’

 

-
+
 
 

 

@@ -527,7 +524,7 @@ 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,
 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).
 
 

 

@@ -554,7 +551,7 @@ directory; they are also installed by running gettextize.
 
 
13.4.3  ‘Makevars’ in ‘po/’

 

-
+
 
 

 

@@ -577,7 +574,7 @@ locations need to adjust the three first variables defined in
 
 
13.4.4  Extending ‘Makefile’ in ‘po/’

 

-
+
 
 

 

@@ -588,8 +585,8 @@ 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
@@ -625,14 +622,14 @@ letters.  See section 9.4  Invoking the msg
 
    
 
  1. Declare the package and version.
 
-
+
 
 This is done by a set of lines like these:
 
 
 
     PACKAGE=gettext
-VERSION=0.15
+VERSION=0.16
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -643,13 +640,13 @@ or, if you are using GNU automake, by a line like this:
 
 
 
    -AM_INIT_AUTOMAKE(gettext, 0.15)
+AM_INIT_AUTOMAKE(gettext, 0.16)
 
    
 
 Of course, you replace ‘gettext’ with the name of your package,
-and ‘0.15’ by its version numbers, exactly as they
+and ‘0.16’ by its version numbers, exactly as they
 should appear in the packaged tar file name of your distribution
-(‘gettext-0.15.tar.gz’, here).
+(‘gettext-0.16.tar.gz’, here).
 
 
  2. Check for internationalization support.
 
@@ -765,7 +762,7 @@ AC_CONFIG_AUX_DIR([subdir])
 
 
    13.4.7  ‘mkinstalldirs’ at top level
    
 
    
-
+
 
 
    
 
    
@@ -779,25 +776,31 @@ automake 1.9.
 
 
    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_h.m4’, ‘inttypes-h.m4’,
-‘inttypes-pri.m4’, ‘lcmessage.m4’,
+‘intdiv0.m4’, ‘intl.m4’, ‘intldir.m4’, ‘intmax.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’,
+‘longdouble.m4’, ‘longlong.m4’, ‘nls.m4’, ‘po.m4’,
+‘printf-posix.m4’, ‘progtest.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.
+‘nls.m4’, ‘po.m4’, ‘progtest.m4’ need to be concatenated.
+
+
    
+
    
+If you are not using GNU automake 1.8 or newer, you will need to
+add a file ‘mkdirp.m4’ from a newer automake distribution to the
+list of files above.
 
 
    
 
    
@@ -837,7 +840,7 @@ piece of m4 code will be the same for all projects using GNU
 
 
    13.4.9  ‘acconfig.h’ at top level
    
 
    
-
+
 
 
    
 
    
@@ -853,7 +856,7 @@ independently from the ‘intl/’ directory.
 
 
    13.4.10  ‘config.h.in’ at top level
    
 
    
-
+
 
 
    
 
    
@@ -1180,9 +1183,9 @@ AM_CPPFLAGS = -I../intl -I$(top_srcdir)/intl
 
 
    13.4.13  ‘gettext.h’ in ‘lib/’
    
 
    
-
-
-
+
+
+
 
 
    
 
    
@@ -1204,7 +1207,7 @@ some older versions of GCC (older than 3.0).
 
 When the package does not include the intl/ subdirectory, and the
 libintl.h header (with its associated libintl library, if any) is not
-already installed on the system, it is preferrable that the package builds
+already installed on the system, it is preferable that the package builds
 without internationalization support, rather than to give a compilation
 error.
 
@@ -1219,7 +1222,7 @@ 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
@@ -1260,7 +1263,7 @@ package that needs it should contain a copy of it on its own.
 
 
    13.5  Autoconf macros for use in ‘configure.in’
    
 
    
-
+
 
 
    
 
    
@@ -1276,7 +1279,7 @@ The primary macro is, of course, AM_GNU_GETTEXT.
 
    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
@@ -1297,10 +1300,13 @@ 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
-the latter case, a static library $(top_builddir)/intl/libintl.a
-will be created.
+should be ‘external’ for packages with no ‘intl/’ directory.
+For packages with an ‘intl/’ directory, you can either use an
+intlsymbol equal to ‘no-libtool’, or you can use ‘external’
+and override by using the macro AM_GNU_GETTEXT_INTL_SUBDIR elsewhere.
+The two ways to specify the existence of an ‘intl/’ directory are
+equivalent.  At build time, a static library
+$(top_builddir)/intl/libintl.a will then be created.
 
 
    
 
    
@@ -1309,9 +1315,11 @@ 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.
-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’
+Only one needsymbol can be specified.  These requirements can also be
+specified by using the macro AM_GNU_GETTEXT_NEED elsewhere.  To specify
+more than one requirement, just specify the strongest one among them, or
+invoke the AM_GNU_GETTEXT_NEED macro several times.  The hierarchy
+among the various alternatives is as follows: ‘need-formatstring-macros’
 implies ‘need-ngettext’.
 
 
    
@@ -1341,7 +1349,7 @@ The complexities that AM_GNU_GETTEXT deals with are the following:
@@ -1049,16 +1049,16 @@ Output the variables occurring in shell-format.
‘--help’
- - + + Display this help and exit.
‘-V’
‘--version’
- - + + Output version information and exit. @@ -1088,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. @@ -1106,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 @@ -1125,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

- +

@@ -1163,7 +1163,7 @@ locale's encoding, produce the dangerous \x60 bytes.

  • -A translator could - voluntarily or inadvertantly - use backquotes +A translator could - voluntarily or inadvertently - use backquotes "`...`" or dollar-parentheses "$(...)" in her translations. The enclosed strings would be executed as command lists by the shell. @@ -1176,9 +1176,9 @@ that don't have the gettext() function in libc.

    -

    15.5.4 Python

    +

    15.5.4 Python

    - +

    @@ -1253,11 +1253,11 @@ An example is available in the ‘examples’ directory:

    -

    15.5.5 GNU clisp - Common Lisp

    +

    15.5.5 GNU clisp - Common Lisp

    - - - + + +

    @@ -1325,9 +1325,9 @@ An example is available in the ‘examples’ directory:

    -

    15.5.6 GNU clisp C sources

    +

    15.5.6 GNU clisp C sources

    - +

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

    15.5.7 Emacs Lisp

    +

    15.5.7 Emacs Lisp

    - +

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

    15.5.8 librep

    +

    15.5.8 librep

    - +

    @@ -1529,10 +1529,10 @@ An example is available in the ‘examples’ directory:

    -

    15.5.9 GNU guile - Scheme

    +

    15.5.9 GNU guile - Scheme

    - - + +

    @@ -1600,9 +1600,9 @@ An example is available in the ‘examples’ directory:

    -

    15.5.10 GNU Smalltalk

    +

    15.5.10 GNU Smalltalk

    - +

    @@ -1673,9 +1673,9 @@ An example is available in the ‘examples’ directory:

    -

    15.5.11 Java

    +

    15.5.11 Java

    - +

    @@ -1809,7 +1809,7 @@ 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. @@ -1915,9 +1915,9 @@ than a class with a single-letter name.

    -

    15.5.12 C#

    +

    15.5.12 C#

    - +

    @@ -2138,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. @@ -2223,10 +2223,10 @@ with a single-letter name.

    -

    15.5.13 GNU awk

    +

    15.5.13 GNU awk

    - - + +

    @@ -2296,11 +2296,11 @@ An example is available in the ‘examples’ directory:

    -

    15.5.14 Pascal - Free Pascal Compiler

    +

    15.5.14 Pascal - Free Pascal Compiler

    - - - + + +

    @@ -2377,9 +2377,9 @@ An example is available in the ‘examples’ directory:

    -

    15.5.15 wxWidgets library

    +

    15.5.15 wxWidgets library

    - +

    @@ -2445,10 +2445,10 @@ yes -

    15.5.16 YCP - YaST2 scripting language

    +

    15.5.16 YCP - YaST2 scripting language

    - - + +

    @@ -2516,10 +2516,10 @@ An example is available in the ‘examples’ directory:

    -

    15.5.17 Tcl - Tk's scripting language

    +

    15.5.17 Tcl - Tk's scripting language

    - - + +

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

    -

    15.5.18 Perl

    +

    15.5.18 Perl

    - +

    @@ -2717,7 +2717,7 @@ An example is available in the ‘examples’ directory:

    - +

    @@ -2732,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. @@ -2866,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?

    - +

    @@ -2915,9 +2915,9 @@ 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

    - +

    @@ -2962,7 +2962,7 @@ print $gettext{Error};

    The exact rule is: You can omit the surrounding quotes, when the hash -key is a valid C (!) identifier, i. e. when it starts with an +key is a valid C (!) identifier, i.e. when it starts with an underscore or an ASCII letter and is followed by an arbitrary number of underscores, ASCII letters or digits. Other Unicode characters are not allowed, regardless of the use utf8 pragma. @@ -2970,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?

    - +

    @@ -3070,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

    - +

    @@ -3208,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

    - +

    @@ -3296,15 +3296,15 @@ 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

    - +

    In Perl, parentheses around function arguments are mostly optional. xgettext will always assume that all -recognized keywords (except for hashs and hash references) are names +recognized keywords (except for hashes and hash references) are names of properly prototyped functions, and will (hopefully) only require parentheses where Perl itself requires them. All constructs in the following example are therefore ok to use: @@ -3342,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

    - +

    @@ -3409,16 +3409,16 @@ EOF

    -Please do not forget, that the line breaks are real, i. e. they +Please do not forget that the line breaks are real, i.e. they translate into newline characters that will consequently show up in 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

    - +

    @@ -3568,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

    - +

    @@ -3639,9 +3639,9 @@ An example is available in the ‘examples’ directory:

    -

    15.5.20 Pike

    +

    15.5.20 Pike

    - +

    @@ -3705,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

    - +

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

    15.6 Internationalizable Data

    +

    15.6 Internationalizable Data

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

    15.6.1 POT - Portable Object Template

    +

    15.6.1 POT - Portable Object Template

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

    15.6.2 Resource String Table

    +

    15.6.2 Resource String Table

    - +

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

    15.6.3 Glade - GNOME user interface description

    +

    15.6.3 Glade - GNOME user interface description

    diff --git a/gettext-tools/doc/gettext_16.html b/gettext-tools/doc/gettext_16.html index c358b8324..38552087d 100644 --- a/gettext-tools/doc/gettext_16.html +++ b/gettext-tools/doc/gettext_16.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - 16 Concluding Remarks @@ -11,7 +11,7 @@ Go to the first, previous

    -

    16 Concluding Remarks

    +

    16 Concluding Remarks

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

    16.1 History of GNU gettext

    +

    16.1 History of GNU gettext

    - +

    @@ -66,7 +66,7 @@ While Jim took some distance and time and became dad for a second time, Roland wanted to get GNU libc internationalized, and got Ulrich Drepper involved in that project. Instead of starting from glocale, Ulrich rewrote something from scratch, but -more conformant to the set of guidelines who emerged out of the +more conforming to the set of guidelines who emerged out of the glocale effort. Then, Ulrich got people from the previous forum to involve themselves into this new project, and the switch from glocale to what was first named msgutils, renamed @@ -125,10 +125,10 @@ manipulating PO files.

    -

    16.2 Related Readings

    +

    16.2 Related Readings

    - - + +

    diff --git a/gettext-tools/doc/gettext_17.html b/gettext-tools/doc/gettext_17.html index 9a9d84658..2fe84d873 100644 --- a/gettext-tools/doc/gettext_17.html +++ b/gettext-tools/doc/gettext_17.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - A Language Codes @@ -11,18 +11,29 @@ Go to the first, previous

    -

    A Language Codes

    +

    A Language Codes

    - - + +

    -The ISO 639 standard defines two character codes for many languages. +The ISO 639 standard defines two-letter codes for many languages, and +three-letter codes for more rarely used languages. All abbreviations for languages used in the Translation Project should come from this standard.

    + + + +

    A.1 Usual Language Codes

    + +

    +For the commonly used languages, the ISO 639-1 standard defines two-letter +codes. + +

    ‘aa’ @@ -31,6 +42,9 @@ Afar.
    ‘ab’
    Abkhazian. +
    ‘ad’ +
    +Adangme.
    ‘ae’
    Avestan. @@ -126,7 +140,7 @@ Danish. German.
    ‘dv’
    -Divehi. +Divehi; Maldivian.
    ‘dz’
    Dzongkha; Bhutani. @@ -171,7 +185,7 @@ Faroese. French.
    ‘fy’
    -Frisian. +Western Frisian.
    ‘ga’
    Irish. @@ -180,7 +194,7 @@ Irish. Scots; Gaelic.
    ‘gl’
    -Gallegan; Galician. +Galician.
    ‘gn’
    Guarani. @@ -192,7 +206,7 @@ Gujarati. Manx.
    ‘ha’
    -Hausa (?). +Hausa.
    ‘he’
    Hebrew (formerly iw). @@ -234,7 +248,7 @@ Igbo. Sichuan Yi.
    ‘ik’
    -Inupiak. +Inupiak; Inupiaq.
    ‘io’
    Ido. @@ -261,10 +275,10 @@ Georgian. Kongo.
    ‘ki’
    -Kikuyu. +Kikuyu; Gikuyu.
    ‘kj’
    -Kuanyama. +Kuanyama; Kwanyama.
    ‘kk’
    Kazakh. @@ -303,7 +317,7 @@ Kirghiz. Latin.
    ‘lb’
    -Letzeburgesch. +Letzeburgesch; Luxembourgish.
    ‘lg’
    Ganda. @@ -330,7 +344,7 @@ Latvian; Lettish. Malagasy.
    ‘mh’
    -Marshall. +Marshallese.
    ‘mi’
    Maori. @@ -387,7 +401,7 @@ Norwegian. Ndebele, South.
    ‘nv’
    -Navajo. +Navajo; Navaho.
    ‘ny’
    Chichewa; Nyanja. @@ -456,7 +470,7 @@ Northern Sami. Sango; Sangro.
    ‘si’
    -Sinhalese. +Sinhala; Sinhalese.
    ‘sk’
    Slovak. @@ -519,7 +533,7 @@ Tagalog. Tswana; Setswana.
    ‘to’
    -Tonga (?). +Tonga.
    ‘tr’
    Turkish. @@ -582,6 +596,203 @@ Chinese. Zulu.
    + + +

    A.2 Rare Language Codes

    + +

    +For rarely used languages, the ISO 639-2 standard defines three-letter +codes. Here is the current list, reduced to only living languages with at least +one million of speakers. + +

    +
    + +
    ‘ace’ +
    +Achinese. +
    ‘awa’ +
    +Awadhi. +
    ‘bad’ +
    +Banda. +
    ‘bal’ +
    +Baluchi. +
    ‘ban’ +
    +Balinese. +
    ‘bem’ +
    +Bemba. +
    ‘bho’ +
    +Bhojpuri. +
    ‘bik’ +
    +Bikol. +
    ‘bin’ +
    +Bini. +
    ‘btk’ +
    +Batak (Indonesia). +
    ‘bug’ +
    +Buginese. +
    ‘ceb’ +
    +Cebuano. +
    ‘din’ +
    +Dinka. +
    ‘doi’ +
    +Dogri. +
    ‘fil’ +
    +Filipino; Pilipino. +
    ‘fon’ +
    +Fon. +
    ‘gon’ +
    +Gondi. +
    ‘gsw’ +
    +Alemani; Swiss German. +
    ‘hil’ +
    +Hiligaynon. +
    ‘hmn’ +
    +Hmong. +
    ‘ilo’ +
    +Iloko. +
    ‘kab’ +
    +Kabyle. +
    ‘kam’ +
    +Kamba. +
    ‘kbd’ +
    +Kabardian. +
    ‘kmb’ +
    +Kimbundu. +
    ‘kok’ +
    +Konkani. +
    ‘kru’ +
    +Kurukh. +
    ‘lua’ +
    +Luba-Lulua. +
    ‘luo’ +
    +Luo (Kenya and Tanzania). +
    ‘mad’ +
    +Madurese. +
    ‘mag’ +
    +Magahi. +
    ‘mai’ +
    +Maithili. +
    ‘mak’ +
    +Makasar. +
    ‘man’ +
    +Mandingo. +
    ‘men’ +
    +Mende. +
    ‘min’ +
    +Minangkabau. +
    ‘mni’ +
    +Manipuri. +
    ‘mos’ +
    +Mossi. +
    ‘mwr’ +
    +Marwari. +
    ‘nap’ +
    +Neapolitan. +
    ‘nso’ +
    +Pedi; Sepedi; Northern Sotho. +
    ‘nym’ +
    +Nyamwezi. +
    ‘nyn’ +
    +Nyankole. +
    ‘pag’ +
    +Pangasinan. +
    ‘pam’ +
    +Pampanga. +
    ‘raj’ +
    +Rajasthani. +
    ‘sas’ +
    +Sasak. +
    ‘sat’ +
    +Santali. +
    ‘scn’ +
    +Sicilian. +
    ‘shn’ +
    +Shan. +
    ‘sid’ +
    +Sidamo. +
    ‘srr’ +
    +Serer. +
    ‘suk’ +
    +Sukuma. +
    ‘sus’ +
    +Susu. +
    ‘tem’ +
    +Timne. +
    ‘tiv’ +
    +Tiv. +
    ‘tum’ +
    +Tumbuka. +
    ‘umb’ +
    +Umbundu. +
    ‘wal’ +
    +Walamo. +
    ‘war’ +
    +Waray. +
    ‘yao’ +
    +Yao. +
    +

    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 ddcb54299..d1b75c5e2 100644 --- a/gettext-tools/doc/gettext_18.html +++ b/gettext-tools/doc/gettext_18.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - B Country Codes @@ -11,10 +11,10 @@ Go to the first, previous

    -

    B Country Codes

    +

    B Country Codes

    - - + +

    @@ -70,6 +70,9 @@ Australia.

    ‘AW’
    Aruba. +
    ‘AX’ +
    +Aaland Islands.
    ‘AZ’
    Azerbaijan. @@ -141,7 +144,7 @@ Cocos (Keeling) Islands. Congo (Dem. Rep.).
    ‘CF’
    -Central African Rep.. +Central African Republic.
    ‘CG’
    Congo (Rep.). @@ -169,9 +172,6 @@ Colombia.
    ‘CR’
    Costa Rica. -
    ‘CS’ -
    -Serbia and Montenegro.
    ‘CU’
    Cuba. @@ -249,7 +249,7 @@ France. Gabon.
    ‘GB’
    -Britain (UK). +Britain (United Kingdom).
    ‘GD’
    Grenada. @@ -259,6 +259,9 @@ Georgia.
    ‘GF’
    French Guiana. +
    ‘GG’ +
    +Guernsey.
    ‘GH’
    Ghana. @@ -325,6 +328,9 @@ Ireland.
    ‘IL’
    Israel. +
    ‘IM’ +
    +Isle of Man.
    ‘IN’
    India. @@ -343,6 +349,9 @@ Iceland.
    ‘IT’
    Italy. +
    ‘JE’ +
    +Jersey.
    ‘JM’
    Jamaica. @@ -427,6 +436,9 @@ Monaco.
    ‘MD’
    Moldova. +
    ‘ME’ +
    +Montenegro.
    ‘MG’
    Madagascar. @@ -571,6 +583,9 @@ Reunion.
    ‘RO’
    Romania. +
    ‘RS’ +
    +Serbia.
    ‘RU’
    Russia. @@ -705,7 +720,7 @@ Uzbekistan. Vatican City.
    ‘VC’
    -St Vincent. +St Vincent and the Grenadines.
    ‘VE’
    Venezuela. diff --git a/gettext-tools/doc/gettext_19.html b/gettext-tools/doc/gettext_19.html index a655311a5..71b9338bf 100644 --- a/gettext-tools/doc/gettext_19.html +++ b/gettext-tools/doc/gettext_19.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - C Licenses @@ -11,9 +11,9 @@ Go to the first, previous

    -

    C Licenses

    +

    C Licenses

    - +

    @@ -27,13 +27,13 @@ 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. +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. +A copy of the license is included in section C.1 GNU GENERAL PUBLIC LICENSE.
  • @@ -47,21 +47,21 @@ 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. +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. +A copy of the license is included in section C.1 GNU GENERAL PUBLIC LICENSE. -

    C.1 GNU GENERAL PUBLIC LICENSE

    +

    C.1 GNU GENERAL PUBLIC LICENSE

    - - + + Version 2, June 1991

    @@ -77,7 +77,7 @@ of this license document, but changing it is not allowed. -

    Preamble

    +

    Preamble

    The licenses for most software are designed to take away your @@ -409,7 +409,7 @@ POSSIBILITY OF SUCH DAMAGES. -

    Appendix: How to Apply These Terms to Your New Programs

    +

    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 @@ -492,10 +492,10 @@ 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

    +

    C.2 GNU LESSER GENERAL PUBLIC LICENSE

    - - + + Version 2.1, February 1999

    @@ -514,7 +514,7 @@ version number 2.1.] -

    Preamble

    +

    Preamble

    The licenses for most software are designed to take away your @@ -1055,7 +1055,7 @@ DAMAGES. -

    How to Apply These Terms to Your New Libraries

    +

    How to Apply These Terms to Your New Libraries

    If you develop a new library, and you want it to be of the greatest @@ -1116,10 +1116,10 @@ Ty Coon, President of Vice That's all there is to it! -

    C.3 GNU Free Documentation License

    +

    C.3 GNU Free Documentation License

    - - + + Version 1.2, November 2002

    @@ -1556,7 +1556,7 @@ as a draft) by the Free Software Foundation. -

    ADDENDUM: How to use this License for your documents

    +

    ADDENDUM: How to use this License for your documents

    To use this License in a document you have written, include a copy of diff --git a/gettext-tools/doc/gettext_2.html b/gettext-tools/doc/gettext_2.html index 7ed53dcd4..fad6fb637 100644 --- a/gettext-tools/doc/gettext_2.html +++ b/gettext-tools/doc/gettext_2.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - 2 The User's View diff --git a/gettext-tools/doc/gettext_20.html b/gettext-tools/doc/gettext_20.html index 3cf0e6de1..ffec300c9 100644 --- a/gettext-tools/doc/gettext_20.html +++ b/gettext-tools/doc/gettext_20.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - Program Index @@ -11,7 +11,7 @@ Go to the first, previous

    -

    Program Index

    +

    Program Index

    Jump to: @@ -31,45 +31,45 @@ Jump to:

    a

    -
  • autopoint +
  • autopoint

    • e

    -
  • envsubst +
  • envsubst

    • g

    -
  • gettext, gettext -
  • gettextize +
  • gettext, gettext +
  • gettextize

    • m

    -
  • msgattrib -
  • msgcat -
  • msgcmp -
  • msgcomm -
  • msgconv -
  • msgen -
  • msgexec -
  • msgfilter -
  • msgfmt -
  • msggrep -
  • msginit -
  • msgmerge -
  • msgunfmt -
  • msguniq +
  • msgattrib +
  • msgcat +
  • msgcmp +
  • msgcomm +
  • msgconv +
  • msgen +
  • msgexec +
  • msgfilter +
  • msgfmt +
  • msggrep +
  • msginit +
  • msgmerge +
  • msgunfmt +
  • msguniq

    • n

    -
  • ngettext, ngettext +
  • ngettext, ngettext

    • r

    -
  • recode-sr-latin +
  • recode-sr-latin

    • x

    -
  • xgettext +
  • xgettext

    • diff --git a/gettext-tools/doc/gettext_21.html b/gettext-tools/doc/gettext_21.html index 8e4b261a0..237aa6683 100644 --- a/gettext-tools/doc/gettext_21.html +++ b/gettext-tools/doc/gettext_21.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - Option Index @@ -11,7 +11,7 @@ Go to the first, previous

    -

    Option Index

    +

    Option Index

    Jump to: @@ -19,553 +19,556 @@ Jump to:

    -

    -
  • --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 +
  • --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 +
  • --clear-previous, msgattrib option +
  • --comment, msggrep option +
  • --compendium, msgmerge 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 +
  • --previous, msgmerge 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 +
  • --symlink, gettextize 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, msgcmp option +
  • --use-fuzzy, msgfmt option +
  • --use-untranslated, msgcmp 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, 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

    • diff --git a/gettext-tools/doc/gettext_22.html b/gettext-tools/doc/gettext_22.html index c86b8b440..9e51665b8 100644 --- a/gettext-tools/doc/gettext_22.html +++ b/gettext-tools/doc/gettext_22.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - Variable Index @@ -11,7 +11,7 @@ Go to the first, previous

    -

    Variable Index

    +

    Variable Index

    Jump to: @@ -25,31 +25,31 @@ Jump to:

    g

    -
  • GETTEXT_LOG_UNTRANSLATED, environment variable +
  • 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 +
  • 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_MSGCTXT, environment variable -
  • MSGEXEC_MSGID, environment variable +
  • MSGEXEC_LOCATION, environment variable +
  • MSGEXEC_MSGCTXT, environment variable +
  • MSGEXEC_MSGID, environment variable

    • t

    -
  • TEXTDOMAIN, environment variable -
  • TEXTDOMAINDIR, environment variable +
  • TEXTDOMAIN, environment variable +
  • TEXTDOMAINDIR, environment variable

    • diff --git a/gettext-tools/doc/gettext_23.html b/gettext-tools/doc/gettext_23.html index 91e1e7994..be513f95c 100644 --- a/gettext-tools/doc/gettext_23.html +++ b/gettext-tools/doc/gettext_23.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - PO Mode Index @@ -11,7 +11,7 @@ Go to the first, previous

    -

    PO Mode Index

    +

    PO Mode Index

    Jump to: @@ -41,70 +41,70 @@ Jump to:

    &

    -
  • ‘.emacs’ customizations -
  • ‘TAGS’, and marking translatable strings +
  • ‘.emacs’ customizations +
  • ‘TAGS’, and marking translatable strings

    • a

    -
  • auxiliary PO file +
  • 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 +
  • 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 +
  • editing comments +
  • editing multiple entries +
  • editing translations +
  • etags, using for marking strings +
  • exiting PO subedit

    • f

    -
  • find source fragment for a PO file entry +
  • find source fragment for a PO file entry

    • i

    -
  • installing PO mode +
  • installing PO mode

    • l

    -
  • looking at the source to aid translation +
  • 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 +
  • 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 +
  • obsolete active entry

    • p

    -
  • pending subedits +
  • pending subedits

    • s

    -
  • starting a string translation -
  • string normalization in entries -
  • subedit minor mode +
  • 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 +
  • use the source, Luke +
  • using obsolete translations to make new entries +
  • using translation compendia

    • diff --git a/gettext-tools/doc/gettext_24.html b/gettext-tools/doc/gettext_24.html index efedebdad..df7039477 100644 --- a/gettext-tools/doc/gettext_24.html +++ b/gettext-tools/doc/gettext_24.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - Autoconf Macro Index @@ -11,7 +11,7 @@ Go to the first, previous

    -

    Autoconf Macro Index

    +

    Autoconf Macro Index

    Jump to: @@ -19,10 +19,12 @@ Jump to:

    a

    -
  • AM_GNU_GETTEXT -
  • AM_GNU_GETTEXT_VERSION -
  • AM_ICONV -
  • AM_PO_SUBDIRS +
  • AM_GNU_GETTEXT +
  • AM_GNU_GETTEXT_INTL_SUBDIR +
  • AM_GNU_GETTEXT_NEED +
  • AM_GNU_GETTEXT_VERSION +
  • AM_ICONV +
  • AM_PO_SUBDIRS

    • diff --git a/gettext-tools/doc/gettext_25.html b/gettext-tools/doc/gettext_25.html index c48685f36..4de97f878 100644 --- a/gettext-tools/doc/gettext_25.html +++ b/gettext-tools/doc/gettext_25.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - General Index @@ -11,7 +11,7 @@ Go to the first, previous

    -

    General Index

    +

    General Index

    Jump to: @@ -72,226 +72,227 @@ Jump to:

    &

  • ‘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 +
  • ‘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 macro to mark strings for translation +
  • _nl_msg_cat_cntr

    • a

    -
  • accumulating translations -
  • adding keywords, xgettext +
  • 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 +
  • 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 +
  • awk

    • b

    -
  • backup old file, and msgmerge program -
  • bash -
  • bibliography +
  • backup old file, and msgmerge program +
  • bash +
  • bibliography
  • big picture -
  • bind_textdomain_codeset -
  • Boost format strings +
  • 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 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 +
  • 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 +
  • 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 +
  • 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 +
  • 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 +
  • control characters +
  • 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 +
  • 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 +
  • 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 +
  • 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 +
  • extracting parts of a PO file into a compendium

    • f

    -
  • FDL, GNU Free Documentation License -
  • file format, ‘.mo’ +
  • 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 +
  • 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 +
  • 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 +
  • hash table, inside MO files
  • he, she, and they -
  • header entry of a PO file +
  • header entry of a PO file
  • help option -
  • history of GNU gettext +
  • 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’ +
  • 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 +
  • initialize new PO file +
  • initialize translations from a compendium +
  • installing gettext +
  • interface to catgets
  • internationalization
  • inttypes.h -
  • ISO 3166 -
  • ISO 639 +
  • ISO 3166 +
  • ISO 639

    • j

    -
  • Java -
  • Java mode, and msgfmt program -
  • Java mode, and msgunfmt program +
  • Java +
  • Java mode, and msgfmt program +
  • Java mode, and msgunfmt program
  • Java, string concatenation

    • k

    -
  • KDE PO file editor -
  • keyboard accelerator checking +
  • KDE PO file editor +
  • keyboard accelerator checking

    • l

  • l10n -
  • language codes +
  • 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 +
  • 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 +
  • 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 @@ -301,196 +302,197 @@ Jump to:
  • locale facet, LC_RESPONSES
  • locale facet, LC_TIME, locale facet, LC_TIME
  • locale facets -
  • locale program +
  • locale program
  • localization -
  • lookup message translation, lookup message translation -
  • lookup plural message translation, lookup plural message translation +
  • 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 +
  • 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 +
  • markup +
  • 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 +
  • migration from earlier versions of gettext +
  • mnemonics of menu entries +
  • MO file's format +
  • modify message attributes +
  • 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 +
  • N_, a convenience macro
  • Native Language Support
  • Natural Language Support
  • newlines in PO files -
  • ngettext -
  • ngettext program, usage +
  • ngettext +
  • ngettext program, usage
  • NLS
  • number format

    • o

    -
  • Object Pascal -
  • obsolete entries -
  • optimization of gettext functions -
  • orthography -
  • outdigits -
  • output to stdout, xgettext +
  • 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 +
  • 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 +
  • 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 +
  • 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 +
  • 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 +
  • 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 +
  • recode-sr-latin program +
  • related reading +
  • release +
  • RST

    • s

    -
  • Scheme -
  • scripting languages -
  • search messages in a catalog +
  • Scheme +
  • scripting languages +
  • search messages in a catalog
  • selecting message language
  • sentences -
  • setting up gettext at build time +
  • setting up gettext at build time
  • setting up gettext at run time -
  • several domains +
  • 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 +
  • 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 +
  • string normalization in entries
  • style -
  • supported languages, xgettext +
  • supported languages, xgettext

    • t

    -
  • Tcl -
  • Tcl mode, and msgfmt program -
  • Tcl mode, and msgunfmt program +
  • 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 +
  • testing ‘.po’ files for equivalence +
  • Tk's scripting language +
  • translated entries +
  • translating menu entries
  • translation aspects
  • Translation Matrix
  • Translation Project -
  • turning off NLS support +
  • 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 +
  • unify duplicate translations +
  • untranslated entries +
  • update translations from a compendium +
  • upgrading to new versions of gettext

    • v

    -
  • version control for backup files, msgmerge +
  • version control for backup files, msgmerge

    • w

    -
  • wxWidgets library +
  • wxWidgets library

    • x

    -
  • xargs, and output from msgexec -
  • xgettext program, usage -
  • xmodmap program, and typing quotation marks +
  • xargs, and output from msgexec +
  • xgettext program, usage +
  • xmodmap program, and typing quotation marks

    • y

    -
  • YaST2 scripting language -
  • YCP +
  • YaST2 scripting language +
  • YCP

    • diff --git a/gettext-tools/doc/gettext_3.html b/gettext-tools/doc/gettext_3.html index 1dde42fdb..a3aa0532b 100644 --- a/gettext-tools/doc/gettext_3.html +++ b/gettext-tools/doc/gettext_3.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - 3 The Format of PO Files @@ -40,6 +40,7 @@ structure: #. extracted-comments #: reference... #, flag... +#| msgid previous-untranslated-string msgid untranslated-string msgstr translated-string @@ -79,7 +80,12 @@ 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. +flags; more about these below. Comment lines starting with #| +contain the previous untranslated string for which the translator gave +a translation. + +

    +

    All comments, of either kind, are optional.

    @@ -147,7 +153,7 @@ string happens to look like a C format string (with ‘%’ 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.6 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
    @@ -155,7 +161,7 @@ See section 10.1 Invoking the msgfmtno-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
    @@ -163,7 +169,7 @@ Likewise for Objective C, see section 15.3.2 O
    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
    @@ -171,7 +177,7 @@ Likewise for Shell, see section 15.3.3 Shell F
    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
    @@ -179,7 +185,7 @@ Likewise for Python, see section 15.3.4 Python
    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
    @@ -187,7 +193,7 @@ Likewise for Lisp, see section 15.3.5 Lisp For
    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
    @@ -195,7 +201,7 @@ Likewise for Emacs Lisp, see section 15.3.6 Em
    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
    @@ -203,7 +209,7 @@ Likewise for librep, see section 15.3.7 librep
    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
    @@ -211,7 +217,7 @@ Likewise for Scheme, see section 15.3.8 Scheme
    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
    @@ -219,7 +225,7 @@ Likewise for Smalltalk, see section 15.3.9 Sma
    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
    @@ -227,7 +233,7 @@ Likewise for Java, see section 15.3.10 Java Fo
    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
    @@ -235,7 +241,7 @@ Likewise for C#, see section 15.3.11 C# 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
    @@ -243,7 +249,7 @@ Likewise for awk, see section 15.3.12 awk Form
    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
    @@ -251,7 +257,7 @@ Likewise for Object Pascal, see section 15.3.13
    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
    @@ -259,7 +265,7 @@ Likewise for YCP, see section 15.3.14 YCP Form
    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
    @@ -267,7 +273,7 @@ Likewise for Tcl, see section 15.3.15 Tcl Form
    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
    @@ -275,7 +281,7 @@ Likewise for Perl, see section 15.3.16 Perl Fo
    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
    @@ -283,7 +289,7 @@ Likewise for Perl brace, see section 15.3.16 P
    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
    @@ -291,7 +297,7 @@ Likewise for PHP, see section 15.3.17 PHP Form
    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
    @@ -299,7 +305,7 @@ Likewise for the GCC sources, see section 15.3.
    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
    @@ -307,7 +313,7 @@ Likewise for Qt, see section 15.3.19 Qt Format
    no-boost-format
    -Likewise for Boost, see section 15.3.20 Boost Format Strings. +Likewise for Boost, see section 15.3.20 Boost Format Strings.
    • @@ -325,6 +331,8 @@ this: #. extracted-comments #: reference... #, flag... +#| msgctxt previous-context +#| msgid previous-untranslated-string msgctxt context msgid untranslated-string msgstr translated-string @@ -352,6 +360,8 @@ plural forms. #. extracted-comments #: reference... #, flag... +#| msgid previous-untranslated-string-singular +#| msgid_plural previous-untranslated-string-plural msgid untranslated-string-singular msgid_plural untranslated-string-plural msgstr[0] translated-string-case-0 @@ -377,6 +387,13 @@ msgstr[1] "s'han trobat %d errors fatals" Here also, a msgctxt context can be specified before msgid, like above. +

    +

    +The previous-untranslated-string is optionally inserted by the +msgmerge program, at the same time when it marks a message fuzzy. +It helps the translator to see which changes were done by the developers +on the untranslated-string. +

    It happens that some lines, usually whitespace or comments, follow the diff --git a/gettext-tools/doc/gettext_4.html b/gettext-tools/doc/gettext_4.html index 0d372d8bc..523e659af 100644 --- a/gettext-tools/doc/gettext_4.html +++ b/gettext-tools/doc/gettext_4.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - 4 Preparing Program Sources @@ -191,6 +191,10 @@ Split at paragraphs.

  • Use format strings instead of string concatenation. + +
  • + +Avoid unusual markup and unusual control characters.

    @@ -220,7 +224,7 @@ This is nearly untranslatable: Is the displayed item a parameter or

    -The ambiguity in this message makes it ununderstandable: Is the program +The ambiguity in this message makes it unintelligible: Is the program attempting to set something on fire? Does it mean "The given object does not match the template"? Does it mean "The template does not fit for any of the objects"? @@ -426,7 +430,7 @@ 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 +Java and C#, string concatenation is very frequently used, because it is a compiler built-in operator. Like in C, in Java, you would change

    @@ -465,11 +469,45 @@ Console.WriteLine( String.Format("Replace {0} with {1}?", object1, object2)); +

    + + +Unusual markup or control characters should not be used in translatable +strings. Translators will likely not understand the particular meaning +of the markup or control characters. + +

    +

    +For example, if you have a convention that ‘|’ delimits the +left-hand and right-hand part of some GUI elements, translators will +often not understand it without specific comments. It might be +better to have the translator translate the left-hand and right-hand +part separately. + +

    +

    +Another example is the ‘argp’ convention to use a single ‘\v’ +(vertical tab) control character to delimit two sections inside a +string. This is flawed. Some translators may convert it to a simple +newline, some to blank lines. With some PO file editors it may not be +easy to even enter a vertical tab control character. So, you cannot +be sure that the translation will contain a ‘\v’ character, at the +corresponding position. The solution is, again, to let the translator +translate two separate strings and combine at run-time the two translated +strings with the ‘\v’ required by the convention. + +

    +

    +HTML markup, however, is common enough that it's probably ok to use in +translatable strings. But please bear in mind that the GNU gettext tools +don't verify that the translations are well-formed HTML. + +

    4.4 How Marks Appear in Sources

    - +

    @@ -490,7 +528,7 @@ different instances that it is impractical to list them all in some

    This marking operation has two goals. The first goal of marking is for triggering the retrieval of the translation, at run time. -The keyword are possibly resolved into a routine able to dynamically +The keyword is possibly resolved into a routine able to dynamically 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 @@ -520,7 +558,7 @@ 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, @@ -543,20 +581,38 @@ it does not offer it officially. The real, genuine keyword is truly

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

    +

    +The marking keywords ‘gettext’ and ‘_’ take the translatable +string as sole argument. It is also possible to define marking functions +that take it at another argument position. It is even possible to make +the marked argument position depend on the total number of arguments of +the function call; this is useful in C++. All this is achieved using +xgettext's ‘--keyword’ option. + +

    +

    +Note also that long strings can be split across lines, into multiple +adjacent string tokens. Automatic string concatenation is performed +at compile time according to ISO C and ISO C++; xgettext also +supports this syntax. +

    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 -an example of string not requiring translation! +‘_()’ if you think it should be translated. For example, ‘"%s"’ +is an example of string not requiring translation. But +‘"%s: %d"’ does require translation, because in French, unlike +in English, it's customary to put a space before a colon.

    4.5 Marking Translatable Strings

    - +

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

    - -The set of program sources, targetted by the PO mode commands describe + +The set of program sources, targeted 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 shell window, change the directory to the root of your project, then @@ -595,7 +651,7 @@ 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. @@ -615,18 +671,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).
    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 +690,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, @@ -686,8 +742,8 @@ 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-. (po-select-mark-and-mark) command will request that you type @@ -748,7 +804,7 @@ prefer ‘_’, as this one is already built in the M-

    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 @@ -816,8 +872,8 @@ only a heuristic. In the ‘.po’ file the entry is marked us

    - - + + 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 @@ -863,7 +919,7 @@ used for solving this problem.

    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: @@ -994,7 +1050,7 @@ printf (_("Written by %s.\n"), manual, section Names. Note this is actually a non-ASCII name: The first name is (with Unicode escapes) "Fran\u00e7ois" or (with HTML entities) "Fran&ccedil;ois". - Pronounciation is like "fraa-swa pee-nar". */ + Pronunciation is like "fraa-swa pee-nar". */ _("Francois Pinard")); @@ -1017,7 +1073,7 @@ script. Here is an example, using Greek as the target script: #. manual, section Names. Note this is actually a non-ASCII #. name: The first name is (with Unicode escapes) #. "Fran\u00e7ois" or (with HTML entities) "Fran&ccedil;ois". -#. Pronounciation is like "fraa-swa pee-nar". +#. Pronunciation is like "fraa-swa pee-nar". msgid "Francois Pinard" msgstr "\phi\rho\alpha\sigma\omicron\alpha \pi\iota\nu\alpha\rho" " (Francois Pinard)" @@ -1033,7 +1089,7 @@ The translation project ht has set up a POT file and translation domain consisting of program author names, with better facilities for the translator than those presented here. Namely, there the original name is written directly in Unicode (rather -than with Unicode escapes or HTML entities), and the pronounciation is +than with Unicode escapes or HTML entities), and the pronunciation is denoted using the International Phonetic Alphabet (see http://www.wikipedia.org/wiki/International_Phonetic_Alphabet). @@ -1149,7 +1205,7 @@ it reads like this: In other words, dgettext is used instead of gettext. -Similary, the dngettext function should be used in place of the +Similarly, the dngettext function should be used in place of the ngettext function. diff --git a/gettext-tools/doc/gettext_5.html b/gettext-tools/doc/gettext_5.html index 214c6705e..7a667760b 100644 --- a/gettext-tools/doc/gettext_5.html +++ b/gettext-tools/doc/gettext_5.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - 5 Making the PO Template File @@ -13,7 +13,7 @@ Go to the first, previous<

    5 Making the PO Template File

    - +

    @@ -36,8 +36,8 @@ was fuzzy, and the suffix ‘.pot’ wasn't in use at that

    5.1 Invoking the xgettext Program

    - - + + 

     xgettext [option] [inputfile] ...
@@ -62,8 +62,8 @@ Input files.
 
    
 
    ‘--files-from=file’
 
    
-
-
+
+
 Read the names of the input files from file instead of getting
 them from the command line.
 
@@ -71,8 +71,8 @@ them from the command line.
 
    
 
    ‘--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.
@@ -93,16 +93,16 @@ If inputfile is ‘-’, standard input is read.
 
    
 
    ‘--default-domain=name’
 
    
-
-
+
+
 Use ‘name.po’ for output (instead of ‘messages.po’).
 
 
    ‘-o file’
 
    
 
    ‘--output=file’
 
    
-
-
+
+
 Write output to specified file (instead of ‘name.po’ or
 ‘messages.po’).
 
@@ -110,14 +110,14 @@ Write output to specified file (instead of ‘name.po’<
 
    
 
    ‘--output-dir=dir’
 
    
-
-
+
+
 Output files will be placed in directory dir.

    - + If the output file is ‘-’ or ‘/dev/stdout’, the output is written to standard output. @@ -132,9 +132,9 @@ is written to standard output.

    ‘--language=name’
    - - + + Specifies the language of the input files. The supported languages are C, C++, ObjectiveC, PO, Python, Lisp, EmacsLisp, librep, Scheme, Smalltalk, @@ -146,8 +146,8 @@ are C, C++, ObjectiveC, PO,
    ‘--c++’
    - - + + This is a shorthand for --language=C++.
    @@ -165,7 +165,7 @@ extension.
    ‘--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 Tcl and Glade input files are @@ -187,16 +187,16 @@ By default the input files are assumed to be in ASCII.
    ‘--join-existing’
    - - + + Join messages with existing file.
    ‘-x file’
    ‘--exclude-file=file’
    - - + + Entries from file are not extracted. file should be a PO or POT file. @@ -204,8 +204,8 @@ POT file.
    ‘--add-comments[=tag]’
    - - + + Place comment block with tag (or those preceding keyword lines) in output file. @@ -221,8 +221,8 @@ in output file.
    ‘--extract-all’
    - - + + Extract all strings. This option has an effect with most languages, namely C, C++, ObjectiveC, @@ -233,14 +233,14 @@ GCC-source, Glade.
    ‘--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 + + +If keywordspec is a C identifier 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 @@ -359,13 +359,13 @@ 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-’.
    - + 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 @@ -383,7 +383,7 @@ together with the checks done by ‘msgfmt -c’ it will en 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 @@ -410,33 +410,33 @@ GCC-source.
    ‘--trigraphs’
    - - + + Understand ANSI C trigraphs for input.
    This option has an effect only with the languages C, C++, ObjectiveC.
    ‘--qt’
    - - + + 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 form is used if the xgettext program decided, the format form is used if @@ -461,47 +461,47 @@ adjacent strings, and escaped end of lines for continued strings.
    ‘--force-po’
    - + Always write an output file even if no message is defined.
    ‘-i’
    ‘--indent’
    - - + + Write the .po file using indented style.
    ‘--no-location’
    - + Do not write ‘#: filename:line’ lines.
    ‘-n’
    ‘--add-location’
    - - + + Generate ‘#: filename:line’ lines (default).
    ‘--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’
    - + 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’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -509,15 +509,15 @@ Note that this file format doesn't support plural forms.
    ‘--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. @@ -526,9 +526,9 @@ lines which are wider than the output page width will be split.
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -536,16 +536,16 @@ for the translator to understand each message's context.
    ‘--sort-by-file’
    - - + + Sort output by file location.
    ‘--omit-header’
    - + 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 @@ -553,7 +553,7 @@ options at different times are guaranteed to produce the same results.
    ‘--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 @@ -569,14 +569,14 @@ simply because xgettext was first used in the GNU project.
    ‘--foreign-user’
    - + Omit FSF copyright in output. This option is equivalent to ‘--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’
    - + 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: @@ -610,16 +610,16 @@ Don't forget to specify this option.
    ‘--msgstr-prefix[=string]’
    - - + + Use string (or "" if not specified) as prefix for msgstr entries.
    ‘-M [string]’
    ‘--msgstr-suffix[=string]’
    - - + + Use string (or "" if not specified) as suffix for msgstr entries.
    @@ -634,16 +634,16 @@ Use string (or "" if not specified) as suffix for msgstr entries.
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit.
    diff --git a/gettext-tools/doc/gettext_6.html b/gettext-tools/doc/gettext_6.html index ffb4b5134..69fd38603 100644 --- a/gettext-tools/doc/gettext_6.html +++ b/gettext-tools/doc/gettext_6.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - 6 Creating a New PO File @@ -13,7 +13,7 @@ Go to the first, previous<

    6 Creating a New PO File

    - +

    @@ -48,16 +48,16 @@ the header entry of this file.

    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. @@ -72,8 +72,8 @@ information with values from the user's environment.

    ‘--input=inputfile’
    - - + + Input POT file.
    @@ -93,8 +93,8 @@ POT file. If it is ‘-’, standard input is read.
    ‘--output-file=file’
    - - + + Write output to specified PO file.
    @@ -115,14 +115,14 @@ standard output.
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -138,15 +138,15 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
    ‘--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 of all installed locales. The default is the user's locale setting.
    ‘--no-translator’
    - + Declares that the PO file will not have a human translator and is instead automatically generated. @@ -154,15 +154,15 @@ automatically generated.
    ‘--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’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -170,15 +170,15 @@ Note that this file format doesn't support plural forms.
    ‘--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. @@ -195,16 +195,16 @@ lines which are wider than the output page width will be split.
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit.
    @@ -213,7 +213,7 @@ Output version information and exit.

    6.2 Filling in the Header Entry

    - +

    @@ -282,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/, @@ -290,14 +290,14 @@ in the "National teams" area.

    Content-Type
    - - + + 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). - + 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 @@ -305,7 +305,7 @@ 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 @@ -322,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 @@ -386,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 @@ -399,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", diff --git a/gettext-tools/doc/gettext_7.html b/gettext-tools/doc/gettext_7.html index e1c4971b4..8c1194402 100644 --- a/gettext-tools/doc/gettext_7.html +++ b/gettext-tools/doc/gettext_7.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - 7 Updating Existing PO Files @@ -18,8 +18,8 @@ Go to the first, previous<

    7.1 Invoking the msgmerge Program

    - - + + 

     msgmerge [option] def.po ref.pot
@@ -56,8 +56,8 @@ References to the new sources.
 
    
 
    ‘--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.
@@ -66,8 +66,8 @@ file will be written relative to the current directory, though.
 
    
 
    ‘--compendium=file’
 
    
-
-
+
+
 Specify an additional library of message translations.  See section 8.3.14  Using Translation Compendia.
 This option may be specified more than once.
 
@@ -83,8 +83,8 @@ This option may be specified more than once.
 
    
 
    ‘--update’
 
    
-
-
+
+
 Update def.po.  Do nothing if def.po is already up to date.
    @@ -99,14 +99,14 @@ Update def.po. Do nothing if def.po is already up to date
    ‘--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 ‘-’. @@ -123,19 +123,19 @@ 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: @@ -185,18 +185,24 @@ The backup suffix is ‘~’, unless set with --suffi

    ‘--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. + +
    ‘--previous’ +
    + +Keep the previous msgids of translated messages, marked with ‘#|’, when +adding the fuzzy marker to such messages.
    @@ -209,14 +215,14 @@ up the operation considerably.
    ‘--properties-input’
    - - + + Assume the input files are Java ResourceBundles in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input files are NeXTstep/GNUstep localized resource files in .strings syntax, not in PO file syntax. @@ -230,30 +236,30 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
    ‘--force-po’
    - + Always write an output file even if it contains no message.
    ‘-i’
    ‘--indent’
    - - + + Write the .po file using indented style.
    ‘--no-location’
    - + Do not write ‘#: filename:line’ lines.
    ‘--add-location’
    - + Generate ‘#: filename:line’ lines (default).
    ‘--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. @@ -262,15 +268,15 @@ GNU extensions.
    ‘--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’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -278,15 +284,15 @@ Note that this file format doesn't support plural forms.
    ‘--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. @@ -295,9 +301,9 @@ lines which are wider than the output page width will be split.
    ‘--sort-output’
    - - - + + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -305,8 +311,8 @@ for the translator to understand each message's context.
    ‘--sort-by-file’
    - - + + Sort output by file location.
    @@ -321,24 +327,24 @@ Sort output by file location.
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit.
    ‘-v’
    ‘--verbose’
    - - + + Increase verbosity level.
    ‘-q’ @@ -347,9 +353,9 @@ Increase verbosity level.
    ‘--silent’
    - - - + + + Suppress progress indicators.
    diff --git a/gettext-tools/doc/gettext_8.html b/gettext-tools/doc/gettext_8.html index 4c7df3ee9..1baa1bac5 100644 --- a/gettext-tools/doc/gettext_8.html +++ b/gettext-tools/doc/gettext_8.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - 8 Editing PO Files @@ -13,7 +13,7 @@ Go to the first, previous<

    8 Editing PO Files

    - +

    @@ -21,21 +21,21 @@ Go to the first, previous<

    8.1 KDE's PO File Editor

    - +

    8.2 GNOME's PO File Editor

    - +

    8.3 Emacs's PO File Editor

    - +

    @@ -64,8 +64,8 @@ For the beginning, besides main PO mode commands

    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 place the programs xgettext, msgfmt, gettext, and @@ -75,8 +75,8 @@ 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 like: @@ -126,8 +126,8 @@ button 1).

    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 PO file in that window. This puts the window read-only and establishes a @@ -159,47 +159,47 @@ 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 did to the PO file are undone a little more. For the purpose of @@ -211,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 @@ -227,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 @@ -242,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 @@ -252,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, @@ -261,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 @@ -273,7 +273,7 @@ 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, @@ -289,7 +289,7 @@ any PO mode action which would help correcting the error.

    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 @@ -300,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 @@ -311,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 @@ -384,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 @@ -396,10 +396,10 @@ 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 @@ -422,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 @@ -445,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 @@ -461,7 +461,7 @@ merely use x for making the switch.

    8.3.4 Normalizing Strings in Entries

    - +

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

    - +

    M-x po-normalize
    - + Tidy the whole PO file by making entries more uniform.
    @@ -532,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. @@ -545,7 +545,7 @@ 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: @@ -598,7 +598,7 @@ to be documented in this manual, once these questions settle.

    8.3.5 Translated Entries

    - +

    @@ -610,7 +610,7 @@ Other entry types will be excluded; translation will not occur for them.

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

    @@ -618,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 @@ -640,7 +640,7 @@ 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 variable po-auto-fuzzy-on-edit is not nil, the entry having @@ -653,12 +653,12 @@ See section 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 @@ -681,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 @@ -692,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 @@ -719,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 @@ -743,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 @@ -761,7 +761,7 @@ still exists.

    8.3.7 Untranslated Entries

    - +

    @@ -781,7 +781,7 @@ 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. @@ -793,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 @@ -820,8 +820,8 @@ 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. @@ -837,7 +837,7 @@ if some untranslated string still exists.

    8.3.8 Obsolete Entries

    - +

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

    - + Moreover, some commands are more specifically related to obsolete entry processing. @@ -872,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 @@ -908,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. @@ -941,8 +941,8 @@ merely tries to provide handy tools for helping her to do so.

    8.3.9 Modifying Translations

    - - + +

    @@ -968,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 @@ -1014,9 +1014,9 @@ 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 @@ -1024,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 @@ -1033,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 @@ -1047,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 @@ -1083,8 +1083,8 @@ 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 @@ -1118,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 @@ -1158,8 +1158,8 @@ See section ‘Keyboard Macros’ in The Emacs Editor.

    8.3.10 Modifying Comments

    - - + +

    @@ -1188,24 +1188,24 @@ so the general indications given for those apply here. See section + 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). @@ -1221,8 +1221,8 @@ 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 @@ -1236,18 +1236,18 @@ See section 8.3.11 Details of Sub Edition, f

    - + 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 @@ -1288,7 +1288,7 @@ regular Emacs commands C-y (yank) and M-y

    8.3.11 Details of Sub Edition

    - +

    @@ -1301,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 @@ -1329,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 @@ -1341,8 +1341,8 @@ 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 @@ -1376,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 @@ -1389,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 @@ -1400,9 +1400,9 @@ are automatically resumed one at a time, so she may decide for each of them.

    8.3.12 C Sources Context

    - - - + + +

    @@ -1439,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. @@ -1448,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 @@ -1521,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. @@ -1544,7 +1544,7 @@ one of the directories she does not want anymore on the search path.

    8.3.13 Consulting Auxiliary PO Files

    - +

    @@ -1557,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 @@ -1573,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. @@ -1619,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 @@ -1640,10 +1640,10 @@ 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 ‘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. @@ -1652,11 +1652,11 @@ fully resolved, the translator should stay aware of normalisation issues.

    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 @@ -1669,8 +1669,8 @@ already translated entries, from translations kept in the compendium.

    8.3.14.1 Creating Compendia

    - - + +

    @@ -1685,8 +1685,8 @@ files and extracting a message subset from a PO file.

    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): @@ -1698,7 +1698,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 +for the same string. Those occurrences will be marked as fuzzy and highly visible decorated; calling msgcat on ‘file1.po’: @@ -1767,7 +1767,7 @@ files or postprocess the result using ‘msgattrib --translated --no-f

    8.3.14.3 Extract a Message Subset from a PO File

    - +

    @@ -1798,7 +1798,7 @@ or to update an already existing translation.

    8.3.14.5 Initialize a New Translation File

    - +

    @@ -1815,7 +1815,7 @@ msgmerge --compendium compendium.po -o file.po /dev/null file.pot

    8.3.14.6 Update an Existing Translation File

    - +

    diff --git a/gettext-tools/doc/gettext_9.html b/gettext-tools/doc/gettext_9.html index b665c685c..c2b9777cd 100644 --- a/gettext-tools/doc/gettext_9.html +++ b/gettext-tools/doc/gettext_9.html @@ -1,7 +1,7 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - 9 Manipulating PO Files @@ -13,7 +13,7 @@ Go to the first, previous<

    9 Manipulating PO Files

    - +

    @@ -23,7 +23,7 @@ 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 @@ -33,7 +33,7 @@ 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 @@ -49,8 +49,8 @@ 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 @@ -67,14 +67,14 @@ 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.

    - + 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. @@ -92,7 +92,7 @@ completely translated.

    - + ‘msgattrib’ can be used to select and extract only the fuzzy or untranslated messages of a translation catalog. @@ -114,16 +114,16 @@ write other specialized programs that process PO files.

    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 @@ -149,8 +149,8 @@ Input files.

    ‘--files-from=file’
    - - + + Read the names of the input files from file instead of getting them from the command line. @@ -158,8 +158,8 @@ them from the command line.
    ‘--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. @@ -180,14 +180,14 @@ If inputfile is ‘-’, standard input is read.
    ‘--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 ‘-’. @@ -202,8 +202,8 @@ or if it is ‘-’.

    ‘--less-than=number’
    - - + + Print messages with less than number definitions, defaults to infinite if not set. @@ -211,8 +211,8 @@ if not set.
    ‘--more-than=number’
    - - + + Print messages with more than number definitions, defaults to 0 if not set. @@ -220,8 +220,8 @@ set.
    ‘--unique’
    - - + + Shorthand for ‘--less-than=2’. Requests that only unique messages be printed. @@ -237,14 +237,14 @@ printed.
    ‘--properties-input’
    - - + + Assume the input files are Java ResourceBundles in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input files are NeXTstep/GNUstep localized resource files in .strings syntax, not in PO file syntax. @@ -260,45 +260,45 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
    ‘--to-code=name’
    - - + + Specify encoding for output.
    ‘--use-first’
    - + Use first available translation for each message. Don't merge several translations into one.
    ‘--force-po’
    - + Always write an output file even if it contains no message.
    ‘-i’
    ‘--indent’
    - - + + Write the .po file using indented style.
    ‘--no-location’
    - + Do not write ‘#: filename:line’ lines.
    ‘-n’
    ‘--add-location’
    - - + + Generate ‘#: filename:line’ lines (default).
    ‘--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. @@ -307,15 +307,15 @@ GNU extensions.
    ‘--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’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -323,15 +323,15 @@ Note that this file format doesn't support plural forms.
    ‘--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. @@ -340,9 +340,9 @@ lines which are wider than the output page width will be split.
    ‘--sort-output’
    - - - + + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -350,8 +350,8 @@ for the translator to understand each message's context.
    ‘--sort-by-file’
    - - + + Sort output by file location. @@ -366,16 +366,16 @@ Sort output by file location.
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit. @@ -385,15 +385,15 @@ Output version information and exit.

    9.2 Invoking the msgconv Program

    - - + + 

     msgconv [option] [inputfile]

    - + The msgconv program converts a translation catalog to a different character encoding. @@ -412,8 +412,8 @@ Input PO file.

    ‘--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. @@ -434,8 +434,8 @@ If no inputfile is given or if it is ‘-’, st
    ‘--output-file=file’
    - - + + Write output to specified file. @@ -455,8 +455,8 @@ or if it is ‘-’.
    ‘--to-code=name’
    - - + + Specify encoding for output. @@ -475,14 +475,14 @@ The default encoding is the current locale's encoding.
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -496,30 +496,30 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
    ‘--force-po’
    - + Always write an output file even if it contains no message.
    ‘-i’
    ‘--indent’
    - - + + Write the .po file using indented style.
    ‘--no-location’
    - + Do not write ‘#: filename:line’ lines.
    ‘--add-location’
    - + Generate ‘#: filename:line’ lines (default).
    ‘--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. @@ -528,15 +528,15 @@ GNU extensions.
    ‘--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’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -544,15 +544,15 @@ Note that this file format doesn't support plural forms.
    ‘--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. @@ -561,8 +561,8 @@ lines which are wider than the output page width will be split.
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -570,8 +570,8 @@ for the translator to understand each message's context.
    ‘--sort-by-file’
    - - + + Sort output by file location. @@ -586,16 +586,16 @@ Sort output by file location.
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit. @@ -605,15 +605,15 @@ Output version information and exit.

    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. @@ -632,8 +632,8 @@ Input PO file.

    ‘--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. @@ -654,8 +654,8 @@ If no inputfile is given or if it is ‘-’, st
    ‘--output-file=file’
    - - + + Write output to specified file. @@ -721,8 +721,8 @@ expressions if -E is given, or fixed strings if -F is given.
    ‘--location=sourcefile’
    - - + + Select messages extracted from sourcefile. sourcefile can be either a literal file name or a wildcard pattern. @@ -730,96 +730,96 @@ either a literal file name or a wildcard pattern.
    ‘--domain=domainname’
    - - + + Select messages belonging to domain domainname.
    ‘-J’
    ‘--msgctxt’
    - - + + Start of patterns for the msgctxt.
    ‘-K’
    ‘--msgid’
    - - + + Start of patterns for the msgid.
    ‘-T’
    ‘--msgstr’
    - - + + Start of patterns for the msgstr.
    ‘-C’
    ‘--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.
    ‘-F’
    ‘--fixed-strings’
    - - + + Specify that pattern is a set of newline-separated strings.
    ‘-e pattern’
    ‘--regexp=pattern’
    - - + + Use pattern as a regular expression.
    ‘-f file’
    ‘--file=file’
    - - + + Obtain pattern from file.
    ‘-i’
    ‘--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. @@ -835,14 +835,14 @@ of the messages that match a selection criterion.
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -856,27 +856,27 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
    ‘--force-po’
    - + Always write an output file even if it contains no message.
    ‘--indent’
    - + Write the .po file using indented style.
    ‘--no-location’
    - + Do not write ‘#: filename:line’ lines.
    ‘--add-location’
    - + Generate ‘#: filename:line’ lines (default).
    ‘--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. @@ -885,15 +885,15 @@ GNU extensions.
    ‘--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’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -901,28 +901,28 @@ Note that this file format doesn't support plural forms.
    ‘--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.
    ‘--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 output by file location. @@ -937,16 +937,16 @@ Sort output by file location.
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit. @@ -956,15 +956,15 @@ Output version information and exit.

    9.4 Invoking the msgfilter Program

    - - + + 

     msgfilter [option] filter [filter-option]

    - + The msgfilter program applies a filter to all translations of a translation catalog. @@ -979,16 +979,16 @@ translation catalog.

    ‘--input=inputfile’
    - - + + Input PO file.
    ‘-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. @@ -1009,8 +1009,8 @@ If no inputfile is given or if it is ‘-’, st
    ‘--output-file=file’
    - - + + Write output to specified file. @@ -1032,7 +1032,7 @@ recognized.

    - + 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 @@ -1046,7 +1046,7 @@ 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 @@ -1066,16 +1066,16 @@ does not have this limitation.

    ‘--expression=script’
    - - + + Add script to the commands to be executed.
    ‘-f scriptfile’
    ‘--file=scriptfile’
    - - + + Add the contents of scriptfile to the commands to be executed.
    ‘-n’ @@ -1084,9 +1084,9 @@ Add the contents of scriptfile to the commands to be executed.
    ‘--silent’
    - - - + + + Suppress automatic printing of pattern space. @@ -1096,8 +1096,8 @@ Suppress automatic printing of pattern space.

    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. @@ -1122,14 +1122,14 @@ convert the message catalog to the UTF-8 encoding when needed.

    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -1143,34 +1143,34 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
    ‘--force-po’
    - + Always write an output file even if it contains no message.
    ‘--indent’
    - + Write the .po file using indented style.
    ‘--keep-header’
    - + 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’
    - + Do not write ‘#: filename:line’ lines.
    ‘--add-location’
    - + Generate ‘#: filename:line’ lines (default).
    ‘--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. @@ -1179,15 +1179,15 @@ GNU extensions.
    ‘--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’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -1195,15 +1195,15 @@ Note that this file format doesn't support plural forms.
    ‘--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. @@ -1212,8 +1212,8 @@ lines which are wider than the output page width will be split.
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -1221,8 +1221,8 @@ for the translator to understand each message's context.
    ‘--sort-by-file’
    - - + + Sort output by file location. @@ -1237,16 +1237,16 @@ Sort output by file location.
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit. @@ -1256,16 +1256,16 @@ Output version information and exit.

    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, @@ -1292,8 +1292,8 @@ Input PO file.

    ‘--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. @@ -1314,8 +1314,8 @@ If no inputfile is given or if it is ‘-’, st
    ‘--output-file=file’
    - - + + Write output to specified file. @@ -1335,16 +1335,16 @@ or if it is ‘-’.
    ‘--repeated’
    - - + + Print only duplicates.
    ‘-u’
    ‘--unique’
    - - + + Print only unique messages, discard duplicates. @@ -1359,14 +1359,14 @@ Print only unique messages, discard duplicates.
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -1382,45 +1382,45 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
    ‘--to-code=name’
    - - + + Specify encoding for output.
    ‘--use-first’
    - + Use first available translation for each message. Don't merge several translations into one.
    ‘--force-po’
    - + Always write an output file even if it contains no message.
    ‘-i’
    ‘--indent’
    - - + + Write the .po file using indented style.
    ‘--no-location’
    - + Do not write ‘#: filename:line’ lines.
    ‘-n’
    ‘--add-location’
    - - + + Generate ‘#: filename:line’ lines (default).
    ‘--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. @@ -1429,15 +1429,15 @@ GNU extensions.
    ‘--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’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -1445,15 +1445,15 @@ Note that this file format doesn't support plural forms.
    ‘--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. @@ -1462,8 +1462,8 @@ lines which are wider than the output page width will be split.
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -1471,8 +1471,8 @@ for the translator to understand each message's context.
    ‘--sort-by-file’
    - - + + Sort output by file location. @@ -1487,16 +1487,16 @@ Sort output by file location.
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit. @@ -1506,15 +1506,15 @@ Output version information and exit.

    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 @@ -1540,8 +1540,8 @@ Input files.

    ‘--files-from=file’
    - - + + Read the names of the input files from file instead of getting them from the command line. @@ -1549,8 +1549,8 @@ them from the command line.
    ‘--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. @@ -1571,8 +1571,8 @@ If inputfile is ‘-’, standard input is read.
    ‘--output-file=file’
    - - + + Write output to specified file. @@ -1592,8 +1592,8 @@ or if it is ‘-’.
    ‘--less-than=number’
    - - + + Print messages with less than number definitions, defaults to infinite if not set. @@ -1601,8 +1601,8 @@ if not set.
    ‘--more-than=number’
    - - + + Print messages with more than number definitions, defaults to 1 if not set. @@ -1610,8 +1610,8 @@ set.
    ‘--unique’
    - - + + Shorthand for ‘--less-than=2’. Requests that only unique messages be printed. @@ -1627,14 +1627,14 @@ printed.
    ‘--properties-input’
    - - + + Assume the input files are Java ResourceBundles in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input files are NeXTstep/GNUstep localized resource files in .strings syntax, not in PO file syntax. @@ -1648,33 +1648,33 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
    ‘--force-po’
    - + Always write an output file even if it contains no message.
    ‘-i’
    ‘--indent’
    - - + + Write the .po file using indented style.
    ‘--no-location’
    - + Do not write ‘#: filename:line’ lines.
    ‘-n’
    ‘--add-location’
    - - + + Generate ‘#: filename:line’ lines (default).
    ‘--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. @@ -1683,15 +1683,15 @@ GNU extensions.
    ‘--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’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -1699,15 +1699,15 @@ Note that this file format doesn't support plural forms.
    ‘--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. @@ -1716,8 +1716,8 @@ lines which are wider than the output page width will be split.
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -1725,13 +1725,13 @@ for the translator to understand each message's context.
    ‘--sort-by-file’
    - - + + Sort output by file location.
    ‘--omit-header’
    - + Don't write header with ‘msgid ""’ entry. @@ -1746,16 +1746,16 @@ Don't write header with ‘msgid ""’ entry.
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit. @@ -1765,15 +1765,15 @@ Output version information and exit.

    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 @@ -1801,8 +1801,8 @@ References to the sources.

    ‘--directory=directory’
    - - + + Add directory to the list of directories. Source files are searched relative to this list of directories. @@ -1818,10 +1818,23 @@ searched relative to this list of directories.
    ‘--multi-domain’
    - - + + Apply ref.pot to each of the domains in def.po. +
    ‘--use-fuzzy’ +
    + +Consider fuzzy messages in the def.po file like translated messages. +Note that using this option is usually wrong, because fuzzy messages are +exactly those which have not been validated by a human translator. + +
    ‘--use-untranslated’ +
    + +Consider untranslated messages in the def.po file like translated +messages. Note that using this option is usually wrong. + @@ -1834,14 +1847,14 @@ Apply ref.pot to each of the domains in def.po.
    ‘--properties-input’
    - - + + Assume the input files are Java ResourceBundles in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input files are NeXTstep/GNUstep localized resource files in .strings syntax, not in PO file syntax. @@ -1857,16 +1870,16 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit. @@ -1876,16 +1889,16 @@ Output version information and exit.

    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. @@ -1904,8 +1917,8 @@ Input PO file.

    ‘--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. @@ -1926,8 +1939,8 @@ If no inputfile is given or if it is ‘-’, st
    ‘--output-file=file’
    - - + + Write output to specified file. @@ -1945,36 +1958,36 @@ or if it is ‘-’.
    ‘--translated’
    - + Keep translated messages, remove untranslated messages.
    ‘--untranslated’
    - + Keep untranslated messages, remove translated messages.
    ‘--no-fuzzy’
    - + Remove ‘fuzzy’ marked messages.
    ‘--only-fuzzy’
    - + Keep ‘fuzzy’ -marked messages, remove all other messsages. +marked messages, remove all other messages.
    ‘--no-obsolete’
    - + Remove obsolete #~ messages.
    ‘--only-obsolete’
    - + Keep obsolete #~ messages, remove all other messages. @@ -1984,7 +1997,7 @@ Keep obsolete #~ messages, remove all other messages.

    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 specified, the attribute modification is applied only to those messages @@ -1996,41 +2009,46 @@ that are listed in the only-file and not listed in the

    ‘--set-fuzzy’
    - + Set all messages ‘fuzzy’.
    ‘--clear-fuzzy’
    - + Set all messages non-‘fuzzy’.
    ‘--set-obsolete’
    - + Set all messages obsolete.
    ‘--clear-obsolete’
    - + Set all messages non-obsolete. +
    ‘--clear-previous’ +
    + +Remove the “previous msgid” (‘#|’) comments from all messages. +
    ‘--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’
    - + Limit the attribute changes to entries that are not listed in file. file should be a PO or POT file.
    ‘--fuzzy’
    - + Synonym for ‘--only-fuzzy --clear-fuzzy’: It keeps only the fuzzy messages and removes their ‘fuzzy’ @@ -2038,7 +2056,7 @@ mark.
    ‘--obsolete’
    - + Synonym for ‘--only-obsolete --clear-obsolete’: It keeps only the obsolete messages and makes them non-obsolete. @@ -2054,14 +2072,14 @@ obsolete messages and makes them non-obsolete.
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -2075,33 +2093,33 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
    ‘--force-po’
    - + Always write an output file even if it contains no message.
    ‘-i’
    ‘--indent’
    - - + + Write the .po file using indented style.
    ‘--no-location’
    - + Do not write ‘#: filename:line’ lines.
    ‘-n’
    ‘--add-location’
    - - + + Generate ‘#: filename:line’ lines (default).
    ‘--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. @@ -2110,15 +2128,15 @@ GNU extensions.
    ‘--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’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -2126,15 +2144,15 @@ Note that this file format doesn't support plural forms.
    ‘--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. @@ -2143,8 +2161,8 @@ lines which are wider than the output page width will be split.
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -2152,8 +2170,8 @@ for the translator to understand each message's context.
    ‘--sort-by-file’
    - - + + Sort output by file location. @@ -2168,16 +2186,16 @@ Sort output by file location.
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit. @@ -2187,15 +2205,15 @@ Output version information and exit.

    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 @@ -2222,8 +2240,8 @@ Input PO or POT file.

    ‘--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. @@ -2244,8 +2262,8 @@ If inputfile is ‘-’, standard input is read.
    ‘--output-file=file’
    - - + + Write output to specified file. @@ -2265,14 +2283,14 @@ or if it is ‘-’.
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -2286,30 +2304,30 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
    ‘--force-po’
    - + Always write an output file even if it contains no message.
    ‘-i’
    ‘--indent’
    - - + + Write the .po file using indented style.
    ‘--no-location’
    - + Do not write ‘#: filename:line’ lines.
    ‘--add-location’
    - + Generate ‘#: filename:line’ lines (default).
    ‘--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. @@ -2318,15 +2336,15 @@ GNU extensions.
    ‘--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’
    - + Write out a NeXTstep/GNUstep localized resource file in .strings syntax. Note that this file format doesn't support plural forms. @@ -2334,15 +2352,15 @@ Note that this file format doesn't support plural forms.
    ‘--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. @@ -2351,8 +2369,8 @@ lines which are wider than the output page width will be split.
    ‘--sort-output’
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -2360,8 +2378,8 @@ for the translator to understand each message's context.
    ‘--sort-by-file’
    - - + + Sort output by file location. @@ -2376,16 +2394,16 @@ Sort output by file location.
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit. @@ -2395,15 +2413,15 @@ Output version information and exit.

    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 @@ -2413,16 +2431,16 @@ 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’.

    - - - + + + 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 @@ -2432,7 +2450,7 @@ 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 @@ -2454,16 +2472,16 @@ locale, by using the LC_ALL environment variable.

    ‘--input=inputfile’
    - - + + Input PO file.
    ‘-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. @@ -2484,14 +2502,14 @@ If no inputfile is given or if it is ‘-’, st
    ‘--properties-input’
    - - + + Assume the input file is a Java ResourceBundle in Java .properties syntax, not in PO file syntax.
    ‘--stringtable-input’
    - + Assume the input file is a NeXTstep/GNUstep localized resource file in .strings syntax, not in PO file syntax. @@ -2507,16 +2525,16 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
    ‘--help’
    - - + + Display this help and exit.
    ‘-V’
    ‘--version’
    - - + + Output version information and exit. @@ -2529,7 +2547,7 @@ Output version information and exit. 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 +you don't need to write routines to parse the PO file; instead, you retrieve a pointer in memory to each of messages contained in the PO file. Functions for writing PO files are not provided at this time. @@ -2542,7 +2560,7 @@ 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.
    @@ -2551,7 +2569,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.
    @@ -2560,7 +2578,7 @@ messages.

    Data Type: po_message_t -
    +
    This is a pointer type that refers to a message of a PO file, including its translation.
    @@ -2569,7 +2587,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 @@ -2580,7 +2598,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.
    @@ -2589,7 +2607,7 @@ 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 @@ -2601,7 +2619,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, @@ -2612,7 +2630,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.
    @@ -2621,7 +2639,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. @@ -2636,7 +2654,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.
    @@ -2645,7 +2663,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. @@ -2655,7 +2673,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. @@ -2665,7 +2683,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. diff --git a/gettext-tools/doc/gettext_foot.html b/gettext-tools/doc/gettext_foot.html index 97037e98d..72a0b7b18 100644 --- a/gettext-tools/doc/gettext_foot.html +++ b/gettext-tools/doc/gettext_foot.html @@ -1,15 +1,15 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - Footnotes -

    GNU gettext tools, version 0.15

    +

    GNU gettext tools, version 0.16

    Native Language Support Library and Tools

    -

    Edition 0.15, 30 June 2006

    +

    Edition 0.16, 20 October 2006

    Ulrich Drepper
    Jim Meyering
    François Pinard
    @@ -35,9 +35,9 @@ in setting the locale values is simulated by looking at the environment variables.

    (5)

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

    -This document was generated on 20 July 2006 using the +This document was generated on 25 October 2006 using the texi2html translator version 1.52b.

    diff --git a/gettext-tools/doc/gettext_toc.html b/gettext-tools/doc/gettext_toc.html index 778189803..321f18d0d 100644 --- a/gettext-tools/doc/gettext_toc.html +++ b/gettext-tools/doc/gettext_toc.html @@ -1,15 +1,15 @@ + from gettext.texi on 25 October 2006 --> GNU gettext utilities - Table of Contents -

    GNU gettext tools, version 0.15

    +

    GNU gettext tools, version 0.16

    Native Language Support Library and Tools

    -

    Edition 0.15, 30 June 2006

    +

    Edition 0.16, 20 October 2006

    Ulrich Drepper
    Jim Meyering
    François Pinard
    @@ -303,134 +303,140 @@ -
  • 13.6 Integrating with CVS - -
  • 13.7 Creating a Distribution Tarball - -
  • 14 The Installer's and Distributor's View -
  • 15 Other Programming Languages - -
  • 16 Concluding Remarks - -
  • A Language Codes -
  • B Country Codes -
  • C Licenses - -
  • Program Index -
  • Option Index -
  • Variable Index -
  • PO Mode Index -
  • Autoconf Macro Index -
  • General Index +
  • 13.5.3 AM_GNU_GETTEXT_NEED in ‘gettext.m4’ +
  • 13.5.4 AM_GNU_GETTEXT_INTL_SUBDIR in ‘intldir.m4’ +
  • 13.5.5 AM_PO_SUBDIRS in ‘po.m4’ +
  • 13.5.6 AM_ICONV in ‘iconv.m4’ + +
  • 13.6 Integrating with CVS + +
  • 13.7 Creating a Distribution Tarball + +
  • 14 The Installer's and Distributor's View +
  • 15 Other Programming Languages + +
  • 16 Concluding Remarks + +
  • A Language Codes + +
  • B Country Codes +
  • C Licenses + +
  • Program Index +
  • Option Index +
  • Variable Index +
  • PO Mode Index +
  • Autoconf Macro Index +
  • General Index

    -This document was generated on 20 July 2006 using the +This document was generated on 25 October 2006 using the texi2html translator version 1.52b.

    diff --git a/gettext-tools/doc/iso-3166.texi b/gettext-tools/doc/iso-3166.texi index c2bdabcef..2b162c71e 100644 --- a/gettext-tools/doc/iso-3166.texi +++ b/gettext-tools/doc/iso-3166.texi @@ -28,6 +28,8 @@ Austria. Australia. @item AW Aruba. +@item AX +Aaland Islands. @item AZ Azerbaijan. @item BA @@ -75,7 +77,7 @@ Cocos (Keeling) Islands. @item CD Congo (Dem. Rep.). @item CF -Central African Rep.. +Central African Republic. @item CG Congo (Rep.). @item CH @@ -94,8 +96,6 @@ China. Colombia. @item CR Costa Rica. -@item CS -Serbia and Montenegro. @item CU Cuba. @item CV @@ -147,13 +147,15 @@ France. @item GA Gabon. @item GB -Britain (UK). +Britain (United Kingdom). @item GD Grenada. @item GE Georgia. @item GF French Guiana. +@item GG +Guernsey. @item GH Ghana. @item GI @@ -198,6 +200,8 @@ Indonesia. Ireland. @item IL Israel. +@item IM +Isle of Man. @item IN India. @item IO @@ -210,6 +214,8 @@ Iran. Iceland. @item IT Italy. +@item JE +Jersey. @item JM Jamaica. @item JO @@ -266,6 +272,8 @@ Morocco. Monaco. @item MD Moldova. +@item ME +Montenegro. @item MG Madagascar. @item MH @@ -362,6 +370,8 @@ Qatar. Reunion. @item RO Romania. +@item RS +Serbia. @item RU Russia. @item RW @@ -451,7 +461,7 @@ Uzbekistan. @item VA Vatican City. @item VC -St Vincent. +St Vincent and the Grenadines. @item VE Venezuela. @item VG diff --git a/gettext-tools/doc/iso-639.texi b/gettext-tools/doc/iso-639.texi index b8694b11e..989ae4c67 100644 --- a/gettext-tools/doc/iso-639.texi +++ b/gettext-tools/doc/iso-639.texi @@ -2,6 +2,8 @@ Afar. @item ab Abkhazian. +@item ad +Adangme. @item ae Avestan. @item af @@ -65,7 +67,7 @@ Danish. @item de German. @item dv -Divehi. +Divehi; Maldivian. @item dz Dzongkha; Bhutani. @item ee @@ -95,13 +97,13 @@ Faroese. @item fr French. @item fy -Frisian. +Western Frisian. @item ga Irish. @item gd Scots; Gaelic. @item gl -Gallegan; Galician. +Galician. @item gn Guarani. @item gu @@ -109,7 +111,7 @@ Gujarati. @item gv Manx. @item ha -Hausa (?). +Hausa. @item he Hebrew (formerly iw). @item hi @@ -137,7 +139,7 @@ Igbo. @item ii Sichuan Yi. @item ik -Inupiak. +Inupiak; Inupiaq. @item io Ido. @item is @@ -155,9 +157,9 @@ Georgian. @item kg Kongo. @item ki -Kikuyu. +Kikuyu; Gikuyu. @item kj -Kuanyama. +Kuanyama; Kwanyama. @item kk Kazakh. @item kl @@ -183,7 +185,7 @@ Kirghiz. @item la Latin. @item lb -Letzeburgesch. +Letzeburgesch; Luxembourgish. @item lg Ganda. @item li @@ -201,7 +203,7 @@ Latvian; Lettish. @item mg Malagasy. @item mh -Marshall. +Marshallese. @item mi Maori. @item mk @@ -239,7 +241,7 @@ Norwegian. @item nr Ndebele, South. @item nv -Navajo. +Navajo; Navaho. @item ny Chichewa; Nyanja. @item oc @@ -285,7 +287,7 @@ Northern Sami. @item sg Sango; Sangro. @item si -Sinhalese. +Sinhala; Sinhalese. @item sk Slovak. @item sl @@ -327,7 +329,7 @@ Tagalog. @item tn Tswana; Setswana. @item to -Tonga (?). +Tonga. @item tr Turkish. @item ts diff --git a/gettext-tools/doc/version.texi b/gettext-tools/doc/version.texi index 38521fddd..48027854e 100644 --- a/gettext-tools/doc/version.texi +++ b/gettext-tools/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 30 June 2006 -@set UPDATED-MONTH June 2006 -@set EDITION 0.15 -@set VERSION 0.15 +@set UPDATED 20 October 2006 +@set UPDATED-MONTH October 2006 +@set EDITION 0.16 +@set VERSION 0.16 diff --git a/gettext-tools/man/autopoint.1 b/gettext-tools/man/autopoint.1 index 2fbc04337..bdbfe72ff 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH AUTOPOINT "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME autopoint \- copies standard gettext infrastructure .SH SYNOPSIS diff --git a/gettext-tools/man/gettextize.1 b/gettext-tools/man/gettextize.1 index 083c64a09..1b832514d 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH GETTEXTIZE "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME gettextize \- install or upgrade gettext infrastructure .SH SYNOPSIS @@ -17,9 +17,6 @@ print this help and exit \fB\-\-version\fR print version information and exit .TP -\fB\-c\fR, \fB\-\-copy\fR -copy files instead of making symlinks -.TP \fB\-f\fR, \fB\-\-force\fR force writing of new files even if old exist .TP @@ -29,6 +26,9 @@ install libintl in a subdirectory \fB\-\-no\-changelog\fR don't update or create ChangeLog files .TP +\fB\-\-symlink\fR +make symbolic links instead of copying files +.TP \fB\-n\fR, \fB\-\-dry\-run\fR print modifications but don't perform them .SH AUTHOR diff --git a/gettext-tools/man/gettextize.1.html b/gettext-tools/man/gettextize.1.html index fb9cd27e6..f46738315 100644 --- a/gettext-tools/man/gettextize.1.html +++ b/gettext-tools/man/gettextize.1.html @@ -73,49 +73,49 @@ print version information and exit cols="2" cellspacing="0" cellpadding="0"> --c, --copy +-f, --force
    -copy files instead of making symlinks
    +force writing of new files even if old exist
    --f, --force
    +--intl
    -force writing of new files even if old exist
    +install libintl in a subdirectory
    ---intl
    +--no-changelog
    -install libintl in a subdirectory
    +don't update or create ChangeLog files
    ---no-changelog
    +--symlink
    -don't update or create ChangeLog files
    +make symbolic links instead of copying files diff --git a/gettext-tools/man/msgattrib.1 b/gettext-tools/man/msgattrib.1 index ff425951c..f19204006 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGATTRIB "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msgattrib \- attribute matching and manipulation on message catalog .SH SYNOPSIS @@ -61,6 +61,9 @@ set all messages obsolete \fB\-\-clear\-obsolete\fR set all messages non-obsolete .TP +\fB\-\-clear\-previous\fR +remove the "previous msgid" from all messages +.TP \fB\-\-only\-file\fR=\fIFILE\fR.po manipulate only entries listed in FILE.po .TP diff --git a/gettext-tools/man/msgattrib.1.html b/gettext-tools/man/msgattrib.1.html index 020eb4e62..9729ff8d2 100644 --- a/gettext-tools/man/msgattrib.1.html +++ b/gettext-tools/man/msgattrib.1.html @@ -245,6 +245,19 @@ set all messages obsolete
    set all messages non-obsolete + + +
    +--clear-previous
    + + + +
    +remove the "previous msgid" from all +messages
    + diff --git a/gettext-tools/man/msgcat.1 b/gettext-tools/man/msgcat.1 index e3a3d67bc..07d1682b9 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGCAT "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msgcat \- combines several message catalogs .SH SYNOPSIS diff --git a/gettext-tools/man/msgcmp.1 b/gettext-tools/man/msgcmp.1 index 64bcbe854..3871afa08 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGCMP "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msgcmp \- compare message catalog and template .SH SYNOPSIS @@ -30,6 +30,12 @@ add DIRECTORY to list for input files search .TP \fB\-m\fR, \fB\-\-multi\-domain\fR apply ref.pot to each of the domains in def.po +.TP +\fB\-\-use\-fuzzy\fR +consider fuzzy entries +.TP +\fB\-\-use\-untranslated\fR +consider untranslated entries .SS "Input file syntax:" .TP \fB\-P\fR, \fB\-\-properties\-input\fR diff --git a/gettext-tools/man/msgcmp.1.html b/gettext-tools/man/msgcmp.1.html index 4732e9025..957074949 100644 --- a/gettext-tools/man/msgcmp.1.html +++ b/gettext-tools/man/msgcmp.1.html @@ -116,6 +116,30 @@ add DIRECTORY to list for input files search
    apply ref.pot to each of the domains in def.po + + +
    +--use-fuzzy
    + + + +
    +consider fuzzy entries
    + + + +
    +--use-untranslated
    + + + +
    +consider untranslated entries
    + diff --git a/gettext-tools/man/msgcomm.1 b/gettext-tools/man/msgcomm.1 index 1e4716c64..fa805541d 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGCOMM "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msgcomm \- match two message catalogs .SH SYNOPSIS diff --git a/gettext-tools/man/msgconv.1 b/gettext-tools/man/msgconv.1 index ceefc2a1f..6c5027216 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGCONV "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msgconv \- character set conversion for message catalog .SH SYNOPSIS diff --git a/gettext-tools/man/msgen.1 b/gettext-tools/man/msgen.1 index 167b2309c..620b8f293 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGEN "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msgen \- create English message catalog .SH SYNOPSIS diff --git a/gettext-tools/man/msgexec.1 b/gettext-tools/man/msgexec.1 index b36155d11..bfe4b5764 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGEXEC "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msgexec \- process translations of message catalog .SH SYNOPSIS diff --git a/gettext-tools/man/msgfilter.1 b/gettext-tools/man/msgfilter.1 index c8881b7a8..d56475350 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGFILTER "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msgfilter \- edit translations of message catalog .SH SYNOPSIS diff --git a/gettext-tools/man/msgfmt.1 b/gettext-tools/man/msgfmt.1 index 09ab9c3d2..5b462ea74 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGFMT "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msgfmt \- compile message catalog to binary format .SH SYNOPSIS diff --git a/gettext-tools/man/msggrep.1 b/gettext-tools/man/msggrep.1 index 41fe4f1a3..9136392a5 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGGREP "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msggrep \- pattern matching on message catalog .SH SYNOPSIS diff --git a/gettext-tools/man/msginit.1 b/gettext-tools/man/msginit.1 index 127202487..3784fb36a 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGINIT "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msginit \- initialize a message catalog .SH SYNOPSIS diff --git a/gettext-tools/man/msgmerge.1 b/gettext-tools/man/msgmerge.1 index 968caff05..d5a1f421b 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGMERGE "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msgmerge \- merge message catalog and template .SH SYNOPSIS @@ -79,6 +79,9 @@ apply ref.pot to each of the domains in def.po .TP \fB\-N\fR, \fB\-\-no\-fuzzy\-matching\fR do not use fuzzy matching +.TP +\fB\-\-previous\fR +keep previous msgids of translated messages .SS "Input file syntax:" .TP \fB\-P\fR, \fB\-\-properties\-input\fR diff --git a/gettext-tools/man/msgmerge.1.html b/gettext-tools/man/msgmerge.1.html index 3f24a29d8..fdcd4bc8d 100644 --- a/gettext-tools/man/msgmerge.1.html +++ b/gettext-tools/man/msgmerge.1.html @@ -285,6 +285,18 @@ apply ref.pot to each of the domains in def.po
    do not use fuzzy matching + + +
    +--previous
    + + + +
    +keep previous msgids of translated messages
    + diff --git a/gettext-tools/man/msgunfmt.1 b/gettext-tools/man/msgunfmt.1 index bf0c5b074..d32d23969 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGUNFMT "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msgunfmt \- uncompile message catalog from binary format .SH SYNOPSIS diff --git a/gettext-tools/man/msguniq.1 b/gettext-tools/man/msguniq.1 index c078f9cd9..a87b4e28f 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH MSGUNIQ "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME msguniq \- unify duplicate translations in message catalog .SH SYNOPSIS diff --git a/gettext-tools/man/xgettext.1 b/gettext-tools/man/xgettext.1 index 1b2ee8795..80b5cb359 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" "July 2006" "GNU gettext-tools 0.15" GNU +.TH XGETTEXT "1" "October 2006" "GNU gettext-tools 0.16" GNU .SH NAME xgettext \- extract gettext strings from source .SH SYNOPSIS diff --git a/gettext-tools/src/po-gram-gen.c b/gettext-tools/src/po-gram-gen.c index ad4fefe44..cb229c69d 100644 --- a/gettext-tools/src/po-gram-gen.c +++ b/gettext-tools/src/po-gram-gen.c @@ -6,13 +6,17 @@ # define COMMENT 257 # define DOMAIN 258 # define JUNK 259 -# define MSGCTXT 260 -# define MSGID 261 -# define MSGID_PLURAL 262 -# define MSGSTR 263 -# define NAME 264 -# define NUMBER 265 -# define STRING 266 +# define PREV_MSGCTXT 260 +# define PREV_MSGID 261 +# define PREV_MSGID_PLURAL 262 +# define PREV_STRING 263 +# define MSGCTXT 264 +# define MSGID 265 +# define MSGID_PLURAL 266 +# define MSGSTR 267 +# define NAME 268 +# define NUMBER 269 +# define STRING 270 #line 20 "po-gram-gen.y" @@ -34,7 +38,7 @@ #include "error.h" #include "xalloc.h" #include "gettext.h" -#include "read-po-abstract.h" +#include "read-catalog-abstract.h" #define _(str) gettext (str) @@ -95,6 +99,8 @@ static inline void 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, + char *prev_msgctxt, + char *prev_msgid, char *prev_msgid_plural, bool obsolete) { /* Test for header entry. Ignore fuzziness of the header entry. */ @@ -104,11 +110,22 @@ do_callback_message (char *msgctxt, po_callback_message (msgctxt, msgid, msgid_pos, msgid_plural, msgstr, msgstr_len, msgstr_pos, + prev_msgctxt, prev_msgid, prev_msgid_plural, false, obsolete); } +#define free_message_intro(value) \ + if ((value).prev_ctxt != NULL) \ + free ((value).prev_ctxt); \ + if ((value).prev_id != NULL) \ + free ((value).prev_id); \ + if ((value).prev_id_plural != NULL) \ + free ((value).prev_id_plural); \ + if ((value).ctxt != NULL) \ + free ((value).ctxt); -#line 126 "po-gram-gen.y" + +#line 143 "po-gram-gen.y" #ifndef YYSTYPE typedef union { @@ -116,6 +133,8 @@ typedef union struct { string_list_ty stringlist; lex_pos_ty pos; bool obsolete; } stringlist; struct { long number; lex_pos_ty pos; bool obsolete; } number; struct { lex_pos_ty pos; bool obsolete; } pos; + struct { char *ctxt; char *id; char *id_plural; lex_pos_ty pos; bool obsolete; } prev; + struct { char *prev_ctxt; char *prev_id; char *prev_id_plural; char *ctxt; lex_pos_ty pos; bool obsolete; } message_intro; struct { struct msgstr_def rhs; lex_pos_ty pos; bool obsolete; } rhs; } yystype; # define YYSTYPE yystype @@ -127,12 +146,12 @@ typedef union -#define YYFINAL 32 +#define YYFINAL 46 #define YYFLAG -32768 -#define YYNTBASE 15 +#define YYNTBASE 19 /* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */ -#define YYTRANSLATE(x) ((unsigned)(x) <= 266 ? yytranslate[x] : 24) +#define YYTRANSLATE(x) ((unsigned)(x) <= 270 ? yytranslate[x] : 33) /* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */ static const char yytranslate[] = @@ -146,7 +165,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, 11, 2, 12, 2, 2, 2, 2, 2, 2, + 2, 15, 2, 16, 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, @@ -163,25 +182,28 @@ 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, 10, 13, 14 + 6, 7, 8, 9, 10, 11, 12, 13, 14, 17, + 18 }; #if YYDEBUG static const short yyprhs[] = { - 0, 0, 1, 4, 7, 10, 13, 16, 21, 26, - 30, 34, 37, 39, 43, 46, 48, 51, 57, 59, - 62 + 0, 0, 1, 4, 7, 10, 13, 15, 18, 23, + 28, 32, 36, 39, 41, 44, 47, 51, 53, 57, + 59, 63, 66, 69, 71, 74, 80, 82, 85, 87 }; static const short yyrhs[] = { - -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 + -1, 19, 20, 0, 19, 21, 0, 19, 22, 0, + 19, 1, 0, 3, 0, 4, 18, 0, 23, 31, + 13, 31, 0, 23, 31, 27, 29, 0, 23, 31, + 27, 0, 23, 31, 29, 0, 23, 31, 0, 25, + 0, 24, 25, 0, 26, 32, 0, 26, 32, 28, + 0, 11, 0, 10, 31, 11, 0, 7, 0, 6, + 32, 7, 0, 12, 31, 0, 8, 32, 0, 30, + 0, 29, 30, 0, 13, 15, 17, 16, 31, 0, + 18, 0, 31, 18, 0, 9, 0, 32, 9, 0 }; #endif @@ -190,9 +212,9 @@ static const short yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const short yyrline[] = { - 0, 146, 147, 148, 149, 150, 154, 161, 179, 197, - 205, 213, 222, 228, 239, 250, 254, 269, 291, 298, - 309 + 0, 170, 171, 172, 173, 174, 179, 187, 195, 216, + 237, 246, 255, 266, 275, 289, 298, 312, 318, 329, + 335, 347, 358, 369, 373, 388, 411, 418, 429, 436 }; #endif @@ -202,28 +224,30 @@ static const short yyrline[] = /* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */ static const char *const yytname[] = { - "$", "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 + "$", "error", "$undefined.", "COMMENT", "DOMAIN", "JUNK", "PREV_MSGCTXT", + "PREV_MSGID", "PREV_MSGID_PLURAL", "PREV_STRING", "MSGCTXT", "MSGID", + "MSGID_PLURAL", "MSGSTR", "NAME", "'['", "']'", "NUMBER", "STRING", + "po_file", "comment", "domain", "message", "message_intro", "prev", + "msg_intro", "prev_msg_intro", "msgid_pluralform", + "prev_msgid_pluralform", "pluralform_list", "pluralform", "string_list", + "prev_string_list", 0 }; #endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const short yyr1[] = { - 0, 15, 15, 15, 15, 15, 16, 17, 17, 17, - 17, 17, 18, 18, 19, 20, 20, 21, 22, 22, - 23 + 0, 19, 19, 19, 19, 19, 20, 21, 22, 22, + 22, 22, 22, 23, 23, 24, 24, 25, 25, 26, + 26, 27, 28, 29, 29, 30, 31, 31, 32, 32 }; /* 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, 1, 3, 2, 1, 2, 5, 1, 2, - 1 + 0, 0, 2, 2, 2, 2, 1, 2, 4, 4, + 3, 3, 2, 1, 2, 2, 3, 1, 3, 1, + 3, 2, 2, 1, 2, 5, 1, 2, 1, 2 }; /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE @@ -231,46 +255,54 @@ static const short yyr2[] = error. */ static const short yydefact[] = { - 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 + 1, 0, 5, 6, 0, 0, 19, 0, 17, 2, + 3, 4, 0, 0, 13, 0, 7, 28, 0, 26, + 0, 12, 14, 15, 20, 29, 18, 27, 0, 0, + 10, 11, 23, 0, 16, 21, 0, 8, 0, 9, + 24, 22, 0, 0, 25, 0, 0 }; static const short yydefgoto[] = { - 1, 7, 8, 9, 19, 20, 21, 13, 10 + 1, 9, 10, 11, 12, 13, 14, 15, 30, 34, + 31, 32, 20, 18 }; static const short yypact[] = { - -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 + -32768, 2,-32768,-32768, -8, 5,-32768, 0,-32768,-32768, + -32768,-32768, 0, 13,-32768, 5,-32768,-32768, 20,-32768, + -7, 8,-32768, 24,-32768,-32768,-32768,-32768, 0, 7, + 15, 15,-32768, 5,-32768, 12, 17, 12, 21, 15, + -32768, 26, 22, 0, 12, 37,-32768 }; static const short yypgoto[] = { - -32768,-32768,-32768,-32768,-32768, 8, -5, -9,-32768 + -32768,-32768,-32768,-32768,-32768,-32768, 27,-32768,-32768,-32768, + 9, -24, -12, -14 }; -#define YYLAST 27 +#define YYLAST 40 static const short yytable[] = { - 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 + 21, 23, 45, 2, 26, 3, 4, 40, 5, 6, + 16, 27, 7, 8, 17, 40, 35, 37, 19, 41, + 28, 29, 36, 7, 8, 19, 27, 24, 38, 25, + 27, 44, 33, 25, 42, 25, 36, 46, 43, 39, + 22 }; static const short yycheck[] = { - 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 + 12, 15, 0, 1, 11, 3, 4, 31, 6, 7, + 18, 18, 10, 11, 9, 39, 28, 29, 18, 33, + 12, 13, 15, 10, 11, 18, 18, 7, 13, 9, + 18, 43, 8, 9, 17, 9, 15, 0, 16, 30, + 13 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "bison.simple" @@ -980,89 +1012,150 @@ yyreduce: switch (yyn) { case 6: -#line 155 "po-gram-gen.y" +#line 180 "po-gram-gen.y" { - po_callback_domain (yyvsp[0].string.string); + po_callback_comment_dispatcher (yyvsp[0].string.string); } break; case 7: -#line 162 "po-gram-gen.y" +#line 188 "po-gram-gen.y" +{ + po_callback_domain (yyvsp[0].string.string); + } + break; +case 8: +#line 196 "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].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, + check_obsolete (yyvsp[-3].message_intro, yyvsp[-2].stringlist); + check_obsolete (yyvsp[-3].message_intro, yyvsp[-1].pos); + check_obsolete (yyvsp[-3].message_intro, yyvsp[0].stringlist); + if (!yyvsp[-3].message_intro.obsolete || pass_obsolete_entries) + do_callback_message (yyvsp[-3].message_intro.ctxt, string2, &yyvsp[-3].message_intro.pos, NULL, string4, strlen (string4) + 1, &yyvsp[-1].pos.pos, - yyvsp[-3].string.obsolete); + yyvsp[-3].message_intro.prev_ctxt, + yyvsp[-3].message_intro.prev_id, yyvsp[-3].message_intro.prev_id_plural, + yyvsp[-3].message_intro.obsolete); else { + free_message_intro (yyvsp[-3].message_intro); free (string2); free (string4); } } break; -case 8: -#line 180 "po-gram-gen.y" +case 9: +#line 217 "po-gram-gen.y" { char *string2 = string_list_concat_destroy (&yyvsp[-2].stringlist.stringlist); - 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, + check_obsolete (yyvsp[-3].message_intro, yyvsp[-2].stringlist); + check_obsolete (yyvsp[-3].message_intro, yyvsp[-1].string); + check_obsolete (yyvsp[-3].message_intro, yyvsp[0].rhs); + if (!yyvsp[-3].message_intro.obsolete || pass_obsolete_entries) + do_callback_message (yyvsp[-3].message_intro.ctxt, string2, &yyvsp[-3].message_intro.pos, yyvsp[-1].string.string, yyvsp[0].rhs.rhs.msgstr, yyvsp[0].rhs.rhs.msgstr_len, &yyvsp[0].rhs.pos, - yyvsp[-3].string.obsolete); + yyvsp[-3].message_intro.prev_ctxt, + yyvsp[-3].message_intro.prev_id, yyvsp[-3].message_intro.prev_id_plural, + yyvsp[-3].message_intro.obsolete); else { + free_message_intro (yyvsp[-3].message_intro); free (string2); free (yyvsp[-1].string.string); free (yyvsp[0].rhs.rhs.msgstr); } } break; -case 9: -#line 198 "po-gram-gen.y" +case 10: +#line 238 "po-gram-gen.y" { - 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")); + check_obsolete (yyvsp[-2].message_intro, yyvsp[-1].stringlist); + check_obsolete (yyvsp[-2].message_intro, yyvsp[0].string); + po_gram_error_at_line (&yyvsp[-2].message_intro.pos, _("missing `msgstr[]' section")); + free_message_intro (yyvsp[-2].message_intro); string_list_destroy (&yyvsp[-1].stringlist.stringlist); free (yyvsp[0].string.string); } break; -case 10: -#line 206 "po-gram-gen.y" +case 11: +#line 247 "po-gram-gen.y" { - 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")); + check_obsolete (yyvsp[-2].message_intro, yyvsp[-1].stringlist); + check_obsolete (yyvsp[-2].message_intro, yyvsp[0].rhs); + po_gram_error_at_line (&yyvsp[-2].message_intro.pos, _("missing `msgid_plural' section")); + free_message_intro (yyvsp[-2].message_intro); string_list_destroy (&yyvsp[-1].stringlist.stringlist); free (yyvsp[0].rhs.rhs.msgstr); } break; -case 11: -#line 214 "po-gram-gen.y" +case 12: +#line 256 "po-gram-gen.y" { - check_obsolete (yyvsp[-1].string, yyvsp[0].stringlist); - po_gram_error_at_line (&yyvsp[-1].string.pos, _("missing `msgstr' section")); + check_obsolete (yyvsp[-1].message_intro, yyvsp[0].stringlist); + po_gram_error_at_line (&yyvsp[-1].message_intro.pos, _("missing `msgstr' section")); + free_message_intro (yyvsp[-1].message_intro); string_list_destroy (&yyvsp[0].stringlist.stringlist); } break; -case 12: -#line 223 "po-gram-gen.y" +case 13: +#line 267 "po-gram-gen.y" +{ + yyval.message_intro.prev_ctxt = NULL; + yyval.message_intro.prev_id = NULL; + yyval.message_intro.prev_id_plural = NULL; + yyval.message_intro.ctxt = yyvsp[0].string.string; + yyval.message_intro.pos = yyvsp[0].string.pos; + yyval.message_intro.obsolete = yyvsp[0].string.obsolete; + } + break; +case 14: +#line 276 "po-gram-gen.y" +{ + check_obsolete (yyvsp[-1].prev, yyvsp[0].string); + yyval.message_intro.prev_ctxt = yyvsp[-1].prev.ctxt; + yyval.message_intro.prev_id = yyvsp[-1].prev.id; + yyval.message_intro.prev_id_plural = yyvsp[-1].prev.id_plural; + yyval.message_intro.ctxt = yyvsp[0].string.string; + yyval.message_intro.pos = yyvsp[0].string.pos; + yyval.message_intro.obsolete = yyvsp[0].string.obsolete; + } + break; +case 15: +#line 290 "po-gram-gen.y" +{ + check_obsolete (yyvsp[-1].string, yyvsp[0].stringlist); + yyval.prev.ctxt = yyvsp[-1].string.string; + yyval.prev.id = string_list_concat_destroy (&yyvsp[0].stringlist.stringlist); + yyval.prev.id_plural = NULL; + yyval.prev.pos = yyvsp[-1].string.pos; + yyval.prev.obsolete = yyvsp[-1].string.obsolete; + } + break; +case 16: +#line 299 "po-gram-gen.y" +{ + check_obsolete (yyvsp[-2].string, yyvsp[-1].stringlist); + check_obsolete (yyvsp[-2].string, yyvsp[0].string); + yyval.prev.ctxt = yyvsp[-2].string.string; + yyval.prev.id = string_list_concat_destroy (&yyvsp[-1].stringlist.stringlist); + yyval.prev.id_plural = yyvsp[0].string.string; + yyval.prev.pos = yyvsp[-2].string.pos; + yyval.prev.obsolete = yyvsp[-2].string.obsolete; + } + break; +case 17: +#line 313 "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" +case 18: +#line 319 "po-gram-gen.y" { check_obsolete (yyvsp[-2].pos, yyvsp[-1].stringlist); check_obsolete (yyvsp[-2].pos, yyvsp[0].pos); @@ -1071,8 +1164,26 @@ case 13: yyval.string.obsolete = yyvsp[0].pos.obsolete; } break; -case 14: -#line 240 "po-gram-gen.y" +case 19: +#line 330 "po-gram-gen.y" +{ + yyval.string.string = NULL; + yyval.string.pos = yyvsp[0].pos.pos; + yyval.string.obsolete = yyvsp[0].pos.obsolete; + } + break; +case 20: +#line 336 "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 21: +#line 348 "po-gram-gen.y" { check_obsolete (yyvsp[-1].pos, yyvsp[0].stringlist); plural_counter = 0; @@ -1081,14 +1192,23 @@ case 14: yyval.string.obsolete = yyvsp[-1].pos.obsolete; } break; -case 15: -#line 251 "po-gram-gen.y" +case 22: +#line 359 "po-gram-gen.y" +{ + check_obsolete (yyvsp[-1].pos, yyvsp[0].stringlist); + yyval.string.string = string_list_concat_destroy (&yyvsp[0].stringlist.stringlist); + yyval.string.pos = yyvsp[-1].pos.pos; + yyval.string.obsolete = yyvsp[-1].pos.obsolete; + } + break; +case 23: +#line 370 "po-gram-gen.y" { yyval.rhs = yyvsp[0].rhs; } break; -case 16: -#line 255 "po-gram-gen.y" +case 24: +#line 374 "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); @@ -1101,8 +1221,8 @@ case 16: yyval.rhs.obsolete = yyvsp[-1].rhs.obsolete; } break; -case 17: -#line 270 "po-gram-gen.y" +case 25: +#line 389 "po-gram-gen.y" { check_obsolete (yyvsp[-4].pos, yyvsp[-3].pos); check_obsolete (yyvsp[-4].pos, yyvsp[-2].number); @@ -1122,8 +1242,8 @@ case 17: yyval.rhs.obsolete = yyvsp[-4].pos.obsolete; } break; -case 18: -#line 292 "po-gram-gen.y" +case 26: +#line 412 "po-gram-gen.y" { string_list_init (&yyval.stringlist.stringlist); string_list_append (&yyval.stringlist.stringlist, yyvsp[0].string.string); @@ -1131,8 +1251,8 @@ case 18: yyval.stringlist.obsolete = yyvsp[0].string.obsolete; } break; -case 19: -#line 299 "po-gram-gen.y" +case 27: +#line 419 "po-gram-gen.y" { check_obsolete (yyvsp[-1].stringlist, yyvsp[0].string); yyval.stringlist.stringlist = yyvsp[-1].stringlist.stringlist; @@ -1141,10 +1261,23 @@ case 19: yyval.stringlist.obsolete = yyvsp[-1].stringlist.obsolete; } break; -case 20: -#line 310 "po-gram-gen.y" +case 28: +#line 430 "po-gram-gen.y" { - po_callback_comment_dispatcher (yyvsp[0].string.string); + string_list_init (&yyval.stringlist.stringlist); + string_list_append (&yyval.stringlist.stringlist, yyvsp[0].string.string); + yyval.stringlist.pos = yyvsp[0].string.pos; + yyval.stringlist.obsolete = yyvsp[0].string.obsolete; + } + break; +case 29: +#line 437 "po-gram-gen.y" +{ + check_obsolete (yyvsp[-1].stringlist, yyvsp[0].string); + yyval.stringlist.stringlist = yyvsp[-1].stringlist.stringlist; + string_list_append (&yyval.stringlist.stringlist, yyvsp[0].string.string); + yyval.stringlist.pos = yyvsp[-1].stringlist.pos; + yyval.stringlist.obsolete = yyvsp[-1].stringlist.obsolete; } break; } @@ -1380,4 +1513,4 @@ yyreturn: #endif return yyresult; } -#line 314 "po-gram-gen.y" +#line 445 "po-gram-gen.y"