I have attached a bunch of patches for various doc grammar and typos.
I couldn't see how to submit anything directly to the gettext.git repo
for review. The submission and review process is so easy for projects
that have repos hosted on Github - just fork/clone, edit away then press
the Pull Request button.
Is there a similar way for mere mortals to submit change requests for
review to the repos in git.sv.gnu.org ?
Phil Davis
Phone: +977 9819573437
Email: phil.da...@inf.org
Skype: phillip.davis.oz
On 11/17/2015 7:53 AM, Daiki Ueno wrote:
Phil Davis <phil.da...@inf.org> writes:
I have just been reading the gettext documentation at
http://www.gnu.org/software/gettext/manual/gettext.html and am
noticing little errors/typos as I go.
For example this fragment of a code example is missing a ")":
static const char *messages[] = {
gettext_noop ("some very meaningful message",
gettext_noop ("and another one")
};
Thanks for pointing that. I have installed the fix in your name:
http://git.sv.gnu.org/cgit/gettext.git/commit/?id=87642183
Is there somewhere where I can get the "original source" of the
documentation, make fixes, and provide the changed file back for
review?
The source of the gettext manual resides in gettext-tools/doc/ in
Texinfo format (*.texi). Further corrections would be greatly
appreciated.
Regards,
>From 300433d308fc69e1d30725e7f6fe0b037ea48c23 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.da...@inf.org>
Date: Fri, 27 Nov 2015 16:07:59 +0545
Subject: [PATCH] doc review
---
INSTALL | 4 +-
gettext-runtime/ABOUT-NLS | 2 +-
gettext-runtime/INSTALL | 4 +-
gettext-tools/INSTALL | 4 +-
gettext-tools/doc/FAQ.html | 6 +-
gettext-tools/doc/gettext.texi | 243 ++++++++++++++++++++-------------------
gettext-tools/doc/msgattrib.texi | 2 +-
gettext-tools/doc/msgcat.texi | 2 +-
gettext-tools/doc/msgcomm.texi | 2 +-
gettext-tools/doc/msgconv.texi | 2 +-
gettext-tools/doc/msgen.texi | 2 +-
gettext-tools/doc/msgfilter.texi | 2 +-
gettext-tools/doc/msgfmt.texi | 2 +-
gettext-tools/doc/msggrep.texi | 2 +-
gettext-tools/doc/msginit.texi | 2 +-
gettext-tools/doc/msgmerge.texi | 2 +-
gettext-tools/doc/msgunfmt.texi | 2 +-
gettext-tools/doc/msguniq.texi | 2 +-
gettext-tools/doc/xgettext.texi | 2 +-
19 files changed, 145 insertions(+), 144 deletions(-)
diff --git a/INSTALL b/INSTALL
index 671b157..f2914df 100644
--- a/INSTALL
+++ b/INSTALL
@@ -38,7 +38,7 @@ The simplest way to compile this package is:
‘sh ./configure’ instead to prevent ‘csh’ from trying to execute
‘configure’ itself.
- Running ‘configure’ takes awhile. While running, it prints some
+ Running ‘configure’ takes a while. While running, it prints some
messages telling which features it is checking for.
2. Type ‘make’ to compile the package.
@@ -77,7 +77,7 @@ directory where you want the object files and executables to
go and run
the ‘configure’ script. ‘configure’ automatically checks for the
source code in the directory that ‘configure’ is in and in ‘..’.
- If you have to use a ‘make’ that does not supports the ‘VPATH’
+ If you have to use a ‘make’ that does not support the ‘VPATH’
variable, you have to compile the package for one architecture at a time
in the source code directory. After you have installed the package for
one architecture, use ‘make distclean’ before reconfiguring for another
diff --git a/gettext-runtime/ABOUT-NLS b/gettext-runtime/ABOUT-NLS
index dd9c5de..d12d06f 100644
--- a/gettext-runtime/ABOUT-NLS
+++ b/gettext-runtime/ABOUT-NLS
@@ -72,7 +72,7 @@ example, 'de_AT' is used for Austria, and 'pt_BR' for Brazil.
The
country code serves to distinguish the dialects.
The locale naming convention of 'LL_CC', with 'LL' denoting the
-language and 'CC' denoting the country, is the one use on systems based
+language and 'CC' denoting the country, is the one used on systems based
on GNU libc. On other systems, some variations of this scheme are used,
such as 'LL' or 'LL_CC.ENCODING'. You can get the list of locales
supported by your system for your language by running the command
diff --git a/gettext-runtime/INSTALL b/gettext-runtime/INSTALL
index 671b157..f2914df 100644
--- a/gettext-runtime/INSTALL
+++ b/gettext-runtime/INSTALL
@@ -38,7 +38,7 @@ The simplest way to compile this package is:
‘sh ./configure’ instead to prevent ‘csh’ from trying to execute
‘configure’ itself.
- Running ‘configure’ takes awhile. While running, it prints some
+ Running ‘configure’ takes a while. While running, it prints some
messages telling which features it is checking for.
2. Type ‘make’ to compile the package.
@@ -77,7 +77,7 @@ directory where you want the object files and executables to
go and run
the ‘configure’ script. ‘configure’ automatically checks for the
source code in the directory that ‘configure’ is in and in ‘..’.
- If you have to use a ‘make’ that does not supports the ‘VPATH’
+ If you have to use a ‘make’ that does not support the ‘VPATH’
variable, you have to compile the package for one architecture at a time
in the source code directory. After you have installed the package for
one architecture, use ‘make distclean’ before reconfiguring for another
diff --git a/gettext-tools/INSTALL b/gettext-tools/INSTALL
index 671b157..f2914df 100644
--- a/gettext-tools/INSTALL
+++ b/gettext-tools/INSTALL
@@ -38,7 +38,7 @@ The simplest way to compile this package is:
‘sh ./configure’ instead to prevent ‘csh’ from trying to execute
‘configure’ itself.
- Running ‘configure’ takes awhile. While running, it prints some
+ Running ‘configure’ takes a while. While running, it prints some
messages telling which features it is checking for.
2. Type ‘make’ to compile the package.
@@ -77,7 +77,7 @@ directory where you want the object files and executables to
go and run
the ‘configure’ script. ‘configure’ automatically checks for the
source code in the directory that ‘configure’ is in and in ‘..’.
- If you have to use a ‘make’ that does not supports the ‘VPATH’
+ If you have to use a ‘make’ that does not support the ‘VPATH’
variable, you have to compile the package for one architecture at a time
in the source code directory. After you have installed the package for
one architecture, use ‘make distclean’ before reconfiguring for another
diff --git a/gettext-tools/doc/FAQ.html b/gettext-tools/doc/FAQ.html
index 4f154eb..fd7f717 100644
--- a/gettext-tools/doc/FAQ.html
+++ b/gettext-tools/doc/FAQ.html
@@ -138,7 +138,7 @@ list</a>.<br>
build error “text relocations remain” in the <span
style="font-family: monospace;">libasprintf</span> subdirectory</h4>
libtool (or more precisely, the version of libtool that was available
-at the time the gettext release waas made) doesn't support linking C++
+at the time the gettext release was made) doesn't support linking C++
libraries with some versions of GCC. As a workaround, you can configure
gettext with the option <span style="font-family:
monospace;">--disable-libasprintf</span>.<br>
<h4><a name="building_install"></a>“make install” fails</h4>
@@ -635,7 +635,7 @@ and link command lines. Otherwise you might end up calling
the <span
Microsoft's <span style="font-family: monospace;">libc.lib</span>,
whereas <span style="font-family: monospace;">intl.dll</span> is using
the <span style="font-family: monospace;">getenv()</span> function
-from Mictosoft's <span style="font-family: monospace;">msvcrt.lib</span>.</li>
+from Microsoft's <span style="font-family: monospace;">msvcrt.lib</span>.</li>
<li>Check that you set the environment variable using <span
style="font-style: italic;">both</span> <span
style="font-family: monospace;">SetEnvironmentVariable()</span> and <span
@@ -809,7 +809,7 @@ they use.<br>
<br>
Use of wide strings <span style="font-family: monospace;">L"..."</span>
doesn't help solving the problem, because on systems like FreeBSD or
-Solaris, the way how wide string literals are stored in compiled code
+Solaris, the way that wide string literals are stored in compiled code
depends on the compilation character set, just as it does for
narrow strings <span style="font-family: monospace;">"..."</span>.
Moreover, wide strings have problems of their own.<br>
diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index ed01f87..d5941d5 100644
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -195,7 +195,7 @@ The User's View
Setting the Locale through Environment Variables
-* Locale Names:: How a Locale Specification Looks Like
+* Locale Names:: What a Locale Specification Looks Like
* Locale Environment Variables:: Which Environment Variable Specfies What
* The LANGUAGE variable:: How to Specify a Priority List of Languages
@@ -548,7 +548,7 @@ and free software. Using a common language is quite handy
for
communication between developers, maintainers and users from all
countries. On the other hand, most people are less comfortable with
English than with their own native language, and would prefer to
-use their mother tongue for day to day's work, as far as possible.
+use their mother tongue for day to day work, as far as possible.
Many would simply @emph{love} to see their computer screen showing
a lot less of English, and far more of their own language.
@@ -600,7 +600,7 @@ GNU @code{gettext} is designed to minimize the impact of
internationalization on program sources, keeping this impact as small
and hardly noticeable as possible. Internationalization has better
chances of succeeding if it is very light weighted, or at least,
-appear to be so, when looking at program sources.
+appears to be so, when looking at program sources.
The Translation Project also uses the GNU @code{gettext} distribution
as a vehicle for documenting its structure and methods. This goes
@@ -625,7 +625,7 @@ tired of writing these long words over and over again, took
the
habit of writing @dfn{i18n} and @dfn{l10n} instead, quoting the first
and last letter of each word, and replacing the run of intermediate
letters by a number merely telling how many such letters there are.
-But in this manual, in the sake of clarity, we will patiently write
+But in this manual, for the sake of clarity, we will patiently write
the names in full, each time@dots{}
@cindex internationalization
@@ -647,7 +647,7 @@ cultural habits. This is a particularisation process, by
which generic
methods already implemented in an internationalized program are used
in specific ways. The programming environment puts several functions
to the programmers disposal which allow this runtime configuration.
-The formal description of specific set of cultural habits for some
+The formal description of the specific set of cultural habits for some
country, together with all associated translations targeted to the
same native language, is called the @dfn{locale} for this language
or country. Users achieve localization of programs by setting proper
@@ -713,7 +713,7 @@ translating them properly would require a prior translation
of the RFC
itself.
@item
-Almost all programs accept options, which are often worded out so to
+Almost all programs accept options, which are often worded out so as to
be descriptive for the English readers; one might want to consider
offering translated versions for program options as well.
@@ -801,10 +801,11 @@ For example, the following numbers are all written
correctly for
their respective locales:
@example
-12,345.67 English
-12.345,67 German
- 12345,67 French
-1,2345.67 Asia
+ 12,345,678.09 English
+ 12.345.678,09 German
+ 12 345 678,09 French
+ 1234,5678.09 Chinese
+1,23,45,678.09 South Asian
@end example
Some programs could go further and use different unit systems, like
@@ -844,7 +845,7 @@ or less reasonable support for at least some of the missing
components.
@section Files Conveying Translations
@cindex files, @file{.po} and @file{.mo}
-The letters PO in @file{.po} files means Portable Object, to
+The letters PO in @file{.po} files mean Portable Object, to
distinguish it from @file{.mo} files, where MO stands for Machine
Object. This paradigm, as well as the PO file format, is inspired
by the NLS standard developed by Uniforum, and first implemented by
@@ -1012,7 +1013,7 @@ represents the target language. See @ref{Creating} for
details.
Then comes the initial translation of messages. Translation in
itself is a whole matter, still exclusively meant for humans,
and whose complexity far overwhelms the level of this manual.
-Nevertheless, a few hints are given in some other chapter of this
+Nevertheless, a few hints are given in some other chapters of this
manual (@pxref{Translators}). You will also find there indications
about how to contact translating teams, or becoming part of them,
for sharing your translating concerns with others who target the same
@@ -1025,8 +1026,8 @@ for ensuring that your efforts fully respect the PO file
format, and quoting
conventions (@pxref{PO Files}). This is surely not an impossible task,
as this is the way many people have handled PO files around 1995.
On the other hand, by using a PO file editor, most details
-of PO file format are taken care of for you, but you have to acquire
-some familiarity with PO file editor itself.
+of the PO file format are taken care of for you, but you have to acquire
+some familiarity with the PO file editor itself.
If some common translations have already been saved into a compendium
PO file, translators may use PO mode for initializing untranslated
@@ -1035,7 +1036,7 @@ the compendium, updating it (@pxref{Compendium}).
Compendium files
are meant to be exchanged between members of a given translation team.
Programs, or packages of programs, are dynamic in nature: users write
-bug reports and suggestion for improvements, maintainers react by
+bug reports and suggestions for improvements, maintainers react by
modifying programs in various ways. The fact that a package has
already been internationalized should not make maintainers shy
of adding new strings, or modifying strings already translated.
@@ -1199,7 +1200,7 @@ prompt, merely execute
@file{.login} or @file{.profile} file, once and for all.
@menu
-* Locale Names:: How a Locale Specification Looks Like
+* Locale Names:: What a Locale Specification Looks Like
* Locale Environment Variables:: Which Environment Variable Specfies What
* The LANGUAGE variable:: How to Specify a Priority List of Languages
@end menu
@@ -1355,7 +1356,7 @@ Languages are not equally well supported in all packages
using GNU
use the translations that are shipped with the operating system
or with particular packages that you install afterwards. But you can also
install newer localizations directly. For doing this, you will need an
-understanding where each localization file is stored on the file system.
+understanding of where each localization file is stored on the file system.
@cindex @file{ABOUT-NLS} file
For programs that participate in the Translation Project, you can start
@@ -1373,7 +1374,7 @@ For programs that are part of the GNOME project, the
starting point is:
For other programs, you may check whether the program's source code package
contains some @file{@var{ll}.po} files; often they are kept together in a
directory called @file{po/}. Each @file{@var{ll}.po} file contains the
-message translations for the language whose abbreviation of @var{ll}.
+message translations for the language whose abbreviation is @var{ll}.
@node PO Files, Sources, Users, Top
@chapter The Format of PO Files
@@ -1423,9 +1424,9 @@ through GNU @code{gettext} tools, there is exactly one
blank line
between entries. Then comments follow, on lines all starting with the
character @code{#}. There are two kinds of comments: those which have
some white space immediately following the @code{#} - the @var{translator
-comments} -, which comments are created and maintained exclusively by the
+comments} -, these comments are created and maintained exclusively by the
translator, and those which have some non-white character just after the
-@code{#} - the @var{automatic comments} -, which comments are created and
+@code{#} - the @var{automatic comments} -, these comments are created and
maintained automatically by GNU @code{gettext} tools. Comment lines
starting with @code{#.} contain comments given by the programmer, directed
at the translator; these comments are called @var{extracted comments}
@@ -1453,7 +1454,7 @@ takes care of quoting for her.
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
-do is merely deleting them, and only by deleting the whole entry.
+do is merely delete 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.
@@ -1473,7 +1474,7 @@ 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
-when it combined the @code{msgid} and @code{msgstr} entries after fuzzy
+when it combines the @code{msgid} and @code{msgstr} entries after fuzzy
search only. @xref{Fuzzy Entries}.
@item c-format
@@ -1678,7 +1679,7 @@ and an absent @code{msgctxt} line do not mean the same
thing.
@kwindex msgid_plural
@cindex plural forms, in PO files
-A different kind of entries is used for translations which involve
+A different kind of entry is used for translations which involve
plural forms.
@example
@@ -1870,16 +1871,16 @@ The use of @code{LC_ALL} might not be appropriate for
you.
@code{LC_ALL} includes all locale categories and especially
@code{LC_CTYPE}. This latter category is responsible for determining
character classes with the @code{isalnum} etc. functions from
-@file{ctype.h} which could especially for programs, which process some
-kind of input language, be wrong. For example this would mean that a
+@file{ctype.h} which could, especially for programs which process some
+kind of input language, be wrong. For example this would mean that
source code using the @,{c} (c-cedilla character) is runnable in
France but not in the U.S.
Some systems also have problems with parsing numbers using the
-@code{scanf} functions if an other but the @code{LC_ALL} locale category is
+@code{scanf} functions if other than the @code{LC_ALL} locale category is
used. The standards say that additional formats but the one known in the
@code{"C"} locale might be recognized. But some systems seem to reject
-numbers in the @code{"C"} locale format. In some situation, it might
+numbers in the @code{"C"} locale format. In some situations, it might
also be a problem with the notation itself which makes it impossible to
recognize whether the number is in the @code{"C"} locale or the local
format. This can happen if thousands separator characters are used.
@@ -1926,7 +1927,7 @@ such as found in the modules @samp{c-ctype},
@samp{c-strcase},
@samp{c-strcasestr}, @samp{c-strtod}, @samp{c-strtold} in the GNU gnulib
source distribution.
-It is also possible to switch the locale forth and back between the
+It is also possible to switch the locale back and forth between the
environment dependent locale and the C locale, but this approach is
normally avoided because a @code{setlocale} call is expensive,
because it is tedious to determine the places where a locale switch
@@ -1941,7 +1942,7 @@ Before strings can be marked for translations, they
sometimes need to
be adjusted. Usually preparing a string for translation is done right
before marking it, during the marking phase which is described in the
next sections. What you have to keep in mind while doing that is the
-following.
+following:
@itemize @bullet
@item
@@ -2051,7 +2052,7 @@ puts ("On the next stack overflow we will crash!!!");
@end example
@noindent
-Should these two statements merged into a single one? I would recommend to
+Should these two statements be merged into a single one? I would recommend to
merge them if the two sentences are related to each other, because then it
makes it easier for the translator to understand and translate both. On
the other hand, if one of the two messages is a stereotypic one, occurring
@@ -2230,7 +2231,7 @@ functions. But this is not universal usage, and some
translatable
strings appear in structured initializations. @xref{Special cases}.
The second goal of the marking operation is to help @code{xgettext}
-at properly extracting all translatable strings when it scans a set
+to properly extract all translatable strings when it scans a set
of program sources and produces PO file templates.
The canonical keyword for marking translatable strings is
@@ -2250,7 +2251,7 @@ sources for those trying to keep them within 79 or 80
columns.
Many packages use @samp{_} (a simple underline) as a keyword,
and write @samp{_("Translatable string")} instead of @samp{gettext
("Translatable string")}. Further, the coding rule, from GNU standards,
-wanting that there is a space between the keyword and the opening
+specifying that there is a space between the keyword and the opening
parenthesis is relaxed, in practice, for this particular usage.
So, the textual overhead per translatable string is reduced to
only three characters: the underline and the two parentheses.
@@ -2305,7 +2306,7 @@ strings in the program sources, while simultaneously
producing a set of
translation in some language, for the package being internationalized.
@emindex @code{etags}, using for marking strings
-The set of program sources, targeted by the PO mode commands describe
+The set of program sources, targeted by the PO mode commands described
here, should have an Emacs tags table constructed for your project,
prior to using these PO file commands. This is easy to do. In any
shell window, change the directory to the root of your project, then
@@ -2387,11 +2388,11 @@ However, by giving a prefix argument to the command
@w{(@kbd{C-u
from the first program source; but in this case, strings that you
recently marked as translatable will be automatically skipped.
-Using this @kbd{,} command does not prevent using of other regular
+Using this @kbd{,} command does not prevent use of other regular
Emacs tags commands. For example, regular @code{tags-search} or
@code{tags-query-replace} commands may be used without disrupting the
independent @kbd{,} search sequence. However, as implemented, the
-@emph{initial} @kbd{,} command (or the @kbd{,} command is used with a
+@emph{initial} @kbd{,} command (or the @kbd{,} command used with a
prefix) might also reinitialize the regular Emacs tags searching to the
first tags file, this reinitialization might be considered spurious.
@@ -2442,8 +2443,8 @@ There is no provision in PO mode, currently, for deleting
a known
keyword, you have to quit the file (maybe using @kbd{q}) and reopen
it afresh. When a PO file is newly brought up in an Emacs window, only
@samp{gettext} and @samp{_} are known as keywords, and @samp{gettext}
-is preferred for the @kbd{M-.} command. In fact, this is not useful to
-prefer @samp{_}, as this one is already built in the @kbd{M-,} command.
+is preferred for the @kbd{M-.} command. In fact, it is not useful to
+prefer @samp{_}, as this one is already built into the @kbd{M-,} command.
@node c-format Flag, Special cases, Marking, Sources
@section Special Comments preceding Keywords
@@ -2469,7 +2470,7 @@ A possible German translation for the above string might
be:
A C programmer, even if he 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.
+is changed but of course the arguments in the @code{printf} have not.
This will most probably lead to problems because now the length of the
string is regarded as the address.
@@ -2482,7 +2483,7 @@ use of @samp{msgfmt -c} will catch the error, so that it
cannot cause
problems at runtime.
@noindent
-If the word order in the above German translation would be correct one
+If the word order in the above German translation is correct one
would have to write
@example
@@ -2595,7 +2596,7 @@ from the array. So one solution can look like this:
@end example
Please convince yourself that the string which is written by
-@code{fputs} is translated in any case. How to get @code{xgettext} know
+@code{fputs} is translated in any case. How to get @code{xgettext} to know
the additional keyword @code{gettext_noop} is explained in @ref{xgettext
Invocation}.
@@ -3318,7 +3319,7 @@ Quit processing, possibly after confirmation
(@code{po-confirm-and-quit}).
@item 0
@efindex 0@r{, PO Mode command}
-Temporary leave the PO file window (@code{po-other-window}).
+Temporarily leave the PO file window (@code{po-other-window}).
@item ?
@itemx h
@@ -3343,10 +3344,10 @@ The command @kbd{_} (@code{po-undo}) interfaces to the
Emacs
Editor}. Each time @kbd{_} is typed, modifications which the translator
did to the PO file are undone a little more. For the purpose of
undoing, each PO mode command is atomic. This is especially true for
-the @kbd{@key{RET}} command: the whole edition made by using a single
-use of this command is undone at once, even if the edition itself
+the @kbd{@key{RET}} command: the whole of the edits made by a single
+use of this command are undone at once, even if the edit itself
implied several actions. However, while in the editing window, one
-can undo the edition work quite parsimoniously.
+can undo the editing work quite parsimoniously.
@efindex Q@r{, PO Mode command}
@efindex q@r{, PO Mode command}
@@ -3404,11 +3405,11 @@ as well as all individual entries.
The program @code{msgfmt} runs asynchronously with Emacs, so the
translator regains control immediately while her PO file is being studied.
Error output is collected in the Emacs @samp{*compilation*} buffer,
-displayed in another window. The regular Emacs command @kbd{C-x`}
+and displayed in another window. The regular Emacs command @kbd{C-x`}
(@code{next-error}), as well as other usual compile commands, allow the
translator to reposition quickly to the offending parts of the PO file.
Once the cursor is on the line in error, the translator may decide on
-any PO mode action which would help correcting the error.
+any PO mode action which would help correct the error.
@node Entry Positioning, Normalizing, Main PO Commands, PO Mode
@subsection Entry Positioning
@@ -3424,7 +3425,7 @@ the PO file, this also selects on which entry commands
operate.
@emindex moving through a PO file
Some PO mode commands alter the position of the cursor in a specialized
-way. A few of those special purpose positioning are described here,
+way. A few of those special purpose positionings are described here,
the others are described in following sections (for a complete list try
@kbd{C-h m}):
@@ -3497,7 +3498,7 @@ how @emph{others} should do translation.
@efindex p@r{, PO Mode command}
@efindex po-previous-entry@r{, PO Mode command}
The commands @kbd{n} (@code{po-next-entry}) and @kbd{p}
-(@code{po-previous-entry}) move the cursor the entry following,
+(@code{po-previous-entry}) move the cursor to the entry following,
or preceding, the current one. If @kbd{n} is given while the
cursor is on the last entry of the PO file, or if @kbd{p}
is given while the cursor is on the first entry, no move is done.
@@ -3512,7 +3513,7 @@ entry, of the PO file. When the cursor is located past
the last
entry in a PO file, most PO mode commands will return an error saying
@samp{After last entry}. Moreover, the commands @kbd{<} and @kbd{>}
have the special property of being able to work even when the cursor
-is not into some PO file entry, and one may use them for nicely
+is not in some PO file entry, and one may use them for nicely
correcting this situation. But even these commands will fail on a
truly empty PO file. There are development plans for the PO mode for it
to interactively fill an empty PO file from sources. @xref{Marking}.
@@ -3691,8 +3692,8 @@ Find the previous translated entry
(@code{po-previous-translated-entry}).
@efindex T@r{, PO Mode command}
@efindex po-previous-translated-entry@r{, PO Mode command}
The commands @kbd{t} (@code{po-next-translated-entry}) and @kbd{T}
-(@code{po-previous-translated-entry}) move forwards or backwards, chasing
-for an translated entry. If none is found, the search is extended and
+(@code{po-previous-translated-entry}) move forwards or backwards, looking
+for a translated entry. If none is found, the search is extended and
wraps around in the PO file buffer.
@evindex po-auto-fuzzy-on-edit@r{, PO Mode variable}
@@ -3718,10 +3719,10 @@ to have a fuzzy translation. They are called fuzzy
entries, for short.
Fuzzy entries, even if they account for translated entries for
most other purposes, usually call for revision by the translator.
Those may be produced by applying the program @code{msgmerge} to
-update an older translated PO files according to a new PO template
+update an older translated PO file according to a new PO template
file, when this tool hypothesises that some new @code{msgid} has
-been modified only slightly out of an older one, and chooses to pair
-what it thinks to be the old translation for the new modified entry.
+been modified only slightly from an older one, and chooses to pair
+what it thinks to be the old translation with the new modified entry.
The slight alteration in the original string (the @code{msgid} string)
should often be reflected in the translated string, and this requires
the intervention of the translator. For this reason, @code{msgmerge}
@@ -3754,7 +3755,7 @@ Remove the fuzzy attribute of the current entry
(@code{po-unfuzzy}).
@efindex F@r{, PO Mode command}
@efindex po-previous-fuzzy-entry@r{, PO Mode command}
The commands @kbd{f} (@code{po-next-fuzzy-entry}) and @kbd{F}
-(@code{po-previous-fuzzy-entry}) move forwards or backwards, chasing for
+(@code{po-previous-fuzzy-entry}) move forwards or backwards, looking for
a fuzzy entry. If none is found, the search is extended and wraps
around in the PO file buffer.
@@ -3764,7 +3765,7 @@ around in the PO file buffer.
The command @kbd{@key{TAB}} (@code{po-unfuzzy}) removes the fuzzy
attribute associated with an entry, usually leaving it translated.
Further, if the variable @code{po-auto-select-on-unfuzzy} has not
-the @code{nil} value, the @kbd{@key{TAB}} command will automatically chase
+the @code{nil} value, the @kbd{@key{TAB}} command will automatically look
for another interesting entry to work on. The initial value of
@code{po-auto-select-on-unfuzzy} is @code{nil}.
@@ -3775,19 +3776,19 @@ 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}}
+in the same blow. If she is not satisfied yet, she merely uses @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.
+fuzzy, when she wants to easily leave a trace that she wants to later return
+to work on 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
-still exists.
+command, the translator is asked for confirmation, if any fuzzy strings
+still exist.
@node Untranslated Entries, Obsolete Entries, Fuzzy Entries, PO Mode
@subsection Untranslated Entries
@@ -3819,7 +3820,7 @@ Find the next untranslated entry
(@code{po-next-untranslated-entry}).
@item U
@efindex U@r{, PO Mode command}
-Find the previous untranslated entry (@code{po-previous-untransted-entry}).
+Find the previous untranslated entry (@code{po-previous-untranslated-entry}).
@item k
@efindex k@r{, PO Mode command}
@@ -3830,10 +3831,10 @@ Turn the current entry into an untranslated one
(@code{po-kill-msgstr}).
@efindex u@r{, PO Mode command}
@efindex po-next-untranslated-entry@r{, PO Mode command}
@efindex U@r{, PO Mode command}
-@efindex po-previous-untransted-entry@r{, PO Mode command}
+@efindex po-previous-untranslated-entry@r{, PO Mode command}
The commands @kbd{u} (@code{po-next-untranslated-entry}) and @kbd{U}
-(@code{po-previous-untransted-entry}) move forwards or backwards,
-chasing for an untranslated entry. If none is found, the search is
+(@code{po-previous-untranslated-entry}) move forwards or backwards,
+looking for an untranslated entry. If none is found, the search is
extended and wraps around in the PO file buffer.
@efindex k@r{, PO Mode command}
@@ -3892,7 +3893,7 @@ Make an active entry obsolete, or zap out an obsolete
entry
@efindex po-previous-obsolete-entry@r{, PO Mode command}
The commands @kbd{o} (@code{po-next-obsolete-entry}) and @kbd{O}
(@code{po-previous-obsolete-entry}) move forwards or backwards,
-chasing for an obsolete entry. If none is found, the search is
+looking for an obsolete entry. If none is found, the search is
extended and wraps around in the PO file buffer.
PO mode does not provide ways for un-commenting an obsolete entry
@@ -3923,8 +3924,8 @@ guesses at retrieving the most probable candidate, among
all obsolete
entries, for initializing the translation of a newly appeared string.
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
+Right now, PO mode completely leaves 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.
@node Modifying Translations, Modifying Comments, Obsolete Entries, PO Mode
@@ -3934,7 +3935,7 @@ merely tries to provide handy tools for helping her to do
so.
PO mode prevents direct modification of the PO file, by the usual
means Emacs gives for altering a buffer's contents. By doing so,
-it pretends helping the translator to avoid little clerical errors
+it pretend it is helping the translator to avoid little clerical errors
about the overall file format, or the proper quoting of strings,
as those errors would be easily made. Other kinds of errors are
still possible, but some may be caught and diagnosed by the batch
@@ -3980,7 +3981,7 @@ Replace the translation, taking the new from the kill ring
The command @kbd{@key{RET}} (@code{po-edit-msgstr}) opens a new Emacs
window meant to edit in a new translation, or to modify an already existing
translation. The new window contains a copy of the translation taken from
-the current PO file entry, all ready for edition, expunged of all quoting
+the current PO file entry, all ready for editing, 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
@w{@kbd{C-c C-c}} to close the subedit window with the automatically requoted
@@ -3996,10 +3997,10 @@ normally used when the translator wants to redo a fresh
translation of
the original string, disregarding any previous work.
@evindex po-auto-edit-with-msgid@r{, PO Mode variable}
-It is possible to arrange so, whenever editing an untranslated
+It is possible to arrange that, whenever editing an untranslated
entry, the @kbd{@key{LFD}} command be automatically executed. If you set
@code{po-auto-edit-with-msgid} to @code{t}, the translation gets
-initialised with the original string, in case none exists already.
+initialised with the original string, if none exists already.
The default value for @code{po-auto-edit-with-msgid} is @code{nil}.
@emindex starting a string translation
@@ -4060,9 +4061,9 @@ the translator may travel along the kill ring for saved
strings,
until she finds the string she 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
+automatically requoted to comply with the format PO files should
have. Further, if the entry is obsolete, PO mode then appropriately
-push the inserted string inside comments. Once again, translators
+puts the inserted string inside comments. Once again, translators
should not burden themselves with quoting considerations besides, of
course, the necessity of the translated string itself respective to
the program using it.
@@ -4088,16 +4089,16 @@ 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}
-to mark the current entry location, then starts chasing obsolete
+to mark the current entry location, then starts looking for obsolete
entries with @kbd{o}, hoping to find some translation corresponding
to the unmodified string. Once found, she uses the @kbd{@key{DEL}} command
-for deleting the obsolete entry, knowing that @kbd{@key{DEL}} also @emph{kills}
+to delete 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}
then @emph{yanks} the saved translation right into the @code{msgstr}
-field. The translator is then free to use @kbd{@key{RET}} for fine
-tuning the translation contents, and maybe to later use @kbd{u},
-then @kbd{m} again, for going on with the next untranslated string.
+field. The translator is then free to use @kbd{@key{RET}} to fine
+tune the translation contents, and maybe to later use @kbd{u},
+then @kbd{m} again, to go on to the next untranslated string.
When some sequence of keys has to be typed over and over again, the
translator may find it useful to become better acquainted with the Emacs
@@ -4112,7 +4113,7 @@ capability of learning these sequences and playing them
back under request.
Any translation work done seriously will raise many linguistic
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
+PO file in the 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.
@@ -4134,12 +4135,12 @@ Interactively edit the translator comments
(@code{po-edit-comment}).
@item K
@efindex K@r{, PO Mode command}
-Save the translator comments on the kill ring, and delete it
+Save the translator comments on the kill ring, and delete them
(@code{po-kill-comment}).
@item W
@efindex W@r{, PO Mode command}
-Save the translator comments on the kill ring, without deleting it
+Save the translator comments on the kill ring, without deleting them
(@code{po-kill-ring-save-comment}).
@item Y
@@ -4151,7 +4152,7 @@ Replace the translator comments, taking the new from the
kill ring
These commands parallel PO mode commands for modifying the translation
strings, and behave much the same way as they do, except that they handle
-this part of PO file comments meant for translator usage, rather
+the part of PO file comments meant for translator usage, rather
than the translation strings. So, if the descriptions given below are
slightly succinct, it is because the full details have already been given.
@xref{Modifying Translations}.
@@ -4163,7 +4164,7 @@ 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.
Comment marks (@code{#}) and the space following them are automatically
-removed before edition, and reinstated after. For translator comments
+removed before editing, 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.
@@ -4201,7 +4202,7 @@ 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}
prior to @kbd{#}, and the previous translation will be right there,
-all ready for being introduced by some explanatory text.
+all ready to be 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
@@ -4211,7 +4212,7 @@ regular Emacs commands @kbd{C-y} (@code{yank}) and
@kbd{M-y}
(@code{yank-pop}) to get the previous translation where she likes.
@node Subedit, C Sources Context, Modifying Comments, PO Mode
-@subsection Details of Sub Edition
+@subsection Details of Sub Editing
@emindex subedit minor mode
The PO subedit minor mode has a few peculiarities worth being described
@@ -4221,11 +4222,11 @@ of Emacs, which are described below.
@table @kbd
@item C-c C-c
@efindex C-c C-c@r{, PO Mode command}
-Complete edition (@code{po-subedit-exit}).
+Complete editing (@code{po-subedit-exit}).
@item C-c C-k
@efindex C-c C-k@r{, PO Mode command}
-Abort edition (@code{po-subedit-abort}).
+Abort editing (@code{po-subedit-abort}).
@item C-c C-a
@efindex C-c C-a@r{, PO Mode command}
@@ -4248,10 +4249,10 @@ sight or if buffers were switched.
If the translator becomes unsatisfied with her translation or comment,
to the extent she prefers keeping what was existent prior to the
@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
+(@code{po-subedit-abort}) to merely get rid of the edits, 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.
+normally with @w{@kbd{C-c C-c}}, then type @code{U} once to undo the
+whole effect of the last edits.
@efindex C-c C-a@r{, PO Mode command}
@efindex po-subedit-cycle-auxiliary@r{, PO Mode command}
@@ -4275,7 +4276,7 @@ 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.
+loses its delimiting property and integrally becomes part of the string.
If she 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
@@ -4285,18 +4286,18 @@ in the editing window, as ending with two @code{<} in a
row.
@emindex editing multiple entries
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
+browsing at will. If, with edits pending, the translator wanders in the
PO file buffer, she 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}}
on a field already being edited merely resumes that particular edit. Yet,
-the translator should better be comfortable at handling many Emacs windows!
+the translator had better be comfortable with handling many Emacs windows!
@emindex pending subedits
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
+translator asks to quit the PO file (with the @kbd{q} command), subedits
are automatically resumed one at a time, so she may decide for each of them.
@node C Sources Context, Auxiliary, Subedit, PO Mode
@@ -4329,11 +4330,11 @@ 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
+variable and function names (if he dared to choose them well), and
overall organization, than to the program code itself.
@emindex find source fragment for a PO file entry
-The following commands are meant to help the translator at getting
+The following commands are meant to help the translator to get
program source context for a PO file entry.
@table @kbd
@@ -4409,8 +4410,8 @@ also looked for, but relative to the directory
immediately above it.
Those two cases take proper care of most PO files. However, it might
happen that a PO file has been moved, or is edited in a different
place than its normal location. When this happens, the translator
-should tell PO mode in which directory normally sits the genuine PO
-file. Many such directories may be specified, and all together, they
+should tell PO mode in which directory the genuine PO file is normally
+found. Many such directories may be specified, and all together, they
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
@@ -4470,9 +4471,9 @@ PO file to the list of auxiliary files, while command
@kbd{M-A}
@efindex po-cycle-auxiliary@r{, PO Mode command}
The command @kbd{a} (@code{po-cycle-auxiliary}) seeks all auxiliary PO
files, round-robin, searching for a translated entry in some other language
-having an @code{msgid} field identical as the one for the current entry.
+having an @code{msgid} field identical to the one for the current entry.
The found PO file, if any, takes the place of the current PO file in
-the display (its window gets on top). Before doing so, the current PO
+the display (its window pops on top). Before doing so, the current PO
file is also made into an auxiliary file, if not already. So, @kbd{a}
in this newly displayed PO file will seek another PO file, and so on,
so repeating @kbd{a} will eventually yield back the original PO file.
@@ -4482,22 +4483,22 @@ so repeating @kbd{a} will eventually yield back the
original PO file.
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
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 selected file has an @code{msgid} field identical to the one for
the current entry, and if yes, this entry becomes current. Otherwise,
the cursor of the selected file is left undisturbed.
For all this to work fully, auxiliary PO files will have to be normalized,
-in that way that @code{msgid} fields should be written @emph{exactly}
+so that @code{msgid} fields are written @emph{exactly}
the same way. It is possible to write @code{msgid} fields in various
-ways for representing the same string, different writing would break the
+ways to represent the same string, but different writing would break the
proper behaviour of the auxiliary file commands of PO mode. This is not
-expected to be much a problem in practice, as most existing PO files have
+expected to be much of a problem in practice, as most existing PO files have
their @code{msgid} entries written by the same GNU @code{gettext} tools.
@efindex normalize@r{, PO Mode command}
However, PO files initially created by PO mode itself, while marking
strings in source files, are normalised differently. So are PO
-files resulting of the @samp{M-x normalize} command. Until these
+files resulting from the @samp{M-x normalize} command. Until these
discrepancies between PO mode and other GNU @code{gettext} tools get
fully resolved, the translator should stay aware of normalisation issues.
@@ -4540,7 +4541,7 @@ msgcat -o compendium.po file1.po file2.po
By default, @code{msgcat} will accumulate divergent translations
for the same string. Those occurrences will be marked as @code{fuzzy}
-and highly visible decorated; calling @code{msgcat} on
+and highly visibly decorated; calling @code{msgcat} on
@file{file1.po}:
@example
@@ -4581,7 +4582,7 @@ has to decide whether the first or the second version is
appropriate
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 she can make use of the
@samp{--use-first} switch:
@example
@@ -4827,7 +4828,7 @@ get colorized output in this situation nevertheless, use
the command
The @samp{--color=html} option will produce output that can be viewed in
a browser. This can be useful, for example, for Indic languages,
-because the renderic of Indic scripts in browser is usually better than
+because the renderic of Indic scripts in a browser is usually better than
in terminal emulators.
Note that the output produced with the @code{--color} option is @emph{not}
@@ -4992,7 +4993,7 @@ This matches the translator comments.
@item .extracted-comment
This matches the extracted comments, i.e.@: the comments placed by the
-programmer at the attention of the translator.
+programmer for the attention of the translator.
@item .reference-comment
This matches the source file reference comments (entire lines).
@@ -5092,7 +5093,7 @@ properties will be silently ignored.
@table @asis
@item @code{color} (CSS2 spec, section 14.1)
@itemx @code{background-color} (CSS2 spec, section 14.2.1)
-These properties is supported. Colors will be adjusted to match the terminal's
+These properties are supported. Colors will be adjusted to match the
terminal's
capabilities. Note that many terminals support only 8 colors.
@item @code{font-weight} (CSS2 spec, section 15.2.3)
@@ -5412,7 +5413,7 @@ files. They would make the file unnecessarily large, and
the
platform dependent as well.)
This particular issue has been strongly debated in the GNU
-@code{gettext} development forum, and it is expectable that MO file
+@code{gettext} development forum, and it is expected that MO file
format will evolve or change over time. It is even possible that many
formats may later be supported concurrently. But surely, we have to
start somewhere, and the MO file format described here is a good start.
@@ -6570,7 +6571,7 @@ string is always the same. One way to use this is:
@end example
@noindent
-But this solution is not usable in all situation (e.g.@: when the locale
+But this solution is not usable in all situations (e.g.@: when the locale
selection changes) nor does it lead to legible code.
For this reason, GNU @code{gettext} caches previous translation results.
@@ -6627,7 +6628,7 @@ by
@end example
@noindent
-Additionally we run the program @file{xgettext} on all source code file
+Additionally we run the program @file{xgettext} on all source code files
which contain translatable strings and that's it: we have a running
program which does not depend on translations to be available, but which
can use any that becomes available.
@@ -6649,8 +6650,8 @@ 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
+define a number (or a symbolic constant) which has to also be defined in
+the message catalog file. He also has to take care of 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
@@ -6689,7 +6690,7 @@ printf (number_count == 1 ? gettext ("you should see %d
number")
@end example
We believe that we can solve all conflicts with this method. If it is
-difficult one can also consider changing one of the conflicting string a
+difficult one can also consider changing one of the conflicting strings a
little bit. But it is not impossible to overcome.
@code{catgets} allows same original entry to have different translations,
@@ -6720,7 +6721,7 @@ is a list comments:
@cindex language selection at runtime
For interactive programs it might be useful to offer a selection of the
-used language at runtime. To understand how to do this one need to know
+used language at runtime. To understand how to do this one needs to know
how the used language is determined while executing the @code{gettext}
function. The method which is presented here only works correctly
with the GNU implementation of the @code{gettext} functions.
@@ -6758,8 +6759,8 @@ words: the used language is changed.
But there is one little hook. The code for gcc-2.7.0 and up provides
some optimization. This optimization normally prevents the calling of
the @code{dcgettext} function as long as no new catalog is loaded. But
-if @code{dcgettext} is not called the program also cannot find the
-@code{LANGUAGE} variable be changed (@pxref{Optimized gettext}). A
+if @code{dcgettext} is not called the program also cannot find when the
+@code{LANGUAGE} variable has changed (@pxref{Optimized gettext}). A
solution for this is very easy. Include the following code in the
language switching function.
@@ -7687,7 +7688,7 @@ teams drive themselves and are fully responsible of their
linguistic
choices for the Translation Project. Keep in mind that translator teams are
@emph{not}
driven by maintainers. You can help by carefully redirecting all
communications and reports from users about linguistic matters to the
-appropriate translation team, or explain users how to reach or join
+appropriate translation team, or explain to users how to reach or join
their team. The simplest might be to send them the @file{ABOUT-NLS} file.
Maintainers should @emph{never ever} apply PO file bug reports
diff --git a/gettext-tools/doc/msgattrib.texi b/gettext-tools/doc/msgattrib.texi
index f895141..9a2c117 100644
--- a/gettext-tools/doc/msgattrib.texi
+++ b/gettext-tools/doc/msgattrib.texi
@@ -261,7 +261,7 @@ Note that this file format doesn't support plural forms.
@opindex --width@r{, @code{msgattrib} option}
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
-(= number of screen columns) is less or equal to the given @var{number}.
+(= number of screen columns) is less than or equal to the given @var{number}.
@item --no-wrap
@opindex --no-wrap@r{, @code{msgattrib} option}
diff --git a/gettext-tools/doc/msgcat.texi b/gettext-tools/doc/msgcat.texi
index 7c15050..76a4afb 100644
--- a/gettext-tools/doc/msgcat.texi
+++ b/gettext-tools/doc/msgcat.texi
@@ -183,7 +183,7 @@ Note that this file format doesn't support plural forms.
@opindex --width@r{, @code{msgcat} option}
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
-(= number of screen columns) is less or equal to the given @var{number}.
+(= number of screen columns) is less than or equal to the given @var{number}.
@item --no-wrap
@opindex --no-wrap@r{, @code{msgcat} option}
diff --git a/gettext-tools/doc/msgcomm.texi b/gettext-tools/doc/msgcomm.texi
index ae7c927..523e225 100644
--- a/gettext-tools/doc/msgcomm.texi
+++ b/gettext-tools/doc/msgcomm.texi
@@ -164,7 +164,7 @@ Note that this file format doesn't support plural forms.
@opindex --width@r{, @code{msgcomm} option}
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
-(= number of screen columns) is less or equal to the given @var{number}.
+(= number of screen columns) is less than or equal to the given @var{number}.
@item --no-wrap
@opindex --no-wrap@r{, @code{msgcomm} option}
diff --git a/gettext-tools/doc/msgconv.texi b/gettext-tools/doc/msgconv.texi
index 805a76f..99507a2 100644
--- a/gettext-tools/doc/msgconv.texi
+++ b/gettext-tools/doc/msgconv.texi
@@ -136,7 +136,7 @@ Note that this file format doesn't support plural forms.
@opindex --width@r{, @code{msgconv} option}
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
-(= number of screen columns) is less or equal to the given @var{number}.
+(= number of screen columns) is less than or equal to the given @var{number}.
@item --no-wrap
@opindex --no-wrap@r{, @code{msgconv} option}
diff --git a/gettext-tools/doc/msgen.texi b/gettext-tools/doc/msgen.texi
index 3f61fa4..503549f 100644
--- a/gettext-tools/doc/msgen.texi
+++ b/gettext-tools/doc/msgen.texi
@@ -136,7 +136,7 @@ Note that this file format doesn't support plural forms.
@opindex --width@r{, @code{msgen} option}
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
-(= number of screen columns) is less or equal to the given @var{number}.
+(= number of screen columns) is less than or equal to the given @var{number}.
@item --no-wrap
@opindex --no-wrap@r{, @code{msgen} option}
diff --git a/gettext-tools/doc/msgfilter.texi b/gettext-tools/doc/msgfilter.texi
index 61c2f57..00050ce 100644
--- a/gettext-tools/doc/msgfilter.texi
+++ b/gettext-tools/doc/msgfilter.texi
@@ -241,7 +241,7 @@ Note that this file format doesn't support plural forms.
@opindex --width@r{, @code{msgfilter} option}
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
-(= number of screen columns) is less or equal to the given @var{number}.
+(= number of screen columns) is less than or equal to the given @var{number}.
@item --no-wrap
@opindex --no-wrap@r{, @code{msgfilter} option}
diff --git a/gettext-tools/doc/msgfmt.texi b/gettext-tools/doc/msgfmt.texi
index a808b7c..4279ec6 100644
--- a/gettext-tools/doc/msgfmt.texi
+++ b/gettext-tools/doc/msgfmt.texi
@@ -303,7 +303,7 @@ Sometimes a keyboard accelerator is also called "keyboard
mnemonic".
This check verifies that if the untranslated string has exactly one
@samp{&} character, the translated string has exactly one @samp{&} as well.
If this option is given with a @var{char} argument, this @var{char} should
-be a non-alphanumeric character and is used as keyboard accelerator mark
+be a non-alphanumeric character and is used as a keyboard accelerator mark
instead of @samp{&}.
@item -f
diff --git a/gettext-tools/doc/msggrep.texi b/gettext-tools/doc/msggrep.texi
index 229b924..fdb89eb 100644
--- a/gettext-tools/doc/msggrep.texi
+++ b/gettext-tools/doc/msggrep.texi
@@ -236,7 +236,7 @@ Note that this file format doesn't support plural forms.
@opindex --width@r{, @code{msggrep} option}
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
-(= number of screen columns) is less or equal to the given @var{number}.
+(= number of screen columns) is less than or equal to the given @var{number}.
@item --no-wrap
@opindex --no-wrap@r{, @code{msggrep} option}
diff --git a/gettext-tools/doc/msginit.texi b/gettext-tools/doc/msginit.texi
index 3be6e17..5fc3737 100644
--- a/gettext-tools/doc/msginit.texi
+++ b/gettext-tools/doc/msginit.texi
@@ -137,7 +137,7 @@ Note that this file format doesn't support plural forms.
@opindex --width@r{, @code{msginit} option}
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
-(= number of screen columns) is less or equal to the given @var{number}.
+(= number of screen columns) is less than or equal to the given @var{number}.
@item --no-wrap
@opindex --no-wrap@r{, @code{msginit} option}
diff --git a/gettext-tools/doc/msgmerge.texi b/gettext-tools/doc/msgmerge.texi
index ad76f0e..5105315 100644
--- a/gettext-tools/doc/msgmerge.texi
+++ b/gettext-tools/doc/msgmerge.texi
@@ -224,7 +224,7 @@ Note that this file format doesn't support plural forms.
@opindex --width@r{, @code{msgmerge} option}
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
-(= number of screen columns) is less or equal to the given @var{number}.
+(= number of screen columns) is less than or equal to the given @var{number}.
@item --no-wrap
@opindex --no-wrap@r{, @code{msgmerge} option}
diff --git a/gettext-tools/doc/msgunfmt.texi b/gettext-tools/doc/msgunfmt.texi
index ed85f81..1fc19fd 100644
--- a/gettext-tools/doc/msgunfmt.texi
+++ b/gettext-tools/doc/msgunfmt.texi
@@ -177,7 +177,7 @@ Note that this file format doesn't support plural forms.
@opindex --width@r{, @code{msgunfmt} option}
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
-(= number of screen columns) is less or equal to the given @var{number}.
+(= number of screen columns) is less than or equal to the given @var{number}.
@item --no-wrap
@opindex --no-wrap@r{, @code{msgunfmt} option}
diff --git a/gettext-tools/doc/msguniq.texi b/gettext-tools/doc/msguniq.texi
index 4bb6ffd..d30666d 100644
--- a/gettext-tools/doc/msguniq.texi
+++ b/gettext-tools/doc/msguniq.texi
@@ -161,7 +161,7 @@ Note that this file format doesn't support plural forms.
@opindex --width@r{, @code{msguniq} option}
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
-(= number of screen columns) is less or equal to the given @var{number}.
+(= number of screen columns) is less than or equal to the given @var{number}.
@item --no-wrap
@opindex --no-wrap@r{, @code{msguniq} option}
diff --git a/gettext-tools/doc/xgettext.texi b/gettext-tools/doc/xgettext.texi
index 34794aa..b5a3e8a 100644
--- a/gettext-tools/doc/xgettext.texi
+++ b/gettext-tools/doc/xgettext.texi
@@ -506,7 +506,7 @@ Note that this file format doesn't support plural forms.
@opindex --width@r{, @code{xgettext} option}
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
-(= number of screen columns) is less or equal to the given @var{number}.
+(= number of screen columns) is less than or equal to the given @var{number}.
@item --no-wrap
@opindex --no-wrap@r{, @code{xgettext} option}
--
1.9.5.github.0
