Add a note on how to send translations.

doc/ChangeLog

@@ -1,3 +1,7 @@
+2004-12-16  Werner Koch  <wk@g10code.com>
+
+	* TRANSLATE: Add a note on how to send translations.
+
 2004-12-16  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpg.sgml: Document --require-secmem/--no-require-secmem.  Note

doc/TRANSLATE

@@ -7,12 +7,27 @@ Some strings in GnuPG are for matching user input against.  These
 strings can accept multiple values that mean essentially the same
 thing.
 
-For example, the string "yes" in English is "sí" in Spanish.  However,
+For example, the string "yes" in English is "sí" in Spanish.  However,
 some users will type "si" (without the accent).  To accomodate both
-users, you can translate the string "yes" as "sí|si".  You can have
+users, you can translate the string "yes" as "sí|si".  You can have
 any number of alternate matches seperated by the | character like
-"sí|si|seguro".
+"sí|si|seguro".
 
 The strings that can be handled in this way are of the form "yes|yes",
 (or "no|no", etc.) There should also be a comment in the .po file
 directing you to this file.
+
+
+
+Sending new or updated translations
+-----------------------------------
+
+Please note that we do not use the TP Robot but require that
+translations are to be send by mail to translations@gnupg.org.  We
+also strongly advise to get subscribed to i18n@gnupg.org and request
+assistance if it is not clear on how to translate certain strings.  A
+wrongly translated string may lead to a security problem.
+
+A copyright disclaimer to the FSF is required by all translators.
+
+

doc/gpg.texi

@@ -141,11 +141,12 @@ For each signature listed, there are several flags in between the
 each signature. From left to right, they are the numbers 1-3 for
 certificate check level (see --ask-cert-level), "L" for a local or
 non-exportable signature (see --lsign-key), "R" for a nonRevocable
-signature (see --nrsign-key), "P" for a signature that contains a
+signature (see the --edit-key command "nrsign"), "P" for a signature
-policy URL (see --cert-policy-url), "N" for a signature that contains
+that contains a policy URL (see --cert-policy-url), "N" for a
-a notation (see --cert-notation), "X" for an eXpired signature (see
+signature that contains a notation (see --cert-notation), "X" for an
---ask-cert-expire), and the numbers 1-9 or "T" for 10 and above to
+eXpired signature (see --ask-cert-expire), and the numbers 1-9 or "T"
-indicate trust signature levels (see the --edit-key command "tsign").
+for 10 and above to indicate trust signature levels (see the
+--edit-key command "tsign").
 
 @item --check-sigs 
 Same as --list-sigs, but the signatures are verified.
@@ -177,35 +178,34 @@ related tasks:
 @table @asis
 
 @item sign
-Make a signature on key of user @code{name}
+Make a signature on key of user @code{name} If the key is not yet
-If the key is not yet signed by the default
+signed by the default user (or the users given with -u), the program
-user (or the users given with -u), the
+displays the information of the key again, together with its
-program displays the information of the key
+fingerprint and asks whether it should be signed. This question is
-again, together with its fingerprint and
+repeated for all users specified with
-asks whether it should be signed. This
+-u.
-question is repeated for all users specified
-with -u.
 
 @item lsign
-Same as --sign but the signature is marked as
+Same as "sign" but the signature is marked as non-exportable and will
-non-exportable and will therefore never be used
+therefore never be used by others. This may be used to make keys
-by others. This may be used to make keys valid
+valid only in the local environment.
-only in the local environment.
 
 @item nrsign
-Same as --sign but the signature is marked as non-revocable and can
+Same as "sign" but the signature is marked as non-revocable and can
 therefore never be revoked.
 
-@item nrlsign
-Combines the functionality of nrsign and lsign to make a signature
-that is both non-revocable and
-non-exportable.
-
 @item tsign
 Make a trust signature. This is a signature that combines the notions
 of certification (like a regular signature), and trust (like the
 "trust" command). It is generally only useful in distinct communities
 or groups.
+@end table
+
+Note that "l" (for local / non-exportable), "nr" (for non-revocable,
+and "t" (for trust) may be freely mixed and prefixed to "sign" to
+create a signature of any type desired.
+
+@table @asis
 
 @item revsig
 Revoke a signature. For every signature which has been generated by
@@ -330,10 +330,10 @@ will not be used by GnuPG.
 @item keyserver
 Set a preferred keyserver for the specified user ID(s). This allows
 other users to know where you prefer they get your key from. See
---keyserver-option honor-keyserver-url. Note that some versions of
+--keyserver-option honor-keyserver-url for more on how this works.
-PGP interpret the presence of a keyserver URL as an instruction to
+Note that some versions of PGP interpret the presence of a keyserver
-enable PGP/MIME mail encoding. Setting a value of "none" removes a
+URL as an instruction to enable PGP/MIME mail encoding. Setting a
-existing preferred keyserver.
+value of "none" removes a existing preferred keyserver.
 
 @item toggle
 Toggle between public and secret key listing.
@@ -387,10 +387,6 @@ Signs a public key with your secret key but marks it as
 non-exportable. This is a shortcut version of the subcommand "lsign"
 from --edit.
 
-@item --nrsign-key @code{name}
-Signs a public key with your secret key but marks it as non-revocable.
-This is a shortcut version of the subcommand "nrsign" from --edit.
-
 @item --delete-key @code{name}
 Remove key from the public keyring. In batch mode either --yes is
 required or the key must be specified by fingerprint. This is a
@@ -844,10 +840,11 @@ timeout applies separately to each key retrieval, and not to the
 --recv-keys command as a whole. Defaults to 30 seconds.
 
 @item http-proxy
-For keyserver schemes that use HTTP (such as HKP), try to access the
+For HTTP-like keyserver schemes that (such as HKP and HTTP itself),
-keyserver over a proxy. If a @code{value} is specified, use this as
+try to access the keyserver over a proxy. If a @code{value} is
-the HTTP proxy. If no @code{value} is specified, try to use the value
+specified, use this as the HTTP proxy. If no @code{value} is
-of the environment variable "http_proxy".
+specified, try to use the value of the environment variable
+"http_proxy".
 
 @item auto-key-retrieve
 This option enables the automatic retrieving of keys from a keyserver
@@ -868,7 +865,7 @@ opposite meaning. The options are:
 
 @table @asis
 
-@item allow-local-sigs
+@item import-local-sigs
 Allow importing key signatures marked as "local". This is not
 generally useful unless a shared keyring scheme is being used.
 Defaults to no.
@@ -893,19 +890,23 @@ opposite meaning. The options are:
 
 @table @asis
 
-@item include-local-sigs
+@item export-local-sigs
 Allow exporting key signatures marked as "local". This is not
 generally useful unless a shared keyring scheme is being used.
 Defaults to no.
 
-@item include-attributes
+@item export-attributes
 Include attribute user IDs (photo IDs) while exporting. This is
 useful to export keys if they are going to be used by an OpenPGP
 program that does not accept attribute user IDs. Defaults to yes.
 
-@item include-sensitive-revkeys
+@item export-sensitive-revkeys
 Include designated revoker information that was marked as
 "sensitive". Defaults to no.
+
+@item export-minimal
+Export the smallest key possible. Currently this is done by leaving
+out any signatures that are not self-signatures. Defaults to no.
 @end table
 
 @item --list-options @code{parameters}
@@ -1577,6 +1578,11 @@ supressed on the command line.
 @item --no-mdc-warning
 Suppress the warning about missing MDC integrity protection.
 
+@item --require-secmem
+@itemx --no-require-secmem
+Refuse to run if GnuPG cannot get secure memory. Defaults to no
+(i.e. run, but give a warning).
+
 @item --no-armor
 Assume the input data is not in ASCII armored format.
 
@@ -1663,9 +1669,9 @@ option is not specified, the expiration time is "never".
 @itemx --no-expert
 Allow the user to do certain nonsensical or "silly" things like
 signing an expired or revoked key, or certain potentially incompatible
-things like generating deprecated key types. This also disables
+things like generating unusual key types. This also disables certain
-certain warning messages about potentially incompatible actions. As
+warning messages about potentially incompatible actions. As the name
-the name implies, this option is for experts only. If you don't fully
+implies, this option is for experts only. If you don't fully
 understand the implications of what it allows you to do, leave this
 off. --no-expert disables this option.