From fe924e6e9909c4a549aaaf71407ccca903c5e735 Mon Sep 17 00:00:00 2001 From: Nathan Loewen Date: Sat, 26 Sep 2020 16:18:18 -0500 Subject: [PATCH] Update English pronoun usage to comply with GNU Kind Communication Guidelines # Motivation The gettext documentation currently contains a disclaimer regarding pronoun usage which contains the statement: >It is absolutely not meant to imply that some roles are more appropriate to >males or females. Besides, as you might guess, GNU gettext is meant to be >useful for people using computers, whatever their sex, race, religion or >nationality! This is however, not a real substitute for use of actual non-gendered language. Many people may enter the manual without reading this statement, especially if they reached the manual by searching. They will then encounter gendered language which (perhaps unintentionally) reinforces gender stereotypes by assigning "he" to programmers and maintainers and "she" to translators. # Changes All English language was updated to use they/them/their pronouns with the following exceptions: 1. References to real people 2. Direct quotes 3. Tests where changing the English pronoun would require changing a matching translation 4. Existing use of gender neutral pronouns such as person/per/pers 5. Historical information such as change logs which could make cross referencing version control information more difficult. Additionally, the pronoun disclaimer in the documentation introduction was updated to be a general statement of non-discrimination and to encourage reporting of biased and discriminatory language. The following RegEx was used to identify pronouns in the code base: \b((s?he)|hers?|him|his)(self)?\b --- Admin/plans | 6 +- INSTALL | 2 +- NEWS | 2 +- build-aux/texi2html | 2 +- gettext-runtime/INSTALL | 2 +- gettext-runtime/intl/COPYING.LIB | 2 +- gettext-runtime/intl/libgnuintl.in.h | 2 +- gettext-runtime/libasprintf/COPYING.LIB | 2 +- gettext-runtime/libasprintf/INSTALL | 2 +- gettext-runtime/libasprintf/gpl.texi | 2 +- gettext-runtime/libasprintf/lgpl.texi | 2 +- gettext-runtime/m4/iconv.m4 | 2 +- gettext-tools/INSTALL | 2 +- gettext-tools/doc/Admin/documentation | 138 +++---- gettext-tools/doc/gettext.texi | 367 +++++++++--------- gettext-tools/doc/gettextize.texi | 2 +- gettext-tools/doc/gpl.texi | 2 +- gettext-tools/doc/lang-bash.texi | 2 +- gettext-tools/doc/lang-perl.texi | 2 +- gettext-tools/doc/lgpl.texi | 2 +- gettext-tools/emacs/po-mode.el | 2 +- .../examples/hello-c++-kde/admin/am_edit | 4 +- gettext-tools/examples/hello-c++-qt/m4/qt.m4 | 2 +- gettext-tools/src/msginit.c | 4 +- gettext-tools/src/msgl-cat.c | 2 +- gettext-tools/src/msgl-check.c | 2 +- gettext-tools/src/write-resources.c | 2 +- gettext-tools/tests/msgcat-2 | 6 +- gettext-tools/tests/msgcat-3 | 6 +- gettext-tools/tests/msgcat-4 | 6 +- gettext-tools/tests/msgcomm-16 | 6 +- gettext-tools/tests/xgettext-lua-1 | 4 +- gnulib-local/lib/libxml/parser.c | 4 +- 33 files changed, 295 insertions(+), 300 deletions(-) diff --git a/Admin/plans b/Admin/plans index f1e7c82c1..1d7940933 100644 --- a/Admin/plans +++ b/Admin/plans @@ -113,13 +113,13 @@ Things we plan to do. Comments welcome. programs to - convert an English-based .pot file into a Russian-based .pot file, - convert an English->Vietnamese PO file to a Russian->Vietnamese PO file, - (to be used when such a translator starts her work), + (to be used when such a translator starts their work), - convert an Russian->Vietnamese PO file back to an English->Vietnamese PO file - (to be used when a translator is done with her work). + (to be used when a translator is done with their work). And then the translator has these additional conversions steps all the time. It would be better, for the future, that the translator has only one - additional step to perform: When she gets a new PO file, she converts it + additional step to perform: When the translator gets a new PO file, they convert it to a mixed English/Russian->Vietnamese PO file. Such a mixed English/Russian->Vietnamese PO file would 1) permit the translator to peek into the English original when something is diff --git a/INSTALL b/INSTALL index 671b157a6..3c96f6561 100644 --- a/INSTALL +++ b/INSTALL @@ -125,7 +125,7 @@ Enabling Relocatability It has been a pain for many users of GNU packages for a long time that packages are not relocatable. It means a user cannot copy a -program, installed by another user on the same machine, to his home +program, installed by another user on the same machine, to their home directory, and have it work correctly (including i18n). So many users need to go through ‘configure; make; make install’ with all its dependencies, options, and hurdles. diff --git a/NEWS b/NEWS index 519581695..cf6c519bf 100644 --- a/NEWS +++ b/NEWS @@ -629,7 +629,7 @@ Version 0.16 - October 2006 The translator then only needs to compare the previous and the current msgid ("too many arguments" and "too few arguments"), and infer which - parts of the translation she needs to change. + parts of the translation they need to change. msgattrib has a new option --clear-previous that removes these #| lines. diff --git a/build-aux/texi2html b/build-aux/texi2html index 96592ebfe..bc8d615a9 100755 --- a/build-aux/texi2html +++ b/build-aux/texi2html @@ -17524,7 +17524,7 @@ sub scan_line($$$$;$) # line (we're in 'check_item'), meant to be prepended to an # @item we don't want to keep @c or @comment as otherwise it # eats the @item line. Other commands could do that too but - # then the user deserves what he gets. + # then the user deserves what they get. if ($state->{'keep_texi'} and (!$state->{'check_item'} or ($macro ne 'c' and $macro ne 'comment'))) { diff --git a/gettext-runtime/INSTALL b/gettext-runtime/INSTALL index 671b157a6..3c96f6561 100644 --- a/gettext-runtime/INSTALL +++ b/gettext-runtime/INSTALL @@ -125,7 +125,7 @@ Enabling Relocatability It has been a pain for many users of GNU packages for a long time that packages are not relocatable. It means a user cannot copy a -program, installed by another user on the same machine, to his home +program, installed by another user on the same machine, to their home directory, and have it work correctly (including i18n). So many users need to go through ‘configure; make; make install’ with all its dependencies, options, and hurdles. diff --git a/gettext-runtime/intl/COPYING.LIB b/gettext-runtime/intl/COPYING.LIB index c2c87d692..03b572ec1 100644 --- a/gettext-runtime/intl/COPYING.LIB +++ b/gettext-runtime/intl/COPYING.LIB @@ -400,7 +400,7 @@ integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing +system; it is up to the author/donor to decide if they are willing to distribute software through any other system and a licensee cannot impose that choice. diff --git a/gettext-runtime/intl/libgnuintl.in.h b/gettext-runtime/intl/libgnuintl.in.h index 6fb192061..1dfed3e74 100644 --- a/gettext-runtime/intl/libgnuintl.in.h +++ b/gettext-runtime/intl/libgnuintl.in.h @@ -86,7 +86,7 @@ extern int libintl_version; class methods called 'gettext'. */ /* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS. - If he doesn't, we choose the method. A third possible method is + If they don't, we choose the method. A third possible method is _INTL_REDIRECT_ASM, supported only by GCC. */ #if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS) # if defined __GNUC__ && __GNUC__ >= 2 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus) diff --git a/gettext-runtime/libasprintf/COPYING.LIB b/gettext-runtime/libasprintf/COPYING.LIB index c2c87d692..03b572ec1 100644 --- a/gettext-runtime/libasprintf/COPYING.LIB +++ b/gettext-runtime/libasprintf/COPYING.LIB @@ -400,7 +400,7 @@ integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing +system; it is up to the author/donor to decide if they are willing to distribute software through any other system and a licensee cannot impose that choice. diff --git a/gettext-runtime/libasprintf/INSTALL b/gettext-runtime/libasprintf/INSTALL index 671b157a6..3c96f6561 100644 --- a/gettext-runtime/libasprintf/INSTALL +++ b/gettext-runtime/libasprintf/INSTALL @@ -125,7 +125,7 @@ Enabling Relocatability It has been a pain for many users of GNU packages for a long time that packages are not relocatable. It means a user cannot copy a -program, installed by another user on the same machine, to his home +program, installed by another user on the same machine, to their home directory, and have it work correctly (including i18n). So many users need to go through ‘configure; make; make install’ with all its dependencies, options, and hurdles. diff --git a/gettext-runtime/libasprintf/gpl.texi b/gettext-runtime/libasprintf/gpl.texi index 38aa91822..bb7ddaa72 100644 --- a/gettext-runtime/libasprintf/gpl.texi +++ b/gettext-runtime/libasprintf/gpl.texi @@ -243,7 +243,7 @@ integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing +system; it is up to the author/donor to decide if they are willing to distribute software through any other system and a licensee cannot impose that choice. diff --git a/gettext-runtime/libasprintf/lgpl.texi b/gettext-runtime/libasprintf/lgpl.texi index ab03d6cc3..0b138ccb6 100644 --- a/gettext-runtime/libasprintf/lgpl.texi +++ b/gettext-runtime/libasprintf/lgpl.texi @@ -430,7 +430,7 @@ integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing +system; it is up to the author/donor to decide if they are willing to distribute software through any other system and a licensee cannot impose that choice. diff --git a/gettext-runtime/m4/iconv.m4 b/gettext-runtime/m4/iconv.m4 index e593b7270..872716abb 100644 --- a/gettext-runtime/m4/iconv.m4 +++ b/gettext-runtime/m4/iconv.m4 @@ -30,7 +30,7 @@ AC_DEFUN([AM_ICONV_LINK], dnl Add $INCICONV to CPPFLAGS before performing the following checks, dnl because if the user has installed libiconv and not disabled its use - dnl via --without-libiconv-prefix, he wants to use it. The first + dnl via --without-libiconv-prefix, they want to use it. The first dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) diff --git a/gettext-tools/INSTALL b/gettext-tools/INSTALL index 671b157a6..3c96f6561 100644 --- a/gettext-tools/INSTALL +++ b/gettext-tools/INSTALL @@ -125,7 +125,7 @@ Enabling Relocatability It has been a pain for many users of GNU packages for a long time that packages are not relocatable. It means a user cannot copy a -program, installed by another user on the same machine, to his home +program, installed by another user on the same machine, to their home directory, and have it work correctly (including i18n). So many users need to go through ‘configure; make; make install’ with all its dependencies, options, and hurdles. diff --git a/gettext-tools/doc/Admin/documentation b/gettext-tools/doc/Admin/documentation index beb1d475a..1b0956dbe 100644 --- a/gettext-tools/doc/Admin/documentation +++ b/gettext-tools/doc/Admin/documentation @@ -20,8 +20,8 @@ Subject: Internationalization of Software? Date: 30 Jun 89 19:05:23 GMT Reply-To: terrell@druhi.ATT.COM (TerrellE) -I know that there are some modifications that I will have to perform to -"internationalize" software products developed for use in the USA. +I know that there are some modifications that I will have to perform to +"internationalize" software products developed for use in the USA. These changes include the obvious (translate the program and documentation into the right language). However, some of the other changes are more subtle. I'm sure that I've overlooked some, but @@ -57,7 +57,7 @@ Necessary changes to "internationalize" a software product: 1,000,000 1 000 000 - + What else is necessary? Overseas users: what changes would you make to your "US Version" software to make it approprate for use in other @@ -109,7 +109,7 @@ Gary Houston (ghouston@actrix.gen.nz) wrote: : always be used? As far as I am concerned, the wide character is used as the representation -inside your program. That is, wide character is your internal data +inside your program. That is, wide character is your internal data representatin form, as I/O operates on multi-byte characters. So, I always read/write mutl-bytes and convert to wide character , and vice versa. @@ -136,23 +136,23 @@ Received: from orac.iinet.com.au (pdcruze@localhost [127.0.0.1]) by orac.iinet.c Message-Id: <199411241657.AAA08605@orac.iinet.com.au> To: pinard@IRO.UMontreal.CA cc: meyering@comco.com -Subject: Re: Starting localization of GNU recode +Subject: Re: Starting localization of GNU recode In-reply-to: Your message of "Thu, 24 Nov 1994 01:11:00 EST." - + Date: Fri, 25 Nov 1994 00:57:10 +0800 From: "Patrick D'Cruze" *** EOOH *** To: pinard@IRO.UMontreal.CA cc: meyering@comco.com -Subject: Re: Starting localization of GNU recode +Subject: Re: Starting localization of GNU recode In-reply-to: Your message of "Thu, 24 Nov 1994 01:11:00 EST." - + Date: Fri, 25 Nov 1994 00:57:10 +0800 From: "Patrick D'Cruze" > I met a few points of discussion while doing so: -> +> > * I got to decide that, even if the program will eventually make > most of its output in the foreign languages, the input syntax, > option values, etc., are not to be localized. @@ -459,8 +459,8 @@ aspects (like *producing* i18nable scanners :-). Let me hope that my pleading for the cause will touch your heart, somewhere :-). Keep happy! --- -Fran�ois Pinard ``Happy GNU Year!'' pinard@iro.umontreal.ca +-- +Fran�ois Pinard ``Happy GNU Year!'' pinard@iro.umontreal.ca A New Year's gift? Give us Programming Freedom! Write lpf@uunet.uu.net  @@ -522,7 +522,7 @@ Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Summary: This FAQ discusses writing programs which can handle different language conventions/character sets/etc. - Applicable to all character set encodings; with particular + Applicable to all character set encodings; with particular emphasis on ISO-8859-1. X-Last-Updated: 1994/11/15 Originator: faqserv@bloom-picayune.MIT.EDU @@ -544,7 +544,7 @@ Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Summary: This FAQ discusses writing programs which can handle different language conventions/character sets/etc. - Applicable to all character set encodings; with particular + Applicable to all character set encodings; with particular emphasis on ISO-8859-1. X-Last-Updated: 1994/11/15 Originator: faqserv@bloom-picayune.MIT.EDU @@ -593,11 +593,11 @@ all of the information given here is also valid for these standards. These standards comprise 8859-X: 8859-1 Europe, Latin America 8859-2 Eastern Europe -8859-3 SE Europe/miscellaneous (Esperanto, Maltese, etc.) +8859-3 SE Europe/miscellaneous (Esperanto, Maltese, etc.) 8859-4 Scandinavia/Baltic (mostly covered by 8859-1 also) 8859-5 Cyrillic 8859-6 Arabic -8859-7 Greek +8859-7 Greek 8859-8 Hebrew 8859-9 Latin5, same as 8859-1 except for Turkish instead of Icelandic 8859-10 Latin6, for Eskimo/Scandinavian languages @@ -648,8 +648,8 @@ documentation to find out about the environments available. There are several LOCALE types available for different localization aspects (currency sign, number representation, characters sets). The value they can take is highly system dependent. Also, it should be up -to the use to define the local environment he needs. - +to the use to define the local environment needed. + A C program inherits its locale environment variables when it starts up. This happens automatically. However, these variables do not automatically control the locale used by the library functions, because @@ -731,26 +731,26 @@ Error messages are kept in a catalog which is opened upon program start with a locale specification. Then the message number and a set specification are used to index the message catalog. A default fourth argument is specified which will be printed if a particular message -cannot be found in the catalog. +cannot be found in the catalog. Here is the world-famous C program using the language-independent X/Open message standard: -------------------------------------------------------------------------- #include #include - + #define SET 1 #define MSG_HELLO 1 - + nl_catd catfd; - + int main (int argc, char **argv) { /* Open the message catalog. We use the basename of the program * as the catalog name. Of course, several programs can also * share a common catalog. */ catfd = catopen (basename (argv [0]), NL_CAT_LOCALE); - /* catgets returns message MSG_HELLO from set SET from the + /* catgets returns message MSG_HELLO from set SET from the * message catalog catfd. If catfd does not refer to a message * catalog, or the requested message cannot be found, the * catalog, or the requested message cannot be found, the @@ -782,16 +782,16 @@ upgrading programs which contain hard-wired strings: 5.2 Sun/XView Sun implements a different set of functions functions to support i18n -of messages (the source is available with the XView code): +of messages (the source is available with the XView code): You can either use: ----------------------------------------------- main() { - // get the message catalog named "helloprogram" + // get the message catalog named "helloprogram" // for the hello world program - textdomain("helloprogram"); + textdomain("helloprogram"); // get the translation for the "Hello, world\n" string printf(gettext("Hello, world\n")); @@ -803,7 +803,7 @@ or you can roll all in one and write ----------------------------------------------- main() { - // get the translation for the "Hello, world\n" string + // get the translation for the "Hello, world\n" string // from the message catalog "helloprogram" printf(dgettext("helloprogram","Hello, world\n")); } @@ -856,8 +856,8 @@ straight forward and you'll get the corresponding characters by using the X11 input functions. Sometimes it may be necessary to input characters for which there are -no keys on your keyboard (e.g. if you want to enter the German '�' -from a French keyboard). +no keys on your keyboard (e.g. if you want to enter the German '�' +from a French keyboard). X11R5 and X11R6 both have extensive support for i18n, but due to a variety of factors the R5 i18n was not well understood or widely @@ -881,15 +881,15 @@ by calls to the Xlib library (or an Xt toolkit call). enter ISO characters by supplying a built-in escape mechanism, if no keys for these characters are on your keyboard, and will pass along and display ISO 8859-1. This hack obviated the need to install an -input method, but was less flexible.] +input method, but was less flexible.] If you are using a toolkit, it is quite simple to support localization -of you X11 code: +of you X11 code: If you're using a toolkit -- Xt and a widget set like Motif or R6 Xaw -- -you need only add a single line of code to your source. Before any other +you need only add a single line of code to your source. Before any other calls to Xt, add a call to XtSetLanguageProc, e.g.: - + int main (int argc, char** argv) { ... @@ -986,7 +986,7 @@ be called by MIME applications to handle MIME types. 8.1.2 MIMElt A "lightweight" MIME library available via anon ftp from -oslonett.no:Software/MsDos/Comm/Offline/mimeltXX.zip +oslonett.no:Software/MsDos/Comm/Offline/mimeltXX.zip It is source code (ANSI C) packaged as a library to facilitate construction of a limited MIME facility (limited == handling only @@ -995,26 +995,26 @@ includes hooks to recode character sets into whatever system you are running off (e.g. if you read mail on a MsDos platform using CP-850, MIMElite may be set up so that QUOTED-PRINTABLE ISO Latin 1 is recoded into CP-850 for reading and saving to file). - -It's main use is to provide programmers of so-called "off-line -readers" (used by user's who access Internet mail through dial-up -service providers) with the tools needed to include proper support for + +It's main use is to provide programmers of so-called "off-line +readers" (used by user's who access Internet mail through dial-up +service providers) with the tools needed to include proper support for QUOTED-PRINTABLE encoding in their product. - -The archive also contain a couple of sample applications that -demonstrates how the library may be used. UNMIME is a stand-alone + +The archive also contain a couple of sample applications that +demonstrates how the library may be used. UNMIME is a stand-alone utility to decode MIME-encoded messages (e.g. it works like UUDECODE for binary files with BASE64 encoding), SENDMIME is a simple utility to send MIME-encoded messages if your service provider doesn't have PINE or similar tools. The current version (2.1) is limited to character set issues. I am -about to release version 2.2, which will support additional +about to release version 2.2, which will support additional Content-Types (e.g. "application/octet-stream"). -9. Programming in Prolog +9. Programming in Prolog SICStus Prolog accepts ISO characters as part of atoms, so you can even define goal names containing accented characters. I/O of 8 bit characters is (obviously) also supported. @@ -1044,7 +1044,7 @@ MS-Windows (using code page 1252) normally uses the first 256 characters of Unicode, which is (for all practical purposes) equivalent to ISO 8859-1. Thus, data representation and conversion for interoperability with other ISO 8859-1 compliant systems is not an -issue. +issue. It seems that C libraries for MS Windows do not support the ANSI/POSIX locale mechanism. (If you have any experiences with that, please let @@ -1098,15 +1098,15 @@ ftp from ftp.vlsivie.tuwien.ac.at under the file name ----------------- -Copyright � 1994 Michael Gschwind (mike@vlsivie.tuwien.ac.at) +Copyright � 1994 Michael Gschwind (mike@vlsivie.tuwien.ac.at) This document may be copied for non-commercial purposes, provided this copyright notice appears. Publication in any other form requires the -author's consent. +author's consent. Dieses Dokument darf unter Angabe dieser urheberrechtlichen Bestimmungen zum Zwecke der nicht-kommerziellen Nutzung beliebig -vervielf�ltigt werden. Die Publikation in jeglicher anderer Form +vervielf�ltigt werden. Die Publikation in jeglicher anderer Form erfordert die Zustimmung des Autors. Michael Gschwind, Institut f. Technische Informatik, TU Wien @@ -1231,7 +1231,7 @@ Received: by icule (Smail3.1.28.1 #1) id m0rr87q-00009TC; Tue, 21 Mar 95 12:53 EST Message-Id: Date: Tue, 21 Mar 95 12:53 EST -From: pinard (Fran�ois Pinard) +From: pinard (Fran�ois Pinard) To: meyering@comco.com CC: drepper@ipd.info.uni-karlsruhe.de In-reply-to: <199503211712.LAA25472@idefix.comco.com> (message from Jim Meyering on Tue, 21 Mar 1995 11:12:49 -0600) @@ -1242,7 +1242,7 @@ Content-Transfer-Encoding: 8bit *** EOOH *** Date: Tue, 21 Mar 95 12:53 EST -From: pinard (Fran�ois Pinard) +From: pinard (Fran�ois Pinard) To: meyering@comco.com CC: drepper@ipd.info.uni-karlsruhe.de In-reply-to: <199503211712.LAA25472@idefix.comco.com> (message from Jim Meyering on Tue, 21 Mar 1995 11:12:49 -0600) @@ -1264,7 +1264,7 @@ Received: by icule (Smail3.1.28.1 #1) id m0s35QR-00008FC; Sun, 23 Apr 95 13:26 EDT Message-Id: Date: Sun, 23 Apr 95 13:26 EDT -From: pinard (Fran�ois Pinard) +From: pinard (Fran�ois Pinard) To: Jim Meyering , Ulrich Drepper , Roland McGrath , @@ -1276,7 +1276,7 @@ Content-Transfer-Encoding: 8bit *** EOOH *** Date: Sun, 23 Apr 95 13:26 EDT -From: pinard (Fran�ois Pinard) +From: pinard (Fran�ois Pinard) To: Jim Meyering , Ulrich Drepper , Roland McGrath , @@ -1321,7 +1321,7 @@ Content-Transfer-Encoding: 8bit *** EOOH *** Date: Mon, 1 May 95 22:16 EDT -From: pinard (Fran�ois Pinard) +From: pinard (Fran�ois Pinard) To: gnu@prep.ai.mit.edu CC: rms@gnu.ai.mit.edu In-reply-to: <9505020044.AA12891@pizza> (gnu@ai.mit.edu) @@ -1353,8 +1353,8 @@ Support (NLS) and, in particular, be able to write their messages translated into native languages, as selected at run time by environment variables''. --- -Fran�ois Pinard ``Vivement GNU!'' +-- +Fran�ois Pinard ``Vivement GNU!'' Email lpf@uunet.uu.net for info about the League for Programming Freedom.  @@ -1401,17 +1401,17 @@ Received: from lagrande.iro.umontreal.ca (lagrande.IRO.UMontreal.CA [132.204.32. Received: (from pinard@localhost) by lagrande.iro.umontreal.ca (8.6.9/8.6.9) id XAA20985 for icule!pinard; Tue, 2 May 1995 23:51:52 -0400 Received: from saguenay.IRO.UMontreal.CA (saguenay32.IRO.UMontreal.CA [132.204.32.54]) by lagrande.iro.umontreal.ca (8.6.9/8.6.9) with ESMTP id XAA20983 for ; Tue, 2 May 1995 23:51:49 -0400 Received: from nz11.rz.uni-karlsruhe.de (nz11.rz.uni-karlsruhe.de [129.13.64.7]) by saguenay.IRO.UMontreal.CA (8.6.9/8.6.9) with ESMTP id XAA12985 for ; Tue, 2 May 1995 23:51:15 -0400 -Received: from ipd.info.uni-karlsruhe.de (actually i44ms.info.uni-karlsruhe.de) +Received: from ipd.info.uni-karlsruhe.de (actually i44ms.info.uni-karlsruhe.de) by nz11.rz.uni-karlsruhe.de with SMTP (PP); Wed, 3 May 1995 03:54:26 +0200 -Received: from i44pc2.info.uni-karlsruhe.de (i44pc2.info.uni-karlsruhe.de [129.13.171.31]) +Received: from i44pc2.info.uni-karlsruhe.de (i44pc2.info.uni-karlsruhe.de [129.13.171.31]) by ipd.info.uni-karlsruhe.de (8.6.4/8.6.4) with SMTP id DAA00768; Wed, 3 May 1995 03:57:08 +0200 Message-Id: <199505030157.DAA00768@ipd.info.uni-karlsruhe.de> To: "ois \"Pinard)\""@rz.uni-karlsruhe.de, meyering@comco.com (Jim Meyering), eggert@twinsun.com (Paul Eggert), roland@gnu.ai.mit.edu (Roland McGrath) -Original-To: pinard@iro.umontreal.ca (Fran�ois Pinard), +Original-To: pinard@iro.umontreal.ca (Fran�ois Pinard), meyering@comco.com (Jim Meyering), eggert@twinsun.com (Paul Eggert), roland@gnu.ai.mit.edu (Roland McGrath) @@ -1424,7 +1424,7 @@ From: Ulrich Drepper To: "ois \"Pinard)\""@rz.uni-karlsruhe.de, meyering@comco.com (Jim Meyering), eggert@twinsun.com (Paul Eggert), roland@gnu.ai.mit.edu (Roland McGrath) -Original-To: pinard@iro.umontreal.ca (Fran�ois Pinard), +Original-To: pinard@iro.umontreal.ca (Fran�ois Pinard), meyering@comco.com (Jim Meyering), eggert@twinsun.com (Paul Eggert), roland@gnu.ai.mit.edu (Roland McGrath) @@ -1446,11 +1446,11 @@ Received: from lagrande.iro.umontreal.ca (lagrande.IRO.UMontreal.CA [132.204.32. Received: (from pinard@localhost) by lagrande.iro.umontreal.ca (8.6.9/8.6.9) id HAA24822 for icule!pinard; Thu, 4 May 1995 07:47:28 -0400 Received: from saguenay.IRO.UMontreal.CA (saguenay32.IRO.UMontreal.CA [132.204.32.54]) by lagrande.iro.umontreal.ca (8.6.9/8.6.9) with ESMTP id HAA24816 for ; Thu, 4 May 1995 07:47:25 -0400 Received: from nz11.rz.uni-karlsruhe.de (nz11.rz.uni-karlsruhe.de [129.13.64.7]) by saguenay.IRO.UMontreal.CA (8.6.9/8.6.9) with ESMTP id HAA17159 for ; Thu, 4 May 1995 07:48:25 -0400 -Received: from ipd.info.uni-karlsruhe.de (actually i44ms.info.uni-karlsruhe.de) +Received: from ipd.info.uni-karlsruhe.de (actually i44ms.info.uni-karlsruhe.de) by nz11.rz.uni-karlsruhe.de with SMTP (PP); Thu, 4 May 1995 13:45:17 +0200 -Received: from i44pc2.info.uni-karlsruhe.de (i44pc2.info.uni-karlsruhe.de [129.13.171.31]) - by ipd.info.uni-karlsruhe.de (8.6.4/8.6.4) with SMTP id NAA06097 +Received: from i44pc2.info.uni-karlsruhe.de (i44pc2.info.uni-karlsruhe.de [129.13.171.31]) + by ipd.info.uni-karlsruhe.de (8.6.4/8.6.4) with SMTP id NAA06097 for ; Thu, 4 May 1995 13:48:06 +0200 Message-Id: <199505041148.NAA06097@ipd.info.uni-karlsruhe.de> To: pinard@IRO.UMontreal.CA @@ -1477,17 +1477,17 @@ From: Ulrich Drepper Content-Transfer-Encoding: 8bit X-Original-Encoding: quoted-printable -From: pinard@iro.umontreal.ca (Fran�ois Pinard) +From: pinard@iro.umontreal.ca (Fran�ois Pinard) Subject: Path to message? Date: Thu, 4 May 95 00:45 EDT > Ulrich, always me. I do not understand that xgettext --help writes: -> +> > Suchpfad ist: /usr/local/share/nls/src -> +> > while /usr/local/share/locale/de/LC_MESSAGES is indeed searched. > Could we solve this inconsistency? -> +> Not quite. /usr/local/share/locale/de/LC_MESSAGES is the path where the .mo/.cat files will go. The search path (Suchpfad :) represents @@ -1525,7 +1525,7 @@ Content-Transfer-Encoding: 8bit *** EOOH *** Date: Thu, 4 May 95 15:27 EDT -From: pinard (Fran�ois Pinard) +From: pinard (Fran�ois Pinard) To: ajc@di.uminho.pt In-reply-to: <9505041601.AA20254@shiva.di.uminho.pt> (ajc@di.uminho.pt) Subject: Re: tar is ready for pt @@ -1603,8 +1603,8 @@ Special means should be used for transiting translation files over email. The simplest way is using GNU shar in default mode, or else, uuencoding the `.po' file prior to mailing. --- -Fran�ois Pinard ``Vivement GNU!'' +-- +Fran�ois Pinard ``Vivement GNU!'' Email lpf@uunet.uu.net for info about the League for Programming Freedom.  @@ -1617,10 +1617,10 @@ Received: from lagrande.iro.umontreal.ca (lagrande.IRO.UMontreal.CA [132.204.32. Received: (from pinard@localhost) by lagrande.iro.umontreal.ca (8.6.9/8.6.9) id KAA08298 for icule!pinard; Thu, 20 Apr 1995 10:12:34 -0400 Received: from saguenay.IRO.UMontreal.CA (saguenay32.IRO.UMontreal.CA [132.204.32.54]) by lagrande.iro.umontreal.ca (8.6.9/8.6.9) with ESMTP id KAA08254 for ; Thu, 20 Apr 1995 10:10:49 -0400 Received: from nz11.rz.uni-karlsruhe.de (nz11.rz.uni-karlsruhe.de [129.13.64.7]) by saguenay.IRO.UMontreal.CA (8.6.9/8.6.9) with ESMTP id KAA20778 for ; Thu, 20 Apr 1995 10:10:25 -0400 -Received: from ipd.info.uni-karlsruhe.de (actually i44ms.info.uni-karlsruhe.de) +Received: from ipd.info.uni-karlsruhe.de (actually i44ms.info.uni-karlsruhe.de) by nz11.rz.uni-karlsruhe.de with SMTP (PP); Thu, 20 Apr 1995 16:05:34 +0200 -Received: from i44pc2.info.uni-karlsruhe.de (i44pc2.info.uni-karlsruhe.de [129.13.171.31]) +Received: from i44pc2.info.uni-karlsruhe.de (i44pc2.info.uni-karlsruhe.de [129.13.171.31]) by ipd.info.uni-karlsruhe.de (8.6.4/8.6.4) with SMTP id QAA28513; Thu, 20 Apr 1995 16:08:10 +0200 Message-Id: <199504201408.QAA28513@ipd.info.uni-karlsruhe.de> diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi index 90eba7997..023b6a719 100644 --- a/gettext-tools/doc/gettext.texi +++ b/gettext-tools/doc/gettext.texi @@ -539,17 +539,13 @@ translations. It explains how the various tools interact in the initial generation of these files, and later, how the maintenance cycle should usually operate. -@cindex sex -@cindex he, she, and they -@cindex she, he, and they -In this manual, we use @emph{he} when speaking of the programmer or -maintainer, @emph{she} when speaking of the translator, and @emph{they} -when speaking of the installers or end users of the translated program. -This is only a convenience for clarifying the documentation. It is -@emph{absolutely} not meant to imply that some roles are more appropriate -to males or females. Besides, as you might guess, GNU @code{gettext} -is meant to be useful for people using computers, whatever their sex, -race, religion or nationality! +@cindex non-discrimination +GNU @code{gettext} is meant to be useful for people using computers, +whatever their gender, race, religion or nationality! To this end, we +strive to use gender neutral language, and avoid terms that could be +considered racist, ablist, or otherwise discrimitory. If you discover +biased or discriminatory language in this document or software, please +report it as a bug! @cindex bug report address Please submit suggestions and corrections @@ -1184,14 +1180,14 @@ it is a machine designated for personal use, additional localizations are probably not necessary. If, however, the machine is in use in an organization or company that has international relationships, one can consider the needs of guest users. If you have a guest from abroad, for -a week, what could be his preferred locales? It may be worth installing +a week, what could be their preferred locales? It may be worth installing these additional localizations ahead of time, since they cost only a bit of disk space at this point. The system-wide default language is the locale configuration that is used -when a new user account is created. But the user can have his own locale +when a new user account is created. But the user can have their own locale configuration that is different from the one of the other users of the -same machine. He can specify it, typically after the first login, as +same machine. They can specify it, typically after the first login, as described in the next section. @node Setting the GUI Locale @@ -1471,7 +1467,7 @@ msgstr @var{translated-string} The general structure of a PO file should be well understood by the translator. When using PO mode, very little has to be known -about the format details, as PO mode takes care of them for her. +about the format details, as PO mode takes care of this. A simple entry can look like this: @@ -1514,15 +1510,15 @@ by @code{msgstr}. The two strings, untranslated and translated, are quoted in various ways in the PO file, using @code{"} delimiters and @code{\} escapes, but the translator does not really have to pay attention to the precise quoting format, as PO mode fully -takes care of quoting for her. +takes care of quoting. The @code{msgid} strings, as well as automatic comments, are produced and managed by other GNU @code{gettext} tools, and PO mode does not -provide means for the translator to alter these. The most she can +provide means for the translator to alter these. The most they can do is merely deleting them, and only by deleting the whole entry. On the other hand, the @code{msgstr} string, as well as translator -comments, are really meant for the translator, and PO mode gives her -the full control she needs. +comments, are really meant for the translator, and PO mode gives them +the full control they need. The comment lines beginning with @code{#,} are special because they are not completely ignored by the programs as comments generally are. The @@ -1534,11 +1530,11 @@ there are two forms of flags defined: @item fuzzy @kwindex fuzzy@r{ flag} This flag can be generated by the @code{msgmerge} program or it can be -inserted by the translator herself. It shows that the @code{msgstr} +inserted by the translator. It shows that the @code{msgstr} string might not be a correct translation (anymore). Only the translator can judge if the translation requires further modification, or is -acceptable as is. Once satisfied with the translation, she then removes -this @code{fuzzy} attribute. The @code{msgmerge} program inserts this +acceptable as is. Once satisfied with the translation, the translator should +remove this @code{fuzzy} attribute. The @code{msgmerge} program inserts this when it combined the @code{msgid} and @code{msgstr} entries after fuzzy search only. @xref{Fuzzy Entries}. @@ -2094,7 +2090,7 @@ printf (rw ? "File %s is write protected" : "File %s is read protected", @end example @noindent -This way the translator will not only understand the message, she will +This way the translator will not only understand the message, they will also be able to find the appropriate grammatical construction. A French translator for example translates "write protected" like "protected against writing". @@ -2118,7 +2114,7 @@ printf ("input file charset \"%s\".\n", fcharset); @noindent the translator would have to translate two half sentences, but nothing -in the POT file would tell her that the two half sentences belong together. +in the POT file would indicate that the two half sentences belong together. It is necessary to merge the two @code{printf} statements so that the translator can handle the entire sentence at once and decide at which place to insert a line break in the translation (if at all): @@ -2152,7 +2148,7 @@ single message be longer than ten lines. The reason is that when the translatable string changes, the translator is faced with the task of updating the entire translated string. Maybe only a single word will have changed in the English string, but the translator doesn't see that -(with the current translation tools), therefore she has to proofread +(with the current translation tools), therefore they have to proofread the entire message. @cindex help option @@ -2161,7 +2157,7 @@ screen pages. It is a courtesy towards the translators to split such a message into several ones of five to ten lines each. While doing that, you can also attempt to split the documented options into groups, such as the input options, the output options, and the informative -output options. This will help every user to find the option he is +output options. This will help every user to find the option they are looking for. @subheading No string concatenation @@ -2416,10 +2412,10 @@ in English, it's customary to put a space before a colon. @emindex marking strings for translation In PO mode, one set of features is meant more for the programmer than -for the translator, and allows him to interactively mark which strings, -in a set of program sources, are translatable, and which are not. +for the translator, and allows the programmer to interactively mark which +strings, in a set of program sources, are translatable, and which are not. Even if it is a fairly easy job for a programmer to find and mark -such strings by other means, using any editor of his choice, PO mode +such strings by other means, using any editor they choose, PO mode makes this work more comfortable. Further, this gives translators who feel a little like programmers, or programmers who feel a little like translators, a tool letting them work at marking translatable @@ -2450,7 +2446,7 @@ a make goal @code{tags} or @code{TAGS} which constructs the tag files in all directories and for all files containing source code. Once your @file{TAGS} file is ready, the following commands assist -the programmer at marking translatable strings in his set of sources. +the programmer at marking translatable strings in their set of sources. But these commands are necessarily driven from within a PO file window, and it is likely that you do not even have such a PO file yet. This is not a problem at all, as you may safely open a new, empty PO @@ -2589,7 +2585,7 @@ A possible German translation for the above string might be: "%d Zeichen lang ist die Zeichenkette `%s'" @end example -A C programmer, even if he cannot speak German, will recognize that +A C programmer, even if they cannot speak German, will recognize that there is something wrong here. The order of the two format specifiers is changed but of course the arguments in the @code{printf} don't have. This will most probably lead to problems because now the length of the @@ -2745,7 +2741,7 @@ with the following one: @end example But this has a drawback. The programmer has to take care that -he uses @code{gettext_noop} for the string @code{"a default message"}. +@code{gettext_noop} is used for the string @code{"a default message"}. A use of @code{gettext} could have in rare cases unpredictable results. One advantage is that you need not make control flow analysis to make @@ -2770,7 +2766,7 @@ the translators or their translation teams. Every program has a place where is shows the bug report address. For GNU programs, it is the code which handles the ``--help'' option, typically in a function called ``usage''. In this place, instruct the -translator to add her own bug reporting address. For example, if that +translator to add their own bug reporting address. For example, if that code has a statement @example @@ -3043,7 +3039,7 @@ $ msginit The alternative way is to do the copy and modifications by hand. To do so, the translator copies @file{@var{package}.pot} to -@file{@var{LANG}.po}. Then she modifies the initial comments and +@file{@var{LANG}.po}. Then they modify the initial comments and the header entry of this file. @menu @@ -3479,7 +3475,7 @@ The commands @kbd{Q} (@code{po-quit}) and @kbd{q} PO file. The former is a bit less verbose than the latter. If the file has been modified, it is saved to disk first. In both cases, and prior to all this, the commands check if any untranslated messages remain in the -PO file and, if so, the translator is asked if she really wants to leave +PO file and, if so, the translator is asked if they really want to leave off working with this PO file. This is the preferred way of getting rid of an Emacs PO file buffer. Merely killing it through the usual command @w{@kbd{C-x k}} (@code{kill-buffer}) is not the tidiest way to proceed. @@ -3488,14 +3484,13 @@ of an Emacs PO file buffer. Merely killing it through the usual command @efindex po-other-window@r{, PO Mode command} The command @kbd{0} (@code{po-other-window}) is another, softer way, to leave PO mode, temporarily. It just moves the cursor to some other -Emacs window, and pops one if necessary. For example, if the translator -just got PO mode to show some source context in some other, she might -discover some apparent bug in the program source that needs correction. -This command allows the translator to change sex, become a programmer, -and have the cursor right into the window containing the program she -(or rather @emph{he}) wants to modify. By later getting the cursor back -in the PO file window, or by asking Emacs to edit this file once again, -PO mode is then recovered. +Emacs window, and pops one if necessary. For example, if the +translator just got PO mode to show some source context in some other, +they might discover some apparent bug in the program source that needs +correction. This command allows the translator switch into the window +containing the program they want to modify. By later getting the +cursor back in the PO file window, or by asking Emacs to edit this +file once again, PO mode is then recovered. @efindex ?@r{, PO Mode command} @efindex h@r{, PO Mode command} @@ -3524,7 +3519,7 @@ as well as all individual entries. @efindex next-error@r{, stepping through PO file validation results} The program @code{msgfmt} runs asynchronously with Emacs, so the -translator regains control immediately while her PO file is being studied. +translator regains control immediately while their PO file is being studied. Error output is collected in the Emacs @samp{*compilation*} buffer, displayed in another window. The regular Emacs command @kbd{C-x`} (@code{next-error}), as well as other usual compile commands, allow the @@ -3600,19 +3595,18 @@ the cursor do not especially try to enforce. The command @kbd{.} current entry properly, after the current entry has been changed by means external to PO mode, or the Emacs screen otherwise altered. -It is yet to be decided if PO mode helps the translator, or otherwise -irritates her, by forcing a rigid window disposition while she -is doing her work. We originally had quite precise ideas about -how windows should behave, but on the other hand, anyone used to -Emacs is often happy to keep full control. Maybe a fixed window -disposition might be offered as a PO mode option that the translator -might activate or deactivate at will, so it could be offered on an -experimental basis. If nobody feels a real need for using it, or -a compulsion for writing it, we should drop this whole idea. -The incentive for doing it should come from translators rather than -programmers, as opinions from an experienced translator are surely -more worth to me than opinions from programmers @emph{thinking} about -how @emph{others} should do translation. +It is yet to be decided if PO mode helps the translator, or if it +irritates by forcing a rigid window disposition. We originally had +quite precise ideas about how windows should behave, but on the other +hand, anyone used to Emacs is often happy to keep full control. Maybe +a fixed window disposition might be offered as a PO mode option that +the translator might activate or deactivate at will, so it could be +offered on an experimental basis. If nobody feels a real need for +using it, or a compulsion for writing it, we should drop this whole +idea. The incentive for doing it should come from translators rather +than programmers, as opinions from an experienced translator are +surely more worth to me than opinions from programmers @emph{thinking} +about how @emph{others} should do translation. @efindex n@r{, PO Mode command} @efindex po-next-entry@r{, PO Mode command} @@ -3639,12 +3633,12 @@ correcting this situation. But even these commands will fail on a truly empty PO file. There are development plans for the PO mode for it to interactively fill an empty PO file from sources. @xref{Marking}. -The translator may decide, before working at the translation of -a particular entry, that she needs to browse the remainder of the -PO file, maybe for finding the terminology or phraseology used -in related entries. She can of course use the standard Emacs idioms -for saving the current cursor location in some register, and use that -register for getting back, or else, use the location ring. +The translator may decide, before working at the translation of a +particular entry, that they needs to browse the remainder of the PO +file, maybe for finding the terminology or phraseology used in related +entries. Standard Emacs idioms can be used for saving the current +cursor location in some register, and useing that register to get +back, or else, use the location ring. @efindex m@r{, PO Mode command} @efindex po-push-location@r{, PO Mode command} @@ -3662,7 +3656,7 @@ on the stack. If the translator wants the position to be kept on the location stack, maybe for taking a look at the entry associated with the top -element, then go elsewhere with the intent of getting back later, she +element, then go elsewhere with the intent of getting back later, they ought to use @kbd{m} immediately after @kbd{r}. @efindex x@r{, PO Mode command} @@ -3850,10 +3844,10 @@ the intervention of the translator. For this reason, @code{msgmerge} might mark some entries as being fuzzy. @emindex moving by fuzzy entries -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 -related to fuzzy entry processing. +Also, the translator may decide to mark an entry as fuzzy for their +own convenience, when they wants to remember that the entry has to be +later revisited. So, some commands are more specifically related to +fuzzy entry processing. @table @kbd @item f @@ -3890,22 +3884,22 @@ the @code{nil} value, the @kbd{@key{TAB}} command will automatically chase for another interesting entry to work on. The initial value of @code{po-auto-select-on-unfuzzy} is @code{nil}. -The initial value of @code{po-auto-fuzzy-on-edit} is @code{nil}. However, -if the variable @code{po-auto-fuzzy-on-edit} is set to @code{t}, any entry -edited through the @kbd{@key{RET}} command is marked fuzzy, as a way to -ensure some kind of double check, later. In this case, the usual paradigm -is that an entry becomes fuzzy (if not already) whenever the translator -modifies it. If she is satisfied with the translation, she then uses -@kbd{@key{TAB}} to pick another entry to work on, clearing the fuzzy attribute -on the same blow. If she is not satisfied yet, she merely uses @kbd{@key{SPC}} -to chase another entry, leaving the entry fuzzy. +The initial value of @code{po-auto-fuzzy-on-edit} is @code{nil}. +However, if the variable @code{po-auto-fuzzy-on-edit} is set to +@code{t}, any entry edited through the @kbd{@key{RET}} command is +marked fuzzy, as a way to ensure some kind of double check, later. In +this case, the usual paradigm is that an entry becomes fuzzy (if not +already) whenever the translator modifies it. If they are satisfied +with the translation, they then use @kbd{@key{TAB}} to pick another +entry to work on, clearing the fuzzy attribute on the same blow. If +they are not satisfied yet, they merely use @kbd{@key{SPC}} to chase +another entry, leaving the entry fuzzy. @efindex DEL@r{, PO Mode command} @efindex po-fade-out-entry@r{, PO Mode command} The translator may also use the @kbd{@key{DEL}} command -(@code{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 -working at this entry. +(@code{po-fade-out-entry}) over any translated entry to mark it as +being fuzzy, when they want to easily return working at this entry. Also, when time comes to quit working on a PO file buffer with the @kbd{q} command, the translator is asked for confirmation, if fuzzy string @@ -4047,7 +4041,7 @@ I think it might be a quite hard problem to do this algorithmically, as we have to develop good and efficient measures of string similarity. Right now, PO mode completely lets the decision to the translator, when the time comes to find the adequate obsolete translation, it -merely tries to provide handy tools for helping her to do so. +merely tries to provide handy tools for helping to do so. @node Modifying Translations @subsection Modifying Translations @@ -4062,7 +4056,7 @@ as those errors would be easily made. Other kinds of errors are still possible, but some may be caught and diagnosed by the batch validation process, which the translator may always trigger by the @kbd{V} command. For all other errors, the translator has to rely on -her own judgment, and also on the linguistic reports submitted to her +their own judgment, and also on the linguistic reports submitted by the users of the translated package, having the same mother tongue. When the time comes to create a translation, correct an error diagnosed @@ -4104,9 +4098,9 @@ 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 the current PO file entry, all ready for edition, expunged of all quoting marks, fully modifiable and with the complete extent of Emacs modifying -commands. When the translator is done with her modifications, she may use +commands. When the translator is done with their modifications, they may use @w{@kbd{C-c C-c}} to close the subedit window with the automatically requoted -results, or @w{@kbd{C-c C-k}} to abort her modifications. @xref{Subedit}, +results, or @w{@kbd{C-c C-k}} to abort their modifications. @xref{Subedit}, for more information. @efindex LFD@r{, PO Mode command} @@ -4132,7 +4126,7 @@ target language are so different that is simply best to start writing on an empty page. At other times, the source and target languages are so close that it would be a waste to retype a number of words already being written in the original string. A translator may also -like having the original string right under her eyes, as she will +like having the original string right under their eyes, as they will progressively overwrite the original text with the translation, even if this requires some extra editing work to get rid of the original. @@ -4152,7 +4146,7 @@ entry. Both commands use exactly the Emacs kill ring, which is shared between buffers, and which is well known already to Emacs lovers. The translator may use @kbd{k} or @kbd{w} many times in the course -of her work, as the kill ring may hold several saved translations. +of their work, as the kill ring may hold several saved translations. From the kill ring, strings may later be reinserted in various Emacs buffers. In particular, the kill ring may be used for moving translation strings between different entries of a single PO file @@ -4179,7 +4173,7 @@ again, immediately, without intervening keystrokes, the translation just inserted is taken away and replaced by the second most recent addition to the kill ring. By repeating @kbd{y} many times in a row, the translator may travel along the kill ring for saved strings, -until she finds the string she really wanted. +until they finds the string they really wanted. When a string is yanked into a PO file entry, it is fully and automatically requoted for complying with the format PO files should @@ -4198,21 +4192,21 @@ yanking commands themselves. @emindex using obsolete translations to make new entries 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 +programmer slightly modifies some string right in the program, their change is later reflected in the PO file by the appearance of a new untranslated entry for the modified string, and the fact that the entry translating the original or unmodified string becomes -obsolete. In many cases, the translator might spare herself some work +obsolete. In many cases, the translator might spare themself some work by retrieving the unmodified translation from the obsolete entry, then initializing the untranslated entry @code{msgstr} field with this retrieved translation. Once this done, the obsolete entry is not wanted anymore, and may be safely deleted. When the translator finds an untranslated entry and suspects that a -slight variant of the translation exists, she immediately uses @kbd{m} +slight variant of the translation exists, they immediately uses @kbd{m} to mark the current entry location, then starts chasing obsolete entries with @kbd{o}, hoping to find some translation corresponding -to the unmodified string. Once found, she uses the @kbd{@key{DEL}} command +to the unmodified string. Once found, they use the @kbd{@key{DEL}} command for deleting the obsolete entry, knowing that @kbd{@key{DEL}} also @emph{kills} the translation, that is, pushes the translation on the kill ring. Then, @kbd{r} returns to the initial untranslated entry, and @kbd{y} @@ -4236,7 +4230,7 @@ difficulties, for which decisions have to be made, and the choices further documented. These documents may be saved within the PO file in form of translator comments, which the translator is free to create, delete, or modify at will. These comments may -be useful to herself when she returns to this PO file after a while. +be useful when they return to this PO file after a while. Comments not having whitespace after the initial @samp{#}, for example, those beginning with @samp{#.} or @samp{#:}, are @emph{not} translator @@ -4283,12 +4277,12 @@ slightly succinct, it is because the full details have already been given. The command @kbd{#} (@code{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 -to add a comment to the entry, and she is presented with an empty screen. +to add a comment to the entry, and they are presented with an empty screen. Comment marks (@code{#}) and the space following them are automatically removed before edition, and reinstated after. For translator comments pertaining to obsolete entries, the uncommenting and recommenting operations are done twice. Once in the editing window, the keys @w{@kbd{C-c C-c}} -allow the translator to tell she is finished with editing the comment. +allow the translator to tell they are finished editing the comment. @xref{Subedit}, for further details. @evindex po-subedit-mode-hook@r{, PO Mode variable} @@ -4316,21 +4310,21 @@ distinction between @emph{translation} strings and @emph{translator comments} strings. So, for example, let's presume the translator has just finished editing a translation, and wants to create a new translator comment to document why the previous translation was -not good, just to remember what was the problem. Foreseeing that she -will do that in her documentation, the translator may want to quote -the previous translation in her translator comments. To do so, she +not good, just to remember what was the problem. Foreseeing that they +will do that in the documentation, the translator may want to quote +the previous translation in the translator comments. To do so, they may initialize the translator comments with the previous translation, still at the head of the kill ring. Because editing already pushed the -previous translation on the kill ring, she merely has to type @kbd{M-w} +previous translation on the kill ring, they merely has to type @kbd{M-w} prior to @kbd{#}, and the previous translation will be right there, all ready for being introduced by some explanatory text. On the other hand, presume there are some translator comments already and that the translator wants to add to those comments, instead -of wholly replacing them. Then, she should edit the comment right -away with @kbd{#}. Once inside the editing window, she can use the +of wholly replacing them. Then, they should edit the comment right +away with @kbd{#}. Once inside the editing window, they can use the regular Emacs commands @kbd{C-y} (@code{yank}) and @kbd{M-y} -(@code{yank-pop}) to get the previous translation where she likes. +(@code{yank-pop}) to get the previous translation where they like. @node Subedit @subsection Details of Sub Edition @@ -4360,45 +4354,45 @@ Consult auxiliary PO files (@code{po-subedit-cycle-auxiliary}). @efindex po-subedit-exit@r{, PO Mode command} 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 @w{@kbd{C-c C-c}} +their heart's content. Once this is done, the command @w{@kbd{C-c C-c}} (@code{po-subedit-exit}) may be used to return the edited translation into the PO file, replacing the original translation, even if it moved out of sight or if buffers were switched. @efindex C-c C-k@r{, PO Mode command} @efindex po-subedit-abort@r{, PO Mode command} -If the translator becomes unsatisfied with her translation or comment, -to the extent she prefers keeping what was existent prior to the -@kbd{@key{RET}} or @kbd{#} command, she may use the command @w{@kbd{C-c C-k}} -(@code{po-subedit-abort}) to merely get rid of edition, while preserving -the original translation or comment. Another way would be for her to exit -normally with @w{@kbd{C-c C-c}}, then type @code{U} once for undoing the -whole effect of last edition. +If the translator becomes unsatisfied with their translation or +comment, to the extent they prefers keeping what was existent prior to +the @kbd{@key{RET}} or @kbd{#} command, they may use the command +@w{@kbd{C-c C-k}} (@code{po-subedit-abort}) to merely get rid of +edition, while preserving the original translation or comment. Another +way would be to exit normally with @w{@kbd{C-c C-c}}, then type +@code{U} once for undoing the whole effect of last edition. @efindex C-c C-a@r{, PO Mode command} @efindex po-subedit-cycle-auxiliary@r{, PO Mode command} The command @w{@kbd{C-c C-a}} (@code{po-subedit-cycle-auxiliary}) -allows for glancing through translations -already achieved in other languages, directly while editing the current -translation. This may be quite convenient when the translator is fluent -at many languages, but of course, only makes sense when such completed -auxiliary PO files are already available to her (@pxref{Auxiliary}). +allows for glancing through translations already achieved in other +languages, directly while editing the current translation. This may +be quite convenient when the translator is fluent at many languages, +but of course, only makes sense when such completed auxiliary PO files +are already available (@pxref{Auxiliary}). Functions found on @code{po-subedit-mode-hook}, if any, are executed after the string has been inserted in the edit buffer. -While editing her translation, the translator should pay attention to not +While editing translations, the translator should pay attention to not inserting unwanted @kbd{@key{RET}} (newline) characters at the end of the translated string if those are not meant to be there, or to removing such characters when they are required. Since these characters are not visible in the editing buffer, they are easily introduced by mistake. -To help her, @kbd{@key{RET}} automatically puts the character @code{<} +To help, @kbd{@key{RET}} automatically puts the character @code{<} at the end of the string being edited, but this @code{<} is not really part of the string. On exiting the editing window with @w{@kbd{C-c C-c}}, PO mode automatically removes such @kbd{<} and all whitespace added after it. If the translator adds characters after the terminating @code{<}, it looses its delimiting property and integrally becomes part of the string. -If she removes the delimiting @code{<}, then the edited string is taken +If they removes the delimiting @code{<}, then the edited string is taken @emph{as is}, with all trailing newlines, even if invisible. Also, if the translated string ought to end itself with a genuine @code{<}, then the delimiting @code{<} may not be removed; so the string should appear, @@ -4408,7 +4402,7 @@ in the editing window, as ending with two @code{<} 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 -PO file buffer, she may decide to start modifying another entry. Each entry +PO file buffer, they may decide to start modifying another entry. Each entry being edited has its own subedit buffer. It is possible to simultaneously edit the translation @emph{and} the comment of a single entry, or to edit entries in different PO files, all at once. Typing @kbd{@key{RET}} @@ -4419,7 +4413,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 @kbd{q} command), subedits -are automatically resumed one at a time, so she may decide for each of them. +are automatically resumed one at a time, so they may decide for each of them. @node C Sources Context @subsection C Sources Context @@ -4433,25 +4427,25 @@ insert special comments in the PO files they generate. Some of these special comments relate the PO file entry to exactly where the untranslated string appears in the program sources. -When the translator gets to an untranslated entry, she is fairly +When the translator gets to an untranslated entry, they are fairly often faced with an original string which is not as informative as it normally should be, being succinct, cryptic, or otherwise ambiguous. -Before choosing how to translate the string, she needs to understand +Before choosing how to translate the string, they needs to understand better what the string really means and how tight the translation has to be. Most of the time, when problems arise, the only way left to make -her judgment is looking at the true program sources from where this +the judgment is looking at the true program sources from where this string originated, searching for surrounding comments the programmer might have put in there, and looking around for helping clues of @emph{any} kind. Surely, when looking at program sources, the translator will receive -more help if she is a fluent programmer. However, even if she is +more help if they are a fluent programmer. However, even if they are not versed in programming and feels a little lost in C code, the -translator should not be shy at taking a look, once in a while. -It is most probable that she will still be able to find some of the -hints she needs. She will learn quickly to not feel uncomfortable -in program code, paying more attention to programmer's comments, -variable and function names (if he dared choosing them well), and +translator should not be shy at taking a look, once in a while. It is +most probable that they will still be able to find some of the hints +they need. Translators will learn quickly to not feel uncomfortable in +program code, paying more attention to programmer's comments, variable +and function names (if the progammer dared choose them well), and overall organization, than to the program code itself. @emindex find source fragment for a PO file entry @@ -4496,7 +4490,7 @@ command diagnoses this as an error. Even if @kbd{s} (or @kbd{M-s}) opens a new window, the cursor stays in the PO file window. If the translator really wants to -get into the program source window, she ought to do it explicitly, +get into the program source window, they ought to do it explicitly, maybe by using command @kbd{O}. When @kbd{s} is typed for the first time, or for a PO file entry which @@ -4516,7 +4510,7 @@ The command @kbd{M-s} behaves differently. Instead of cycling through references, it lets the translator choose a particular reference among many, and displays that reference. It is best used with completion, if the translator types @kbd{@key{TAB}} immediately after @kbd{M-s}, in -response to the question, she will be offered a menu of all possible +response to the question, they will be offered a menu of all possible references, as a reminder of which are the acceptable answers. This command is useful only where there are really many contexts available for a single string to translate. @@ -4537,7 +4531,7 @@ constitute what is called the @dfn{search path} for program sources. The command @kbd{S} (@code{po-consider-source-path}) is used to interactively enter a new directory at the front of the search path, and the command @kbd{M-S} (@code{po-ignore-source-path}) is used to select, with completion, -one of the directories she does not want anymore on the search path. +one of the directories they do not want anymore on the search path. @node Auxiliary @subsection Consulting Auxiliary PO Files @@ -4545,8 +4539,8 @@ one of the directories she does not want anymore on the search path. PO mode is able to help the knowledgeable translator, being fluent in many languages, at taking advantage of translations already achieved -in other languages she just happens to know. It provides these other -language translations as additional context for her own work. Moreover, +in other languages they just happen to know. It provides these other +language translations as additional context for their own work. Moreover, it has features to ease the production of translations for many languages at once, for translators preferring to work in this way. @@ -4602,7 +4596,7 @@ so repeating @kbd{a} will eventually yield back the original PO file. @efindex C-c C-a@r{, PO Mode command} @efindex po-select-auxiliary@r{, PO Mode command} The command @kbd{C-c C-a} (@code{po-select-auxiliary}) asks the translator -for her choice of a particular auxiliary file, with completion, and +for their choice of a particular auxiliary file, with completion, and then switches to that selected PO file. The command also checks if the selected file has an @code{msgid} field identical as the one for the current entry, and if yes, this entry becomes current. Otherwise, @@ -4630,7 +4624,7 @@ fully resolved, the translator should stay aware of normalisation issues. @cindex compendium A @dfn{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 +use gettext tools to build a new compendium, to add entries to their compendium, and to initialize untranslated entries, or to update already translated entries, from translations kept in the compendium. @@ -4697,13 +4691,13 @@ msgstr "" @end example @noindent -The translator will have to resolve this ``conflict'' manually; she +The translator will have to resolve this ``conflict'' manually; they has to decide whether the first or the second version is appropriate (or provide a new translation), to delete the ``marker lines'', and finally to remove the @code{fuzzy} mark. If the translator knows in advance the first found translation of a -message is always the best translation she can make use to the +message is always the best translation they can make use to the @samp{--use-first} switch: @example @@ -4773,12 +4767,12 @@ possible conflicts that arose during the merge. @cindex encoding conversion When a translator takes over the translation job from another translator, -but she uses a different character encoding in her locale, she will -convert the catalog to her character encoding. This is best done through -the @samp{msgconv} program. +but uses a different character encoding in their locale, the new +translator will convert the catalog to their character encoding. This is +best done through the @samp{msgconv} program. When a maintainer takes a source file with tagged messages from another -package, he should also take the existing translations for this source +package, they should also take the existing translations for this source file (and not let the translators do the same job twice). One way to do this is through @samp{msggrep}, another is to create a POT file for that source file and use @samp{msgmerge}. @@ -4787,7 +4781,7 @@ that source file and use @samp{msgmerge}. @cindex orthography 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 +versus German as written in Germany --- they needs to apply some text processing to every message in the catalog. The tool for doing this is @samp{msgfilter}. @@ -4798,8 +4792,8 @@ POT file may have had different comments and different plural message counts, that's why it's better to use the original POT file if available. @cindex checking of translations -When a translator wants to check her translations, for example according -to orthography rules or using a non-interactive spell checker, she can do +When a translator wants to check their translations, for example according +to orthography rules or using a non-interactive spell checker, they can do so using the @samp{msgexec} program. @cindex duplicate elimination @@ -7165,15 +7159,15 @@ the @file{po/} directory of GNU @code{gettext} knows by default both of the mentioned short forms so you are invited to follow this proposal for your own ease. -Now to @code{catgets}. The main problem is the work for the -programmer. Every time he comes to a translatable string he has to -define a number (or a symbolic constant) which has also be defined in -the message catalog file. He also has to take care for duplicate -entries, duplicate message IDs etc. If he wants to have the same -quality in the message catalog as the GNU @code{gettext} program -provides he also has to put the descriptive comments for the strings and -the location in all source code files in the message catalog. This is -nearly a Mission: Impossible. +Now to @code{catgets}. The main problem is the work for the programmer. +Every time they comes to a translatable string they has to define a +number (or a symbolic constant) which has also be defined in the message +catalog file. The programmer also has to take care for duplicate +entries, duplicate message IDs etc. If they wants to have the same +quality in the message catalog as the GNU @code{gettext} program provides +they also has to put the descriptive comments for the strings and the +location in all source code files in the message catalog. This is nearly +a Mission: Impossible. But there are also some points people might call advantages speaking for @code{catgets}. If you have a single word in a string and this string @@ -7787,7 +7781,7 @@ If we get any inquiries about GNU @code{gettext}, send them on to: The @file{*-pretest} lists are quite useful to me, maybe the idea could be generalized to many GNU, and non-GNU packages. But each maintainer -his/her way! +has their own way! Fran@,{c}ois, we have a mechanism in place here at @file{gnu.ai.mit.edu} to track teams, support mailing lists for @@ -7959,18 +7953,19 @@ and therefore you cannot omit the placeholder. A translator sometimes has only a limited amount of time per week to spend on a package, and some packages have quite large message catalogs -(over 1000 messages). Therefore she wishes to translate the messages +(over 1000 messages). Therefore they wish to translate the messages first that are the most visible to the user, or that occur most frequently. This section describes how to determine these "most urgent" messages. It also applies to determine the "next most urgent" messages after the message catalog has already been partially translated. -In a first step, she uses the programs like a user would do. While she -does this, the GNU @code{gettext} library logs into a file the not yet -translated messages for which a translation was requested from the program. +In a first step, the translator uses the programs like a user would do. +While they do this, the GNU @code{gettext} library logs into a file the +not yet translated messages for which a translation was requested from +the program. -In a second step, she uses the PO mode to translate precisely this set -of messages. +In a second step, the translator uses the PO mode to translate precisely +this set of messages. @vindex GETTEXT_LOG_UNTRANSLATED@r{, environment variable} Here are more details. The GNU @code{libintl} library (but not the @@ -8000,10 +7995,10 @@ $ GETTEXT_LOG_UNTRANSLATED=$HOME/gettextlogused $ export GETTEXT_LOG_UNTRANSLATED @end smallexample -Then she uses and peruses the programs. (It is a good and recommended -practice to use the programs for which you provide translations: it -gives you the needed context.) When done, she removes the environment -variables: +Then they use and peruse the programs. (It is a good and recommended +practice to use the programs for which you provide translations: it gives +you the needed context.) When done, the translator removes the +environment variables: @smallexample $ unset LD_PRELOAD @@ -8036,10 +8031,10 @@ $ domain=coreutils # the name of the domain to be handled $ package=/usr/src/gnu/coreutils-4.5.4 # the package where it comes from @end smallexample -She takes the latest copy of @file{$lang.po} from the Translation Project, +They take the latest copy of @file{$lang.po} from the Translation Project, or from the package (in most cases, @file{$package/po/$lang.po}), or -creates a fresh one if she's the first translator (see @ref{Creating}). -She then uses the following commands to mark the not urgent messages as +creates a fresh one if they are the first translator (see @ref{Creating}). +They then use the following commands to mark the not urgent messages as "obsolete". (This doesn't mean that these messages - translated and untranslated ones - will go away. It simply means that the PO file editor will ignore them in the following editing session.) @@ -8051,11 +8046,11 @@ $ msgattrib --set-obsolete --ignore-file $domain-missing.po $domain.$lang.po \ > $domain.$lang-urgent.po @end smallexample -The she translates @file{$domain.$lang-urgent.po} by use of a PO file editor -(@pxref{Editing}). +Then the translator translates @file{$domain.$lang-urgent.po} by use of a +PO file editor (@pxref{Editing}). (FIXME: I don't know whether @code{KBabel} and @code{gtranslator} also preserve obsolete messages, as they should.) -Finally she restores the not urgent messages (with their earlier +Finally they restore the not urgent messages (with their earlier translations, for those which were already translated) through this command: @smallexample @@ -8063,7 +8058,7 @@ $ msgmerge --no-fuzzy-matching $domain.$lang-urgent.po $package/po/$domain.pot \ > $domain.$lang.po @end smallexample -Then she can submit @file{$domain.$lang.po} and proceed to the next domain. +Then they can submit @file{$domain.$lang.po} and proceed to the next domain. @node Maintainers @chapter The Maintainer's View @@ -8209,11 +8204,11 @@ their team. Maintainers should @emph{never ever} apply PO file bug reports themselves, short-cutting translation teams. If some translator has -difficulty to get some of her points through her team, it should not be -an option for her to directly negotiate translations with maintainers. -Teams ought to settle their problems themselves, if any. If you, as -a maintainer, ever think there is a real problem with a team, please -never try to @emph{solve} a team's problem on your own. +difficulty to get some of their points through their team, it should not +be an option to directly negotiate translations with maintainers. Teams +ought to settle their problems themselves, if any. If you, as a +maintainer, ever think there is a real problem with a team, please never +try to @emph{solve} a team's problem on your own. @node gettextize Invocation @section Invoking the @code{gettextize} Program @@ -9076,13 +9071,13 @@ version controlled files. In a project development with multiple developers, there should be a single developer who occasionally - when there is desire to upgrade to a new @code{gettext} version - runs @code{gettextize} and performs the -changes listed in @ref{Adjusting Files}, and then commits his changes +changes listed in @ref{Adjusting Files}, and then commits their changes to the repository. It is highly recommended that all developers on a project use the same version of GNU @code{gettext} in the package. In other words, if a -developer runs @code{gettextize}, he should go the whole way, make the -necessary remaining changes and commit his changes to the repository. +developer runs @code{gettextize}, they should go the whole way, make the +necessary remaining changes and commit their changes to the repository. Otherwise the following damages will likely occur: @itemize @bullet @@ -9143,7 +9138,7 @@ quite fast. The advantage is that anyone can check out the source, and the usual "./configure; make" will work. The drawbacks are: 2a. The one who checks out the repository needs tools like GNU @code{automake}, GNU -@code{autoconf}, GNU @code{m4} installed in his PATH; sometimes he +@code{autoconf}, GNU @code{m4} installed in their PATH; sometimes they even needs particular versions of them. 2b. When a release is made and a commit is made on the generated files, the other developers get conflicts on the generated files when merging the local work back to @@ -9153,8 +9148,8 @@ are annoying. @item The advantage is less work for the maintainers. The drawback is that anyone who checks out the source not only needs tools like GNU -@code{automake}, GNU @code{autoconf}, GNU @code{m4} installed in his -PATH, but also that he needs to perform a package specific pre-build +@code{automake}, GNU @code{autoconf}, GNU @code{m4} installed in their +PATH, but also that they need to perform a package specific pre-build step before being able to "./configure; make". @end enumerate @@ -9163,7 +9158,7 @@ by the occasional @code{gettextize} invocation and update should be committed into the repository. For the third approach, the maintainer can omit from the repository -all the files that @code{gettextize} mentions as "copy". Instead, he +all the files that @code{gettextize} mentions as "copy". Instead, they adds to the @file{configure.ac} or @file{configure.in} a line of the form @@ -9455,7 +9450,7 @@ underlying language runtime. @section The Translator's View The translator works exactly as in the C language case. The only -difference is that when translating format strings, she has to be aware +difference is that when translating format strings, they have to be aware of the language's particular syntax for positional arguments in format strings. @@ -10459,11 +10454,11 @@ file would introduce translator mistakes. Desktop Entry files may contain an @samp{Icon} property, and this property is localizable. If a translator wishes to localize an icon, -she should do so by bypassing the normal workflow with PO files: +they should do so by bypassing the normal workflow with PO files: @enumerate @item The translator contacts the package developers directly, sending them -the icon appropriate for her locale, with a request to change the +the icon appropriate for the locale, with a request to change the template file. @item The package developers add the icon file to their repository, and a diff --git a/gettext-tools/doc/gettextize.texi b/gettext-tools/doc/gettextize.texi index 853894227..8241036c9 100644 --- a/gettext-tools/doc/gettextize.texi +++ b/gettext-tools/doc/gettextize.texi @@ -153,7 +153,7 @@ contain package dependent files. The @code{gettextize} program makes backup files for all files it replaces or changes, and also write ChangeLog entries about these changes. This way, the careful maintainer can check after running -@code{gettextize} whether its changes are acceptable to him, and +@code{gettextize} whether its changes are acceptable, and possibly adjust them. An exception to this rule is the @file{intl/} directory, which is removed as a whole if it still existed. diff --git a/gettext-tools/doc/gpl.texi b/gettext-tools/doc/gpl.texi index 38aa91822..bb7ddaa72 100644 --- a/gettext-tools/doc/gpl.texi +++ b/gettext-tools/doc/gpl.texi @@ -243,7 +243,7 @@ integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing +system; it is up to the author/donor to decide if they are willing to distribute software through any other system and a licensee cannot impose that choice. diff --git a/gettext-tools/doc/lang-bash.texi b/gettext-tools/doc/lang-bash.texi index 3d0c0bb39..0ce89d1eb 100644 --- a/gettext-tools/doc/lang-bash.texi +++ b/gettext-tools/doc/lang-bash.texi @@ -33,7 +33,7 @@ locale's encoding, produce the dangerous @code{\x60} bytes. @item A translator could - voluntarily or inadvertently - use backquotes -@code{"`...`"} or dollar-parentheses @code{"$(...)"} in her translations. +@code{"`...`"} or dollar-parentheses @code{"$(...)"} in their translations. The enclosed strings would be executed as command lists by the shell. @end enumerate diff --git a/gettext-tools/doc/lang-perl.texi b/gettext-tools/doc/lang-perl.texi index 7f9104817..6370c2c34 100644 --- a/gettext-tools/doc/lang-perl.texi +++ b/gettext-tools/doc/lang-perl.texi @@ -845,7 +845,7 @@ There are two possible work-arounds for this problem. If you are sure that your program will run under Perl 5.8.0 or newer (these Perl versions handle positional parameters in @code{printf()}) or if you are sure that the translator will not have to reorder the arguments -in her translation -- for example if you have only one brace placeholder +in their translation -- for example if you have only one brace placeholder in your string, or if it describes a syntax, like in this one --, you can mark the string as @code{no-perl-brace-format} and use @code{printf()}: diff --git a/gettext-tools/doc/lgpl.texi b/gettext-tools/doc/lgpl.texi index ab03d6cc3..0b138ccb6 100644 --- a/gettext-tools/doc/lgpl.texi +++ b/gettext-tools/doc/lgpl.texi @@ -430,7 +430,7 @@ integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing +system; it is up to the author/donor to decide if they are willing to distribute software through any other system and a licensee cannot impose that choice. diff --git a/gettext-tools/emacs/po-mode.el b/gettext-tools/emacs/po-mode.el index e04428772..0895e68b5 100644 --- a/gettext-tools/emacs/po-mode.el +++ b/gettext-tools/emacs/po-mode.el @@ -2098,7 +2098,7 @@ comments) from the current entry, if the user gives the permission." "Get out of PO mode, leaving PO file buffer in fundamental mode." (interactive) (if (po-check-all-pending-edits) - ;; Don't ask the user for confirmation, since he has explicitly asked + ;; Don't ask the user for confirmation, since they have explicitly asked ;; for it. (progn (setq buffer-read-only po-read-only) diff --git a/gettext-tools/examples/hello-c++-kde/admin/am_edit b/gettext-tools/examples/hello-c++-kde/admin/am_edit index a618de1e8..c7e664bb4 100644 --- a/gettext-tools/examples/hello-c++-kde/admin/am_edit +++ b/gettext-tools/examples/hello-c++-kde/admin/am_edit @@ -1929,8 +1929,8 @@ sub make_meta_classes () # Bah. This is the case, if no C++ file includes the .moc # file. We make a .moc.cpp file for that. Unfortunately this # is not included in the %sources hash, but rather is mentioned - # in %depedmocs. If the user wants to use AUTO he can't just - # use an unspecific METAINCLUDES. Instead he must use + # in %depedmocs. If the user wants to use AUTO they can't just + # use an unspecific METAINCLUDES. Instead they must use # program_METAINCLUDES. Anyway, it's not working real nicely. # E.g. Its not clear what happens if user specifies two # METAINCLUDES=AUTO in the same Makefile.am. diff --git a/gettext-tools/examples/hello-c++-qt/m4/qt.m4 b/gettext-tools/examples/hello-c++-qt/m4/qt.m4 index b734356a1..56d6f68e1 100644 --- a/gettext-tools/examples/hello-c++-qt/m4/qt.m4 +++ b/gettext-tools/examples/hello-c++-qt/m4/qt.m4 @@ -447,7 +447,7 @@ AC_DEFUN([FUN_QT_COMPILE], #include #include ], [QString s = "hello world"; - QMessageBox::information(0, s, "no he is not"); + QMessageBox::information(0, s, "no they are not"); return 0;], qt_compile=yes, qt_compile=no) diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c index 9a227ba56..a5eb89e42 100644 --- a/gettext-tools/src/msginit.c +++ b/gettext-tools/src/msginit.c @@ -1187,7 +1187,7 @@ get_user_email () size_t linelen; int exitstatus; - /* Ask the user for his email address. */ + /* Ask the user for their email address. */ argv[0] = BOURNE_SHELL; argv[1] = (char *) prog; argv[2] = (char *) _("\ @@ -1200,7 +1200,7 @@ you in case of unexpected technical problems.\n"); if (child == -1) goto failed; - /* Retrieve his answer. */ + /* Retrieve their answer. */ fp = fdopen (fd[0], "r"); if (fp == NULL) { diff --git a/gettext-tools/src/msgl-cat.c b/gettext-tools/src/msgl-cat.c index 990d39e92..b38b25eae 100644 --- a/gettext-tools/src/msgl-cat.c +++ b/gettext-tools/src/msgl-cat.c @@ -448,7 +448,7 @@ catenate_msgdomain_list (string_list_ty *file_list, if (second != NULL) { - /* A conversion is needed. Warn the user since he hasn't asked + /* A conversion is needed. Warn the user since they haven't asked for it and might be surprised. */ if (with_UTF8) multiline_warning (xasprintf (_("warning: ")), diff --git a/gettext-tools/src/msgl-check.c b/gettext-tools/src/msgl-check.c index 32c21adf5..59d13259f 100644 --- a/gettext-tools/src/msgl-check.c +++ b/gettext-tools/src/msgl-check.c @@ -211,7 +211,7 @@ check_plural_eval (const struct expression *plural_expr, } -/* Try to help the translator by looking up the right plural formula for her. +/* Try to help the translator by looking up the right plural formula. Return a freshly allocated multiline help string, or NULL. */ static char * plural_help (const char *nullentry) diff --git a/gettext-tools/src/write-resources.c b/gettext-tools/src/write-resources.c index 55c3e769b..d06540901 100644 --- a/gettext-tools/src/write-resources.c +++ b/gettext-tools/src/write-resources.c @@ -97,7 +97,7 @@ execute_writing_input (const char *progname, progname); /* Remove zombie process from process list, and retrieve exit status. */ - /* He we can ignore SIGPIPE because WriteResource either writes to a file + /* Here we can ignore SIGPIPE because WriteResource either writes to a file - then it never gets SIGPIPE - or to standard output, and in the latter case it has no side effects other than writing to standard output. */ exitstatus = diff --git a/gettext-tools/tests/msgcat-2 b/gettext-tools/tests/msgcat-2 index f4caa6183..f83cc4e07 100755 --- a/gettext-tools/tests/msgcat-2 +++ b/gettext-tools/tests/msgcat-2 @@ -24,7 +24,7 @@ msgstr "" msgid "" "Congratulations!" msgstr "" -"Gl�ckwunsch!" +"Gl�ckwunsch!" EOF cat <<\EOF > mcat-test2.in2 @@ -43,7 +43,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Remind user of the login name he chose +#. Remind user of the login name they chose #: clients/inst_ask_config.ycp:72 #, ycp-format msgid "You can log in as \"%1\"." @@ -82,7 +82,7 @@ msgstr "" msgid "Congratulations!" msgstr "Glückwunsch!" -#. Remind user of the login name he chose +#. Remind user of the login name they chose #: clients/inst_ask_config.ycp:72 #, ycp-format msgid "You can log in as \"%1\"." diff --git a/gettext-tools/tests/msgcat-3 b/gettext-tools/tests/msgcat-3 index bf757c415..f0c7474a9 100755 --- a/gettext-tools/tests/msgcat-3 +++ b/gettext-tools/tests/msgcat-3 @@ -25,7 +25,7 @@ msgstr "" msgid "" "Congratulations!" msgstr "" -"Gl�ckwunsch!" +"Gl�ckwunsch!" EOF cat <<\EOF > mcat-test3.in2 @@ -44,7 +44,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Remind user of the login name he chose +#. Remind user of the login name they chose #: clients/inst_ask_config.ycp:72 #, ycp-format msgid "You can log in as \"%1\"." @@ -83,7 +83,7 @@ msgstr "" msgid "Congratulations!" msgstr "Glückwunsch!" -#. Remind user of the login name he chose +#. Remind user of the login name they chose #: clients/inst_ask_config.ycp:72 #, ycp-format msgid "You can log in as \"%1\"." diff --git a/gettext-tools/tests/msgcat-4 b/gettext-tools/tests/msgcat-4 index 5e9a3bc65..cb5fe4247 100755 --- a/gettext-tools/tests/msgcat-4 +++ b/gettext-tools/tests/msgcat-4 @@ -20,7 +20,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Remind user of the login name he chose +#. Remind user of the login name they chose #: clients/inst_ask_config.ycp:72 #, ycp-format msgid "You can log in as \"%1\"." @@ -48,7 +48,7 @@ msgstr "" msgid "" "Congratulations!" msgstr "" -"Gl�ckwunsch!" +"Gl�ckwunsch!" EOF rm -f mcat-test4.tmp @@ -78,7 +78,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Remind user of the login name he chose +#. Remind user of the login name they chose #: clients/inst_ask_config.ycp:72 #, ycp-format msgid "You can log in as \"%1\"." diff --git a/gettext-tools/tests/msgcomm-16 b/gettext-tools/tests/msgcomm-16 index 6b7f6f3b3..af364db61 100755 --- a/gettext-tools/tests/msgcomm-16 +++ b/gettext-tools/tests/msgcomm-16 @@ -24,7 +24,7 @@ msgstr "" msgid "" "Congratulations!" msgstr "" -"Gl�ckwunsch!" +"Gl�ckwunsch!" EOF cat <<\EOF > mcomm-test16.in2 @@ -43,7 +43,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Remind user of the login name he chose +#. Remind user of the login name they chose #: clients/inst_ask_config.ycp:72 #, ycp-format msgid "You can log in as \"%1\"." @@ -82,7 +82,7 @@ msgstr "" msgid "Congratulations!" msgstr "Glückwunsch!" -#. Remind user of the login name he chose +#. Remind user of the login name they chose #: clients/inst_ask_config.ycp:72 #, ycp-format msgid "You can log in as \"%1\"." diff --git a/gettext-tools/tests/xgettext-lua-1 b/gettext-tools/tests/xgettext-lua-1 index 7e4715fbc..0e625b621 100755 --- a/gettext-tools/tests/xgettext-lua-1 +++ b/gettext-tools/tests/xgettext-lua-1 @@ -9,7 +9,7 @@ print(_('And another one.')) print(_("Don't be afraid to extract this one.")) print(_('I don\'t bite!')) print(_("I said: \"This is a test.\"")) -print(_('He said: "You\'re right!"')) +print(_('They said: "You\'re right!"')) print(_([[I like brackets.]])) print(_([===[Brackets are awesome!]===])) print(_([===[==[Even nested brackets]==]===])) @@ -54,7 +54,7 @@ msgstr "" msgid "I said: \"This is a test.\"" msgstr "" -msgid "He said: \"You're right!\"" +msgid "They said: \"You're right!\"" msgstr "" msgid "I like brackets." diff --git a/gnulib-local/lib/libxml/parser.c b/gnulib-local/lib/libxml/parser.c index d485a58b8..8f23a745d 100644 --- a/gnulib-local/lib/libxml/parser.c +++ b/gnulib-local/lib/libxml/parser.c @@ -2945,7 +2945,7 @@ xmlSplitQName(xmlParserCtxtPtr ctxt, const xmlChar *name, xmlChar **prefix) { } if (len >= max) { /* - * Okay someone managed to make a huge name, so he's ready to pay + * Okay someone managed to make a huge name, so they're ready to pay * for the processing speed. */ max = len * 2; @@ -3024,7 +3024,7 @@ xmlSplitQName(xmlParserCtxtPtr ctxt, const xmlChar *name, xmlChar **prefix) { } if (len >= max) { /* - * Okay someone managed to make a huge name, so he's ready to pay + * Okay someone managed to make a huge name, so they're ready to pay * for the processing speed. */ max = len * 2; -- 2.28.0