Commit 37dbcca2 37dbcca2bdab4ea25ef0ccb10e24e12b7bd0d597 by uid65697

Changed multiline doc string to

a single-line one: gettext 0.13 is unable to handle
translator comments with multiline msgids.
1 parent 6556df8c
......@@ -34,10 +34,10 @@ const char *program_version = "GNU dotlock (" PACKAGE_STRING ")";
static char doc[] =
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
N_("GNU dotlock -- lock mail spool files"
"\v"
"Returns 0 on success, 3 if the locking the file fails because"
" it's already locked, and 1 if some other kind of error occurred.");
N_("GNU dotlock -- lock mail spool files\
\v\
Returns 0 on success, 3 if locking the file fails because\
it's already locked, and 1 if some other kind of error occurred.");
static char args_doc[] = N_("FILE");
......
......@@ -45,15 +45,15 @@ const char *program_version = "mail.local (" PACKAGE_STRING ")";
static char doc[] =
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
N_("GNU mail.local -- the local MDA"
"\v"
"Debug flags are:\n"
" g - guimb stack traces\n"
" T - mailutil traces (MU_DEBUG_TRACE)\n"
" P - network protocols (MU_DEBUG_PROT)\n"
" t - sieve trace (MU_SIEVE_DEBUG_TRACE)\n"
" l - sieve action logs\n"
" 0-9 - Set mail.local debugging level\n");
N_("GNU mail.local -- the local MDA\
\v\
Debug flags are:\n\
g - guimb stack traces\n\
T - mailutil traces (MU_DEBUG_TRACE)\n\
P - network protocols (MU_DEBUG_PROT)\n\
t - sieve trace (MU_SIEVE_DEBUG_TRACE)\n\
l - sieve action logs\n\
0-9 - Set mail.local debugging level\n");
static char args_doc[] = N_("recipient [recipient ...]");
......
......@@ -45,34 +45,34 @@ const char *program_version = "mail.remote (" PACKAGE_STRING ")";
static char doc[] =
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
N_("GNU mail.remote -- pseudo-sendmail interface for mail delivery\n"
"\v"
"\n"
"An RFC2822 formatted message is read from stdin and delivered using\n"
"the mailer. This utility can be used as a drop-in replacement\n"
"for /bin/sendmail to forward mail directly to an SMTP gateway.\n"
"\n"
"The default mailer is \"sendmail:\", which is not supported by this\n"
"utility (it is intended to be used when you don't have a working\n"
"sendmail). You should specify your SMTP gateway by specifying\n"
"a --mailer as something like \"smtp://mail.example.com\". This would\n"
"normally be added to your user-specific configuration file,\n"
" ~/.mailutils/mailutils,\n"
"or the global configuration file,\n"
" /etc/mailutils.rc,\n"
"with a line such as:\n"
" :mailer --mailer=smtp://mail.example.com\n"
"\n"
"If not explicitly specified, the default from address is derived from the\n"
"\"From:\" field in the message, if present, or the default user's email\n"
"address if not present.\n"
"\n"
"If not explicitly specified, the default to addresses are derived from the\n"
"\"To:\", \"Cc:\", and \"Bcc:\" fields in the message.\n"
"\n"
"If --debug is specified, the envelope commands in the SMTP protocol\n"
"transaction will be printed to stdout. If specified more than once,\n"
"the data part of the protocol transaction will also be printed to stdout.\n");
N_("GNU mail.remote -- pseudo-sendmail interface for mail delivery\n\
\v\
\n\
An RFC2822 formatted message is read from stdin and delivered using\n\
the mailer. This utility can be used as a drop-in replacement\n\
for /bin/sendmail to forward mail directly to an SMTP gateway.\n\
\n\
The default mailer is \"sendmail:\", which is not supported by this\n\
utility (it is intended to be used when you don't have a working\n\
sendmail). You should specify your SMTP gateway by specifying\n\
a --mailer as something like \"smtp://mail.example.com\". This would\n\
normally be added to your user-specific configuration file,\n\
~/.mailutils/mailutils,\n\
or the global configuration file,\n\
/etc/mailutils.rc,\n\
with a line such as:\n\
:mailer --mailer=smtp://mail.example.com\n\
\n\
If not explicitly specified, the default from address is derived from the\n\
\"From:\" field in the message, if present, or the default user's email\n\
address if not present.\n\
\n\
If not explicitly specified, the default to addresses are derived from the\n\
\"To:\", \"Cc:\", and \"Bcc:\" fields in the message.\n\
\n\
If --debug is specified, the envelope commands in the SMTP protocol\n\
transaction will be printed to stdout. If specified more than once,\n\
the data part of the protocol transaction will also be printed to stdout.\n");
static struct argp_option options[] = {
{"from", 'f', N_("ADDR"), 0, N_("Override the default from address")},
......
......@@ -22,9 +22,9 @@
const char *program_version = "anno (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH anno\v"
"Options marked with `*' are not yet implemented.\n"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH anno\v\
Options marked with `*' are not yet implemented.\n\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = N_("[msg [msg...]]");
/* GNU options */
......
......@@ -22,8 +22,8 @@
const char *program_version = "fmtcheck (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH fmtcheck\v"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH fmtcheck\v\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = "";
/* GNU options */
......
......@@ -35,8 +35,8 @@
const char *program_version = "folder (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH folder\v"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH folder\v\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = N_("[action] [msg]");
static struct argp_option options[] = {
......
......@@ -22,9 +22,9 @@
const char *program_version = "forw (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH forw\v"
"Options marked with `*' are not yet implemented.\n"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH forw\v\
Options marked with `*' are not yet implemented.\n\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = "[msgs]";
/* GNU options */
......
......@@ -22,8 +22,8 @@
const char *program_version = "inc (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH inc\v"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH inc\v\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = N_("[+folder]");
/* GNU options */
......
......@@ -20,8 +20,8 @@
const char *program_version = "install-mh (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH install-mh\v"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH install-mh\v\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = "";
/* GNU options */
......
......@@ -20,8 +20,8 @@
const char *program_version = "mark (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH mark\v"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH mark\v\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = "[msgs...]";
/* GNU options */
......
......@@ -24,8 +24,8 @@
const char *program_version = "mhl (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH mhl\v"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH mhl\v\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = N_("[files]");
/* GNU options */
......
......@@ -27,9 +27,9 @@
const char *program_version = "mhn (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH mhn\v"
"Options marked with `*' are not yet implemented.\n"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH mhn\v\
Options marked with `*' are not yet implemented.\n\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = "[msgs]";
static struct argp_option options[] = {
......
......@@ -22,8 +22,8 @@
const char *program_version = "mhpath (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH mhpath\v"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH mhpath\v\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = N_("[+folder] [msgs]");
/* GNU options */
......
......@@ -28,9 +28,9 @@
const char *program_version = "pick (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH pick\v"
"Options marked with `*' are not yet implemented.\n"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH pick\v\
Options marked with `*' are not yet implemented.\n\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = N_("[messages]");
/* GNU options */
......
......@@ -27,9 +27,9 @@
const char *program_version = "refile (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH refile\v"
"Options marked with `*' are not yet implemented.\n"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH refile\v\
Options marked with `*' are not yet implemented.\n\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = N_("messages folder [folder...]");
/* GNU options */
......
......@@ -24,9 +24,9 @@
const char *program_version = "reply (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH repl\v"
"Options marked with `*' are not yet implemented.\n"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH repl\v\
Options marked with `*' are not yet implemented.\n\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = N_("[+folder] [msg]");
......
......@@ -31,8 +31,8 @@
const char *program_version = "rmf (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH rmf\v"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH rmf\v\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = N_("[+folder]");
/* GNU options */
......
......@@ -22,8 +22,8 @@
const char *program_version = "rmm (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH rmm\v"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH rmm\v\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = N_("[+folder] [msgs]");
/* GNU options */
......
......@@ -29,8 +29,8 @@
const char *program_version = "scan (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH scan\v"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH scan\v\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = N_("[+folder] [msgs]");
/* GNU options */
......
......@@ -26,9 +26,9 @@
const char *program_version = "send (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH send\v"
"Options marked with `*' are not yet implemented.\n"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH send\v\
Options marked with `*' are not yet implemented.\n\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = N_("file [file...]");
......
......@@ -20,8 +20,8 @@
const char *program_version = "whom (" PACKAGE_STRING ")";
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
static char doc[] = N_("GNU MH whom\v"
"Use -help to obtain the list of traditional MH options.");
static char doc[] = N_("GNU MH whom\v\
Use -help to obtain the list of traditional MH options.");
static char args_doc[] = "[file]";
/* GNU options */
......
......@@ -51,14 +51,14 @@ const char *program_version = "sieve (" PACKAGE_STRING ")";
static char doc[] =
/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
in this message */
N_("GNU sieve -- a mail filtering tool\n"
"\v"
"Debug flags:\n"
" g - main parser traces\n"
" T - mailutil traces (MU_DEBUG_TRACE)\n"
" P - network protocols (MU_DEBUG_PROT)\n"
" t - sieve trace (MU_SIEVE_DEBUG_TRACE)\n"
" i - sieve instructions trace (MU_SIEVE_DEBUG_INSTR)\n");
N_("GNU sieve -- a mail filtering tool\n\
\v\
Debug flags:\n\
g - main parser traces\n\
T - mailutil traces (MU_DEBUG_TRACE)\n\
P - network protocols (MU_DEBUG_PROT)\n\
t - sieve trace (MU_SIEVE_DEBUG_TRACE)\n\
i - sieve instructions trace (MU_SIEVE_DEBUG_INSTR)\n");
#define D_DEFAULT "TPt"
......