Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 1491b258 1491b258c75b403d3f68897a639ee6d290f0fb67 by Sergey Poznyakoff
Options

Reformat argp docstring in accordance with the new argp guidelines. Remove unne… 

…eded translators comment.
1 parent a104de8d
Inline Side-by-side
Showing 28 changed files with 58 additions and 106 deletions
...@@ -33,11 +33,9 @@ ...@@ -33,11 +33,9 @@
33 33
34 const char *program_version = "GNU dotlock (" PACKAGE_STRING ")"; 34 const char *program_version = "GNU dotlock (" PACKAGE_STRING ")";
35 static char doc[] = 35 static char doc[] =
36 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 36 N_("GNU dotlock -- lock mail spool files")
37 in this message */ 37 "\v"
38 N_("GNU dotlock -- lock mail spool files\ 38 N_("Returns 0 on success, 3 if locking the file fails because\
39 \v\
40 Returns 0 on success, 3 if locking the file fails because\
41 it's already locked, and 1 if some other kind of error occurred."); 39 it's already locked, and 1 if some other kind of error occurred.");
42 40
43 static char args_doc[] = N_("FILE"); 41 static char args_doc[] = N_("FILE");
......
...@@ -50,11 +50,9 @@ void notify_biff (mu_mailbox_t mbox, char *name, size_t size); ...@@ -50,11 +50,9 @@ void notify_biff (mu_mailbox_t mbox, char *name, size_t size);
50 50
51 const char *program_version = "mail.local (" PACKAGE_STRING ")"; 51 const char *program_version = "mail.local (" PACKAGE_STRING ")";
52 static char doc[] = 52 static char doc[] =
53 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 53 N_("GNU mail.local -- the local MDA")
54 in this message */ 54 "\v"
55 N_("GNU mail.local -- the local MDA\ 55 N_("Debug flags are:\n\
56 \v\
57 Debug flags are:\n\
58 g - guimb stack traces\n\ 56 g - guimb stack traces\n\
59 T - mailutils traces (MU_DEBUG_TRACE)\n\ 57 T - mailutils traces (MU_DEBUG_TRACE)\n\
60 P - network protocols (MU_DEBUG_PROT)\n\ 58 P - network protocols (MU_DEBUG_PROT)\n\
......
...@@ -47,11 +47,9 @@ ...@@ -47,11 +47,9 @@
47 47
48 const char *program_version = "mail.remote (" PACKAGE_STRING ")"; 48 const char *program_version = "mail.remote (" PACKAGE_STRING ")";
49 static char doc[] = 49 static char doc[] =
50 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 50 N_("GNU mail.remote -- pseudo-sendmail interface for mail delivery\n")
51 in this message */ 51 "\v"
52 N_("GNU mail.remote -- pseudo-sendmail interface for mail delivery\n\ 52 N_("This is a simple drop-in replacement for sendmail to forward mail directly\n\
53 \v\
54 This is a simple drop-in replacement for sendmail to forward mail directly\n\
55 to an SMTP gateway.\n\ 53 to an SMTP gateway.\n\
56 You should always specify your SMTP gateway using --mailer option\n\ 54 You should always specify your SMTP gateway using --mailer option\n\
57 (the best place to do so is in your configuration file).\n\ 55 (the best place to do so is in your configuration file).\n\
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
26 #include <sys/stat.h> 26 #include <sys/stat.h>
27 27
28 const char *program_version = "ali (" PACKAGE_STRING ")"; 28 const char *program_version = "ali (" PACKAGE_STRING ")";
29 static char doc[] = N_("GNU MH ali\v" 29 static char doc[] = N_("GNU MH ali")"\v"
30 "Options marked with `*' are not yet implemented.\n" 30 N_("Options marked with `*' are not yet implemented.\n"
31 "Use -help to obtain the list of traditional MH options."); 31 "Use -help to obtain the list of traditional MH options.");
32 static char args_doc[] = N_("aliases ..."); 32 static char args_doc[] = N_("aliases ...");
33 33
......
...@@ -21,10 +21,8 @@ ...@@ -21,10 +21,8 @@
21 #include <mh.h> 21 #include <mh.h>
22 22
23 const char *program_version = "anno (" PACKAGE_STRING ")"; 23 const char *program_version = "anno (" PACKAGE_STRING ")";
24 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 24 static char doc[] = N_("GNU MH anno")"\v"
25 in this message */ 25 N_("Options marked with `*' are not yet implemented.\n\
26 static char doc[] = N_("GNU MH anno\v\
27 Options marked with `*' are not yet implemented.\n\
28 Use -help to obtain the list of traditional MH options."); 26 Use -help to obtain the list of traditional MH options.");
29 static char args_doc[] = N_("[msg [msg...]]"); 27 static char args_doc[] = N_("[msg [msg...]]");
30 28
......
...@@ -24,10 +24,8 @@ ...@@ -24,10 +24,8 @@
24 #include <obstack.h> 24 #include <obstack.h>
25 25
26 const char *program_version = "burst (" PACKAGE_STRING ")"; 26 const char *program_version = "burst (" PACKAGE_STRING ")";
27 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 27 static char doc[] = N_("GNU MH burst")"\v"
28 in this message */ 28 N_("Options marked with `*' are not yet implemented.\n\
29 static char doc[] = N_("GNU MH burst\v\
30 Options marked with `*' are not yet implemented.\n\
31 Use -help to obtain the list of traditional MH options."); 29 Use -help to obtain the list of traditional MH options.");
32 static char args_doc[] = "[msgs]"; 30 static char args_doc[] = "[msgs]";
33 31
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
23 #include <sys/stat.h> 23 #include <sys/stat.h>
24 24
25 const char *program_version = "comp (" PACKAGE_STRING ")"; 25 const char *program_version = "comp (" PACKAGE_STRING ")";
26 static char doc[] = N_("GNU MH comp\v" 26 static char doc[] = N_("GNU MH comp")"\v"
27 "Options marked with `*' are not yet implemented.\n" 27 N_("Options marked with `*' are not yet implemented.\n"
28 "Use -help to obtain the list of traditional MH options."); 28 "Use -help to obtain the list of traditional MH options.");
29 static char args_doc[] = "[msg]"; 29 static char args_doc[] = "[msg]";
30 30
......
...@@ -22,10 +22,8 @@ ...@@ -22,10 +22,8 @@
22 #include <mh.h> 22 #include <mh.h>
23 23
24 const char *program_version = "fmtcheck (" PACKAGE_STRING ")"; 24 const char *program_version = "fmtcheck (" PACKAGE_STRING ")";
25 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 25 static char doc[] = N_("GNU MH fmtcheck")"\v"
26 in this message */ 26 N_("Use -help to obtain the list of traditional MH options.");
27 static char doc[] = N_("GNU MH fmtcheck\v\
28 Use -help to obtain the list of traditional MH options.");
29 static char args_doc[] = ""; 27 static char args_doc[] = "";
30 28
31 /* GNU options */ 29 /* GNU options */
......
...@@ -35,10 +35,8 @@ ...@@ -35,10 +35,8 @@
35 #include <obstack.h> 35 #include <obstack.h>
36 36
37 const char *program_version = "folder (" PACKAGE_STRING ")"; 37 const char *program_version = "folder (" PACKAGE_STRING ")";
38 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 38 static char doc[] = N_("GNU MH folder")"\v"
39 in this message */ 39 N_("Use -help to obtain the list of traditional MH options.");
40 static char doc[] = N_("GNU MH folder\v\
41 Use -help to obtain the list of traditional MH options.");
42 static char args_doc[] = N_("[action] [msg]"); 40 static char args_doc[] = N_("[action] [msg]");
43 41
44 static struct argp_option options[] = { 42 static struct argp_option options[] = {
......
...@@ -21,10 +21,8 @@ ...@@ -21,10 +21,8 @@
21 #include <mh.h> 21 #include <mh.h>
22 22
23 const char *program_version = "forw (" PACKAGE_STRING ")"; 23 const char *program_version = "forw (" PACKAGE_STRING ")";
24 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 24 static char doc[] = N_("GNU MH forw")"\v"
25 in this message */ 25 N_("Options marked with `*' are not yet implemented.\n\
26 static char doc[] = N_("GNU MH forw\v\
27 Options marked with `*' are not yet implemented.\n\
28 Use -help to obtain the list of traditional MH options."); 26 Use -help to obtain the list of traditional MH options.");
29 static char args_doc[] = "[msgs]"; 27 static char args_doc[] = "[msgs]";
30 28
......
...@@ -22,10 +22,8 @@ ...@@ -22,10 +22,8 @@
22 #include <mh.h> 22 #include <mh.h>
23 23
24 const char *program_version = "inc (" PACKAGE_STRING ")"; 24 const char *program_version = "inc (" PACKAGE_STRING ")";
25 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 25 static char doc[] = N_("GNU MH inc")"\v"
26 in this message */ 26 N_("Use -help to obtain the list of traditional MH options.");
27 static char doc[] = N_("GNU MH inc\v\
28 Use -help to obtain the list of traditional MH options.");
29 static char args_doc[] = N_("[+folder]"); 27 static char args_doc[] = N_("[+folder]");
30 28
31 /* GNU options */ 29 /* GNU options */
......
...@@ -19,10 +19,8 @@ ...@@ -19,10 +19,8 @@
19 #include <mh.h> 19 #include <mh.h>
20 20
21 const char *program_version = "install-mh (" PACKAGE_STRING ")"; 21 const char *program_version = "install-mh (" PACKAGE_STRING ")";
22 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 22 static char doc[] = N_("GNU MH install-mh")"\v"
23 in this message */ 23 N_("Use -help to obtain the list of traditional MH options.");
24 static char doc[] = N_("GNU MH install-mh\v\
25 Use -help to obtain the list of traditional MH options.");
26 static char args_doc[] = ""; 24 static char args_doc[] = "";
27 25
28 /* GNU options */ 26 /* GNU options */
......
...@@ -19,10 +19,8 @@ ...@@ -19,10 +19,8 @@
19 #include <mh.h> 19 #include <mh.h>
20 20
21 const char *program_version = "mark (" PACKAGE_STRING ")"; 21 const char *program_version = "mark (" PACKAGE_STRING ")";
22 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 22 static char doc[] = N_("GNU MH mark")"\v"
23 in this message */ 23 N_("Use -help to obtain the list of traditional MH options.");
24 static char doc[] = N_("GNU MH mark\v\
25 Use -help to obtain the list of traditional MH options.");
26 static char args_doc[] = "[msgs...]"; 24 static char args_doc[] = "[msgs...]";
27 25
28 /* GNU options */ 26 /* GNU options */
......
...@@ -23,10 +23,8 @@ ...@@ -23,10 +23,8 @@
23 #include <unistd.h> 23 #include <unistd.h>
24 24
25 const char *program_version = "mhl (" PACKAGE_STRING ")"; 25 const char *program_version = "mhl (" PACKAGE_STRING ")";
26 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 26 static char doc[] = N_("GNU MH mhl")"\v"
27 in this message */ 27 N_("Use -help to obtain the list of traditional MH options.");
28 static char doc[] = N_("GNU MH mhl\v\
29 Use -help to obtain the list of traditional MH options.");
30 static char args_doc[] = N_("[files]"); 28 static char args_doc[] = N_("[files]");
31 29
32 /* GNU options */ 30 /* GNU options */
......
...@@ -26,10 +26,8 @@ ...@@ -26,10 +26,8 @@
26 #include <obstack.h> 26 #include <obstack.h>
27 27
28 const char *program_version = "mhn (" PACKAGE_STRING ")"; 28 const char *program_version = "mhn (" PACKAGE_STRING ")";
29 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 29 static char doc[] = N_("GNU MH mhn")"\v"
30 in this message */ 30 N_("Options marked with `*' are not yet implemented.\n\
31 static char doc[] = N_("GNU MH mhn\v\
32 Options marked with `*' are not yet implemented.\n\
33 Use -help to obtain the list of traditional MH options."); 31 Use -help to obtain the list of traditional MH options.");
34 static char args_doc[] = "[msgs]"; 32 static char args_doc[] = "[msgs]";
35 33
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
21 #include <mh.h> 21 #include <mh.h>
22 22
23 const char *program_version = "mhparam (" PACKAGE_STRING ")"; 23 const char *program_version = "mhparam (" PACKAGE_STRING ")";
24 static char doc[] = N_("GNU MH mhparam\v" 24 static char doc[] = N_("GNU MH mhparam")"\v"
25 "Use -help to obtain the list of traditional MH options."); 25 N_("Use -help to obtain the list of traditional MH options.");
26 static char args_doc[] = N_("[components]"); 26 static char args_doc[] = N_("[components]");
27 27
28 /* GNU options */ 28 /* GNU options */
......
...@@ -21,10 +21,8 @@ ...@@ -21,10 +21,8 @@
21 #include <mh.h> 21 #include <mh.h>
22 22
23 const char *program_version = "mhpath (" PACKAGE_STRING ")"; 23 const char *program_version = "mhpath (" PACKAGE_STRING ")";
24 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 24 static char doc[] = N_("GNU MH mhpath")"\v"
25 in this message */ 25 N_("Use -help to obtain the list of traditional MH options.");
26 static char doc[] = N_("GNU MH mhpath\v\
27 Use -help to obtain the list of traditional MH options.");
28 static char args_doc[] = N_("[+folder] [msgs]"); 26 static char args_doc[] = N_("[+folder] [msgs]");
29 27
30 /* GNU options */ 28 /* GNU options */
......
...@@ -27,10 +27,8 @@ ...@@ -27,10 +27,8 @@
27 #include <obstack.h> 27 #include <obstack.h>
28 28
29 const char *program_version = "pick (" PACKAGE_STRING ")"; 29 const char *program_version = "pick (" PACKAGE_STRING ")";
30 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 30 static char doc[] = N_("GNU MH pick")"\v"
31 in this message */ 31 N_("Options marked with `*' are not yet implemented.\n\
32 static char doc[] = N_("GNU MH pick\v\
33 Options marked with `*' are not yet implemented.\n\
34 Use -help to obtain the list of traditional MH options."); 32 Use -help to obtain the list of traditional MH options.");
35 static char args_doc[] = N_("[messages]"); 33 static char args_doc[] = N_("[messages]");
36 34
......
...@@ -26,10 +26,8 @@ ...@@ -26,10 +26,8 @@
26 #include <fcntl.h> 26 #include <fcntl.h>
27 27
28 const char *program_version = "refile (" PACKAGE_STRING ")"; 28 const char *program_version = "refile (" PACKAGE_STRING ")";
29 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 29 static char doc[] = N_("GNU MH refile")"\v"
30 in this message */ 30 N_("Options marked with `*' are not yet implemented.\n\
31 static char doc[] = N_("GNU MH refile\v\
32 Options marked with `*' are not yet implemented.\n\
33 Use -help to obtain the list of traditional MH options."); 31 Use -help to obtain the list of traditional MH options.");
34 static char args_doc[] = N_("messages folder [folder...]"); 32 static char args_doc[] = N_("messages folder [folder...]");
35 33
......
...@@ -24,10 +24,8 @@ ...@@ -24,10 +24,8 @@
24 #include <unistd.h> 24 #include <unistd.h>
25 25
26 const char *program_version = "reply (" PACKAGE_STRING ")"; 26 const char *program_version = "reply (" PACKAGE_STRING ")";
27 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 27 static char doc[] = N_("GNU MH repl")"\v"
28 in this message */ 28 N_("Options marked with `*' are not yet implemented.\n\
29 static char doc[] = N_("GNU MH repl\v\
30 Options marked with `*' are not yet implemented.\n\
31 Use -help to obtain the list of traditional MH options."); 29 Use -help to obtain the list of traditional MH options.");
32 static char args_doc[] = N_("[+folder] [msg]"); 30 static char args_doc[] = N_("[+folder] [msg]");
33 31
......
...@@ -30,10 +30,8 @@ ...@@ -30,10 +30,8 @@
30 #include <dirent.h> 30 #include <dirent.h>
31 31
32 const char *program_version = "rmf (" PACKAGE_STRING ")"; 32 const char *program_version = "rmf (" PACKAGE_STRING ")";
33 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 33 static char doc[] = N_("GNU MH rmf")"\v"
34 in this message */ 34 N_("Use -help to obtain the list of traditional MH options.");
35 static char doc[] = N_("GNU MH rmf\v\
36 Use -help to obtain the list of traditional MH options.");
37 static char args_doc[] = N_("[+folder]"); 35 static char args_doc[] = N_("[+folder]");
38 36
39 /* GNU options */ 37 /* GNU options */
......
...@@ -21,10 +21,8 @@ ...@@ -21,10 +21,8 @@
21 #include <mh.h> 21 #include <mh.h>
22 22
23 const char *program_version = "rmm (" PACKAGE_STRING ")"; 23 const char *program_version = "rmm (" PACKAGE_STRING ")";
24 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 24 static char doc[] = N_("GNU MH rmm")"\v"
25 in this message */ 25 N_("Use -help to obtain the list of traditional MH options.");
26 static char doc[] = N_("GNU MH rmm\v\
27 Use -help to obtain the list of traditional MH options.");
28 static char args_doc[] = N_("[+folder] [msgs]"); 26 static char args_doc[] = N_("[+folder] [msgs]");
29 27
30 /* GNU options */ 28 /* GNU options */
......
...@@ -29,10 +29,8 @@ ...@@ -29,10 +29,8 @@
29 #include <mailutils/observer.h> 29 #include <mailutils/observer.h>
30 30
31 const char *program_version = "scan (" PACKAGE_STRING ")"; 31 const char *program_version = "scan (" PACKAGE_STRING ")";
32 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 32 static char doc[] = N_("GNU MH scan")"\v"
33 in this message */ 33 N_("Use -help to obtain the list of traditional MH options.");
34 static char doc[] = N_("GNU MH scan\v\
35 Use -help to obtain the list of traditional MH options.");
36 static char args_doc[] = N_("[+folder] [msgs]"); 34 static char args_doc[] = N_("[+folder] [msgs]");
37 35
38 /* GNU options */ 36 /* GNU options */
......
...@@ -25,10 +25,8 @@ ...@@ -25,10 +25,8 @@
25 #include <pwd.h> 25 #include <pwd.h>
26 26
27 const char *program_version = "send (" PACKAGE_STRING ")"; 27 const char *program_version = "send (" PACKAGE_STRING ")";
28 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 28 static char doc[] = N_("GNU MH send")"\v"
29 in this message */ 29 N_("Options marked with `*' are not yet implemented.\n\
30 static char doc[] = N_("GNU MH send\v\
31 Options marked with `*' are not yet implemented.\n\
32 Use -help to obtain the list of traditional MH options."); 30 Use -help to obtain the list of traditional MH options.");
33 static char args_doc[] = N_("file [file...]"); 31 static char args_doc[] = N_("file [file...]");
34 32
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
24 #include <signal.h> 24 #include <signal.h>
25 25
26 const char *program_version = "sortm (" PACKAGE_STRING ")"; 26 const char *program_version = "sortm (" PACKAGE_STRING ")";
27 static char doc[] = N_("GNU MH sortm\v" 27 static char doc[] = N_("GNU MH sortm")"\v"
28 "Use -help to obtain the list of traditional MH options."); 28 N_("Use -help to obtain the list of traditional MH options.");
29 static char args_doc[] = N_("[msgs]"); 29 static char args_doc[] = N_("[msgs]");
30 30
31 #define ARG_QUICKSORT 1024 31 #define ARG_QUICKSORT 1024
......
...@@ -19,10 +19,8 @@ ...@@ -19,10 +19,8 @@
19 #include <mh.h> 19 #include <mh.h>
20 20
21 const char *program_version = "whom (" PACKAGE_STRING ")"; 21 const char *program_version = "whom (" PACKAGE_STRING ")";
22 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 22 static char doc[] = N_("GNU MH whom")"\v"
23 in this message */ 23 N_("Use -help to obtain the list of traditional MH options.");
24 static char doc[] = N_("GNU MH whom\v\
25 Use -help to obtain the list of traditional MH options.");
26 static char args_doc[] = "[file]"; 24 static char args_doc[] = "[file]";
27 25
28 /* GNU options */ 26 /* GNU options */
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
26 #include <sys/wait.h> 26 #include <sys/wait.h>
27 27
28 const char *program_version = "mimeview (" PACKAGE_STRING ")"; 28 const char *program_version = "mimeview (" PACKAGE_STRING ")";
29 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
30 in this message */
31 static char doc[] = N_("GNU mimeview -- display files, using mailcap mechanism. \ 29 static char doc[] = N_("GNU mimeview -- display files, using mailcap mechanism. \
32 Default mime.types file is ") DEFAULT_CUPS_CONFDIR "/mime.types" 30 Default mime.types file is ") DEFAULT_CUPS_CONFDIR "/mime.types"
33 N_("\n\nDebug flags are:\n\ 31 N_("\n\nDebug flags are:\n\
......
...@@ -49,11 +49,9 @@ ...@@ -49,11 +49,9 @@
49 const char *program_version = "sieve (" PACKAGE_STRING ")"; 49 const char *program_version = "sieve (" PACKAGE_STRING ")";
50 50
51 static char doc[] = 51 static char doc[] =
52 /* TRANSLATORS: Please, preserve the vertical tabulation (^K character) 52 N_("GNU sieve -- a mail filtering tool\n")
53 in this message */ 53 "\v"
54 N_("GNU sieve -- a mail filtering tool\n\ 54 N_("Debug flags:\n\
55 \v\
56 Debug flags:\n\
57 g - main parser traces\n\ 55 g - main parser traces\n\
58 T - mailutils traces (MU_DEBUG_TRACE)\n\ 56 T - mailutils traces (MU_DEBUG_TRACE)\n\
59 P - network protocols (MU_DEBUG_PROT)\n\ 57 P - network protocols (MU_DEBUG_PROT)\n\
......