aniani/elinks
0
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-06-30 22:19:29 -04:00
Code

Merge branch 'elinks-0.12' into elinks-0.13

Browse Source 
Conflicts:
	src/config/conf.c
	src/network/ssl/ssl.c
This commit is contained in:
Kalle Olavi Niemitalo 2009-03-12 08:46:02 +02:00 committed by Kalle Olavi Niemitalo
commit 1bb71f3732
26 changed files with 757 additions and 592 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bfu/leds.c
View File

@ -79,7 +79,7 @@ static struct option_info led_options[] = {
INIT_OPT_STRING("ui.clock", N_("Format"), INIT_OPT_STRING("ui.clock", N_("Format"),
"format", 0, "[%H:%M]", "format", 0, "[%H:%M]",
N_("Format string for the digital clock. See the strftime(3)\n" N_("Format string for the digital clock. See the strftime(3) "
"manpage for details.")), "manpage for details.")),
/* Compatibility alias. Added: 2004-04-22, 0.9.CVS. */ /* Compatibility alias. Added: 2004-04-22, 0.9.CVS. */
@ -92,8 +92,8 @@ static struct option_info led_options[] = {
INIT_OPT_BOOL("ui.leds", N_("Enable"), INIT_OPT_BOOL("ui.leds", N_("Enable"),
"enable", 0, 1, "enable", 0, 1,
N_("Enable LEDs.\n" N_("Enable LEDs. These visual indicators will inform you "
"These visual indicators will inform you about various states.")), "about various states.")),
NULL_OPTION_INFO, NULL_OPTION_INFO,
}; };

19
src/bookmarks/bookmarks.c
View File

@ -52,29 +52,32 @@ static struct option_info bookmark_options_info[] = {
#ifdef CONFIG_XBEL_BOOKMARKS #ifdef CONFIG_XBEL_BOOKMARKS
INIT_OPT_INT("bookmarks", N_("File format"), INIT_OPT_INT("bookmarks", N_("File format"),
"file_format", 0, 0, 1, 0, "file_format", 0, 0, 1, 0,
N_("File format for bookmarks (affects both reading and saving):\n" N_("File format for bookmarks (affects both reading and "
"saving):\n"
"0 is the default native ELinks format\n" "0 is the default native ELinks format\n"
"1 is XBEL universal XML bookmarks format")), "1 is XBEL universal XML bookmarks format")),
#else #else
INIT_OPT_INT("bookmarks", N_("File format"), INIT_OPT_INT("bookmarks", N_("File format"),
"file_format", 0, 0, 1, 0, "file_format", 0, 0, 1, 0,
N_("File format for bookmarks (affects both reading and saving):\n" N_("File format for bookmarks (affects both reading and "
"saving):\n"
"0 is the default native ELinks format\n" "0 is the default native ELinks format\n"
"1 is XBEL universal XML bookmarks format (DISABLED)")), "1 is XBEL universal XML bookmarks format (DISABLED)")),
#endif #endif
INIT_OPT_BOOL("bookmarks", N_("Save folder state"), INIT_OPT_BOOL("bookmarks", N_("Save folder state"),
"folder_state", 0, 1, "folder_state", 0, 1,
N_("When saving bookmarks also store whether folders are\n" N_("When saving bookmarks also store whether folders are "
"expanded or not, so the look of the bookmark dialog is\n" "expanded or not, so the look of the bookmark dialog is "
"kept across ELinks sessions. If disabled all folders will\n" "kept across ELinks sessions. If disabled all folders will "
"appear unexpanded next time ELinks is run.")), "appear unexpanded next time ELinks is run.")),
INIT_OPT_BOOL("ui.sessions", N_("Periodic snapshotting"), INIT_OPT_BOOL("ui.sessions", N_("Periodic snapshotting"),
"snapshot", 0, 0, "snapshot", 0, 0,
N_("Automatically save a snapshot of all tabs periodically.\n" N_("Automatically save a snapshot of all tabs periodically. "
"This will periodically bookmark the tabs of each terminal in a separate folder\n" "This will periodically bookmark the tabs of each terminal "
"for recovery after a crash.\n\n" "in a separate folder for recovery after a crash.\n"
"\n"
"This feature requires bookmark support.")), "This feature requires bookmark support.")),
NULL_OPTION_INFO NULL_OPTION_INFO

4
src/bookmarks/dialogs.c
View File

@ -687,8 +687,8 @@ test_search(struct listbox_item *item, void *data_, int *offset)
} }
if (title) { if (title) {
ctx->found = strcasecmp(title, ctx->found = (strcasestr(title, ctx->title)
ctx->title); != NULL);
mem_free(title); mem_free(title);
} }
/** @todo Tell the user that the string could /** @todo Tell the user that the string could

172
src/config/cmdline.c
View File

@ -421,6 +421,28 @@ version_cmd(struct option *o, unsigned char ***argv, int *argc)
#define gettext_nonempty(x) (*(x) ? gettext(x) : (x)) #define gettext_nonempty(x) (*(x) ? gettext(x) : (x))
static void print_option_desc(const unsigned char *desc)
{
struct string wrapped;
static const struct string indent = INIT_STRING(" ", 12);
if (init_string(&wrapped)
&& wrap_option_desc(&wrapped, desc, &indent, 79 - indent.length)) {
/* struct string could in principle contain null
* characters, so don't use printf() or fputs(). */
fwrite(wrapped.source, 1, wrapped.length, stdout);
} else {
/* Write the error to stderr so it appears on the
* screen even if stdout is being parsed by a script
* that reformats it to HTML or such. */
fprintf(stderr, "%12s%s\n", "",
gettext("Out of memory formatting option documentation"));
}
/* done_string() is safe even if init_string() failed. */
done_string(&wrapped);
}
static void print_full_help_outer(struct option *tree, unsigned char *path); static void print_full_help_outer(struct option *tree, unsigned char *path);
static void static void
@ -539,19 +561,9 @@ print_full_help_inner(struct option *tree, unsigned char *path,
} }
} }
printf("\n %8s", ""); putchar('\n');
{ print_option_desc(desc);
int l = strlen(desc); putchar('\n');
int i;
for (i = 0; i < l; i++) {
putchar(desc[i]);
if (desc[i] == '\n')
printf(" %8s", "");
}
}
printf("\n\n");
if (option->type == OPT_TREE) { if (option->type == OPT_TREE) {
memcpy(savedpos, ".", 2); memcpy(savedpos, ".", 2);
@ -726,10 +738,11 @@ struct option_info cmdline_options_info[] = {
/* [gettext_accelerator_context(IGNORE)] */ /* [gettext_accelerator_context(IGNORE)] */
INIT_OPT_BOOL("", N_("Restrict to anonymous mode"), INIT_OPT_BOOL("", N_("Restrict to anonymous mode"),
"anonymous", 0, 0, "anonymous", 0, 0,
N_("Restricts ELinks so it can run on an anonymous account.\n" N_("Restricts ELinks so it can run on an anonymous account. "
"Local file browsing, downloads, and modification of options\n" "Local file browsing, downloads, and modification of options "
"will be disabled. Execution of viewers is allowed, but entries\n" "will be disabled. Execution of viewers is allowed, but "
"in the association table can't be added or modified.")), "entries in the association table can't be added or "
"modified.")),
INIT_OPT_BOOL("", N_("Autosubmit first form"), INIT_OPT_BOOL("", N_("Autosubmit first form"),
"auto-submit", 0, 0, "auto-submit", 0, 0,
@ -737,30 +750,30 @@ struct option_info cmdline_options_info[] = {
INIT_OPT_INT("", N_("Clone internal session with given ID"), INIT_OPT_INT("", N_("Clone internal session with given ID"),
"base-session", 0, 0, INT_MAX, 0, "base-session", 0, 0, INT_MAX, 0,
N_("Used internally when opening ELinks instances in new windows.\n" N_("Used internally when opening ELinks instances in new "
"The ID maps to information that will be used when creating the\n" "windows. The ID maps to information that will be used when "
"new instance. You don't want to use it.")), "creating the new instance. You don't want to use it.")),
INIT_OPT_COMMAND("", NULL, "confdir", OPT_HIDDEN, redir_cmd, NULL), INIT_OPT_COMMAND("", NULL, "confdir", OPT_HIDDEN, redir_cmd, NULL),
INIT_OPT_STRING("", N_("Name of directory with configuration file"), INIT_OPT_STRING("", N_("Name of directory with configuration file"),
"config-dir", 0, "", "config-dir", 0, "",
N_("Path of the directory ELinks will read and write its\n" N_("Path of the directory ELinks will read and write its "
"config and runtime state files to instead of ~/.elinks.\n" "config and runtime state files to instead of ~/.elinks. "
"If the path does not begin with a '/' it is assumed to be\n" "If the path does not begin with a '/' it is assumed to be "
"relative to your HOME directory.")), "relative to your HOME directory.")),
INIT_OPT_COMMAND("", N_("Print default configuration file to stdout"), INIT_OPT_COMMAND("", N_("Print default configuration file to stdout"),
"config-dump", 0, printconfigdump_cmd, "config-dump", 0, printconfigdump_cmd,
N_("Print a configuration file with options set to the built-in\n" N_("Print a configuration file with options set to the "
"defaults to stdout.")), "built-in defaults to stdout.")),
INIT_OPT_COMMAND("", NULL, "conffile", OPT_HIDDEN, redir_cmd, NULL), INIT_OPT_COMMAND("", NULL, "conffile", OPT_HIDDEN, redir_cmd, NULL),
INIT_OPT_STRING("", N_("Name of configuration file"), INIT_OPT_STRING("", N_("Name of configuration file"),
"config-file", 0, "elinks.conf", "config-file", 0, "elinks.conf",
N_("Name of the configuration file that all configuration\n" N_("Name of the configuration file that all configuration "
"options will be read from and written to. It should be\n" "options will be read from and written to. It should be "
"relative to config-dir.")), "relative to config-dir.")),
INIT_OPT_COMMAND("", N_("Print help for configuration options"), INIT_OPT_COMMAND("", N_("Print help for configuration options"),
@ -769,17 +782,19 @@ struct option_info cmdline_options_info[] = {
INIT_OPT_CMDALIAS("", N_("MIME type assumed for unknown document types"), INIT_OPT_CMDALIAS("", N_("MIME type assumed for unknown document types"),
"default-mime-type", 0, "mime.default_type", "default-mime-type", 0, "mime.default_type",
N_("The default MIME type used for documents of unknown type.")), N_("The default MIME type used for documents of unknown "
"type.")),
INIT_OPT_BOOL("", N_("Ignore user-defined keybindings"), INIT_OPT_BOOL("", N_("Ignore user-defined keybindings"),
"default-keys", 0, 0, "default-keys", 0, 0,
N_("When set, all keybindings from configuration files will be\n" N_("When set, all keybindings from configuration files will "
"ignored. It forces use of default keybindings and will reset\n" "be ignored. It forces use of default keybindings and will "
"user-defined ones on save.")), "reset user-defined ones on save.")),
INIT_OPT_BOOL("", N_("Print formatted versions of given URLs to stdout"), INIT_OPT_BOOL("", N_("Print formatted versions of given URLs to stdout"),
"dump", 0, 0, "dump", 0, 0,
N_("Print formatted plain-text versions of given URLs to stdout.")), N_("Print formatted plain-text versions of given URLs to "
"stdout.")),
INIT_OPT_CMDALIAS("", N_("Codepage to use with -dump"), INIT_OPT_CMDALIAS("", N_("Codepage to use with -dump"),
"dump-charset", 0, "document.dump.codepage", "dump-charset", 0, "document.dump.codepage",
@ -795,16 +810,16 @@ struct option_info cmdline_options_info[] = {
INIT_OPT_COMMAND("", N_("Evaluate configuration file directive"), INIT_OPT_COMMAND("", N_("Evaluate configuration file directive"),
"eval", 0, eval_cmd, "eval", 0, eval_cmd,
N_("Specify configuration file directives on the command-line\n" N_("Specify configuration file directives on the command-line "
"which will be evaluated after all configuration files has been\n" "which will be evaluated after all configuration files has "
"read. Example usage:\n" "been read. Example usage:\n"
"\t-eval 'set protocol.file.allow_special_files = 1'")), "\t-eval 'set protocol.file.allow_special_files = 1'")),
/* lynx compatibility */ /* lynx compatibility */
INIT_OPT_COMMAND("", N_("Interpret documents of unknown types as HTML"), INIT_OPT_COMMAND("", N_("Interpret documents of unknown types as HTML"),
"force-html", 0, forcehtml_cmd, "force-html", 0, forcehtml_cmd,
N_("Makes ELinks assume documents of unknown types are HTML.\n" N_("Makes ELinks assume documents of unknown types are HTML. "
"Useful when using ELinks as an external viewer from MUAs.\n" "Useful when using ELinks as an external viewer from MUAs. "
"This is equivalent to -default-mime-type text/html.")), "This is equivalent to -default-mime-type text/html.")),
/* XXX: -?, -h and -help share the same caption and should be kept in /* XXX: -?, -h and -help share the same caption and should be kept in
@ -819,9 +834,9 @@ struct option_info cmdline_options_info[] = {
INIT_OPT_BOOL("", N_("Only permit local connections"), INIT_OPT_BOOL("", N_("Only permit local connections"),
"localhost", 0, 0, "localhost", 0, 0,
N_("Restricts ELinks to work offline and only connect to servers\n" N_("Restricts ELinks to work offline and only connect to "
"with local addresses (ie. 127.0.0.1). No connections to remote\n" "servers with local addresses (ie. 127.0.0.1). No connections "
"servers will be permitted.")), "to remote servers will be permitted.")),
INIT_OPT_COMMAND("", N_("Print detailed usage help and exit"), INIT_OPT_COMMAND("", N_("Print detailed usage help and exit"),
"long-help", 0, printhelp_cmd, "long-help", 0, printhelp_cmd,
@ -829,40 +844,46 @@ struct option_info cmdline_options_info[] = {
INIT_OPT_COMMAND("", N_("Look up specified host"), INIT_OPT_COMMAND("", N_("Look up specified host"),
"lookup", 0, lookup_cmd, "lookup", 0, lookup_cmd,
N_("Look up specified host and print all DNS resolved IP addresses.")), N_("Look up specified host and print all DNS resolved IP "
"addresses.")),
INIT_OPT_BOOL("", N_("Run as separate instance"), INIT_OPT_BOOL("", N_("Run as separate instance"),
"no-connect", 0, 0, "no-connect", 0, 0,
N_("Run ELinks as a separate instance instead of connecting to an\n" N_("Run ELinks as a separate instance instead of connecting "
"existing instance. Note that normally no runtime state files\n" "to an existing instance. Note that normally no runtime state "
"(bookmarks, history, etc.) are written to the disk when this\n" "files (bookmarks, history, etc.) are written to the disk "
"option is used. See also -touch-files.")), "when this option is used. See also -touch-files.")),
INIT_OPT_BOOL("", N_("Disable use of files in ~/.elinks"), INIT_OPT_BOOL("", N_("Disable use of files in ~/.elinks"),
"no-home", 0, 0, "no-home", 0, 0,
N_("Disables creation and use of files in the user specific home\n" N_("Disables creation and use of files in the user specific "
"configuration directory (~/.elinks). It forces default configuration\n" "home configuration directory (~/.elinks). It forces default "
"values to be used and disables saving of runtime state files.")), "configuration values to be used and disables saving of "
"runtime state files.")),
INIT_OPT_CMDALIAS("", N_("Disable link numbering in dump output"), INIT_OPT_CMDALIAS("", N_("Disable link numbering in dump output"),
"no-numbering", OPT_ALIAS_NEGATE, "document.dump.numbering", "no-numbering", OPT_ALIAS_NEGATE, "document.dump.numbering",
N_("Prevents printing of link number in dump output.\n" N_("Prevents printing of link number in dump output.\n"
"\n"
"Note that this really affects only -dump, nothing else.")), "Note that this really affects only -dump, nothing else.")),
INIT_OPT_CMDALIAS("", N_("Disable printing of link references in dump output"), INIT_OPT_CMDALIAS("", N_("Disable printing of link references in dump output"),
"no-references", OPT_ALIAS_NEGATE, "document.dump.references", "no-references", OPT_ALIAS_NEGATE, "document.dump.references",
N_("Prevents printing of references (URIs) of document links\n" N_("Prevents printing of references (URIs) of document links "
"in dump output.\n" "in dump output.\n"
"\n"
"Note that this really affects only -dump, nothing else.")), "Note that this really affects only -dump, nothing else.")),
INIT_OPT_COMMAND("", N_("Control an already running ELinks"), INIT_OPT_COMMAND("", N_("Control an already running ELinks"),
"remote", 0, remote_cmd, "remote", 0, remote_cmd,
N_("Control a remote ELinks instance by passing commands to it.\n" N_("Control a remote ELinks instance by passing commands to "
"The option takes an additional argument containing the method\n" "it. The option takes an additional argument containing the "
"which should be invoked and any parameters that should be passed\n" "method which should be invoked and any parameters that "
"to it. For ease of use, the additional method argument can be\n" "should be passed to it. For ease of use, the additional "
"omitted in which case any URL arguments will be opened in new\n" "method argument can be omitted in which case any URL "
"tabs in the remote instance.\n" "arguments will be opened in new tabs in the remote "
"instance.\n"
"\n"
"Following is a list of the supported methods:\n" "Following is a list of the supported methods:\n"
"\tping() : look for a remote instance\n" "\tping() : look for a remote instance\n"
"\topenURL() : prompt URL in current tab\n" "\topenURL() : prompt URL in current tab\n"
@ -875,20 +896,23 @@ struct option_info cmdline_options_info[] = {
INIT_OPT_INT("", N_("Connect to session ring with given ID"), INIT_OPT_INT("", N_("Connect to session ring with given ID"),
"session-ring", 0, 0, INT_MAX, 0, "session-ring", 0, 0, INT_MAX, 0,
N_("ID of session ring this ELinks session should connect to. ELinks\n" N_("ID of session ring this ELinks session should connect to. "
"works in so-called session rings, whereby all instances of ELinks\n" "ELinks works in so-called session rings, whereby all "
"are interconnected and share state (cache, bookmarks, cookies,\n" "instances of ELinks are interconnected and share state "
"and so on). By default, all ELinks instances connect to session\n" "(cache, bookmarks, cookies, and so on). By default, all "
"ring 0. You can change that behaviour with this switch and form as\n" "ELinks instances connect to session ring 0. You can change "
"many session rings as you want. Obviously, if the session-ring with\n" "that behaviour with this switch and form as many session "
"this number doesn't exist yet, it's created and this ELinks instance\n" "rings as you want. Obviously, if the session-ring with this "
"will become the master instance (that usually doesn't matter for you\n" "number doesn't exist yet, it's created and this ELinks "
"as a user much). Note that you usually don't want to use this unless\n" "instance will become the master instance (that usually "
"you're a developer and you want to do some testing - if you want the\n" "doesn't matter for you as a user much).\n"
"ELinks instances each running standalone, rather use the -no-connect\n" "\n"
"command-line option. Also note that normally no runtime state files\n" "Note that you usually don't want to use this unless you're a "
"are written to the disk when this option is used. See also\n" "developer and you want to do some testing - if you want the "
"-touch-files.")), "ELinks instances each running standalone, rather use the "
"-no-connect command-line option. Also note that normally no "
"runtime state files are written to the disk when this option "
"is used. See also -touch-files.")),
INIT_OPT_BOOL("", N_("Print the source of given URLs to stdout"), INIT_OPT_BOOL("", N_("Print the source of given URLs to stdout"),
"source", 0, 0, "source", 0, 0,
@ -898,14 +922,14 @@ struct option_info cmdline_options_info[] = {
INIT_OPT_BOOL("", N_("Touch files in ~/.elinks when running with -no-connect/-session-ring"), INIT_OPT_BOOL("", N_("Touch files in ~/.elinks when running with -no-connect/-session-ring"),
"touch-files", 0, 0, "touch-files", 0, 0,
N_("When enabled, runtime state files (bookmarks, history, etc.) are\n" N_("When enabled, runtime state files (bookmarks, history, "
"written to disk, even when -no-connect or -session-ring is used.\n" "etc.) are written to disk, even when -no-connect or "
"The option has no effect if not used in conjunction with any of\n" "-session-ring is used. The option has no effect if not used "
"these options.")), "in conjunction with any of these options.")),
INIT_OPT_INT("", N_("Verbose level"), INIT_OPT_INT("", N_("Verbose level"),
"verbose", 0, 0, VERBOSE_LEVELS - 1, VERBOSE_WARNINGS, "verbose", 0, 0, VERBOSE_LEVELS - 1, VERBOSE_WARNINGS,
N_("The verbose level controls what messages are shown at\n" N_("The verbose level controls what messages are shown at "
"start up and while running:\n" "start up and while running:\n"
"\t0 means only show serious errors\n" "\t0 means only show serious errors\n"
"\t1 means show serious errors and warnings\n" "\t1 means show serious errors and warnings\n"

99
src/config/conf.c
View File

@ -861,6 +861,66 @@ add_indent_to_string(struct string *string, int depth)
add_xchar_to_string(string, ' ', depth * indentation); add_xchar_to_string(string, ' ', depth * indentation);
} }
struct string *
wrap_option_desc(struct string *out, const unsigned char *src,
const struct string *indent, int maxwidth)
{
const unsigned char *last_space = NULL;
const unsigned char *uncopied = src;
int width = 0;
/* TODO: multibyte or fullwidth characters */
for (; *src; src++, width++) {
if (*src == '\n') {
last_space = src;
goto split;
}
if (*src == ' ') last_space = src;
if (width >= maxwidth && last_space) {
split:
if (!add_string_to_string(out, indent))
return NULL;
if (!add_bytes_to_string(out, uncopied,
last_space - uncopied))
return NULL;
if (!add_char_to_string(out, '\n'))
return NULL;
uncopied = last_space + 1;
width = src - uncopied;
last_space = NULL;
}
}
if (*uncopied) {
if (!add_string_to_string(out, indent))
return NULL;
if (!add_to_string(out, uncopied))
return NULL;
if (!add_char_to_string(out, '\n'))
return NULL;
}
return out;
}
static void
output_option_desc_as_comment(struct string *out, const struct option *option,
int i18n, int depth)
{
unsigned char *desc_i18n = conf_i18n(option->desc, i18n);
struct string indent;
if (!init_string(&indent)) return;
add_indent_to_string(&indent, depth);
if (!add_to_string(&indent, "# ")) goto out_of_memory;
if (!wrap_option_desc(out, desc_i18n, &indent, 80 - indent.length))
goto out_of_memory;
out_of_memory:
done_string(&indent);
}
static unsigned char *smart_config_output_fn_domain; static unsigned char *smart_config_output_fn_domain;
static void static void
@ -868,8 +928,6 @@ smart_config_output_fn(struct string *string, struct option *option,
unsigned char *path, int depth, int do_print_comment, unsigned char *path, int depth, int do_print_comment,
int action, int i18n) int action, int i18n)
{ {
unsigned char *desc_i18n;
if (option->type == OPT_ALIAS) if (option->type == OPT_ALIAS)
return; return;
@ -896,41 +954,8 @@ smart_config_output_fn(struct string *string, struct option *option,
if (!option->desc || !do_print_comment) if (!option->desc || !do_print_comment)
break; break;
desc_i18n = conf_i18n(option->desc, i18n); output_option_desc_as_comment(string, option,
i18n, depth);
if (!*desc_i18n) break;
add_indent_to_string(string, depth);
add_to_string(string, "# ");
{
unsigned char *i = desc_i18n;
unsigned char *j = i;
unsigned char *last_space = NULL;
int config_width = 80;
int n = depth * indentation + 3;
for (; *i; i++, n++) {
if (*i == '\n') {
last_space = i;
goto split;
}
if (*i == ' ') last_space = i;
if (n >= config_width && last_space) {
split:
add_bytes_to_string(string, j, last_space - j);
add_char_to_string(string, '\n');
add_indent_to_string(string, depth);
add_to_string(string, "# ");
j = last_space + 1;
n = depth * indentation + 2 + i - last_space;
last_space = NULL;
}
}
add_to_string(string, j);
}
add_char_to_string(string, '\n');
break; break;
case 2: case 2:

3
src/config/conf.h
View File

@ -25,4 +25,7 @@ int write_config(struct terminal *);
unsigned char * unsigned char *
create_config_string(unsigned char *prefix, unsigned char *name); create_config_string(unsigned char *prefix, unsigned char *name);
struct string *wrap_option_desc(struct string *out, const unsigned char *src,
const struct string *indent, int maxwidth);
#endif #endif

554
src/config/options.inc
View File

@ -22,7 +22,8 @@ static struct option_info config_options_info[] = {
INIT_OPT_INT("config", N_("Comments"), INIT_OPT_INT("config", N_("Comments"),
"comments", 0, 0, 3, 3, "comments", 0, 0, 3, 3,
N_("Amount of comments automatically written to the config file:\n" N_("Amount of comments automatically written to the config "
"file:\n"
"0 is no comments are written\n" "0 is no comments are written\n"
"1 is only the \"blurb\" (name+type) is written\n" "1 is only the \"blurb\" (name+type) is written\n"
"2 is only the description is written\n" "2 is only the description is written\n"
@ -30,39 +31,41 @@ static struct option_info config_options_info[] = {
INIT_OPT_INT("config", N_("Indentation"), INIT_OPT_INT("config", N_("Indentation"),
"indentation", 0, 0, 16, 2, "indentation", 0, 0, 16, 2,
N_("Shift width of one indentation level in the configuration\n" N_("Shift width of one indentation level in the configuration "
"file. Zero means that no indentation is performed at all\n" "file. Zero means that no indentation is performed at all "
"when saving the configuration.")), "when saving the configuration.")),
INIT_OPT_INT("config", N_("Saving style"), INIT_OPT_INT("config", N_("Saving style"),
"saving_style", 0, 0, 3, 3, "saving_style", 0, 0, 3, 3,
N_("Determines what happens when you tell ELinks to save options:\n" N_("Determines what happens when you tell ELinks to save "
"options:\n"
"0 is only values of current options are altered\n" "0 is only values of current options are altered\n"
"1 is values of current options are altered and missing options\n" "1 is values of current options are altered and missing\n"
" are added at the end of the file\n" " options are added at the end of the file\n"
"2 is the configuration file is rewritten from scratch\n" "2 is the configuration file is rewritten from scratch\n"
"3 is values of current options are altered and missing options\n" "3 is values of current options are altered and missing\n"
" CHANGED during this ELinks session are added at the end of\n" " options CHANGED during this ELinks session are added at\n"
" the file")), " the end of the file")),
INIT_OPT_BOOL("config", N_("Comments localization"), INIT_OPT_BOOL("config", N_("Comments localization"),
"i18n", 0, 0, "i18n", 0, 0,
N_("If set to 1, comments in the configuration file will be\n" N_("If set to 1, comments in the configuration file will be "
"translated to the language used by UI. Note that if you have\n" "translated to the language used by UI. Note that if you have "
"different language set in different terminals, the language\n" "different language set in different terminals, the language "
"used in the configuration file MAY be the same as on the\n" "used in the configuration file MAY be the same as on the "
"terminal where you saved the file, but it should be generally\n" "terminal where you saved the file, but it should be "
"considered unpredictable.")), "generally considered unpredictable.")),
INIT_OPT_BOOL("config", N_("Saving style warnings"), INIT_OPT_BOOL("config", N_("Saving style warnings"),
"saving_style_w", 0, 0, "saving_style_w", 0, 0,
N_("This is internal option used when displaying a warning about\n" N_("This is internal option used when displaying a warning "
"obsolete config.saving_style. You shouldn't touch it.")), "about obsolete config.saving_style. You shouldn't touch "
"it.")),
INIT_OPT_BOOL("config", N_("Show template"), INIT_OPT_BOOL("config", N_("Show template"),
"show_template", 0, 0, "show_template", 0, 0,
N_("Show template options in autocreated trees in the options\n" N_("Show template options in autocreated trees in the options "
"manager and save them to the configuration file.")), "manager and save them to the configuration file.")),
/* Keep options in alphabetical order. */ /* Keep options in alphabetical order. */
@ -83,12 +86,13 @@ static struct option_info config_options_info[] = {
INIT_OPT_INT("connection", N_("Maximum connections per host"), INIT_OPT_INT("connection", N_("Maximum connections per host"),
"max_connections_to_host", 0, 1, 8, 2, "max_connections_to_host", 0, 1, 8, 2,
N_("Maximum number of concurrent connections to a given host.")), N_("Maximum number of concurrent connections to a given "
"host.")),
INIT_OPT_INT("connection", N_("Connection retries"), INIT_OPT_INT("connection", N_("Connection retries"),
"retries", 0, 0, 16, 3, "retries", 0, 0, 16, 3,
N_("Number of tries to establish a connection.\n" N_("Number of tries to establish a connection. "
"Zero means try forever.")), "Zero means try forever.")),
INIT_OPT_INT("connection", N_("Receive timeout"), INIT_OPT_INT("connection", N_("Receive timeout"),
"receive_timeout", 0, 1, 1800, 120, "receive_timeout", 0, 1, 1800, 120,
@ -97,20 +101,22 @@ static struct option_info config_options_info[] = {
#ifdef CONFIG_IPV6 #ifdef CONFIG_IPV6
INIT_OPT_BOOL("connection", N_("Try IPv4 when connecting"), INIT_OPT_BOOL("connection", N_("Try IPv4 when connecting"),
"try_ipv4", 0, 1, "try_ipv4", 0, 1,
N_("Whether to try to connect to a host over IPv4.\n" N_("Whether to try to connect to a host over IPv4. "
"Note that if connection.try_ipv6 is enabled too,\n" "Note that if connection.try_ipv6 is enabled too, "
"it takes precedence. And better do not touch this\n" "it takes precedence. And better do not touch this "
"at all unless you are sure what are you doing.\n" "at all unless you are sure what are you doing.\n"
"Note that you can also force a given protocol\n" "\n"
"to be used on a per-connection basis by using a URL\n" "Note that you can also force a given protocol "
"to be used on a per-connection basis by using a URL "
"in the style of e.g. http4://elinks.cz/.")), "in the style of e.g. http4://elinks.cz/.")),
#else #else
INIT_OPT_BOOL("connection", N_("Try IPv4 when connecting"), INIT_OPT_BOOL("connection", N_("Try IPv4 when connecting"),
"try_ipv4", 0, 1, "try_ipv4", 0, 1,
N_("Whether to try to connect to a host over IPv4.\n" N_("Whether to try to connect to a host over IPv4. "
"Do not touch this option.\n" "Do not touch this option.\n"
"Note that you can also force a given protocol\n" "\n"
"to be used on a per-connection basis by using a URL\n" "Note that you can also force a given protocol "
"to be used on a per-connection basis by using a URL "
"in the style of e.g. http4://elinks.cz/.")), "in the style of e.g. http4://elinks.cz/.")),
#endif #endif
@ -118,8 +124,9 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("connection", N_("Try IPv6 when connecting"), INIT_OPT_BOOL("connection", N_("Try IPv6 when connecting"),
"try_ipv6", 0, 1, "try_ipv6", 0, 1,
N_("Whether to try to connect to a host over IPv6.\n" N_("Whether to try to connect to a host over IPv6.\n"
"Note that you can also force a given protocol\n" "\n"
"to be used on a per-connection basis by using a URL\n" "Note that you can also force a given protocol "
"to be used on a per-connection basis by using a URL "
"in the style of e.g. http6://elinks.cz/.")), "in the style of e.g. http6://elinks.cz/.")),
#endif #endif
@ -142,16 +149,16 @@ static struct option_info config_options_info[] = {
INIT_OPT_TREE("document.browse", N_("Access keys"), INIT_OPT_TREE("document.browse", N_("Access keys"),
"accesskey", 0, "accesskey", 0,
N_("Options for handling of link access keys.\n" N_("Options for handling of link access keys. "
"An HTML document can use the ACCESSKEY attribute to assign\n" "An HTML document can use the ACCESSKEY attribute to assign "
"an access key to an element. When an access key is pressed,\n" "an access key to an element. When an access key is pressed, "
"the corresponding element will be given focus.")), "the corresponding element will be given focus.")),
INIT_OPT_BOOL("document.browse.accesskey", N_("Automatic links following"), INIT_OPT_BOOL("document.browse.accesskey", N_("Automatic links following"),
"auto_follow", 0, 0, "auto_follow", 0, 0,
N_("Automatically follow a link or submit a form if appropriate\n" N_("Automatically follow a link or submit a form if "
"accesskey is pressed - this is the standard behaviour, but it's\n" "appropriate accesskey is pressed - this is the standard "
"considered dangerous.")), "behaviour, but it's considered dangerous.")),
INIT_OPT_BOOL("document.browse.accesskey", N_("Display access key in link info"), INIT_OPT_BOOL("document.browse.accesskey", N_("Display access key in link info"),
"display", 0, 0, "display", 0, 0,
@ -160,8 +167,10 @@ static struct option_info config_options_info[] = {
INIT_OPT_INT("document.browse.accesskey", N_("Accesskey priority"), INIT_OPT_INT("document.browse.accesskey", N_("Accesskey priority"),
"priority", 0, 0, 2, 0, "priority", 0, 0, 2, 0,
N_("Priority of 'accesskey' HTML attribute:\n" N_("Priority of 'accesskey' HTML attribute:\n"
"0 is first try all normal bindings; if it fails, check accesskey\n" "0 is first try all normal bindings; if it fails,\n"
"1 is first try only frame bindings; if it fails, check accesskey\n" " check accesskey\n"
"1 is first try only frame bindings; if it fails,\n"
" check accesskey\n"
"2 is first check accesskey (this can be dangerous)")), "2 is first check accesskey (this can be dangerous)")),
@ -171,8 +180,8 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.browse.forms", N_("Submit form automatically"), INIT_OPT_BOOL("document.browse.forms", N_("Submit form automatically"),
"auto_submit", 0, 1, "auto_submit", 0, 1,
N_("Automagically submit a form when enter is pressed with a text\n" N_("Automagically submit a form when enter is pressed with a "
"field selected.")), "text field selected.")),
INIT_OPT_BOOL("document.browse.forms", N_("Confirm submission"), INIT_OPT_BOOL("document.browse.forms", N_("Confirm submission"),
"confirm_submit", 0, 1, "confirm_submit", 0, 1,
@ -184,20 +193,22 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.browse.forms", N_("Insert mode"), INIT_OPT_BOOL("document.browse.forms", N_("Insert mode"),
"insert_mode", 0, 1, "insert_mode", 0, 1,
N_("The setting for this option affects how key presses are handled\n" N_("The setting for this option affects how key presses are "
"when one selects a text-input form-field. When enabled, one must\n" "handled when one selects a text-input form-field. When "
"explicitly 'enter' a selected text-field to edit it; this prevents\n" "enabled, one must explicitly 'enter' a selected text-field "
"text fields from capturing key presses, such as presses of a scroll\n" "to edit it; this prevents text fields from capturing key "
"key, when it is inadvertently selected. When disabled, key presses\n" "presses, such as presses of a scroll key, when it is "
"are always inserted into a selected text field.")), "inadvertently selected. When disabled, key presses are "
"always inserted into a selected text field.")),
INIT_OPT_STRING("document.browse.forms", N_("External editor"), INIT_OPT_STRING("document.browse.forms", N_("External editor"),
"editor", 0, "", "editor", 0, "",
N_("Path to the executable that ELinks should launch when the user\n" N_("Path to the executable that ELinks should launch when the "
"requests to edit a textarea with an external editor.\n" "user requests to edit a textarea with an external editor.\n"
"If this is blank, ELinks will use the value of the environmental\n" "\n"
"variable $EDITOR. If $EDITOR is empty or not set, ELinks will then\n" "If this is blank, ELinks will use the value of the "
"default to \"vi\".")), "environmental variable $EDITOR. If $EDITOR is empty or not "
"set, ELinks will then default to \"vi\".")),
INIT_OPT_TREE("document.browse", N_("Images"), INIT_OPT_TREE("document.browse", N_("Images"),
@ -209,15 +220,18 @@ static struct option_info config_options_info[] = {
N_("Display style for image tags when displayed:\n" N_("Display style for image tags when displayed:\n"
"0 means always display IMG\n" "0 means always display IMG\n"
"1 means always display filename\n" "1 means always display filename\n"
"2 means display alt/title attribute if possible, IMG if not\n" "2 means display alt/title attribute if possible,\n"
"3 means display alt/title attribute if possible, filename if not")), " IMG if not\n"
"3 means display alt/title attribute if possible,\n"
" filename if not")),
INIT_OPT_INT("document.browse.images", N_("Maximum length for image filename"), INIT_OPT_INT("document.browse.images", N_("Maximum length for image filename"),
"filename_maxlen", 0, 0, 500, 0, "filename_maxlen", 0, 0, 500, 0,
N_("Maximum length of image filename when displayed:\n" N_("Maximum length of image filename when displayed:\n"
"0 means always display full filename\n" "0 means always display full filename\n"
"1-500 means display filename with this maximal length;\n" "1-500 means display filename with this maximal length;\n"
" if it is longer, the middle is substituted by an asterisk")), " if it is longer, the middle is substituted by\n"
" an asterisk")),
/* Compatibility aliases. Added: 2004-12-15, 0.10pre3.CVS. It was /* Compatibility aliases. Added: 2004-12-15, 0.10pre3.CVS. It was
* replaced by display_style and filename_maxlen options combination. */ * replaced by display_style and filename_maxlen options combination. */
@ -244,19 +258,20 @@ static struct option_info config_options_info[] = {
N_("Maximum length of image label (alt/title):\n" N_("Maximum length of image label (alt/title):\n"
"0 means always display full label\n" "0 means always display full label\n"
"1-500 means display label with this maximal length;\n" "1-500 means display label with this maximal length;\n"
" if it is longer, the middle is substituted by an asterisk")), " if it is longer, the middle is substituted by\n"
" an asterisk")),
INIT_OPT_BOOL("document.browse.images", N_("Display links to images w/o alt"), INIT_OPT_BOOL("document.browse.images", N_("Display links to images w/o alt"),
"show_as_links", 0, 0, "show_as_links", 0, 0,
N_("Display links to images without an alt attribute. If this option\n" N_("Display links to images without an alt attribute. If this "
"is off, these images are completely invisible.")), "option is off, these images are completely invisible.")),
INIT_OPT_BOOL("document.browse.images", N_("Display links to images"), INIT_OPT_BOOL("document.browse.images", N_("Display links to images"),
"show_any_as_links", 0, 1, "show_any_as_links", 0, 1,
N_("Display links to any images in the document, regardless of them\n" N_("Display links to any images in the document, regardless "
"having an alt attribute or not. If this option is off, the alt\n" "of them having an alt attribute or not. If this option is "
"attribute contents is shown, but as normal text, not selectable\n" "off, the alt attribute contents is shown, but as normal "
"as a link.")), "text, not selectable as a link.")),
INIT_OPT_TREE("document.browse", N_("Links"), INIT_OPT_TREE("document.browse", N_("Links"),
@ -281,7 +296,7 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.browse.links.active_link", N_("Enable color"), INIT_OPT_BOOL("document.browse.links.active_link", N_("Enable color"),
"enable_color", 0, 0, "enable_color", 0, 0,
N_("Enable use of the active link background and text color\n" N_("Enable use of the active link background and text color "
"settings instead of the link colors from the document.")), "settings instead of the link colors from the document.")),
INIT_OPT_BOOL("document.browse.links.active_link", N_("Bold"), INIT_OPT_BOOL("document.browse.links.active_link", N_("Bold"),
@ -300,7 +315,8 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.browse.links", N_("Directory highlighting"), INIT_OPT_BOOL("document.browse.links", N_("Directory highlighting"),
"color_dirs", 0, 1, "color_dirs", 0, 1,
N_("Highlight links to directories in FTP and local directory listing.")), N_("Highlight links to directories in FTP and local directory "
"listing.")),
INIT_OPT_BOOL("document.browse.links", N_("Number links"), INIT_OPT_BOOL("document.browse.links", N_("Number links"),
"numbering", 0, 0, "numbering", 0, 0,
@ -323,35 +339,36 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.browse.links", N_("Use tabindex"), INIT_OPT_BOOL("document.browse.links", N_("Use tabindex"),
"use_tabindex", 0, 1, "use_tabindex", 0, 1,
N_("Whether to navigate links using tabindex specified ordering.\n" N_("Whether to navigate links using tabindex specified "
"The TABINDEX attribute in HTML elements specifies the order\n" "ordering. The TABINDEX attribute in HTML elements specifies "
"in which links should receive focus when using the keyboard\n" "the order in which links should receive focus when using the "
"to navigate the document.")), "keyboard to navigate the document.")),
INIT_OPT_BOOL("document.browse.links", N_("Missing fragment reporting"), INIT_OPT_BOOL("document.browse.links", N_("Missing fragment reporting"),
"missing_fragment", 0, 1, "missing_fragment", 0, 1,
N_("Open a message box when document has no tag with given id.")), N_("Open a message box when document has no tag with given "
"id.")),
INIT_OPT_INT("document.browse.links", N_("Number keys select links"), INIT_OPT_INT("document.browse.links", N_("Number keys select links"),
"number_keys_select_link", 0, 0, 2, 1, "number_keys_select_link", 0, 0, 2, 1,
N_("Number keys select links rather than specify command prefixes. This\n" N_("Number keys select links rather than specify command "
"is a tristate:\n" "prefixes. This is a tristate:\n"
"0 means never\n" "0 means never\n"
"1 means if document.browse.links.numbering = 1\n" "1 means if document.browse.links.numbering = 1\n"
"2 means always")), "2 means always")),
INIT_OPT_BOOL("document.browse.links", N_("Warn about maliciously crafted URIs"), INIT_OPT_BOOL("document.browse.links", N_("Warn about maliciously crafted URIs"),
"warn_malicious", 0, 1, "warn_malicious", 0, 1,
N_("When following a link the user ID part of the URI is\n" N_("When following a link the user ID part of the URI is "
"checked and if a maliciously crafted URI is detected a\n" "checked and if a maliciously crafted URI is detected a "
"warning dialog will ask before following the link.")), "warning dialog will ask before following the link.")),
/* TODO - this is somehow implemented by ff, but disabled /* TODO - this is somehow implemented by ff, but disabled
* for now as it doesn't work. */ * for now as it doesn't work. */
INIT_OPT_BOOL("document.browse.links", N_("Wrap-around links cycling"), INIT_OPT_BOOL("document.browse.links", N_("Wrap-around links cycling"),
"wraparound", /* 0 */ 0, 0, "wraparound", /* 0 */ 0, 0,
N_("When pressing 'down' on the last link, jump to the first one, and\n" N_("When pressing 'down' on the last link, jump to the first "
"vice versa.")), "one, and vice versa.")),
INIT_OPT_TREE("document.browse", N_("Scrolling"), INIT_OPT_TREE("document.browse", N_("Scrolling"),
@ -360,24 +377,25 @@ static struct option_info config_options_info[] = {
INIT_OPT_INT("document.browse.scrolling", N_("Horizontal step"), INIT_OPT_INT("document.browse.scrolling", N_("Horizontal step"),
"horizontal_step", 0, 1, 9999, 8, "horizontal_step", 0, 1, 9999, 8,
N_("Number of columns to scroll when a key bound to scroll-left or scroll-\n" N_("Number of columns to scroll when a key bound to "
"right is pressed and no prefix was given.")), "scroll-left or scroll-right is pressed and no prefix was "
"given.")),
INIT_OPT_BOOL("document.browse.scrolling", N_("Extended horizontal scrolling"), INIT_OPT_BOOL("document.browse.scrolling", N_("Extended horizontal scrolling"),
"horizontal_extended", 0, 1, "horizontal_extended", 0, 1,
N_("Whether to allow horizontal scrolling when the document\n" N_("Whether to allow horizontal scrolling when the document "
"does not extend off the screen. Useful for copy/paste\n" "does not extend off the screen. Useful for copy/paste "
"operations.")), "operations.")),
INIT_OPT_INT("document.browse.scrolling", N_("Margin"), INIT_OPT_INT("document.browse.scrolling", N_("Margin"),
"margin", 0, 0, 20, 3, "margin", 0, 0, 20, 3,
N_("Size of the virtual margin - when you click inside of that margin,\n" N_("Size of the virtual margin - when you click inside of "
"document scrolls in that direction.")), "that margin, document scrolls in that direction.")),
INIT_OPT_INT("document.browse.scrolling", N_("Vertical step"), INIT_OPT_INT("document.browse.scrolling", N_("Vertical step"),
"vertical_step", 0, 1, 9999, 2, "vertical_step", 0, 1, 9999, 2,
N_("Number of lines to scroll when a key bound to scroll-up or scroll-\n" N_("Number of lines to scroll when a key bound to scroll-up "
"down is pressed and no prefix was given.")), "or scroll-down is pressed and no prefix was given.")),
INIT_OPT_TREE("document.browse", N_("Searching"), INIT_OPT_TREE("document.browse", N_("Searching"),
@ -386,8 +404,8 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.browse.search", N_("Case sensitivity"), INIT_OPT_BOOL("document.browse.search", N_("Case sensitivity"),
"case", 0, 0, "case", 0, 0,
N_("Whether the search should match the document text while maintaining\n" N_("Whether the search should match the document text while "
"case sensitivity.")), "maintaining case sensitivity.")),
#ifdef HAVE_TRE_REGEX_H #ifdef HAVE_TRE_REGEX_H
INIT_OPT_INT("document.browse.search", N_("Regular expressions"), INIT_OPT_INT("document.browse.search", N_("Regular expressions"),
@ -400,12 +418,13 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.browse.search", N_("Show search hit top or bottom dialogs"), INIT_OPT_BOOL("document.browse.search", N_("Show search hit top or bottom dialogs"),
"show_hit_top_bottom", 0, 1, "show_hit_top_bottom", 0, 1,
N_("Whether to show a dialog when the search hits the top or bottom of the\n" N_("Whether to show a dialog when the search hits the top or "
"document.")), "bottom of the document.")),
INIT_OPT_BOOL("document.browse.search", N_("Wraparound"), INIT_OPT_BOOL("document.browse.search", N_("Wraparound"),
"wraparound", 0, 1, "wraparound", 0, 1,
N_("Wrap around when searching. Currently only used for typeahead.")), N_("Wrap around when searching. Currently only used for "
"typeahead.")),
INIT_OPT_INT("document.browse.search", N_("Show not found"), INIT_OPT_INT("document.browse.search", N_("Show not found"),
"show_not_found", 0, 0, 2, 2, "show_not_found", 0, 0, 2, 2,
@ -416,13 +435,17 @@ static struct option_info config_options_info[] = {
INIT_OPT_INT("document.browse.search", N_("Typeahead searching"), INIT_OPT_INT("document.browse.search", N_("Typeahead searching"),
"typeahead", 0, 0, 2, 0, "typeahead", 0, 0, 2, 0,
N_("Start typeahead searching when an unbound key is pressed without\n" N_("Start typeahead searching when an unbound key is pressed "
"any modifiers. Note that most keys have default bindings, so this\n" "without any modifiers. Note that most keys have default "
"feature will not be useful unless you unbind them.\n\n" "bindings, so this feature will not be useful unless you "
"0 disables this feature; typeahead searching will only be used\n" "unbind them.\n"
" when you press a key bound to search-typeahead or similar\n" "\n"
"0 disables this feature; typeahead searching will only be\n"
" used when you press a key bound to search-typeahead or\n"
" similar\n"
"1 automatically starts typeahead searching thru link text\n" "1 automatically starts typeahead searching thru link text\n"
"2 automatically starts typeahead searching thru all document text")), "2 automatically starts typeahead searching thru all document\n"
" text")),
INIT_OPT_INT("document.browse", N_("Horizontal text margin"), INIT_OPT_INT("document.browse", N_("Horizontal text margin"),
@ -431,19 +454,21 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.browse", N_("Document meta refresh"), INIT_OPT_BOOL("document.browse", N_("Document meta refresh"),
"refresh", 0, 1, "refresh", 0, 1,
N_("Automatically follow document-specified refresh directives ('<meta>\n" N_("Automatically follow document-specified refresh "
"refresh' tags). Web-page authors use these to instruct the browser\n" "directives ('<meta> refresh' tags). Web-page authors use "
"to reload a document at a given interval or to load another page.\n" "these to instruct the browser to reload a document at a "
"Regardless of the value the refresh URI is accessible as a link.\n" "given interval or to load another page. Regardless of the "
"Use the document.browse.minimum_refresh_time to control the minimum\n" "value the refresh URI is accessible as a link.\n"
"number of seconds a refresh will wait.")), "\n"
"Use the document.browse.minimum_refresh_time to control the "
"minimum number of seconds a refresh will wait.")),
INIT_OPT_INT("document.browse", N_("Document meta refresh minimum time"), INIT_OPT_INT("document.browse", N_("Document meta refresh minimum time"),
"minimum_refresh_time", 0, 0, INT_MAX, 1000, "minimum_refresh_time", 0, 0, INT_MAX, 1000,
N_("The minimum number of milliseconds that should pass before\n" N_("The minimum number of milliseconds that should pass "
"refreshing. If set to zero the document refresh time is used\n" "before refreshing. If set to zero the document refresh time "
"unchanged. It can fix going back in history for some sites that\n" "is used unchanged. It can fix going back in history for some "
"use refreshing with zero values.")), "sites that use refreshing with zero values.")),
INIT_OPT_BOOL("document.browse", N_("Tables navigation order"), INIT_OPT_BOOL("document.browse", N_("Tables navigation order"),
"table_move_order", 0, 0, "table_move_order", 0, 0,
@ -459,28 +484,32 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.cache", N_("Cache information about redirects"), INIT_OPT_BOOL("document.cache", N_("Cache information about redirects"),
"cache_redirects", 0, 0, "cache_redirects", 0, 0,
N_("Cache even redirects sent by server (usually thru HTTP by a 302\n" N_("Cache even redirects sent by server (usually thru HTTP by "
"HTTP code and a Location header). This was the original behaviour\n" "a 302 HTTP code and a Location header). This was the "
"for quite some time, but it causes problems in a situation very\n" "original behaviour for quite some time, but it causes "
"common to various web login systems - frequently, when accessing\n" "problems in a situation very common to various web login "
"a certain location, they will redirect you to a login page if they\n" "systems - frequently, when accessing a certain location, "
"don't receive an auth cookie, the login page then gives you the\n" "they will redirect you to a login page if they don't receive "
"cookie and redirects you back to the original page, but there you\n" "an auth cookie, the login page then gives you the cookie and "
"have already cached redirect back to the login page! If this\n" "redirects you back to the original page, but there you have "
"option has value of 0, this malfunction is fixed, but occasionally\n" "already cached redirect back to the login page! If this "
"you may get superfluous (depends on how you take it ;-) requests to\n" "option has value of 0, this malfunction is fixed, but "
"the server. If this option has value of 1, experienced users can\n" "occasionally you may get superfluous (depends on how you "
"still workaround it by clever combination of usage of reload,\n" "take it ;-) requests to the server. If this option has value "
"jumping around in session history and hitting ctrl+enter.\n" "of 1, experienced users can still workaround it by clever "
"Note that this option is checked when retrieving the information\n" "combination of usage of reload, jumping around in session "
"from cache, not when saving it to cache - thus if you enable\n" "history and hitting ctrl+enter.\n"
"it, even previous redirects will be taken from cache instead of\n" "\n"
"asking the server.")), "Note that this option is checked when retrieving the "
"information from cache, not when saving it to cache - thus "
"if you enable it, even previous redirects will be taken from "
"cache instead of asking the server.")),
INIT_OPT_BOOL("document.cache", N_("Ignore cache-control info from server"), INIT_OPT_BOOL("document.cache", N_("Ignore cache-control info from server"),
"ignore_cache_control", 0, 1, "ignore_cache_control", 0, 1,
N_("Ignore Cache-Control and Pragma server headers.\n" N_("Ignore Cache-Control and Pragma server headers. "
"When set, the document is cached even with 'Cache-Control: no-cache'.")), "When set, the document is cached even with 'Cache-Control: "
"no-cache'.")),
INIT_OPT_TREE("document.cache", N_("Formatted documents"), INIT_OPT_TREE("document.cache", N_("Formatted documents"),
"format", 0, "format", 0,
@ -488,28 +517,33 @@ static struct option_info config_options_info[] = {
INIT_OPT_INT("document.cache.format", N_("Number"), INIT_OPT_INT("document.cache.format", N_("Number"),
"size", 0, 0, 256, 5, "size", 0, 0, 256, 5,
N_("Number of cached formatted pages. Do not get too generous\n" N_("Number of cached formatted pages. Do not get too "
"here, 'formatted' means that all the accompanying structures\n" "generous here, 'formatted' means that all the accompanying "
"are kept in memory so that you get the cached document\n" "structures are kept in memory so that you get the cached "
"immediatelly, but these structures may take a lot - 2x the\n" "document immediatelly, but these structures may take a lot "
"size of the HTML source is probably not unusual, but it can\n" "- 2x the size of the HTML source is probably not unusual, "
"be even more if the document consists of a lot of short lines\n" "but it can be even more if the document consists of a lot "
"(padded right, if possible) and links and not much other markup.\n" "of short lines (padded right, if possible) and links and "
"So if you set this to 256 and then you don't like your ELinks\n" "not much other markup. So if you set this to 256 and then "
"eating 90M, don't come complaining to us. ;-)\n" "you don't like your ELinks eating 90M, don't come "
"Also note that the format cache itself is not counted to the\n" "complaining to us. ;-)\n"
"memory cache size, but the HTML source of the formatted documents\n" "\n"
"is always cached, even if it is over the memory cache size\n" "Also note that the format cache itself is not counted to "
"threshold. (Then of course no other documents can be cached.)")), "the memory cache size, but the HTML source of the formatted "
"documents is always cached, even if it is over the memory "
"cache size threshold. (Then of course no other documents "
"can be cached.)")),
/* FIXME: Write more. */ /* FIXME: Write more. */
INIT_OPT_INT("document.cache", N_("Revalidation interval"), INIT_OPT_INT("document.cache", N_("Revalidation interval"),
"revalidation_interval", 0, -1, 86400, -1, "revalidation_interval", 0, -1, 86400, -1,
N_("Period in seconds that a cache entry is considered to be\n" N_("Period in seconds that a cache entry is considered to be "
"up-to-date. When a document is loaded and this interval has elapsed\n" "up-to-date. When a document is loaded and this interval has "
"since the document was initially loaded or most recently\n" "elapsed since the document was initially loaded or most "
"revalidated with the server, the server will be checked in case\n" "recently revalidated with the server, the server will be "
"there is a more up-to-date version of the document.\n\n" "checked in case there is a more up-to-date version of the "
"document.\n"
"\n"
"A value of -1 disables automatic revalidation.")), "A value of -1 disables automatic revalidation.")),
INIT_OPT_TREE("document.cache", N_("Memory cache"), INIT_OPT_TREE("document.cache", N_("Memory cache"),
@ -528,7 +562,7 @@ static struct option_info config_options_info[] = {
INIT_OPT_CODEPAGE("document.codepage", N_("Default codepage"), INIT_OPT_CODEPAGE("document.codepage", N_("Default codepage"),
"assume", 0, "System", "assume", 0, "System",
N_("Default document codepage. 'System' stands for\n" N_("Default document codepage. 'System' stands for "
"a codepage determined by a selected locale.")), "a codepage determined by a selected locale.")),
INIT_OPT_BOOL("document.codepage", N_("Ignore charset info from server"), INIT_OPT_BOOL("document.codepage", N_("Ignore charset info from server"),
@ -569,6 +603,7 @@ static struct option_info config_options_info[] = {
INIT_OPT_COLOR("document.colors", N_("Directory color"), INIT_OPT_COLOR("document.colors", N_("Directory color"),
"dirs", 0, "#ffff00", "dirs", 0, "#ffff00",
N_("Default directory color.\n" N_("Default directory color.\n"
"\n"
"See document.browse.links.color_dirs option.")), "See document.browse.links.color_dirs option.")),
/* Compatibility alias: added by jonas at 2005-05-31, 0.11.CVS. */ /* Compatibility alias: added by jonas at 2005-05-31, 0.11.CVS. */
@ -577,10 +612,11 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.colors", N_("Increase contrast"), INIT_OPT_BOOL("document.colors", N_("Increase contrast"),
"increase_contrast", 0, 1, "increase_contrast", 0, 1,
N_("Increase the contrast between the foreground and background colors\n" N_("Increase the contrast between the foreground and "
"to ensure readability. For example it disallows dark colors on a\n" "background colors to ensure readability. For example it "
"black background. Note, this is different from ensuring the contrast\n" "disallows dark colors on a black background. Note, this "
"with the ensure_contrast option.")), "is different from ensuring the contrast with the "
"ensure_contrast option.")),
INIT_OPT_BOOL("document.colors", N_("Ensure contrast"), INIT_OPT_BOOL("document.colors", N_("Ensure contrast"),
"ensure_contrast", 0, 1, "ensure_contrast", 0, 1,
@ -614,8 +650,8 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.download", N_("Set original time"), INIT_OPT_BOOL("document.download", N_("Set original time"),
"set_original_time", 0, 0, "set_original_time", 0, 0,
N_("Set the timestamp of each downloaded file to the timestamp\n" N_("Set the timestamp of each downloaded file to the "
"stored on the server.")), "timestamp stored on the server.")),
/* Does automatic resuming make sense as an option? */ /* Does automatic resuming make sense as an option? */
INIT_OPT_INT("document.download", N_("Prevent overwriting"), INIT_OPT_INT("document.download", N_("Prevent overwriting"),
@ -639,7 +675,7 @@ static struct option_info config_options_info[] = {
INIT_OPT_CODEPAGE("document.dump", N_("Codepage"), INIT_OPT_CODEPAGE("document.dump", N_("Codepage"),
"codepage", 0, "System", "codepage", 0, "System",
N_("Codepage used in dump output. 'System' stands for\n" N_("Codepage used in dump output. 'System' stands for "
"a codepage determined by a selected locale.")), "a codepage determined by a selected locale.")),
INIT_OPT_INT("document.dump", N_("Color mode"), INIT_OPT_INT("document.dump", N_("Color mode"),
@ -650,10 +686,12 @@ static struct option_info config_options_info[] = {
* TRANSLATORS: This restriction applies only to the * TRANSLATORS: This restriction applies only to the
* "en" (English) translation. (See doc/Makefile.) */ * "en" (English) translation. (See doc/Makefile.) */
N_("Color mode for dumps.\n" N_("Color mode for dumps.\n"
"\n"
"Some modes may have been disabled at compile time. " "Some modes may have been disabled at compile time. "
"The Setup -> Terminal options dialog lists the modes " "The Setup -> Terminal options dialog lists the modes "
"supported by this executable. If you select an " "supported by this executable. If you select an "
"unsupported mode, ELinks uses 16 colors.\n" "unsupported mode, ELinks uses 16 colors.\n"
"\n"
"The color modes are:\n" "The color modes are:\n"
"-1 is standard dump mode\n" "-1 is standard dump mode\n"
"0 is mono mode\n" "0 is mono mode\n"
@ -676,7 +714,7 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.dump", N_("References"), INIT_OPT_BOOL("document.dump", N_("References"),
"references", 0, 1, "references", 0, 1,
N_("Whether to print references (URIs) of document links\n" N_("Whether to print references (URIs) of document links "
"in dump output.")), "in dump output.")),
INIT_OPT_STRING("document.dump", N_("Separator"), INIT_OPT_STRING("document.dump", N_("Separator"),
@ -734,8 +772,8 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.html", N_("Wrap non breaking space"), INIT_OPT_BOOL("document.html", N_("Wrap non breaking space"),
"wrap_nbsp", 0, 0, "wrap_nbsp", 0, 0,
N_("If set do not honour non breaking space (the nbsp entity)\n" N_("If set do not honour non breaking space (the nbsp entity) "
"but allow to wrap the text. This can help keeping the width\n" "but allow to wrap the text. This can help keeping the width "
"of documents down so no horizontal scrolling is needed.")), "of documents down so no horizontal scrolling is needed.")),
@ -749,25 +787,29 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("document.plain", N_("Compress empty lines"), INIT_OPT_BOOL("document.plain", N_("Compress empty lines"),
"compress_empty_lines", 0, 0, "compress_empty_lines", 0, 0,
N_("Compress successive empty lines to only one in displayed text.")), N_("Compress successive empty lines to only one in displayed "
"text.")),
INIT_OPT_TREE("document", N_("URI passing"), INIT_OPT_TREE("document", N_("URI passing"),
"uri_passing", OPT_SORT | OPT_AUTOCREATE, "uri_passing", OPT_SORT | OPT_AUTOCREATE,
N_("Rules for passing URIs to external commands. When one rule\n" N_("Rules for passing URIs to external commands. When one "
"is defined the link and tab menu will have a menu item that\n" "rule is defined the link and tab menu will have a menu item "
"makes it possible to pass the the link, frame or tab URI to\n" "that makes it possible to pass the the link, frame or tab "
"an external command. If several rules are defined the link and\n" "URI to an external command. If several rules are defined the "
"tab menu will have a submenu of items for each rule. Note, this\n" "link and tab menu will have a submenu of items for each "
"is mostly useful for launching graphical viewers, since there\n" "rule.\n"
"is no support for releasing the terminal while the command runs.\n" "\n"
"The action and submenus are also available by binding keys to\n" "Note, this is mostly useful for launching graphical viewers, "
"the frame-external-command, the link-external-command, and\n" "since there is no support for releasing the terminal while "
"the tab-external-command actions.")), "the command runs. The action and submenus are also available "
"by binding keys to the frame-external-command, the "
"link-external-command, and the tab-external-command "
"actions.")),
INIT_OPT_STRING("document.uri_passing", NULL, INIT_OPT_STRING("document.uri_passing", NULL,
"_template_", 0, "", "_template_", 0, "",
N_("A rule for passing URI to an external command.\n" N_("A rule for passing URI to an external command. "
"The format is:\n" "The format is:\n"
"%c in the string means the current URL\n" "%c in the string means the current URL\n"
"%% in the string means '%'\n" "%% in the string means '%'\n"
@ -783,26 +825,30 @@ static struct option_info config_options_info[] = {
INIT_OPT_INT("infofiles", N_("Save interval"), INIT_OPT_INT("infofiles", N_("Save interval"),
"save_interval", 0, 0, INT_MAX, 300, "save_interval", 0, 0, INT_MAX, 300,
N_("Interval at which to trigger information files in ~/.elinks\n" N_("Interval at which to trigger information files in "
"to be saved to disk if they have changed (seconds; 0 to disable)")), "~/.elinks to be saved to disk if they have changed "
"(seconds; 0 to disable)")),
INIT_OPT_BOOL("infofiles", N_("Use secure file saving"), INIT_OPT_BOOL("infofiles", N_("Use secure file saving"),
"secure_save", 0, 1, "secure_save", 0, 1,
N_("First write data to unique temporary file, then rename this file\n" N_("First write data to unique temporary file, then rename "
"upon successfully finishing this. Note that this relates only to\n" "this file upon successfully finishing this. Note that this "
"config files, not downloaded files. You may want to disable\n" "relates only to config files, not downloaded files. "
"it if you are using some exotic permissions for concerned files.\n" "You may want to disable it if you are using some exotic "
"Secure file saving is automagically disabled if file is symlink.\n" "permissions for concerned files. Secure file saving is "
"Warning: some systems (ie. OS/2, Win32) require that destination\n" "automagically disabled if file is symlink.\n"
"file doesn't exist when rename(3) is called, breaking atomicity,\n" "\n"
"and reducing reliability of this feature.")), "Warning: some systems (ie. OS/2, Win32) require that "
"destination file doesn't exist when rename(3) is called, "
"breaking atomicity, and reducing reliability of this "
"feature.")),
INIT_OPT_BOOL("infofiles", N_("Use fsync(3) with secure file saving"), INIT_OPT_BOOL("infofiles", N_("Use fsync(3) with secure file saving"),
"secure_save_fsync", 0, 1, "secure_save_fsync", 0, 1,
N_("When using secure file saving, call fsync(3), if the OS\n" N_("When using secure file saving, call fsync(3), if the OS "
"supports it, to force the OS immediately to write the data\n" "supports it, to force the OS immediately to write the "
"to permanent storage. This is optional for those who wish\n" "data to permanent storage. This is optional for those who "
"to avoid excessive disk I/O.")), "wish to avoid excessive disk I/O.")),
/* Keep options in alphabetical order. */ /* Keep options in alphabetical order. */
@ -814,7 +860,8 @@ static struct option_info config_options_info[] = {
INIT_OPT_TREE("terminal", NULL, INIT_OPT_TREE("terminal", NULL,
"_template_", 0, "_template_", 0,
N_("Options specific to this terminal type (according to $TERM value).")), N_("Options specific to this terminal type (according to "
"$TERM value).")),
/* TODO: Incorporate some of the following to the option text. /* TODO: Incorporate some of the following to the option text.
* *
@ -839,8 +886,8 @@ static struct option_info config_options_info[] = {
* understands UTF-8 and has the characters in its font. */ * understands UTF-8 and has the characters in its font. */
INIT_OPT_INT("terminal._template_", N_("Type"), INIT_OPT_INT("terminal._template_", N_("Type"),
"type", 0, 0, 4, 0, "type", 0, 0, 4, 0,
N_("Terminal type; matters mostly only when drawing frames and\n" N_("Terminal type; matters mostly only when drawing frames "
"dialog box borders:\n" "and dialog box borders:\n"
"0 is dumb terminal type, ASCII art\n" "0 is dumb terminal type, ASCII art\n"
"1 is VT100, simple but portable\n" "1 is VT100, simple but portable\n"
"2 is Linux, you get double frames and other goodies\n" "2 is Linux, you get double frames and other goodies\n"
@ -851,20 +898,21 @@ static struct option_info config_options_info[] = {
"latin1_title", 0, 1, "latin1_title", 0, 1,
N_("When updating the window title of xterm or a similar " N_("When updating the window title of xterm or a similar "
"terminal emulator, encode the title in ISO-8859-1 (Latin-1), " "terminal emulator, encode the title in ISO-8859-1 (Latin-1), "
"rather than in the charset used for other text in the window. " "rather than in the charset used for other text in the "
"Cyrillic and other characters get replaced with Latin ones. " "window. Cyrillic and other characters get replaced with "
"Xterm requires this unless you explicitly enable UTF-8 " "Latin ones. Xterm requires this unless you explicitly "
"titles in it.\n" "enable UTF-8 titles in it.\n"
"\n" "\n"
"If this option does not take effect immediately, try switching " "If this option does not take effect immediately, try "
"to a different page so that ELinks notices it needs to update " "switching to a different page so that ELinks notices "
"the title.")), "it needs to update the title.")),
INIT_OPT_BOOL("terminal._template_", N_("Switch fonts for line drawing"), INIT_OPT_BOOL("terminal._template_", N_("Switch fonts for line drawing"),
"m11_hack", 0, 0, "m11_hack", 0, 0,
N_("Switch fonts when drawing lines, enabling both local characters\n" N_("Switch fonts when drawing lines, enabling both local "
"and lines working at the same time. ELinks uses this option only if\n" "characters and lines working at the same time. "
"UTF-8 I/O is disabled and the terminal type is Linux or FreeBSD.")), "ELinks uses this option only if UTF-8 I/O is disabled "
"and the terminal type is Linux or FreeBSD.")),
/* When CONFIG_UTF8 is defined, any code that reads the "utf_8_io" /* When CONFIG_UTF8 is defined, any code that reads the "utf_8_io"
* option should also check whether the "codepage" option is UTF-8, * option should also check whether the "codepage" option is UTF-8,
@ -873,9 +921,10 @@ static struct option_info config_options_info[] = {
* please report any such possibilities as bugs.) */ * please report any such possibilities as bugs.) */
INIT_OPT_BOOL("terminal._template_", N_("UTF-8 I/O"), INIT_OPT_BOOL("terminal._template_", N_("UTF-8 I/O"),
"utf_8_io", 0, 0, "utf_8_io", 0, 0,
N_("Enable I/O in UTF-8 for Unicode terminals. Note that currently,\n" N_("Enable I/O in UTF-8 for Unicode terminals. "
"only the subset of UTF-8 according to terminal codepage is used.\n" "Note that currently, only the subset of UTF-8 according to "
"ELinks ignores this option if the terminal codepage is UTF-8.")), "terminal codepage is used. ELinks ignores this option "
"if the terminal codepage is UTF-8.")),
#ifdef CONFIG_COMBINE #ifdef CONFIG_COMBINE
INIT_OPT_BOOL("terminal._template_", N_("Combining characters"), INIT_OPT_BOOL("terminal._template_", N_("Combining characters"),
@ -886,13 +935,14 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("terminal._template_", N_("Restrict frames in cp850/852"), INIT_OPT_BOOL("terminal._template_", N_("Restrict frames in cp850/852"),
"restrict_852", 0, 0, "restrict_852", 0, 0,
N_("Restrict the characters used when drawing lines. Makes sense\n" N_("Restrict the characters used when drawing lines. "
"only with linux terminals using the cp850/852 character sets.")), "Makes sense only with linux terminals using the cp850/852 "
"character sets.")),
INIT_OPT_BOOL("terminal._template_", N_("Block cursor"), INIT_OPT_BOOL("terminal._template_", N_("Block cursor"),
"block_cursor", 0, 0, "block_cursor", 0, 0,
N_("Move cursor to bottom right corner when done drawing.\n" N_("Move cursor to bottom right corner when done drawing. "
"This is particularly useful when we have a block cursor,\n" "This is particularly useful when we have a block cursor, "
"so that inversed text is displayed correctly.")), "so that inversed text is displayed correctly.")),
INIT_OPT_INT("terminal._template_", N_("Color mode"), INIT_OPT_INT("terminal._template_", N_("Color mode"),
@ -902,12 +952,14 @@ static struct option_info config_options_info[] = {
* an outer list entry after an inner list. * an outer list entry after an inner list.
* TRANSLATORS: This restriction applies only to the * TRANSLATORS: This restriction applies only to the
* "en" (English) translation. (See doc/Makefile.) */ * "en" (English) translation. (See doc/Makefile.) */
N_("The color mode controls what colors are used and how they are " N_("The color mode controls what colors are used and how they "
"output to the terminal.\n" "are output to the terminal.\n"
"\n"
"Some modes may have been disabled at compile time. " "Some modes may have been disabled at compile time. "
"The Setup -> Terminal options dialog lists the modes " "The Setup -> Terminal options dialog lists the modes "
"supported by this executable. If you select an " "supported by this executable. If you select an "
"unsupported mode, ELinks uses 16 colors.\n" "unsupported mode, ELinks uses 16 colors.\n"
"\n"
"The color modes are:\n" "The color modes are:\n"
"0 is mono mode, only 2 colors are used\n" "0 is mono mode, only 2 colors are used\n"
"1 is 16 color mode, uses the common ANSI colors\n" "1 is 16 color mode, uses the common ANSI colors\n"
@ -917,22 +969,26 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("terminal._template_", N_("Transparency"), INIT_OPT_BOOL("terminal._template_", N_("Transparency"),
"transparency", 0, 0, "transparency", 0, 0,
N_("If we should not set the background to black. This is particularly\n" N_("If we should not set the background to black. "
"useful when we have a terminal (typically in some windowing\n" "This is particularly useful when we have a terminal "
"environment) with a background image or a transparent background -\n" "(typically in some windowing environment) with a background "
"it will be visible in ELinks as well (but ELinks document color handling\n" "image or a transparent background - it will be visible in "
"will still assume the background is black so if you have a bright background\n" "ELinks as well (but ELinks document color handling will "
"you might experience contrast problems). Note that this option makes\n" "still assume the background is black so if you have a "
"sense only when colors are enabled.")), "bright background you might experience contrast problems). "
"Note that this option makes sense only when colors are "
"enabled.")),
INIT_OPT_BOOL("terminal._template_", N_("Underline"), INIT_OPT_BOOL("terminal._template_", N_("Underline"),
"underline", 0, 0, "underline", 0, 0,
N_("If we should use underline or enhance the color instead.")), N_("If we should use underline or enhance the color "
"instead.")),
INIT_OPT_CODEPAGE("terminal._template_", N_("Codepage"), INIT_OPT_CODEPAGE("terminal._template_", N_("Codepage"),
"charset", 0, "System", "charset", 0, "System",
N_("Codepage of charset used for displaying content on terminal.\n" N_("Codepage of charset used for displaying content on "
"'System' stands for a codepage determined by a selected locale.")), "terminal. 'System' stands for a codepage determined by "
"a selected locale.")),
/* Keep options in alphabetical order. */ /* Keep options in alphabetical order. */
@ -1152,7 +1208,7 @@ static struct option_info config_options_info[] = {
INIT_OPT_COLORS(".tabs", N_("Unvisited tab"), INIT_OPT_COLORS(".tabs", N_("Unvisited tab"),
"unvisited", "darkblue", "white", "gray", "white", "unvisited", "darkblue", "white", "gray", "white",
N_("Tab colors for tabs that have not been\n" N_("Tab colors for tabs that have not been "
"selected since they completed loading.")), "selected since they completed loading.")),
INIT_OPT_COLORS(".tabs", N_("Unselected tab"), INIT_OPT_COLORS(".tabs", N_("Unselected tab"),
@ -1190,30 +1246,34 @@ static struct option_info config_options_info[] = {
INIT_OPT_INT("ui.dialogs", N_("Minimal height of listbox widget"), INIT_OPT_INT("ui.dialogs", N_("Minimal height of listbox widget"),
"listbox_min_height", 0, 1, 20, 10, "listbox_min_height", 0, 1, 20, 10,
N_("Minimal height of the listbox widget (used e.g. for bookmarks\n" N_("Minimal height of the listbox widget (used e.g. for "
"or global history).")), "bookmarks or global history).")),
INIT_OPT_BOOL("ui.dialogs", N_("Drop shadows"), INIT_OPT_BOOL("ui.dialogs", N_("Drop shadows"),
"shadows", 0, 0, "shadows", 0, 0,
N_("Make dialogs drop shadows (the shadows are solid, you can\n" N_("Make dialogs drop shadows (the shadows are solid, you "
"adjust their color by ui.colors.*.dialog.shadow). You may\n" "can adjust their color by ui.colors.*.dialog.shadow). "
"also want to eliminate the wide borders by adjusting setup.h.")), "You may also want to eliminate the wide borders by "
"adjusting setup.h.")),
INIT_OPT_BOOL("ui.dialogs", N_("Underline menu hotkeys"), INIT_OPT_BOOL("ui.dialogs", N_("Underline menu hotkeys"),
"underline_hotkeys", 0, 0, "underline_hotkeys", 0, 0,
N_("Whether to underline hotkeys in menus to make them more\n" N_("Whether to underline hotkeys in menus to make them more "
"visible. Requires that underlining is enabled for the terminal.")), "visible. Requires that underlining is enabled for the "
"terminal.")),
INIT_OPT_BOOL("ui.dialogs", N_("Underline button shortcuts"), INIT_OPT_BOOL("ui.dialogs", N_("Underline button shortcuts"),
"underline_button_shortcuts", 0, 0, "underline_button_shortcuts", 0, 0,
N_("Whether to underline button shortcuts to make them more\n" N_("Whether to underline button shortcuts to make them more "
"visible. Requires that underlining is enabled for the terminal.")), "visible. Requires that underlining is enabled for the "
"terminal.")),
INIT_OPT_TREE("ui", N_("Timer options"), INIT_OPT_TREE("ui", N_("Timer options"),
"timer", 0, "timer", 0,
N_("Timed action after certain interval of user inactivity. Someone can\n" N_("Timed action after certain interval of user inactivity. "
"even find this useful, although you may not believe that.")), "Someone can even find this useful, although you may not "
"believe that.")),
#ifdef CONFIG_LEDS #ifdef CONFIG_LEDS
INIT_OPT_INT("ui.timer", N_("Enable"), INIT_OPT_INT("ui.timer", N_("Enable"),
@ -1233,12 +1293,13 @@ static struct option_info config_options_info[] = {
INIT_OPT_INT("ui.timer", N_("Duration"), INIT_OPT_INT("ui.timer", N_("Duration"),
"duration", 0, 1, 86400, 86400, "duration", 0, 1, 86400, 86400,
N_("Inactivity timeout in seconds. The maximum of one day\n" N_("Inactivity timeout in seconds. The maximum of one day "
"should be enough for just everyone (TM).")), "should be enough for just everyone (TM).")),
INIT_OPT_STRING("ui.timer", N_("Action"), INIT_OPT_STRING("ui.timer", N_("Action"),
"action", 0, "", "action", 0, "",
N_("Keybinding action to be triggered when timer reaches zero.")), N_("Keybinding action to be triggered when timer reaches "
"zero.")),
INIT_OPT_TREE("ui", N_("Window tabs"), INIT_OPT_TREE("ui", N_("Window tabs"),
@ -1258,8 +1319,8 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("ui.tabs", N_("Wrap-around tabs cycling"), INIT_OPT_BOOL("ui.tabs", N_("Wrap-around tabs cycling"),
"wraparound", 0, 1, "wraparound", 0, 1,
N_("When moving right from the last tab, jump to the first one, and\n" N_("When moving right from the last tab, jump to the first "
"vice versa.")), "one, and vice versa.")),
INIT_OPT_BOOL("ui.tabs", N_("Confirm tab closing"), INIT_OPT_BOOL("ui.tabs", N_("Confirm tab closing"),
"confirm_close", 0, 0, "confirm_close", 0, 0,
@ -1269,8 +1330,9 @@ static struct option_info config_options_info[] = {
INIT_OPT_LANGUAGE("ui", N_("Language"), INIT_OPT_LANGUAGE("ui", N_("Language"),
"language", 0, "language", 0,
N_("Language of user interface. 'System' means that the language will\n" N_("Language of user interface. 'System' means that the "
"be extracted from the environment dynamically.")), "language will be extracted from the environment "
"dynamically.")),
INIT_OPT_BOOL("ui", N_("Display menu bar always"), INIT_OPT_BOOL("ui", N_("Display menu bar always"),
"show_menu_bar_always", 0, 0, "show_menu_bar_always", 0, 0,
@ -1286,14 +1348,15 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("ui", N_("Display goto dialog in new tabs"), INIT_OPT_BOOL("ui", N_("Display goto dialog in new tabs"),
"startup_goto_dialog", 0, 1, "startup_goto_dialog", 0, 1,
N_("Pop up goto dialog in newly created tabs when there's no homepage\n" N_("Pop up goto dialog in newly created tabs when there's "
"set. This means also showing goto dialog on startup.")), "no homepage set. This means also showing goto dialog on "
"startup.")),
INIT_OPT_BOOL("ui", N_("Show a message box when file is saved successfully"), INIT_OPT_BOOL("ui", N_("Show a message box when file is saved successfully"),
"success_msgbox", 0, 1, "success_msgbox", 0, 1,
N_("When you pressed a [ Save ] button in some manager, this option\n" N_("When you pressed a [ Save ] button in some manager, "
"will make sure that a box confirming success of the operation will\n" "this option will make sure that a box confirming success "
"pop up.")), "of the operation will pop up.")),
INIT_OPT_TREE("ui", N_("Sessions"), INIT_OPT_TREE("ui", N_("Sessions"),
@ -1302,30 +1365,35 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("ui.sessions", N_("Keep session active"), INIT_OPT_BOOL("ui.sessions", N_("Keep session active"),
"keep_session_active", 0, 0, "keep_session_active", 0, 0,
N_("Keep the session active even if the last terminal exits.")), N_("Keep the session active even if the last terminal "
"exits.")),
INIT_OPT_BOOL("ui.sessions", N_("Auto save session"), INIT_OPT_BOOL("ui.sessions", N_("Auto save session"),
"auto_save", 0, 0, "auto_save", 0, 0,
N_("Automatically save the session when quitting.\n" N_("Automatically save the session when quitting.\n"
"\n"
"This feature requires bookmark support.")), "This feature requires bookmark support.")),
INIT_OPT_BOOL("ui.sessions", N_("Auto restore session"), INIT_OPT_BOOL("ui.sessions", N_("Auto restore session"),
"auto_restore", 0, 0, "auto_restore", 0, 0,
N_("Automatically restore the session at start.\n" N_("Automatically restore the session at start.\n"
"\n"
"This feature requires bookmark support.")), "This feature requires bookmark support.")),
INIT_OPT_STRING("ui.sessions", N_("Auto save and restore session folder name"), INIT_OPT_STRING("ui.sessions", N_("Auto save and restore session folder name"),
"auto_save_foldername", 0, "Auto saved session", "auto_save_foldername", 0, "Auto saved session",
N_("Name of the bookmarks folder used for auto saving and restoring session.\n" N_("Name of the bookmarks folder used for auto saving and "
"The name has to be unique. Any folders with the same name will be deleted.\n" "restoring session. The name has to be unique. Any folders "
"with the same name will be deleted.\n"
"\n"
"This only makes sense with bookmark support.")), "This only makes sense with bookmark support.")),
INIT_OPT_STRING("ui.sessions", N_("Homepage URI"), INIT_OPT_STRING("ui.sessions", N_("Homepage URI"),
"homepage", 0, WWW_HOME_URL, "homepage", 0, WWW_HOME_URL,
N_("The URI to load either at startup time when no URI was given\n" N_("The URI to load either at startup time when no URI was "
"on the command line or when requested by the goto-url-home action.\n" "given on the command line or when requested by the "
"Set to \"\" if the environment variable WWW_HOME should be used\n" "goto-url-home action. Set to \"\" if the environment "
"as homepage URI instead.")), "variable WWW_HOME should be used as homepage URI instead.")),
#ifdef HAVE_STRFTIME #ifdef HAVE_STRFTIME
INIT_OPT_STRING("ui", N_("Date format"), INIT_OPT_STRING("ui", N_("Date format"),
@ -1335,9 +1403,9 @@ static struct option_info config_options_info[] = {
INIT_OPT_BOOL("ui", N_("Set window title"), INIT_OPT_BOOL("ui", N_("Set window title"),
"window_title", 0, 1, "window_title", 0, 1,
N_("Set the window title when running in a windowing environment\n" N_("Set the window title when running in a windowing "
"in an xterm-like terminal. This way the document's title is\n" "environment in an xterm-like terminal. This way the "
"shown on the window titlebar.")), "document's title is shown on the window titlebar.")),

26
src/cookies/cookies.c
View File

@ -101,27 +101,29 @@ static struct option_info cookies_options[] = {
"max_age", 0, -1, 10000, -1, "max_age", 0, -1, 10000, -1,
N_("Cookie maximum age (in days):\n" N_("Cookie maximum age (in days):\n"
"-1 is use cookie's expiration date if any\n" "-1 is use cookie's expiration date if any\n"
"0 is force expiration at the end of session, ignoring cookie's\n" "0 is force expiration at the end of session, ignoring\n"
" expiration date\n" " cookie's expiration date\n"
"1+ is use cookie's expiration date, but limit age to the given\n" "1+ is use cookie's expiration date, but limit age to the\n"
" number of days")), " given number of days")),
INIT_OPT_BOOL("cookies", N_("Paranoid security"), INIT_OPT_BOOL("cookies", N_("Paranoid security"),
"paranoid_security", 0, 0, "paranoid_security", 0, 0,
N_("When enabled, we'll require three dots in cookies domain for all\n" N_("When enabled, we'll require three dots in cookies domain "
"non-international domains (instead of just two dots). Some countries\n" "for all non-international domains (instead of just two "
"have generic second level domains (eg. .com.pl, .co.uk) and allowing\n" "dots). Some countries have generic second level domains "
"sites to set cookies for these generic domains could potentially be\n" "(eg. .com.pl, .co.uk) and allowing sites to set cookies "
"very bad. Note, it is off by default as it breaks a lot of sites.")), "for these generic domains could potentially be very bad. "
"Note, it is off by default as it breaks a lot of sites.")),
INIT_OPT_BOOL("cookies", N_("Saving"), INIT_OPT_BOOL("cookies", N_("Saving"),
"save", 0, 1, "save", 0, 1,
N_("Whether cookies should be loaded from and saved to disk.")), N_("Whether cookies should be loaded from and saved to "
"disk.")),
INIT_OPT_BOOL("cookies", N_("Resaving"), INIT_OPT_BOOL("cookies", N_("Resaving"),
"resave", 0, 1, "resave", 0, 1,
N_("Save cookies after each change in cookies list? No effect when\n" N_("Save cookies after each change in cookies list? "
"cookie saving (cookies.save) is off.")), "No effect when cookie saving (cookies.save) is off.")),
NULL_OPTION_INFO, NULL_OPTION_INFO,
}; };

31
src/document/css/css.c
View File

@ -29,7 +29,8 @@
struct option_info css_options_info[] = { struct option_info css_options_info[] = {
INIT_OPT_TREE("document", N_("Cascading Style Sheets"), INIT_OPT_TREE("document", N_("Cascading Style Sheets"),
"css", OPT_SORT, "css", OPT_SORT,
N_("Options concerning how to use CSS for styling documents.")), N_("Options concerning how to use CSS for styling "
"documents.")),
INIT_OPT_BOOL("document.css", N_("Enable CSS"), INIT_OPT_BOOL("document.css", N_("Enable CSS"),
"enable", 0, 1, "enable", 0, 1,
@ -37,30 +38,32 @@ struct option_info css_options_info[] = {
INIT_OPT_BOOL("document.css", N_("Ignore \"display: none\""), INIT_OPT_BOOL("document.css", N_("Ignore \"display: none\""),
"ignore_display_none", 0, 1, "ignore_display_none", 0, 1,
N_("When enabled, elements are rendered, even when their display\n" N_("When enabled, elements are rendered, even when their "
"property has the value \"none\". Because ELinks's CSS support is\n" "display property has the value \"none\". Because ELinks's "
"still very incomplete, this setting can improve the way that some\n" "CSS support is still very incomplete, this setting can "
"documents are rendered.")), "improve the way that some documents are rendered.")),
INIT_OPT_BOOL("document.css", N_("Import external style sheets"), INIT_OPT_BOOL("document.css", N_("Import external style sheets"),
"import", 0, 1, "import", 0, 1,
N_("When enabled any external style sheets that are imported from\n" N_("When enabled any external style sheets that are imported "
"either CSS itself using the @import keyword or from the HTML using\n" "from either CSS itself using the @import keyword or from the "
"<link> tags in the document header will also be downloaded.")), "HTML using <link> tags in the document header will also be "
"downloaded.")),
INIT_OPT_STRING("document.css", N_("Default style sheet"), INIT_OPT_STRING("document.css", N_("Default style sheet"),
"stylesheet", 0, "", "stylesheet", 0, "",
N_("The path to the file containing the default user defined\n" N_("The path to the file containing the default user defined "
"Cascading Style Sheet. It can be used to control the basic\n" "Cascading Style Sheet. It can be used to control the basic "
"layout of HTML documents. The path is assumed to be relative\n" "layout of HTML documents. The path is assumed to be relative "
"to ELinks' home directory.\n" "to ELinks' home directory.\n"
"\n"
"Leave as \"\" to use built-in document styling.")), "Leave as \"\" to use built-in document styling.")),
INIT_OPT_STRING("document.css", N_("Media types"), INIT_OPT_STRING("document.css", N_("Media types"),
"media", 0, "tty", "media", 0, "tty",
N_("CSS media types that ELinks claims to support, separated with\n" N_("CSS media types that ELinks claims to support, separated "
"commas. The \"all\" type is implied. Currently, only ASCII\n" "with commas. The \"all\" type is implied. Currently, only "
"characters work reliably here. See CSS2 section 7:\n" "ASCII characters work reliably here. See CSS2 section 7: "
"http://www.w3.org/TR/1998/REC-CSS2-19980512/media.html")), "http://www.w3.org/TR/1998/REC-CSS2-19980512/media.html")),
NULL_OPTION_INFO, NULL_OPTION_INFO,

4
src/ecmascript/ecmascript.c
View File

@ -52,8 +52,8 @@ static struct option_info ecmascript_options[] = {
INIT_OPT_BOOL("ecmascript", N_("Ignore <noscript> content"), INIT_OPT_BOOL("ecmascript", N_("Ignore <noscript> content"),
"ignore_noscript", 0, 0, "ignore_noscript", 0, 0,
N_("Whether to ignore content enclosed by the <noscript> tag\n" N_("Whether to ignore content enclosed by the <noscript> tag "
"when ECMAScript is enabled.")), "when ECMAScript is enabled.")),
INIT_OPT_INT("ecmascript", N_("Maximum execution time"), INIT_OPT_INT("ecmascript", N_("Maximum execution time"),
"max_exec_time", 0, 1, 3600, 5, "max_exec_time", 0, 1, 3600, 5,

4
src/formhist/formhist.c
View File

@ -35,8 +35,8 @@
static struct option_info forms_history_options[] = { static struct option_info forms_history_options[] = {
INIT_OPT_BOOL("document.browse.forms", N_("Show form history dialog"), INIT_OPT_BOOL("document.browse.forms", N_("Show form history dialog"),
"show_formhist", 0, 0, "show_formhist", 0, 0,
N_("Ask if a login form should be saved to file or not.\n" N_("Ask if a login form should be saved to file or not. "
"This option only disables the dialog, already saved login\n" "This option only disables the dialog, already saved login "
"forms are unaffected.")), "forms are unaffected.")),
NULL_OPTION_INFO, NULL_OPTION_INFO,

3
src/globhist/globhist.c
View File

@ -63,7 +63,8 @@ static struct option_info global_history_options[] = {
INIT_OPT_BOOL("document.history.global", N_("Enable"), INIT_OPT_BOOL("document.history.global", N_("Enable"),
"enable", 0, 1, "enable", 0, 1,
N_("Enable global history (\"history of all pages visited\").")), N_("Enable global history (\"history of all pages "
"visited\").")),
INIT_OPT_INT("document.history.global", N_("Maximum number of entries"), INIT_OPT_INT("document.history.global", N_("Maximum number of entries"),
"max_items", 0, 1, INT_MAX, 1024, "max_items", 0, 1, INT_MAX, 1024,

46
src/mime/backend/default.c
View File

@ -24,33 +24,34 @@
static struct option_info default_mime_options[] = { static struct option_info default_mime_options[] = {
INIT_OPT_TREE("mime", N_("MIME type associations"), INIT_OPT_TREE("mime", N_("MIME type associations"),
"type", OPT_AUTOCREATE, "type", OPT_AUTOCREATE,
N_("Handler <-> MIME type association. The first sub-tree is the MIME\n" N_("Handler <-> MIME type association. The first sub-tree is "
"class while the second sub-tree is the MIME type (ie. image/gif\n" "the MIME class while the second sub-tree is the MIME type "
"handler will reside at mime.type.image.gif). Each MIME type option\n" "(ie. image/gif handler will reside at mime.type.image.gif). "
"should contain (case-sensitive) name of the MIME handler (its\n" "Each MIME type option should contain (case-sensitive) name "
"properties are stored at mime.handler.<name>).")), "of the MIME handler (its properties are stored at "
"mime.handler.<name>).")),
INIT_OPT_TREE("mime.type", NULL, INIT_OPT_TREE("mime.type", NULL,
"_template_", OPT_AUTOCREATE, "_template_", OPT_AUTOCREATE,
N_("Handler matching this MIME-type class ('*' is used here in place\n" N_("Handler matching this MIME-type class "
"of '.').")), "('*' is used here in place of '.').")),
INIT_OPT_STRING("mime.type._template_", NULL, INIT_OPT_STRING("mime.type._template_", NULL,
"_template_", 0, "", "_template_", 0, "",
N_("Handler matching this MIME-type name ('*' is used here in place\n" N_("Handler matching this MIME-type name "
"of '.').")), "('*' is used here in place of '.').")),
INIT_OPT_TREE("mime", N_("File type handlers"), INIT_OPT_TREE("mime", N_("File type handlers"),
"handler", OPT_AUTOCREATE, "handler", OPT_AUTOCREATE,
N_("A file type handler is a set of information about how to use\n" N_("A file type handler is a set of information about how to "
"an external program to view a file. It is possible to refer to it\n" "use an external program to view a file. It is possible to "
"for several MIME types -- e.g., you can define an 'image' handler\n" "refer to it for several MIME types -- e.g., you can define "
"to which mime.type.image.png, mime.type.image.jpeg, and so on will\n" "an 'image' handler to which mime.type.image.png, "
"refer; or one might define a handler for a more specific type of file\n" "mime.type.image.jpeg, and so on will refer; or one might "
"-- e.g., PDF files.\n" "define a handler for a more specific type of file -- e.g., "
"Note you must define both a MIME handler and a MIME type association\n" "PDF files. Note you must define both a MIME handler "
"for it to work.")), "and a MIME type association for it to work.")),
INIT_OPT_TREE("mime.handler", NULL, INIT_OPT_TREE("mime.handler", NULL,
"_template_", OPT_AUTOCREATE, "_template_", OPT_AUTOCREATE,
@ -58,7 +59,8 @@ static struct option_info default_mime_options[] = {
INIT_OPT_TREE("mime.handler._template_", NULL, INIT_OPT_TREE("mime.handler._template_", NULL,
"_template_", 0, "_template_", 0,
N_("System-specific handler description (ie. unix, unix-xwin, ...).")), N_("System-specific handler description "
"(ie. unix, unix-xwin, ...).")),
INIT_OPT_BOOL("mime.handler._template_._template_", N_("Ask before opening"), INIT_OPT_BOOL("mime.handler._template_._template_", N_("Ask before opening"),
"ask", 0, 1, "ask", 0, 1,
@ -71,8 +73,8 @@ static struct option_info default_mime_options[] = {
INIT_OPT_STRING("mime.handler._template_._template_", N_("Program"), INIT_OPT_STRING("mime.handler._template_._template_", N_("Program"),
"program", 0, "", "program", 0, "",
/* xgettext:no-c-format */ /* xgettext:no-c-format */
N_("External viewer for this file type. '%' in this string will be\n" N_("External viewer for this file type. "
"substituted by a file name.\n" "'%' in this string will be substituted by a file name. "
"Do _not_ put single- or double-quotes around the % sign.")), "Do _not_ put single- or double-quotes around the % sign.")),
@ -82,8 +84,8 @@ static struct option_info default_mime_options[] = {
INIT_OPT_STRING("mime.extension", NULL, INIT_OPT_STRING("mime.extension", NULL,
"_template_", 0, "", "_template_", 0, "",
N_("MIME-type matching this file extension ('*' is used here in place\n" N_("MIME-type matching this file extension "
"of '.').")), "('*' is used here in place of '.').")),
#define INIT_OPT_MIME_EXTENSION(extension, type) \ #define INIT_OPT_MIME_EXTENSION(extension, type) \
INIT_OPT_STRING("mime.extension", NULL, extension, 0, type, NULL) INIT_OPT_STRING("mime.extension", NULL, extension, 0, type, NULL)

16
src/mime/backend/mailcap.c
View File

@ -96,7 +96,7 @@ static struct option_info mailcap_options[] = {
INIT_OPT_STRING("mime.mailcap", N_("Path"), INIT_OPT_STRING("mime.mailcap", N_("Path"),
"path", 0, DEFAULT_MAILCAP_PATH, "path", 0, DEFAULT_MAILCAP_PATH,
N_("Mailcap search path. Colon-separated list of files.\n" N_("Mailcap search path. Colon-separated list of files. "
"Leave as \"\" to use MAILCAP environment variable instead.")), "Leave as \"\" to use MAILCAP environment variable instead.")),
INIT_OPT_BOOL("mime.mailcap", N_("Ask before opening"), INIT_OPT_BOOL("mime.mailcap", N_("Ask before opening"),
@ -105,17 +105,19 @@ static struct option_info mailcap_options[] = {
INIT_OPT_INT("mime.mailcap", N_("Type query string"), INIT_OPT_INT("mime.mailcap", N_("Type query string"),
"description", 0, 0, 2, 0, "description", 0, 0, 2, 0,
N_("Type of description to show in \"what to do with this file\"\n" N_("Type of description to show in \"what to do with "
"query dialog:\n" "this file\" query dialog:\n"
"0 is show \"mailcap\"\n" "0 is show \"mailcap\"\n"
"1 is show program to be run\n" "1 is show program to be run\n"
"2 is show mailcap description field if any; \"mailcap\" otherwise")), "2 is show mailcap description field if any;\n"
" \"mailcap\" otherwise")),
INIT_OPT_BOOL("mime.mailcap", N_("Prioritize entries by file"), INIT_OPT_BOOL("mime.mailcap", N_("Prioritize entries by file"),
"prioritize", 0, 1, "prioritize", 0, 1,
N_("Prioritize entries by the order of the files in the mailcap\n" N_("Prioritize entries by the order of the files in "
"path. This means that wildcard entries (like: image/*) will\n" "the mailcap path. This means that wildcard entries "
"also be checked before deciding the handler.")), "(like: image/*) will also be checked before deciding "
"the handler.")),
NULL_OPTION_INFO, NULL_OPTION_INFO,
}; };

7
src/mime/backend/mimetypes.c
View File

@ -45,8 +45,8 @@ enum mimetypes_option {
static struct option_info mimetypes_options[] = { static struct option_info mimetypes_options[] = {
INIT_OPT_TREE("mime", N_("Mimetypes files"), INIT_OPT_TREE("mime", N_("Mimetypes files"),
"mimetypes", 0, "mimetypes", 0,
N_("Options for the support of mime.types files. These files\n" N_("Options for the support of mime.types files. These files "
"can be used to find the content type of a URL by looking at\n" "can be used to find the content type of a URL by looking at "
"the extension of the file name.")), "the extension of the file name.")),
INIT_OPT_BOOL("mime.mimetypes", N_("Enable"), INIT_OPT_BOOL("mime.mimetypes", N_("Enable"),
@ -55,7 +55,8 @@ static struct option_info mimetypes_options[] = {
INIT_OPT_STRING("mime.mimetypes", N_("Path"), INIT_OPT_STRING("mime.mimetypes", N_("Path"),
"path", 0, DEFAULT_MIMETYPES_PATH, "path", 0, DEFAULT_MIMETYPES_PATH,
N_("The search path for mime.types files. Colon-separated list of files.")), N_("The search path for mime.types files. "
"Colon-separated list of files.")),
NULL_OPTION_INFO, NULL_OPTION_INFO,
}; };

5
src/mime/mime.c
View File

@ -41,8 +41,9 @@ static struct option_info mime_options[] = {
INIT_OPT_STRING("mime", N_("Default MIME-type"), INIT_OPT_STRING("mime", N_("Default MIME-type"),
"default_type", 0, DEFAULT_MIME_TYPE, "default_type", 0, DEFAULT_MIME_TYPE,
N_("Document MIME-type to assume by default (when we are unable to\n" N_("Document MIME-type to assume by default "
"guess it properly from known information about the document).")), "(when we are unable to guess it properly "
"from known information about the document).")),
NULL_OPTION_INFO, NULL_OPTION_INFO,
}; };

51
src/network/ssl/ssl.c
View File

@ -77,7 +77,7 @@ done_openssl(struct module *module)
static struct option_info openssl_options[] = { static struct option_info openssl_options[] = {
INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"), INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
"cert_verify", 0, 0, "cert_verify", 0, 0,
N_("Verify the peer's SSL certificate. Note that this\n" N_("Verify the peer's SSL certificate. Note that this "
"needs extensive configuration of OpenSSL by the user.")), "needs extensive configuration of OpenSSL by the user.")),
INIT_OPT_TREE("connection.ssl", N_("Client Certificates"), INIT_OPT_TREE("connection.ssl", N_("Client Certificates"),
@ -86,28 +86,30 @@ static struct option_info openssl_options[] = {
INIT_OPT_BOOL("connection.ssl.client_cert", N_("Enable"), INIT_OPT_BOOL("connection.ssl.client_cert", N_("Enable"),
"enable", 0, 0, "enable", 0, 0,
N_("Enable or not the sending of X509 client certificates\n" N_("Enable or not the sending of X509 client certificates "
"to servers which request them.")), "to servers which request them.")),
#ifdef CONFIG_NSS_COMPAT_OSSL #ifdef CONFIG_NSS_COMPAT_OSSL
INIT_OPT_STRING("connection.ssl.client_cert", N_("Certificate nickname"), INIT_OPT_STRING("connection.ssl.client_cert", N_("Certificate nickname"),
"nickname", 0, "", "nickname", 0, "",
N_("The nickname of the client certificate stored in NSS\n" N_("The nickname of the client certificate stored in NSS "
"database. If this value is unset, the nickname from\n" "database. If this value is unset, the nickname from "
"the X509_CLIENT_CERT variable is used instead. If you\n" "the X509_CLIENT_CERT variable is used instead. If you "
"have a PKCS#12 file containing client certificate, you\n" "have a PKCS#12 file containing client certificate, you "
"can import it into your NSS database with:\n" "can import it into your NSS database with:\n"
"$ pk12util -i mycert.p12 -d /path/to/database\n\n" "\n"
"The NSS database location can be changed by SSL_DIR\n" "$ pk12util -i mycert.p12 -d /path/to/database\n"
"environment variable. The database can be also shared\n" "\n"
"with Mozilla browsers.")), "The NSS database location can be changed by SSL_DIR "
"environment variable. The database can be also shared "
"with Mozilla browsers.")),
#else #else
INIT_OPT_STRING("connection.ssl.client_cert", N_("Certificate File"), INIT_OPT_STRING("connection.ssl.client_cert", N_("Certificate File"),
"file", 0, "", "file", 0, "",
N_("The location of a file containing the client certificate\n" N_("The location of a file containing the client certificate "
"and unencrypted private key in PEM format. If unset, the\n" "and unencrypted private key in PEM format. If unset, the "
"file pointed to by the X509_CLIENT_CERT variable is used\n" "file pointed to by the X509_CLIENT_CERT variable is used "
"instead.")), "instead.")),
#endif #endif
NULL_OPTION_INFO, NULL_OPTION_INFO,
@ -181,8 +183,8 @@ done_gnutls(struct module *module)
static struct option_info gnutls_options[] = { static struct option_info gnutls_options[] = {
INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"), INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
"cert_verify", 0, 0, "cert_verify", 0, 0,
N_("Verify the peer's SSL certificate. If you enable\n" N_("Verify the peer's SSL certificate. If you enable "
"this, set also \"Trusted CA file\".")), "this, set also \"Trusted CA file\".")),
/* The default value of the following option points to a file /* The default value of the following option points to a file
* generated by the ca-certificates Debian package. Don't use * generated by the ca-certificates Debian package. Don't use
@ -194,12 +196,13 @@ static struct option_info gnutls_options[] = {
* TODO: If the file name is relative, look in elinks_home? */ * TODO: If the file name is relative, look in elinks_home? */
INIT_OPT_STRING("connection.ssl", N_("Trusted CA file"), INIT_OPT_STRING("connection.ssl", N_("Trusted CA file"),
"trusted_ca_file", 0, "/etc/ssl/certs/ca-certificates.crt", "trusted_ca_file", 0, "/etc/ssl/certs/ca-certificates.crt",
N_("The location of a file containing certificates of\n" N_("The location of a file containing certificates of "
"trusted certification authorities in PEM format.\n" "trusted certification authorities in PEM format. "
"ELinks then trusts certificates issued by these CAs.\n" "ELinks then trusts certificates issued by these CAs.\n"
"If you change this option or the file, you must\n" "\n"
"restart ELinks for the changes to take effect.\n" "If you change this option or the file, you must "
"This option affects GnuTLS but not OpenSSL.")), "restart ELinks for the changes to take effect. "
"This option affects GnuTLS but not OpenSSL.")),
NULL_OPTION_INFO, NULL_OPTION_INFO,
}; };

110
src/protocol/bittorrent/bittorrent.c
View File

@ -54,41 +54,41 @@ static struct option_info bittorrent_protocol_options[] = {
INIT_OPT_BOOL("protocol.bittorrent.tracker", N_("Use compact tracker format"), INIT_OPT_BOOL("protocol.bittorrent.tracker", N_("Use compact tracker format"),
"compact", 0, 0, "compact", 0, 0,
N_("Whether to request that the tracker returns peer info\n" N_("Whether to request that the tracker returns peer info "
"in compact format. Note, the compact format only supports\n" "in compact format. Note, the compact format only supports "
"IPv4 addresses.")), "IPv4 addresses.")),
INIT_OPT_INT("protocol.bittorrent.tracker", N_("Tracker announce interval"), INIT_OPT_INT("protocol.bittorrent.tracker", N_("Tracker announce interval"),
"interval", 0, 0, INT_MAX, 0, "interval", 0, 0, INT_MAX, 0,
N_("The number of seconds to wait between periodically contacting\n" N_("The number of seconds to wait between periodically "
"the tracker for announcing progress and requesting more peers.\n" "contacting the tracker for announcing progress and "
"Set to zero to use the interval requested by the tracker.")), "requesting more peers. Set to zero to use the interval "
"requested by the tracker.")),
INIT_OPT_STRING("protocol.bittorrent.tracker", N_("IP-address to announce"), INIT_OPT_STRING("protocol.bittorrent.tracker", N_("IP-address to announce"),
"ip_address", 0, "", "ip_address", 0, "",
N_("What IP address to report to the tracker. If set to \"\"\n" N_("What IP address to report to the tracker. If set to \"\" "
"no IP address will be sent and the tracker will automatically\n" "no IP address will be sent and the tracker will "
"determine an appropriate IP address.")), "automatically determine an appropriate IP address.")),
INIT_OPT_STRING("protocol.bittorrent.tracker", N_("User identification string"), INIT_OPT_STRING("protocol.bittorrent.tracker", N_("User identification string"),
"key", 0, "", "key", 0, "",
N_("An additional identification that is not shared with any users.\n" N_("An additional identification that is not shared with any "
"It is intended to allow a client to prove their identity should\n" "users. It is intended to allow a client to prove their "
"their IP address change. It is an optional parameter, but some\n" "identity should their IP address change. It is an optional "
"trackers require this parameter. If set to \"\" no user key will\n" "parameter, but some trackers require this parameter. "
"be sent to the tracker.")), "If set to \"\" no user key will be sent to the tracker.")),
INIT_OPT_INT("protocol.bittorrent.tracker", N_("Maximum number of peers to request"), INIT_OPT_INT("protocol.bittorrent.tracker", N_("Maximum number of peers to request"),
"numwant", 0, 0, INT_MAX, 50, "numwant", 0, 0, INT_MAX, 50,
N_("The maximum number of peers to request from the tracker.\n" N_("The maximum number of peers to request from the tracker. "
"Set to 0 to use the server default.")), "Set to 0 to use the server default.")),
INIT_OPT_INT("protocol.bittorrent.tracker", N_("Minimum peers to skip rerequesting"), INIT_OPT_INT("protocol.bittorrent.tracker", N_("Minimum peers to skip rerequesting"),
"min_skip_size", 0, 0, INT_MAX, 20, "min_skip_size", 0, 0, INT_MAX, 20,
N_("The minimum number of peers to have in the current peer info\n" N_("The minimum number of peers to have in the current peer "
"pool before skipping requesting of more peers. I.e. setting\n" "info pool before skipping requesting of more peers. I.e. "
"numwant to zero.\n" "setting numwant to zero. Set to 0 to not have any limit.")),
"Set to 0 to not have any limit.")),
/* ****************************************************************** */ /* ****************************************************************** */
@ -101,38 +101,41 @@ static struct option_info bittorrent_protocol_options[] = {
INIT_OPT_INT("protocol.bittorrent.peerwire", N_("Maximum number of peer connections"), INIT_OPT_INT("protocol.bittorrent.peerwire", N_("Maximum number of peer connections"),
"connections", 0, 1, INT_MAX, 55, "connections", 0, 1, INT_MAX, 55,
N_("The maximum number of allowed connections to both active and\n" N_("The maximum number of allowed connections to both active "
"non-active peers. By increasing the number of allowed connections,\n" "and non-active peers. By increasing the number of allowed "
"the chance of finding good peers to download from is increased.\n" "connections, the chance of finding good peers to download "
"However, too many connections can lead to TCP congestion. If the\n" "from is increased. However, too many connections can lead to "
"maximum is reached all new incoming connections will be closed.")), "TCP congestion. If the maximum is reached all new incoming "
"connections will be closed.")),
INIT_OPT_INT("protocol.bittorrent.peerwire", N_("Maximum peer message length"), INIT_OPT_INT("protocol.bittorrent.peerwire", N_("Maximum peer message length"),
"max_message_length", 0, 1, INT_MAX, BITTORRENT_MESSAGE_MAX_SIZE, "max_message_length", 0, 1, INT_MAX, BITTORRENT_MESSAGE_MAX_SIZE,
N_("The maximum length of messages to accept over the wire.\n" N_("The maximum length of messages to accept over the wire. "
"Larger values will cause the connection to be dropped.")), "Larger values will cause the connection to be dropped.")),
INIT_OPT_INT("protocol.bittorrent.peerwire", N_("Maximum allowed request length"), INIT_OPT_INT("protocol.bittorrent.peerwire", N_("Maximum allowed request length"),
"max_request_length", 0, 1, INT_MAX, BITTORRENT_REQUEST_ACCEPT_LENGTH, "max_request_length", 0, 1, INT_MAX, BITTORRENT_REQUEST_ACCEPT_LENGTH,
N_("The maximum length to allow for incoming requests.\n" N_("The maximum length to allow for incoming requests. "
"Larger requests will cause the connection to be dropped.")), "Larger requests will cause the connection to be dropped.")),
INIT_OPT_INT("protocol.bittorrent.peerwire", N_("Length of requests"), INIT_OPT_INT("protocol.bittorrent.peerwire", N_("Length of requests"),
"request_length", 0, 1, INT_MAX, BITTORRENT_REQUEST_LENGTH, "request_length", 0, 1, INT_MAX, BITTORRENT_REQUEST_LENGTH,
N_("How many bytes to query for per request. This is complementary\n" N_("How many bytes to query for per request. This is "
"to the max_request_length option. If the configured length is\n" "complementary to the max_request_length option. "
"bigger than the piece length it will be truncated.")), "If the configured length is bigger than the piece length "
"it will be truncated.")),
INIT_OPT_INT("protocol.bittorrent.peerwire", N_("Peer inactivity timeout"), INIT_OPT_INT("protocol.bittorrent.peerwire", N_("Peer inactivity timeout"),
"timeout", 0, 0, INT_MAX, 300, "timeout", 0, 0, INT_MAX, 300,
N_("The number of seconds to wait before closing a socket on\n" N_("The number of seconds to wait before closing a socket on "
"which nothing has been received or sent.")), "which nothing has been received or sent.")),
INIT_OPT_INT("protocol.bittorrent.peerwire", N_("Maximum peer pool size"), INIT_OPT_INT("protocol.bittorrent.peerwire", N_("Maximum peer pool size"),
"pool_size", 0, 0, INT_MAX, 55, "pool_size", 0, 0, INT_MAX, 55,
N_("Maximum number of items in the peer pool. The peer pool\n" N_("Maximum number of items in the peer pool. The peer pool "
"contains information used for establishing connections to\n" "contains information used for establishing connections to "
"new peers.\n" "new peers.\n"
"\n"
"Set to 0 to have unlimited size.")), "Set to 0 to have unlimited size.")),
@ -142,8 +145,9 @@ static struct option_info bittorrent_protocol_options[] = {
INIT_OPT_INT("protocol.bittorrent", N_("Maximum piece cache size"), INIT_OPT_INT("protocol.bittorrent", N_("Maximum piece cache size"),
"piece_cache_size", 0, 0, INT_MAX, 1024 * 1024, "piece_cache_size", 0, 0, INT_MAX, 1024 * 1024,
N_("The maximum amount of memory used to hold recently\n" N_("The maximum amount of memory used to hold recently "
"downloaded pieces.\n" "downloaded pieces.\n"
"\n"
"Set to 0 to have unlimited size.")), "Set to 0 to have unlimited size.")),
/* ****************************************************************** */ /* ****************************************************************** */
@ -153,11 +157,11 @@ static struct option_info bittorrent_protocol_options[] = {
#if 0 #if 0
INIT_OPT_STRING("protocol.bittorrent", N_("Sharing rate"), INIT_OPT_STRING("protocol.bittorrent", N_("Sharing rate"),
"sharing_rate", 0, "1.0", "sharing_rate", 0, "1.0",
N_("The minimum sharing rate to achieve before stop seeding.\n" N_("The minimum sharing rate to achieve before stop seeding. "
"The sharing rate is computed as the number of uploaded bytes\n" "The sharing rate is computed as the number of uploaded bytes "
"divided with the number of downloaded bytes. The value should\n" "divided with the number of downloaded bytes. The value "
"be a double value between 0.0 and 1.0 both included.\n" "should be a double value between 0.0 and 1.0 both included. "
"Set to 1.0 to atleast upload a complete copy of all data and\n" "Set to 1.0 to atleast upload a complete copy of all data and "
"set to 0.0 to have unlimited sharing rate.")), "set to 0.0 to have unlimited sharing rate.")),
#endif #endif
INIT_OPT_INT("protocol.bittorrent", N_("Maximum number of uploads"), INIT_OPT_INT("protocol.bittorrent", N_("Maximum number of uploads"),
@ -167,42 +171,42 @@ static struct option_info bittorrent_protocol_options[] = {
/* The number of uploads to fill out to with extra optimistic unchokes */ /* The number of uploads to fill out to with extra optimistic unchokes */
INIT_OPT_INT("protocol.bittorrent", N_("Minimum number of uploads"), INIT_OPT_INT("protocol.bittorrent", N_("Minimum number of uploads"),
"min_uploads", 0, 0, INT_MAX, 2, "min_uploads", 0, 0, INT_MAX, 2,
N_("The minimum number of uploads which should at least\n" N_("The minimum number of uploads which should at least "
"be used for new connections.")), "be used for new connections.")),
#if 0 #if 0
INIT_OPT_INT("protocol.bittorrent", N_("Keepalive interval"), INIT_OPT_INT("protocol.bittorrent", N_("Keepalive interval"),
"keepalive_interval", 0, 0, INT_MAX, 120, "keepalive_interval", 0, 0, INT_MAX, 120,
N_("The number of seconds to pause between sending keepalive\n" N_("The number of seconds to pause between sending keepalive "
"messages.")), "messages.")),
#endif #endif
INIT_OPT_INT("protocol.bittorrent", N_("Number of pending requests"), INIT_OPT_INT("protocol.bittorrent", N_("Number of pending requests"),
"request_queue_size", 0, 1, INT_MAX, 5, "request_queue_size", 0, 1, INT_MAX, 5,
N_("How many piece requests to continuously keep in queue. Pipelining\n" N_("How many piece requests to continuously keep in queue. "
"of requests is essential to saturate connections and get a good\n" "Pipelining of requests is essential to saturate connections "
"connection performance and thus a faster download. However, a\n" "and get a good connection performance and thus a faster "
"very big queue size can lead to wasting bandwidth near the end\n" "download. However, a very big queue size can lead to wasting "
"of the connection since remaining piece blocks will be requested\n" "bandwidth near the end of the connection since remaining "
"from multiple peers.")), "piece blocks will be requested from multiple peers.")),
#if 0 #if 0
/* Bram uses 30 seconds here. */ /* Bram uses 30 seconds here. */
INIT_OPT_INT("protocol.bittorrent", N_("Peer snubbing interval"), INIT_OPT_INT("protocol.bittorrent", N_("Peer snubbing interval"),
"snubbing_interval", 0, 0, INT_MAX, 30, "snubbing_interval", 0, 0, INT_MAX, 30,
N_("The number of seconds to wait for file data before assuming\n" N_("The number of seconds to wait for file data before "
"the peer has been snubbed.")), "assuming the peer has been snubbed.")),
#endif #endif
INIT_OPT_INT("protocol.bittorrent", N_("Peer choke interval"), INIT_OPT_INT("protocol.bittorrent", N_("Peer choke interval"),
"choke_interval", 0, 0, INT_MAX, BITTORRENT_DEFAULT_CHOKE_INTERVAL, "choke_interval", 0, 0, INT_MAX, BITTORRENT_DEFAULT_CHOKE_INTERVAL,
N_("The number of seconds between updating the connection state\n" N_("The number of seconds between updating the connection "
"and most importantly choke and unchoke peer connections. The\n" "state and most importantly choke and unchoke peer "
"choke period should be big enough for newly unchoked connections\n" "connections. The choke period should be big enough for newly "
"to get started but small enough to not allow freeriders too much\n" "unchoked connections to get started but small enough to not "
"room for stealing bandwidth.")), "allow freeriders too much room for stealing bandwidth.")),
INIT_OPT_INT("protocol.bittorrent", N_("Rarest first piece selection cutoff"), INIT_OPT_INT("protocol.bittorrent", N_("Rarest first piece selection cutoff"),
"rarest_first_cutoff", 0, 0, INT_MAX, 4, "rarest_first_cutoff", 0, 0, INT_MAX, 4,
N_("The number of pieces to obtain before switching piece\n" N_("The number of pieces to obtain before switching piece "
"selection strategy from random to rarest first.")), "selection strategy from random to rarest first.")),
INIT_OPT_BOOL("protocol.bittorrent", N_("Allow blacklisting"), INIT_OPT_BOOL("protocol.bittorrent", N_("Allow blacklisting"),

3
src/protocol/file/cgi.c
View File

@ -43,7 +43,8 @@ static struct option_info cgi_options[] = {
INIT_OPT_STRING("protocol.file.cgi", N_("Path"), INIT_OPT_STRING("protocol.file.cgi", N_("Path"),
"path", 0, "", "path", 0, "",
N_("Colon separated list of directories, where CGI scripts are stored.")), N_("Colon separated list of directories, "
"where CGI scripts are stored.")),
INIT_OPT_BOOL("protocol.file.cgi", N_("Allow local CGI"), INIT_OPT_BOOL("protocol.file.cgi", N_("Allow local CGI"),
"policy", 0, 0, "policy", 0, 0,

15
src/protocol/file/file.c
View File

@ -43,20 +43,21 @@ static struct option_info file_options[] = {
INIT_OPT_BOOL("protocol.file", N_("Allow reading special files"), INIT_OPT_BOOL("protocol.file", N_("Allow reading special files"),
"allow_special_files", 0, 0, "allow_special_files", 0, 0,
N_("Whether to allow reading from non-regular files.\n" N_("Whether to allow reading from non-regular files. "
"Note this can be dangerous; reading /dev/urandom or\n" "Note this can be dangerous; reading /dev/urandom or "
"/dev/zero can ruin your day!")), "/dev/zero can ruin your day!")),
INIT_OPT_BOOL("protocol.file", N_("Show hidden files in directory listing"), INIT_OPT_BOOL("protocol.file", N_("Show hidden files in directory listing"),
"show_hidden_files", 0, 1, "show_hidden_files", 0, 1,
N_("When set to false, files with name starting with a dot will be\n" N_("When set to false, files with name starting with a dot "
"hidden in local directory listings.")), "will be hidden in local directory listings.")),
INIT_OPT_BOOL("protocol.file", N_("Try encoding extensions"), INIT_OPT_BOOL("protocol.file", N_("Try encoding extensions"),
"try_encoding_extensions", 0, 1, "try_encoding_extensions", 0, 1,
N_("When set, if we can't open a file named 'filename', we'll try\n" N_("When set, if we can't open a file named 'filename', "
"to open 'filename' with some encoding extension appended\n" "we'll try to open 'filename' with some encoding extension "
"(ie. 'filename.gz'); it depends on the supported encodings.")), "appended (ie. 'filename.gz'); it depends on the supported "
"encodings.")),
NULL_OPTION_INFO, NULL_OPTION_INFO,
}; };

11
src/protocol/ftp/ftp.c
View File

@ -63,8 +63,9 @@ struct option_info ftp_options[] = {
INIT_OPT_STRING("protocol.ftp.proxy", N_("Host and port-number"), INIT_OPT_STRING("protocol.ftp.proxy", N_("Host and port-number"),
"host", 0, "", "host", 0, "",
N_("Host and port-number (host:port) of the FTP proxy, or blank.\n" N_("Host and port-number (host:port) of the FTP proxy, "
"If it's blank, FTP_PROXY environment variable is checked as well.")), "or blank. If it's blank, FTP_PROXY environment variable "
"is checked as well.")),
INIT_OPT_STRING("protocol.ftp", N_("Anonymous password"), INIT_OPT_STRING("protocol.ftp", N_("Anonymous password"),
"anon_passwd", 0, "some@host.domain", "anon_passwd", 0, "some@host.domain",
@ -72,11 +73,13 @@ struct option_info ftp_options[] = {
INIT_OPT_BOOL("protocol.ftp", N_("Use passive mode (IPv4)"), INIT_OPT_BOOL("protocol.ftp", N_("Use passive mode (IPv4)"),
"use_pasv", 0, 1, "use_pasv", 0, 1,
N_("Use PASV instead of PORT (passive vs active mode, IPv4 only).")), N_("Use PASV instead of PORT (passive vs active mode, "
"IPv4 only).")),
#ifdef CONFIG_IPV6 #ifdef CONFIG_IPV6
INIT_OPT_BOOL("protocol.ftp", N_("Use passive mode (IPv6)"), INIT_OPT_BOOL("protocol.ftp", N_("Use passive mode (IPv6)"),
"use_epsv", 0, 0, "use_epsv", 0, 0,
N_("Use EPSV instead of EPRT (passive vs active mode, IPv6 only).")), N_("Use EPSV instead of EPRT (passive vs active mode, "
"IPv6 only).")),
#endif /* CONFIG_IPV6 */ #endif /* CONFIG_IPV6 */
NULL_OPTION_INFO, NULL_OPTION_INFO,
}; };

88
src/protocol/http/http.c
View File

@ -80,8 +80,8 @@ static struct option_info http_options[] = {
INIT_OPT_BOOL("protocol.http.bugs", N_("Do not send Accept-Charset"), INIT_OPT_BOOL("protocol.http.bugs", N_("Do not send Accept-Charset"),
"accept_charset", 0, 1, "accept_charset", 0, 1,
N_("The Accept-Charset header is quite long and sending it can trigger\n" N_("The Accept-Charset header is quite long and sending it "
"bugs in some rarely found servers.")), "can trigger bugs in some rarely found servers.")),
INIT_OPT_BOOL("protocol.http.bugs", N_("Allow blacklisting"), INIT_OPT_BOOL("protocol.http.bugs", N_("Allow blacklisting"),
"allow_blacklist", 0, 1, "allow_blacklist", 0, 1,
@ -89,9 +89,10 @@ static struct option_info http_options[] = {
INIT_OPT_BOOL("protocol.http.bugs", N_("Broken 302 redirects"), INIT_OPT_BOOL("protocol.http.bugs", N_("Broken 302 redirects"),
"broken_302_redirect", 0, 1, "broken_302_redirect", 0, 1,
N_("Broken 302 redirect (violates RFC but compatible with Netscape).\n" N_("Broken 302 redirect (violates RFC but compatible with "
"This is a problem for a lot of web discussion boards and the like.\n" "Netscape). This is a problem for a lot of web discussion "
"If they will do strange things to you, try to play with this.")), "boards and the like. If they will do strange things to you, "
"try to play with this.")),
INIT_OPT_BOOL("protocol.http.bugs", N_("No keepalive after POST requests"), INIT_OPT_BOOL("protocol.http.bugs", N_("No keepalive after POST requests"),
"post_no_keepalive", 0, 0, "post_no_keepalive", 0, 0,
@ -107,8 +108,9 @@ static struct option_info http_options[] = {
INIT_OPT_STRING("protocol.http.proxy", N_("Host and port-number"), INIT_OPT_STRING("protocol.http.proxy", N_("Host and port-number"),
"host", 0, "", "host", 0, "",
N_("Host and port-number (host:port) of the HTTP proxy, or blank.\n" N_("Host and port-number (host:port) of the HTTP proxy, "
"If it's blank, HTTP_PROXY environment variable is checked as well.")), "or blank. If it's blank, HTTP_PROXY environment variable "
"is checked as well.")),
INIT_OPT_STRING("protocol.http.proxy", N_("Username"), INIT_OPT_STRING("protocol.http.proxy", N_("Username"),
"user", 0, "", "user", 0, "",
@ -121,12 +123,13 @@ static struct option_info http_options[] = {
INIT_OPT_TREE("protocol.http", N_("Referer sending"), INIT_OPT_TREE("protocol.http", N_("Referer sending"),
"referer", 0, "referer", 0,
N_("HTTP referer sending options. HTTP referer is a special header\n" N_("HTTP referer sending options. HTTP referer is a special "
"sent in the HTTP requests, which is supposed to contain the previous\n" "header sent in the HTTP requests, which is supposed to "
"page visited by the browser. This way, the server can know what link\n" "contain the previous page visited by the browser."
"did you follow when accessing that page. However, this behaviour\n" "This way, the server can know what link did you follow "
"can unfortunately considerably affect privacy and can lead even to a\n" "when accessing that page. However, this behaviour can "
"security problem on some badly designed web pages.")), "unfortunately considerably affect privacy and can lead even "
"to a security problem on some badly designed web pages.")),
INIT_OPT_INT("protocol.http.referer", N_("Policy"), INIT_OPT_INT("protocol.http.referer", N_("Policy"),
"policy", 0, "policy", 0,
@ -148,48 +151,54 @@ static struct option_info http_options[] = {
INIT_OPT_BOOL("protocol.http", N_("Use UI language as Accept-Language"), INIT_OPT_BOOL("protocol.http", N_("Use UI language as Accept-Language"),
"accept_ui_language", 0, 1, "accept_ui_language", 0, 1,
N_("Request localised versions of documents from web-servers (using the\n" N_("Request localised versions of documents from web-servers "
"Accept-Language header) using the language you have configured for\n" "(using the Accept-Language header) using the language "
"ELinks' user-interface (this also affects navigator.language ECMAScript\n" "you have configured for ELinks' user-interface (this also "
"value available to scripts). Note that some see this as a potential\n" "affects navigator.language ECMAScript value available to "
"security risk because it tells web-masters and the FBI sniffers about\n" "scripts). Note that some see this as a potential security "
"your language preference.")), "risk because it tells web-masters and the FBI sniffers "
"about your language preference.")),
/* After the compression support has been tested enough, /* After the compression support has been tested enough,
* we might wrap this option in #if CFG_DEBUG. */ * we might wrap this option in #if CFG_DEBUG. */
INIT_OPT_BOOL("protocol.http", N_("Enable on-the-fly compression"), INIT_OPT_BOOL("protocol.http", N_("Enable on-the-fly compression"),
"compression", 0, 1, "compression", 0, 1,
N_("If enabled, the capability to receive compressed content\n" N_("If enabled, the capability to receive compressed content "
"(gzip and/or bzip2) is announced to the server, which\n" "(gzip and/or bzip2) is announced to the server, which "
"usually sends the reply compressed, thus saving some\n" "usually sends the reply compressed, thus saving some "
"bandwidth at slight CPU expense.\n" "bandwidth at slight CPU expense.\n"
"\n" "\n"
"If ELinks displays a incomplete page or garbage, try\n" "If ELinks displays a incomplete page or garbage, try "
"disabling this option. If that helps, there may be a bug in\n" "disabling this option. If that helps, there may be a bug in "
"the decompression part of ELinks. Please report such bugs.\n" "the decompression part of ELinks. Please report such bugs.\n"
"\n" "\n"
"If ELinks has been compiled without compression support,\n" "If ELinks has been compiled without compression support, "
"this option has no effect. To check the supported features,\n" "this option has no effect. To check the supported features, "
"see Help -> About.")), "see Help -> About.")),
INIT_OPT_BOOL("protocol.http", N_("Activate HTTP TRACE debugging"), INIT_OPT_BOOL("protocol.http", N_("Activate HTTP TRACE debugging"),
"trace", 0, 0, "trace", 0, 0,
N_("If active, all HTTP requests are sent with TRACE as their method\n" N_("If active, all HTTP requests are sent with TRACE as "
"rather than GET or POST. This is useful for debugging of both ELinks\n" "their method rather than GET or POST. This is useful for "
"and various server-side scripts --- the server only returns the client's\n" "debugging of both ELinks and various server-side scripts "
"request back to the client verbatim. Note that this type of request may\n" "--- the server only returns the client's request back to "
"the client verbatim. Note that this type of request may "
"not be enabled on all servers.")), "not be enabled on all servers.")),
/* OSNews.com is supposed to be relying on the textmode token, at least. */ /* OSNews.com is supposed to be relying on the textmode token, at least. */
INIT_OPT_STRING("protocol.http", N_("User-agent identification"), INIT_OPT_STRING("protocol.http", N_("User-agent identification"),
"user_agent", 0, "ELinks/%v (textmode; %s; %t-%b)", "user_agent", 0, "ELinks/%v (textmode; %s; %t-%b)",
N_("Change the User Agent ID. That means identification string, which\n" N_("Change the User Agent ID. That means identification "
"is sent to HTTP server when a document is requested. The 'textmode'\n" "string, which is sent to HTTP server when a document is "
"token in the first field is our silent attempt to establish this as\n" "requested. The 'textmode' token in the first field is our "
"a standard for new textmode user agents, so that the webmasters can\n" "silent attempt to establish this as a standard for new "
"have just a single uniform test for these if they are e.g. pushing\n" "textmode user agents, so that the webmasters can have "
"some lite version to them automagically.\n" "just a single uniform test for these if they are e.g. "
"Use \" \" if you don't want any User-Agent header to be sent at all.\n" "pushing some lite version to them automagically.\n"
"\n"
"Use \" \" if you don't want any User-Agent header to be sent "
"at all.\n"
"\n"
"%v in the string means ELinks version,\n" "%v in the string means ELinks version,\n"
"%s in the string means system identification,\n" "%s in the string means system identification,\n"
"%t in the string means size of the terminal,\n" "%t in the string means size of the terminal,\n"
@ -206,8 +215,9 @@ static struct option_info http_options[] = {
INIT_OPT_STRING("protocol.https.proxy", N_("Host and port-number"), INIT_OPT_STRING("protocol.https.proxy", N_("Host and port-number"),
"host", 0, "", "host", 0, "",
N_("Host and port-number (host:port) of the HTTPS CONNECT proxy, or blank.\n" N_("Host and port-number (host:port) of the HTTPS CONNECT "
"If it's blank, HTTPS_PROXY environment variable is checked as well.")), "proxy, or blank. If it's blank, HTTPS_PROXY environment "
"variable is checked as well.")),
NULL_OPTION_INFO, NULL_OPTION_INFO,
}; };

9
src/protocol/nntp/nntp.c
View File

@ -35,13 +35,14 @@ static struct option_info nntp_protocol_options[] = {
INIT_OPT_STRING("protocol.nntp", N_("Default news server"), INIT_OPT_STRING("protocol.nntp", N_("Default news server"),
"server", 0, "", "server", 0, "",
N_("Used when resolving news: URIs. If set to the empty string\n" N_("Used when resolving news: URIs. "
"the value of the NNTPSERVER environment variable will be used.")), "If set to the empty string the value of the NNTPSERVER "
"environment variable will be used.")),
INIT_OPT_STRING("protocol.nntp", N_("Message header entries"), INIT_OPT_STRING("protocol.nntp", N_("Message header entries"),
"header_entries", 0, NNTP_HEADER_ENTRIES, "header_entries", 0, NNTP_HEADER_ENTRIES,
N_("Comma separated list of which entries in the article header\n" N_("Comma separated list of which entries in the article "
"to show. E.g. 'Subject' and 'From'.\n" "header to show. E.g. 'Subject' and 'From'. "
"All header entries can be read in the header info dialog.")), "All header entries can be read in the header info dialog.")),
NULL_OPTION_INFO, NULL_OPTION_INFO,

8
src/protocol/protocol.c
View File

@ -276,10 +276,10 @@ static struct option_info protocol_options[] = {
INIT_OPT_STRING("protocol", N_("No-proxy domains"), INIT_OPT_STRING("protocol", N_("No-proxy domains"),
"no_proxy", 0, "", "no_proxy", 0, "",
N_("Comma separated list of domains for which the proxy (HTTP/FTP)\n" N_("Comma separated list of domains for which the proxy "
"should be disabled. Optionally, a port can be specified for some\n" "(HTTP/FTP) should be disabled. Optionally, a port can be "
"domains as well. If it's blank, NO_PROXY environment variable is\n" "specified for some domains as well. If it's blank, "
"checked as well.")), "NO_PROXY environment variable is checked as well.")),
NULL_OPTION_INFO, NULL_OPTION_INFO,
}; };

46
src/protocol/rewrite/rewrite.c
View File

@ -43,26 +43,28 @@ enum uri_rewrite_option {
static struct option_info uri_rewrite_options[] = { static struct option_info uri_rewrite_options[] = {
INIT_OPT_TREE("protocol", N_("URI rewriting"), INIT_OPT_TREE("protocol", N_("URI rewriting"),
"rewrite", OPT_SORT, "rewrite", OPT_SORT,
N_("Rules for rewriting URIs entered in the goto dialog.\n" N_("Rules for rewriting URIs entered in the goto dialog. "
"It makes it possible to define a set of prefixes that will\n" "It makes it possible to define a set of prefixes that will "
"be expanded if they match a string entered in the goto dialog.\n" "be expanded if they match a string entered in the goto "
"The prefixes can be dumb, meaning that they work only like\n" "dialog. The prefixes can be dumb, meaning that they work "
"URI abbreviations, or smart ones, making it possible to pass\n" "only like URI abbreviations, or smart ones, making it "
"arguments to them like search engine keywords.")), "possible to pass arguments to them like search engine "
"keywords.")),
INIT_OPT_BOOL("protocol.rewrite", N_("Enable dumb prefixes"), INIT_OPT_BOOL("protocol.rewrite", N_("Enable dumb prefixes"),
"enable-dumb", 0, 1, "enable-dumb", 0, 1,
N_("Enable dumb prefixes - simple URI abbreviations which can\n" N_("Enable dumb prefixes - simple URI abbreviations which "
"be written to the Goto URL dialog instead of actual URIs - i.e.\n" "can be written to the Goto URL dialog instead of actual URIs "
"if you write 'elinks' there, you are directed to\n" "- i.e. if you write 'elinks' there, you are directed to "
"http://elinks.cz/.")), "http://elinks.cz/.")),
INIT_OPT_BOOL("protocol.rewrite", N_("Enable smart prefixes"), INIT_OPT_BOOL("protocol.rewrite", N_("Enable smart prefixes"),
"enable-smart", 0, 1, "enable-smart", 0, 1,
N_("Enable smart prefixes - URI templates triggered by writing\n" N_("Enable smart prefixes - URI templates triggered by "
"given abbreviation to the Goto URL dialog followed by a list\n" "writing given abbreviation to the Goto URL dialog followed "
"of arguments from which the actual URI is composed - i.e.\n" "by a list of arguments from which the actual URI is composed "
"'gg:search keywords' or 'gn search keywords for news'.")), "- i.e. 'gg:search keywords' or 'gn search keywords for "
"news'.")),
INIT_OPT_TREE("protocol.rewrite", N_("Dumb Prefixes"), INIT_OPT_TREE("protocol.rewrite", N_("Dumb Prefixes"),
"dumb", OPT_AUTOCREATE | OPT_SORT, "dumb", OPT_AUTOCREATE | OPT_SORT,
@ -77,7 +79,8 @@ static struct option_info uri_rewrite_options[] = {
INIT_OPT_TREE("protocol.rewrite", N_("Smart Prefixes"), INIT_OPT_TREE("protocol.rewrite", N_("Smart Prefixes"),
"smart", OPT_AUTOCREATE | OPT_SORT, "smart", OPT_AUTOCREATE | OPT_SORT,
N_("Smart prefixes, see enable-smart description for details.")), N_("Smart prefixes, see enable-smart description for "
"details.")),
/* TODO: In some rare occations current link URI and referrer might /* TODO: In some rare occations current link URI and referrer might
* also be useful and dare I mention some kind of proxy argument. --jonas */ * also be useful and dare I mention some kind of proxy argument. --jonas */
@ -93,14 +96,17 @@ static struct option_info uri_rewrite_options[] = {
INIT_OPT_STRING("protocol.rewrite", N_("Default template"), INIT_OPT_STRING("protocol.rewrite", N_("Default template"),
"default_template", 0, "", "default_template", 0, "",
/* xgettext:no-c-format */ /* xgettext:no-c-format */
N_("Default URI template used when the string entered in\n" N_("Default URI template used when the string entered in "
"the goto dialog does not appear to be a URI or a filename\n" "the goto dialog does not appear to be a URI or a filename "
"(i.e. contains no '.', ':' or '/' characters), and does\n" "(i.e. contains no '.', ':' or '/' characters), and does "
"not match any defined prefixes. Set the value to \"\" to\n" "not match any defined prefixes. Set the value to \"\" to "
"disable use of the default template rewrite rule.\n" "disable use of the default template rewrite rule.\n"
"\n"
"%c in the template means the current URL,\n" "%c in the template means the current URL,\n"
"%s in the template means the whole string from the goto dialog,\n" "%s in the template means the whole string from the goto\n"
"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n" " dialog,\n"
"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part\n"
" of %s,\n"
"%% in the template means '%'.")), "%% in the template means '%'.")),
#define INIT_OPT_DUMB_PREFIX(prefix, uri) \ #define INIT_OPT_DUMB_PREFIX(prefix, uri) \

9
src/protocol/user.c
View File

@ -33,8 +33,8 @@
static struct option_info user_protocol_options[] = { static struct option_info user_protocol_options[] = {
INIT_OPT_TREE("protocol", N_("User protocols"), INIT_OPT_TREE("protocol", N_("User protocols"),
"user", OPT_AUTOCREATE, "user", OPT_AUTOCREATE,
N_("User protocols. Options in this tree specify external\n" N_("User protocols. Options in this tree specify external "
"handlers for the appropriate protocols. Ie.\n" "handlers for the appropriate protocols. Ie. "
"protocol.user.mailto.unix.")), "protocol.user.mailto.unix.")),
/* FIXME: Poorly designed options structure. Ought to be able to specify /* FIXME: Poorly designed options structure. Ought to be able to specify
@ -44,8 +44,9 @@ static struct option_info user_protocol_options[] = {
INIT_OPT_TREE("protocol.user", NULL, INIT_OPT_TREE("protocol.user", NULL,
"_template_", OPT_AUTOCREATE, "_template_", OPT_AUTOCREATE,
N_("Handler (external program) for this protocol. Name the\n" N_("Handler (external program) for this protocol. Name the "
"options in this tree after your system (ie. unix, unix-xwin).")), "options in this tree after your system (ie. unix, "
"unix-xwin).")),
INIT_OPT_STRING("protocol.user._template_", NULL, INIT_OPT_STRING("protocol.user._template_", NULL,
"_template_", 0, "", "_template_", 0, "",