[PATCH 3/3] more cleanup of "allow to"
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Tue Aug 2 04:19:17 CEST 2016
* README, agent/command.c, agent/keyformat.txt, common/i18n.c,
common/iobuf.c, common/keyserver.h, dirmngr/cdblib.c,
dirmngr/ldap-wrapper.c, doc/DETAILS, doc/TRANSLATE,
doc/announce-2.1.txt, doc/gpg.texi, doc/gpgsm.texi,
doc/scdaemon.texi, doc/tools.texi, doc/whats-new-in-2.1.txt,
g10/export.c, g10/getkey.c, g10/import.c, g10/keyedit.c, m4/ksba.m4,
m4/libgcrypt.m4, m4/ntbtls.m4, po/ca.po, po/cs.po, po/da.po,
po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fi.po,
po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po,
po/nb.po, po/pl.po, po/pt.po, po/ro.po, po/ru.po, po/sk.po,
po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po,
scd/app-p15.c, scd/ccid-driver.c, scd/command.c, sm/gpgsm.c,
sm/sign.c, tools/gpgconf-comp.c, tools/gpgtar.h: replace "Allow to"
with clearer text.
In standard English, the normal construction is "${XXX} allows ${YYY}
to" -- that is, the subject (${XXX}) of the sentence is allowing the
object (${YYY}) to do something. When the object is missing, the
phrasing sounds awkward, even if the object is implied by context.
There's almost always a better construction that isn't as awkward.
These changes should make the language a bit clearer.
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
README | 13 +++++++------
agent/command.c | 2 +-
agent/keyformat.txt | 2 +-
common/i18n.c | 6 +++---
common/iobuf.c | 2 +-
common/keyserver.h | 4 ++--
dirmngr/cdblib.c | 2 +-
dirmngr/ldap-wrapper.c | 4 ++--
doc/DETAILS | 4 ++--
doc/TRANSLATE | 4 ++--
doc/announce-2.1.txt | 8 ++++----
doc/gpg.texi | 2 +-
doc/gpgsm.texi | 4 ++--
doc/scdaemon.texi | 10 +++++-----
doc/tools.texi | 8 ++++----
doc/whats-new-in-2.1.txt | 2 +-
g10/export.c | 2 +-
g10/getkey.c | 2 +-
g10/import.c | 2 +-
g10/keyedit.c | 2 +-
m4/ksba.m4 | 6 +++---
m4/libgcrypt.m4 | 6 +++---
m4/ntbtls.m4 | 8 ++++----
po/ca.po | 2 +-
po/cs.po | 2 +-
po/da.po | 2 +-
po/de.po | 2 +-
po/el.po | 2 +-
po/eo.po | 2 +-
po/es.po | 2 +-
po/et.po | 2 +-
po/fi.po | 2 +-
po/fr.po | 2 +-
po/gl.po | 2 +-
po/hu.po | 2 +-
po/id.po | 2 +-
po/it.po | 2 +-
po/ja.po | 2 +-
po/nb.po | 2 +-
po/pl.po | 2 +-
po/pt.po | 2 +-
po/ro.po | 2 +-
po/ru.po | 2 +-
po/sk.po | 2 +-
po/sv.po | 2 +-
po/tr.po | 2 +-
po/uk.po | 2 +-
po/zh_CN.po | 2 +-
po/zh_TW.po | 2 +-
scd/app-p15.c | 4 ++--
scd/ccid-driver.c | 2 +-
scd/command.c | 2 +-
sm/gpgsm.c | 4 ++--
sm/sign.c | 2 +-
tools/gpgconf-comp.c | 4 ++--
tools/gpgtar.h | 2 +-
56 files changed, 89 insertions(+), 88 deletions(-)
diff --git a/README b/README
index 224db30..bb5cbef 100644
--- a/README
+++ b/README
@@ -9,15 +9,16 @@
* INTRODUCTION
GnuPG is a complete and free implementation of the OpenPGP standard
- as defined by RFC4880 (also known as PGP). GnuPG allows to encrypt
- and sign data and communication, features a versatile key management
- system as well as access modules for public key directories.
+ as defined by RFC4880 (also known as PGP). GnuPG enables encryption
+ and signing of data and communication, and features a versatile key
+ management system as well as access modules for public key
+ directories.
GnuPG, also known as GPG, is a command line tool with features for
easy integration with other applications. A wealth of frontend
- applications and libraries making use of GnuPG are available. Since
- version 2 GnuPG provides support for S/MIME and Secure Shell in
- addition to OpenPGP.
+ applications and libraries are available that make use of GnuPG.
+ Since version 2 GnuPG provides support for S/MIME and Secure Shell
+ in addition to OpenPGP.
GnuPG is Free Software (meaning that it respects your freedom). It
can be freely used, modified and distributed under the terms of the
diff --git a/agent/command.c b/agent/command.c
index e5d2268..1803b5f 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -3043,7 +3043,7 @@ io_monitor (assuan_context_t ctx, void *hook, int direction,
(void) hook;
- /* Note that we only check for the uppercase name. This allows to
+ /* Note that we only check for the uppercase name. This allows the user to
see the logging for debugging if using a non-upercase command
name. */
if (ctx && direction == ASSUAN_IO_FROM_PEER
diff --git a/agent/keyformat.txt b/agent/keyformat.txt
index c1a59ce..ddfb44b 100644
--- a/agent/keyformat.txt
+++ b/agent/keyformat.txt
@@ -324,7 +324,7 @@ similar to the private-key storage format. This is a master
passphrase format where each file may protect several secrets under
one master passphrase. It is possible to have several of those files
each protected by a dedicated master passphrase. Clear text keywords
-allow to list the available protected passphrases.
+allow listing the available protected passphrases.
The name of the files with these protected secrets have this form:
pw-<string>.dat. STRING may be an arbitrary string, as a default name
diff --git a/common/i18n.c b/common/i18n.c
index 39e3d8f..413fa9a 100644
--- a/common/i18n.c
+++ b/common/i18n.c
@@ -156,9 +156,9 @@ i18n_utf8 (const char *string)
}
-/* A variant of gettext which allows to specify the local to use for
- translating the message. The function assumes that utf-8 is used
- for the encoding. */
+/* A variant of gettext which allows the programmer to specify the
+ locale to use for translating the message. The function assumes
+ that utf-8 is used for the encoding. */
const char *
i18n_localegettext (const char *lc_messages, const char *string)
{
diff --git a/common/iobuf.c b/common/iobuf.c
index 9d582ca..06d0b61 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -1198,7 +1198,7 @@ iobuf_cancel (iobuf_t a)
#if defined(HAVE_W32_SYSTEM) || defined(__riscos__)
if (remove_name)
{
- /* Argg, MSDOS does not allow to remove open files. So
+ /* Argg, MSDOS does not allow removing open files. So
* we have to do it here */
#ifdef HAVE_W32CE_SYSTEM
wchar_t *wtmp = utf8_to_wchar (remove_name);
diff --git a/common/keyserver.h b/common/keyserver.h
index 63dbde6..200378d 100644
--- a/common/keyserver.h
+++ b/common/keyserver.h
@@ -48,8 +48,8 @@
/* Must be 127 due to shell internal magic. */
#define KEYSERVER_SCHEME_NOT_FOUND 127
-/* Object to hold information pertaining to a keyserver; it further
- allows to build a list of keyservers. Note that g10/options.h has
+/* Object to hold information pertaining to a keyserver; it also
+ allows building a list of keyservers. Note that g10/options.h has
a typedef for this. FIXME: We should make use of the
parse_uri_t. */
struct keyserver_spec
diff --git a/dirmngr/cdblib.c b/dirmngr/cdblib.c
index 23cb317..52c17c9 100644
--- a/dirmngr/cdblib.c
+++ b/dirmngr/cdblib.c
@@ -296,7 +296,7 @@ cdb_find(struct cdb *cdbp, const void *key, cdbi_t klen)
/* Sequential-find routines that used separate structure. It is
possible to have many than one record with the same key in a
- database, and these routines allows to enumerate all them.
+ database, and these routines allow enumeration of all of them.
cdb_findinit() initializes search structure pointed to by cdbfp.
It will return negative value on error or 0 on success. cdb_find
next() attempts to find next matching key, setting value position
diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c
index 55fcd8b..5fa3eac 100644
--- a/dirmngr/ldap-wrapper.c
+++ b/dirmngr/ldap-wrapper.c
@@ -545,8 +545,8 @@ reader_callback (void *cb_value, char *buffer, size_t count, size_t *nread)
if (!buffer && !count && !nread)
return -1; /* Rewind is not supported. */
- /* If we ever encountered a read error don't allow to continue and
- possible overwrite the last error cause. Bail out also if the
+ /* If we ever encountered a read error, don't continue (we don't want to
+ possibly overwrite the last error cause). Bail out also if the
file descriptor has been closed. */
if (ctx->fd_error || ctx->fd == -1)
{
diff --git a/doc/DETAILS b/doc/DETAILS
index 4b3f0af..02f9bad 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -913,8 +913,8 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
*** FAILURE <location> <error_code>
This is the counterpart to SUCCESS and used to indicate a program
- failure. It is used similar to ISO-C's EXIT_FAILURE but allows to
- convey more information, in particular an gpg-error error code.
+ failure. It is used similar to ISO-C's EXIT_FAILURE but allows
+ conveying more information, in particular a gpg-error error code.
That numerical error code may optionally have a suffix made of an
underscore and a string with an error symbol like "151011327_EOF".
A dash may be used instead of <location>.
diff --git a/doc/TRANSLATE b/doc/TRANSLATE
index 2a20aad..eb0de97 100644
--- a/doc/TRANSLATE
+++ b/doc/TRANSLATE
@@ -23,8 +23,8 @@ Help files
GnuPG provides a little help feature (entering a ? on a prompt). This
help used to be translated the usual way with gettext but it turned
-out that this is too inflexible and does for example not allow to
-correct little mistakes in the English text. For some newer features
+out that this is too inflexible and does for example not allow
+correcting little mistakes in the English text. For some newer features
we require editable help files anyway and thus the existing help
strings have been moved to plain text files names "help.LL.txt". We
distribute these files and allow overriding them by files of that name
diff --git a/doc/announce-2.1.txt b/doc/announce-2.1.txt
index e165332..8c35e53 100644
--- a/doc/announce-2.1.txt
+++ b/doc/announce-2.1.txt
@@ -6,13 +6,13 @@ new release: Version 2.1.0.
The GNU Privacy Guard (GnuPG) is a complete and free implementation of
the OpenPGP standard as defined by RFC-4880 and better known as PGP.
-GnuPG, also known as GPG, allows to encrypt and sign data and
+GnuPG, also known as GPG, enables encryption and signing of data and
communication, features a versatile key management system as well as
access modules for public key directories. GnuPG itself is a command
line tool with features for easy integration with other applications.
-A wealth of frontend applications and libraries making use of GnuPG
-are available. Since version 2 GnuPG provides support for S/MIME and
-Secure Shell in addition to OpenPGP.
+A wealth of frontend applications and libraries are available that
+make use of GnuPG. Since version 2 GnuPG provides support for S/MIME
+and Secure Shell in addition to OpenPGP.
GnuPG is Free Software (meaning that it respects your freedom). It can
be freely used, modified and distributed under the terms of the GNU
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 3be401f..4d6a261 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2357,7 +2357,7 @@ obsolete; it does not harm to use it though.
Revert to the pre-2.1 public key list mode. This only affects the
human readable output and not the machine interface
(i.e. @code{--with-colons}). Note that the legacy format does not
-allow to convey suitable information for elliptic curves.
+convey suitable information for elliptic curves.
@item --with-fingerprint
@opindex with-fingerprint
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 2f6c297..dae26b2 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -636,7 +636,7 @@ algorithm than actually used. @command{gpgsm} uses a one-pass data
processing model and thus needs to rely on the announced digest
algorithms to properly hash the data. As a workaround this option may
be used to tell gpg to also hash the data using the algorithm
- at var{name}; this slows processing down a little bit but allows to verify
+ at var{name}; this slows processing down a little bit but allows verification of
such broken signatures. If @command{gpgsm} prints an error like
``digest algo 8 has not been enabled'' you may want to try this option,
with @samp{SHA256} for @var{name}.
@@ -1479,7 +1479,7 @@ GETAUDITLOG [--data] [--html]
If @option{--data} is used, the audit log is send using D-lines
instead of being sent to the file descriptor given by an OUTPUT
-command. If @option{--html} is used, the output is formated as an
+command. If @option{--html} is used, the output is formatted as an
XHTML block. This is designed to be incorporated into a HTML
document.
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 5e53223..c145814 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -258,7 +258,7 @@ deprecated; it may be removed in future releases.
@item --disable-ccid
@opindex disable-ccid
Disable the integrated support for CCID compliant readers. This
-allows to fall back to one of the other drivers even if the internal
+allows falling back to one of the other drivers even if the internal
CCID driver can handle the reader. Note, that CCID support is only
available if libusb was available at build time.
@@ -284,10 +284,10 @@ To get a list of available CCID readers you may use this command:
If @var{n} is not 0 and no client is actively using the card, the card
will be powered down after @var{n} seconds. Powering down the card
avoids a potential risk of damaging a card when used with certain
-cheap readers. This also allows non Scdaemon aware applications to
-access the card. The disadvantage of using a card timeout is that
-accessing the card takes longer and that the user needs to enter the
-PIN again after the next power up.
+cheap readers. This also allows applications that are not aware of
+Scdaemon to access the card. The disadvantage of using a card timeout
+is that accessing the card takes longer and that the user needs to
+enter the PIN again after the next power up.
Note that with the current version of Scdaemon the card is powered
down immediately at the next timer tick for any value of @var{n} other
diff --git a/doc/tools.texi b/doc/tools.texi
index e52d6a7..d6cf56e 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -234,7 +234,7 @@ commit the changes.
@command{gpgconf} provides the backend of a configuration editor. The
configuration editor would usually be a graphical user interface
-program, that allows to display the current options, their default
+program that displays the current options, their default
values, and allows the user to make changes to the options. These
changes can then be made active with @command{gpgconf} again. Such a
program that uses @command{gpgconf} in this way will be called GUI
@@ -999,9 +999,9 @@ This script is a wrapper around @command{gpgconf} to run it with the
command @code{--apply-defaults} for all real users with an existing
GnuPG home directory. Admins might want to use this script to update he
GnuPG configuration files for all users after
- at file{/etc/gnupg/gpgconf.conf} has been changed. This allows to enforce
-certain policies for all users. Note, that this is not a bulletproof of
-forcing a user to use certain options. A user may always directly edit
+ at file{/etc/gnupg/gpgconf.conf} has been changed. This allows enforcing
+certain policies for all users. Note, that this is not a bulletproof way to
+force a user to use certain options. A user may always directly edit
the configuration files and bypass gpgconf.
@noindent
diff --git a/doc/whats-new-in-2.1.txt b/doc/whats-new-in-2.1.txt
index dd29c66..19ed8b9 100644
--- a/doc/whats-new-in-2.1.txt
+++ b/doc/whats-new-in-2.1.txt
@@ -540,7 +540,7 @@ https://gnupg.org/faq/whats-new-in-2.1.html
key id matching the key id of another key. Importing a key with a
long key id already used by another key in gpg’s local key store was
not possible due to checks done on import. Now, if the “wrong†key
- has been imported first /gpg/ would not allow to later import the
+ has been imported first /gpg/ would not allow later import of the
second “correct†key. This problem has been fixed in 2.1 by allowing
the import and by doing trial verification against all matching keys.
diff --git a/g10/export.c b/g10/export.c
index 92235fb..8c15868 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -1925,7 +1925,7 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret,
continue;
}
- /* The agent does not yet allow to export v3 packets. It is
+ /* The agent does not yet allow export of v3 packets. It is
actually questionable whether we should allow them at
all. */
if (pk->version == 3)
diff --git a/g10/getkey.c b/g10/getkey.c
index 3fe8274..90083ba 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -2514,7 +2514,7 @@ merge_selfsigs_main (KBNODE keyblock, int *r_revoked,
else if ((IS_UID_SIG (sig) || IS_UID_REV (sig))
&& sig->timestamp >= sigdate)
{
- /* Note: we allow to invalidate cert revocations
+ /* Note: we allow invalidation of cert revocations
* by a newer signature. An attacker can't use this
* because a key should be revoked with a key revocation.
* The reason why we have to allow for that is that at
diff --git a/g10/import.c b/g10/import.c
index b83f371..3c7edd7 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -2020,7 +2020,7 @@ import_secret_one (ctrl_t ctrl, kbnode_t keyblock,
#ifdef ENABLE_SELINUX_HACKS
if (1)
{
- /* We don't allow to import secret keys because that may be used
+ /* We don't allow importing secret keys because that may be used
to put a secret key into the keyring and the user might later
be tricked into signing stuff with that key. */
log_error (_("importing secret keys not allowed\n"));
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 9ebd643..4c833f8 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1338,7 +1338,7 @@ sign_uids (ctrl_t ctrl, estream_t fp,
}
/* Fixme: see whether there is a revocation in which
- * case we should allow to sign it again. */
+ * case we should allow signing it again. */
if (!node->pkt->pkt.signature->flags.exportable && local)
tty_fprintf ( fp,
_("\"%s\" was already locally signed by key %s\n"),
diff --git a/m4/ksba.m4 b/m4/ksba.m4
index 73b2e26..3e14e67 100644
--- a/m4/ksba.m4
+++ b/m4/ksba.m4
@@ -13,11 +13,11 @@
dnl AM_PATH_KSBA([MINIMUM-VERSION,
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS
-dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUN-VERSION of 1:1.0.7 won't pass the test unless the installed
+dnl a MINIMUM-VERSION of 1:1.0.7 won't pass the test unless the installed
dnl version of libksba is at least 1.0.7 *and* the API number is 1. Using
-dnl this features allows to prevent build against newer versions of libksba
+dnl this feature prevents building against newer versions of libksba
dnl with a changed API.
dnl
AC_DEFUN([AM_PATH_KSBA],
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index c67cfec..d89fe11 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -15,11 +15,11 @@
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
-dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
+dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
-dnl this features allows to prevent build against newer versions of libgcrypt
+dnl this feature prevents building against newer versions of libgcrypt
dnl with a changed API.
dnl
dnl If a prefix option is not used, the config script is first
diff --git a/m4/ntbtls.m4 b/m4/ntbtls.m4
index 85c8ee9..0a30d92 100644
--- a/m4/ntbtls.m4
+++ b/m4/ntbtls.m4
@@ -14,11 +14,11 @@ dnl AM_PATH_NTBTLS([MINIMUM-VERSION,
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl
dnl Test for NTBTLS and define NTBTLS_CFLAGS and NTBTLS_LIBS.
-dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
-dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
-dnl this features allows to prevent build against newer versions of libgcrypt
+dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
+dnl version of ntbtls is at least 1.2.5 *and* the API number is 1. Using
+dnl this feature prevents building against newer versions of ntbtls
dnl with a changed API.
dnl
AC_DEFUN([AM_PATH_NTBTLS],
diff --git a/po/ca.po b/po/ca.po
index 086ac26..633fc3c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8756,7 +8756,7 @@ msgstr ""
msgid "Options enforcing a passphrase policy"
msgstr ""
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr ""
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/cs.po b/po/cs.po
index 96bb049..ef00cd1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8257,7 +8257,7 @@ msgstr "|N| nastavit maximálnà životnost klÃÄů SSH na N sekund"
msgid "Options enforcing a passphrase policy"
msgstr "Volby vynucujÃcà politiku hesel"
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr "nedovolit obejÃt politiku hesel"
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/da.po b/po/da.po
index 2f8fb37..edc95da 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8774,7 +8774,7 @@ msgstr "|N|angive maksimal livsforløb for SSH-nøgle til N sekunder"
msgid "Options enforcing a passphrase policy"
msgstr "Tilvalg der fremtvinger en adgangsfrasepolitik"
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr "tillad ikke omgåelse af adgangsfrasepolitikken"
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/de.po b/po/de.po
index f341c5f..c8748fe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8322,7 +8322,7 @@ msgstr "|N|setze die maximale Lebenszeit von SSH Schlüsseln auf N Sekunden"
msgid "Options enforcing a passphrase policy"
msgstr "Optionen für eine Passphrase-Policy"
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr "Einhaltung der Passphrase-Policy erzwingen"
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/el.po b/po/el.po
index 0160ccb..9e0cc10 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8572,7 +8572,7 @@ msgstr ""
msgid "Options enforcing a passphrase policy"
msgstr ""
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr ""
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/eo.po b/po/eo.po
index 958c534..7b9921b 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8515,7 +8515,7 @@ msgstr ""
msgid "Options enforcing a passphrase policy"
msgstr ""
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr ""
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/es.po b/po/es.po
index 5e374f5..4cbfd2e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8801,7 +8801,7 @@ msgstr "|N|establecer vida m
msgid "Options enforcing a passphrase policy"
msgstr "Opciones que fuerzan una política de frases contraseña"
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr "no permitir evitar la política de frases contraseña"
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/et.po b/po/et.po
index 5d9dcf3..c0534d9 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8489,7 +8489,7 @@ msgstr ""
msgid "Options enforcing a passphrase policy"
msgstr ""
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr ""
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/fi.po b/po/fi.po
index 414f99b..0fe5521 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8552,7 +8552,7 @@ msgstr ""
msgid "Options enforcing a passphrase policy"
msgstr ""
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr ""
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/fr.po b/po/fr.po
index c4b6e4d..af39a5c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8490,7 +8490,7 @@ msgstr "|N|définir la durée maximale du cache de clef SSH à N secondes"
msgid "Options enforcing a passphrase policy"
msgstr "Options d'application d'une politique de phrase secrète"
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr "pas de contournement de politique de phrase secrète"
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/gl.po b/po/gl.po
index c8c5a26..c892f28 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8576,7 +8576,7 @@ msgstr ""
msgid "Options enforcing a passphrase policy"
msgstr ""
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr ""
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/hu.po b/po/hu.po
index 8505a8f..392ac37 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8522,7 +8522,7 @@ msgstr ""
msgid "Options enforcing a passphrase policy"
msgstr ""
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr ""
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/id.po b/po/id.po
index f1fbc44..452dccd 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8511,7 +8511,7 @@ msgstr ""
msgid "Options enforcing a passphrase policy"
msgstr ""
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr ""
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/it.po b/po/it.po
index 3a0572b..a5cf128 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8555,7 +8555,7 @@ msgstr ""
msgid "Options enforcing a passphrase policy"
msgstr ""
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr ""
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/ja.po b/po/ja.po
index 51cfc72..5f94814 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7974,7 +7974,7 @@ msgstr "|N|最大SSHéµå˜ç¶šæ™‚é–“ã‚’N秒ã¨ã™ã‚‹"
msgid "Options enforcing a passphrase policy"
msgstr "パスワード・ãƒãƒªã‚·ãƒ¼ã®å¼·åˆ¶ã‚ªãƒ—ション"
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr "パスワード・ãƒãƒªã‚·ãƒ¼ã‚’迂回ã™ã‚‹ã“ã¨ã‚’èªã‚ãªã„"
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/nb.po b/po/nb.po
index db163f2..12bfd13 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8090,7 +8090,7 @@ msgstr "|N|endre maksimal livstid for SSH-nøkler til N antall sekunder"
msgid "Options enforcing a passphrase policy"
msgstr "Valg som håndhever passordfrase-regler"
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr "ikke tillat overstyring av passordfrase-regler"
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/pl.po b/po/pl.po
index 74cd6d9..75822e4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8837,7 +8837,7 @@ msgstr "|N|ustawienie maksymalnego czasu
msgid "Options enforcing a passphrase policy"
msgstr "Opcje wymuszaj±ce politykê hase³"
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr "nie zezwalanie na pominiêcie polityki hase³"
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/pt.po b/po/pt.po
index beee02b..63c6cec 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8524,7 +8524,7 @@ msgstr ""
msgid "Options enforcing a passphrase policy"
msgstr ""
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr ""
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/ro.po b/po/ro.po
index 71435aa..dffe008 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8586,7 +8586,7 @@ msgstr ""
msgid "Options enforcing a passphrase policy"
msgstr ""
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr ""
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/ru.po b/po/ru.po
index 57c4045..f36a27c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8195,7 +8195,7 @@ msgstr "|N|уÑтановить макÑимальный Ñрок дейÑтви
msgid "Options enforcing a passphrase policy"
msgstr "Параметры, обеÑпечивающие правила Ð´Ð»Ñ Ñ„Ñ€Ð°Ð·-паролей"
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr "не позволÑÑ‚ÑŒ обходить правила Ð´Ð»Ñ Ñ„Ñ€Ð°Ð·-паролей"
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/sk.po b/po/sk.po
index 8dda2be..d5e8692 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8541,7 +8541,7 @@ msgstr ""
msgid "Options enforcing a passphrase policy"
msgstr ""
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr ""
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/sv.po b/po/sv.po
index 5c41560..8ff4dbf 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8917,7 +8917,7 @@ msgstr "|N|ställ in maximal livstid för SSH-nyckel till N sekunder"
msgid "Options enforcing a passphrase policy"
msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr "tillåt inte att gå förbi lösenfraspolicyn"
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/tr.po b/po/tr.po
index 6e661b5..1eae9b4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8819,7 +8819,7 @@ msgstr "|N|azami SSH anahtarı ömrü N saniyeye ayarlanır"
msgid "Options enforcing a passphrase policy"
msgstr "Bir anahtar parolası kuralını zorlayan seçenekler"
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr "anahtar parolası kuralının atlanmasına izin verilmez"
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/uk.po b/po/uk.po
index 97442c8..ac57ed4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8299,7 +8299,7 @@ msgstr "|N|вÑтановити макÑимальний Ñтрок дії кл
msgid "Options enforcing a passphrase policy"
msgstr "Параметри примуÑового викориÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð» паролів"
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr "не дозволÑти обхід правил паролів"
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 41613c7..27f88bb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8410,7 +8410,7 @@ msgstr ""
msgid "Options enforcing a passphrase policy"
msgstr ""
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr ""
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d9a4bb8..9438e3d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8039,7 +8039,7 @@ msgstr "|N|把 SSH 金鑰最大生å˜æ™‚é–“è¨æˆ N 秒"
msgid "Options enforcing a passphrase policy"
msgstr "強制執行密語原則的é¸é …"
-msgid "do not allow to bypass the passphrase policy"
+msgid "do not allow bypassing the passphrase policy"
msgstr "ä¸å…許略éŽå¯†èªžåŽŸå‰‡"
msgid "|N|set minimal required length for new passphrases to N"
diff --git a/scd/app-p15.c b/scd/app-p15.c
index e4d9de0..12254ab 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -2935,8 +2935,8 @@ do_sign (app_t app, const char *keyidstr, int hashalgo,
/* Due to the fact that the non-repudiation signature on a BELPIC
card requires a verify immediately before the DSO we set the
- MSE before we do the verification. Other cards might allow to do
- this also but I don't want to break anything, thus we do it only
+ MSE before we do the verification. Other cards might also allow
+ this but I don't want to break anything, thus we do it only
for the BELPIC card here. */
if (app->app_local->card_type == CARD_TYPE_BELPIC)
{
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 7a093f6..b1523cb 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -2980,7 +2980,7 @@ ccid_transceive (ccid_driver_t handle,
nresp = &dummy_nresp;
*nresp = 0;
- /* Smarter readers allow to send APDUs directly; divert here. */
+ /* Smarter readers allow sending APDUs directly; divert here. */
if (handle->apdu_level)
{
/* We employ a hack for Omnikey readers which are able to send
diff --git a/scd/command.c b/scd/command.c
index d90c320..239480b 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -499,7 +499,7 @@ static const char hlp_serialno[] =
"error is returned if the application is not supported or available.\n"
"The default is to auto-select the application using a hardwired\n"
"preference system. Note, that a future extension to this function\n"
- "may allow to specify a list and order of applications to try.\n"
+ "may enable specifying a list and order of applications to try.\n"
"\n"
"This function is special in that it can be used to reset the card.\n"
"Most other functions will return an error when a card change has\n"
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 9b7dd4b..b64072e 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -1681,7 +1681,7 @@ main ( int argc, char **argv)
/* Build the recipient list. We first add the regular ones and then
the encrypt-to ones because the underlying function will silently
- ignore duplicates and we can't allow to keep a duplicate which is
+ ignore duplicates and we can't allow keeping a duplicate which is
flagged as encrypt-to as the actually encrypt function would then
complain about no (regular) recipients. */
for (sl = remusr; sl; sl = sl->next)
@@ -1785,7 +1785,7 @@ main ( int argc, char **argv)
{
estream_t fp = open_es_fwrite (opt.outfile?opt.outfile:"-");
- /* Fixme: We should also allow to concatenate multiple files for
+ /* Fixme: We should also allow concatenation of multiple files for
signing because that is what gpg does.*/
set_binary (stdin);
if (!argc) /* Create from stdin. */
diff --git a/sm/sign.c b/sm/sign.c
index 08eebb7..6cb1f86 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -109,7 +109,7 @@ hash_and_copy_data (int fd, gcry_md_hd_t md, ksba_writer_t writer)
es_fclose (fp);
if (!any)
{
- /* We can't allow to sign an empty message because it does not
+ /* We can't allow signing an empty message because it does not
make much sense and more seriously, ksba_cms_build has
already written the tag for data and now expects an octet
string and an octet string of size 0 is illegal. */
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 3d456a9..82b5325 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -560,7 +560,7 @@ static gc_option_t gc_options_gpg_agent[] =
"gnupg", N_("Options enforcing a passphrase policy") },
{ "enforce-passphrase-constraints", GC_OPT_FLAG_RUNTIME,
GC_LEVEL_EXPERT, "gnupg",
- N_("do not allow to bypass the passphrase policy"),
+ N_("do not allow bypassing the passphrase policy"),
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
{ "min-passphrase-len", GC_OPT_FLAG_RUNTIME,
GC_LEVEL_ADVANCED, "gnupg",
@@ -3736,7 +3736,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
if (defaults)
{
- /* Here we explicitly allow to update the value again. */
+ /* Here we explicitly allow updating the value again. */
if (newflags)
{
option_info->new_flags = 0;
diff --git a/tools/gpgtar.h b/tools/gpgtar.h
index 3f21ea1..7d03719 100644
--- a/tools/gpgtar.h
+++ b/tools/gpgtar.h
@@ -103,7 +103,7 @@ struct tar_header_s
unsigned long long mtime; /* Modification time since Epoch. Note
that we don't use time_t here but a
type which is more likely to be larger
- that 32 bit and thus allows to track
+ that 32 bit and thus allows tracking
times beyond 2106. */
typeflag_t typeflag; /* The type of the file. */
--
2.8.1
More information about the Gnupg-devel
mailing list