diff --git a/common/content/io.js b/common/content/io.js index 54a158f0..ab759325 100644 --- a/common/content/io.js +++ b/common/content/io.js @@ -792,7 +792,7 @@ lookup: } options.add(["banghist", "bh"], - "Replace occurances of ! with the previous command when executing external commands", + "Replace occurences of ! with the previous command when executing external commands", "banghist", true); options.add(["fileencoding", "fenc"], diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml index 365285d1..35d65ea0 100644 --- a/common/locale/en-US/options.xml +++ b/common/locale/en-US/options.xml @@ -299,12 +299,12 @@ 'act' 'activate' 'activate' 'act' stringlist - addons,downloads,extensions,help, + addons,downloads,extoptions,help, homepage,quickmark,tabopen,paste

- A list of items when, when opened in a new tab are - automatically focused. Available items are, + A list of items which, when opened in a new tab, are + automatically focused. Available items:

@@ -353,7 +353,7 @@ To enable autocompletion for everything but :history or - :bmarks, you would choose a value such as, + :bmarks, you would choose a value such as !/ex/bmarks,.? @@ -377,7 +377,7 @@ on

- Replace occurances of ! with the previous command when + Replace occurences of ! with the previous command when executing external commands.

@@ -392,8 +392,8 @@

List of directories searched when executing the :cd - command. This is only used for relative paths if an absolute path is - specified then the option is ignored. + command. This is only used for relative paths; if an absolute path is + specified, this option is ignored.

@@ -405,7 +405,7 @@ charlist slf -

Items which are completed at the :open prompts. Available items are,

+

Items which are completed at the :open prompts. Available items:

s
Search engines and keyword URLs
@@ -446,7 +446,7 @@

This means that with defsearch set to youtube, - then :open Tim Minchin behaves exactly as + :open Tim Minchin behaves exactly as :open youtube Tim Minchin, so long as you don't have a search or bookmark keyword called ‘Tim’.

@@ -476,33 +476,19 @@ - 'noex' 'noexrc' - 'ex' 'exrc' - 'exrc' 'ex' - boolean - off + 'enc' 'encoding' + 'encoding' + string + UTF-8

- Allow reading of an RC file in the current directory. This file is - sourced after the default &dactyl.name;rc file in your - home directory. + Changes the character encoding of the current buffer. Valid only + until a new page is loaded.

- - 'eht' 'extendedhinttags' - 'extendedhinttags' 'eht' - - string - &hinttags; - -

The XPath string of hintable elements activated by ;.

- - - - 'noeb' 'noerrorbells' 'eb' 'errorbells' @@ -532,20 +518,35 @@ + - 'enc' 'encoding' - 'encoding' - string - UTF-8 + 'noex' 'noexrc' + 'ex' 'exrc' + 'exrc' 'ex' + boolean + off

- Changes the character encoding of the current buffer. Valid only - until a new page is loaded. + Allow reading of an RC file in the current directory. This file is + sourced after the default &dactyl.name;rc file in your + home directory.

+ + 'eht' 'extendedhinttags' + 'extendedhinttags' 'eht' + + string + &hinttags; + +

The XPath string of hintable elements activated by ;.

+ + + + 'fenc' 'fileencoding' 'fileencoding' @@ -560,20 +561,6 @@ - - 'nosf' 'nostrictfocus' - 'sf' 'strictfocus' - 'strictfocus' 'sf' - boolean - on - -

- Prevent scripts from focusing input elements without user intervention. -

- - - - 'fh' 'followhints' 'followhints' 'fh' @@ -666,8 +653,8 @@
value
The hint is the value displayed in a text input, or the selected option for a dropdown.
-
label
The value of an explicit label for the input, this will not match most manually added labels that are found on sites.
-
name
The name of the input will be used, although the name is not designed for user consumption, it is frequently very similar to the label.
+
label
The value of an explicit label for the input; this will not match most manually added labels that are found on sites.
+
name
The name of the input will be used; although the name is not designed for user consumption, it is frequently very similar to the label.
 @@ -679,18 +666,18 @@ stringlist contains -

Change the hint matching algorithm during Hints mode.

+

Change the hint matching algorithm used in Hints mode.

Possible values:

-
contains
+
contains
The typed characters are split on whitespace, and these character groups have to match anywhere inside the text of the link.
-
wordstartswith
+
wordstartswith
The typed characters are matched with the beginning of the first word (see wordseparators) in the @@ -705,17 +692,17 @@ following words in the order they appear in the link.
-
firstletters
+
firstletters
Behaves like wordstartswith, but non-matching words aren't overleaped.
-
custom
+
custom
Delegate to the function - dactyl.plugins.customHintMatcher + dactyl.plugins.customHintMatcher.
-
transliterated
+
transliterated
Certain alphanumeric characters are translated into their unaccented equivalents, such that ‘euro’ will match 'æuró', @@ -766,24 +753,6 @@ - - 'noprivate' 'private' - 'private' - boolean - off - -

- Set the private browsing option. In private browsing mode - history, cache files, cookies, form data, passwords, download list - entries, local and URL marks, command-line history - and macros are available only for the duration of the private - browsing session and deleted when returning to normal browsing - mode. See also privacy. -

- - - - 'nohls' 'nohlsearch' 'hls' 'hlsearch' @@ -791,7 +760,7 @@ boolean off -

Highlight previous search pattern matches

+

Highlight previous search pattern matches.

 @@ -902,9 +871,9 @@

Load plugin scripts when starting up. When on, yet unloaded plugins - are automatically loaded after the &dactyl.name;rc file has been + are automatically loaded after the &dactyl.name;rc file has been sourced. To load plugins earlier, use the :loadplugins - command within the &dactyl.name;rc. + command within &dactyl.name;rc.

@@ -946,23 +915,6 @@ - - 'nextpattern' - 'nextpattern' - stringlist - \bnext,^>$,^(>>|»)$,^(>|»),(>|»)$,\bmore\b - -

- Patterns to use when guessing the next page in a document - sequence after pressing the ]] key. Each pattern is - successively tested against each link in the page (as defined by - hinttags, starting with the last), and the first link to - match is followed. -

- - - - 'newtab' 'newtab' @@ -976,7 +928,7 @@ ! to the command in question.

-

The possible values are,

+

Possible values:

all
All commands
@@ -992,6 +944,23 @@ + + 'nextpattern' + 'nextpattern' + stringlist + \bnext,^>$,^(>>|»)$,^(>|»),(>|»)$,\bmore\b + +

+ Patterns to use when guessing the next page in a document + sequence after pressing the ]] key. Each pattern is + successively tested against each link in the page (as defined by + hinttags, starting with the last), and the first link to + match is followed. +

+ + + + 'noonline' 'online' 'online' @@ -1013,9 +982,9 @@ charlist gfm -

Info shown in in the :pageinfo output.

+

Info shown in the :pageinfo output.

-

Items available by default are,

+

Items available by default:

g
General info
@@ -1059,8 +1028,8 @@

- This option does not alter the behavior pop-up blocker of - &dactyl.host; in any way. + This option does not alter the &dactyl.host; pop-up blocker behavior + in any way. @@ -1083,6 +1052,24 @@ + + 'noprivate' 'private' + 'private' + boolean + off + +

+ Set the private browsing option. In private browsing mode + history, cache files, cookies, form data, passwords, download list + entries, local and URL marks, command-line history + and macros are available only for the duration of the private + browsing session and deleted when returning to normal browsing + mode. See also privacy. +

+ + + + $&dactyl.idname;_RUNTIME 'rtp' 'runtimepath' @@ -1142,7 +1129,7 @@

The default sanitizer time span. Only items created within this timespan are - deleted. The value must be of the one of the forms, + deleted. The value must be of the one of:

@@ -1267,6 +1254,20 @@ + + 'nosf' 'nostrictfocus' + 'sf' 'strictfocus' + 'strictfocus' 'sf' + boolean + on + +

+ Prevent scripts from focusing input elements without user intervention. +

+ + + + 'suggestengines' 'suggestengines' @@ -1296,18 +1297,6 @@ - - 'noum' 'nousermode' - 'um' 'usermode' - 'usermode' 'um' - boolean - off - -

Show current website with minimal styling.

- - - - 'urlseparator' 'urlseparator' @@ -1316,7 +1305,7 @@

The regular expression used to split URL lists in commands - including :open. When set to the empty string, URL lists + like :open. When set to the empty string, URL lists are never split. With the default value, the following will open three URLs in the current tab and two new background tabs,

@@ -1325,6 +1314,18 @@ + + 'noum' 'nousermode' + 'um' 'usermode' + 'usermode' 'um' + boolean + off + +

Show current website with minimal styling.

+ + + + 'verbose', 'vbs' 'verbose' 'vbs' @@ -1368,7 +1369,7 @@ Defines how completions are matched with regard to character case. Keys in the regexmap refer to completion context names (see :contexts) for which the value applies. Possible values - are, + are:

@@ -1392,7 +1393,7 @@ :set wildignore=\.o$,^\..*\.s[a-z]2$ - Unlike Vim each pattern is a regular expression rather than a glob. + Unlike Vim, each pattern is a regular expression rather than a glob. The only way to include a literal comma in a pattern is with the escape sequence \u0044. @@ -1414,7 +1415,7 @@ been reached.

-

These are the possible values for each part are,

+

These are the possible values for each part:

Complete only the first match.
diff --git a/common/locale/en-US/various.xml b/common/locale/en-US/various.xml index 2b27d965..b0e204fd 100644 --- a/common/locale/en-US/various.xml +++ b/common/locale/en-US/various.xml @@ -32,7 +32,7 @@

Lists the completion contexts used during the completion of its - arguments. These context names may used to tune the function of + arguments. These context names may be used to tune the function of the completion system via options like autocomplete and wildcase. Note that completion must be triggered in order for this command to be effective, so if autocompletion is not @@ -75,7 +75,7 @@ :!cmd

- Run an external command command. Runs cmd through system() + Run an external command. Runs cmd through system() and displays its output. Any ‘!’ in cmd is replaced with the previous external command, so long as it is not preceded by a backslash and banghist is enabled. @@ -168,7 +168,7 @@

Clear private data items for timespan, where item … - is a list of private items to delete. If ! is specified + is a list of private items to delete. If ! is specified, then sanitizeitems is used for the list of items to delete. Items may be any of:

@@ -199,10 +199,10 @@

- If timespan (short name -t) is specified then only + If timespan (short name -t) is specified, only items within that timespan are deleted, otherwise the value of sanitizetimespan is used. If -older (short name - -o) is specified, than only items older than + -o) is specified, then only items older than timespan are deleted.

@@ -244,7 +244,7 @@

Open a help page for subject. If subject is - omitted, open the default pate as specified in helpfile. + omitted, open the default page as specified in helpfile. If you're not sure of the exact topic you need help with, try completion or :help overview.