diff --git a/vimperator/locale/en-US/gui.txt b/vimperator/locale/en-US/gui.txt index 8bba1a8b..9598aa19 100644 --- a/vimperator/locale/en-US/gui.txt +++ b/vimperator/locale/en-US/gui.txt @@ -21,7 +21,7 @@ section:Dialogs[dialogs] |:addo| |:addons| + ||:addo[ns]|| ________________________________________________________________________________ -Show available browser Extensions and Themes. +Show available Firefox Extensions and Themes. You can add/remove/disable browser extensions from this dialog. Be aware that not all Firefox extensions work, because Vimperator overrides some key bindings and changes Firefox's GUI. diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt index 2f4ff593..a65f8bfa 100644 --- a/vimperator/locale/en-US/index.txt +++ b/vimperator/locale/en-US/index.txt @@ -186,8 +186,8 @@ section:Ex{nbsp}commands[ex-cmd-index,:index] ||[c]:extdelete[c]|| ||[c]:extdisable[c]|| ||[c]:extenable[c]|| -||[c]:extoptions[c]|| ||[c]:extensions[c]|| List all installed extensions + +||[c]:extoptions[c]|| ||[c]:exusage[c]|| List all Ex commands with a short description + ||[c]:finish[c]|| Stop sourcing a script file + ||[c]:forward[c]|| Go forward in the browser history + diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt index 4e2c0b3c..835e97ea 100644 --- a/vimperator/locale/en-US/map.txt +++ b/vimperator/locale/en-US/map.txt @@ -138,7 +138,7 @@ subsection:Key{nbsp}sequences[:<>,key-sequence] For most keys, the key-sequence is the same as the character you see when you type that key, however there are some exceptions which allow for a much larger -number of keys to be used in mappings. +number of keys to be used in mappings. * [c][c], [c]\<[c], [c][c], [c]\ [c] allow a literal [c]<[c] or space character. * [c]\'[c], [c]\"[c] and [c]\\[c] must be used to avoid escaping issues when mapping a quote or backslash. @@ -148,7 +148,7 @@ number of keys to be used in mappings. Most keyboards have some modifiers such as the control, alt or meta keys. In order to create a mapping that uses these keys the correct prefix must be used -within the angle brackets. +within the angle brackets. * [c][c]: The control or ctrl key. * [c][c]: The alt key. @@ -157,7 +157,7 @@ within the angle brackets. These prefixes can be combined however you see fit, though you should note that within angle brackets all alphabetic characters are read as lowercase. In order -to force them to be uppercase, you must specify the S- prefix as well. +to force them to be uppercase, you must specify the S- prefix as well. Additionally, you should never use the S- prefix with a number of piece of punctuation, even if you require a shift to type that character; doing so will give you a mapping that cannot be typed. With non-character keys, tab and @@ -173,7 +173,7 @@ the situation: * [c][c]: exactly the same as above * [c][c]: press J while holding control and alt -subsection:Special{nbsp}Characters[map-special-chars] +subsection:Special{nbsp}characters[:map-special-chars] || + |||| diff --git a/vimperator/locale/en-US/starting.txt b/vimperator/locale/en-US/starting.txt index 76c89bbe..9a0d2a05 100644 --- a/vimperator/locale/en-US/starting.txt +++ b/vimperator/locale/en-US/starting.txt @@ -96,7 +96,7 @@ section:Restarting[restarting] |:res| |:restart| + ||:res[tart]|| ________________________________________________________________________________ -Force the browser to restart. Useful when installing extensions. +Force Firefox to restart. Useful when installing extensions. ________________________________________________________________________________ // vim: set filetype=asciidoc: diff --git a/xulmus/locale/en-US/asciidoc.conf b/xulmus/locale/en-US/asciidoc.conf index c11aa7cd..20fcb711 100644 --- a/xulmus/locale/en-US/asciidoc.conf +++ b/xulmus/locale/en-US/asciidoc.conf @@ -87,6 +87,7 @@ LOGO=
[c]=#command [m]=#mapping [a]=#argument +[j]=#jump # FIXME: this prevents all asciidoc attribute processing # ^obviously it doesn't? --stepnem {|}=argument2 @@ -101,6 +102,7 @@ option=| option2='|' command=| mapping=| +jump=| argument=| # NOTE: in certain contexts the unescaped '#' is stripped. As we're ditching # asciidoc I won't bother investigating --djk diff --git a/xulmus/locale/en-US/autocommands.txt b/xulmus/locale/en-US/autocommands.txt index 112cada4..ca2e6d90 100644 --- a/xulmus/locale/en-US/autocommands.txt +++ b/xulmus/locale/en-US/autocommands.txt @@ -10,11 +10,11 @@ Execute commands automatically on events. [c]:au[tocmd][c] {event} {pat} {cmd} -Add {cmd} to the list of commands Xulmus will execute on {event} for a URL matching {pat}: - If the *-javascript* (short name *-js*) option is specified, {cmd} is executed as JavaScript code, with any supplied arguments available as variables. +Add {cmd} to the list of commands Xulmus will execute on {event} for a URL matching {pat}: + * [c]:autocmd[!][c] {events} {pat}: list/remove autocommands filtered by {events} and {pat} * [c]:autocmd[!][c] {events}: list/remove autocommands matching {events} * [c]:autocmd[!][c] * {pat}: list/remove autocommands matching {pat} diff --git a/xulmus/locale/en-US/gui.txt b/xulmus/locale/en-US/gui.txt index c405d36c..1d9286a2 100644 --- a/xulmus/locale/en-US/gui.txt +++ b/xulmus/locale/en-US/gui.txt @@ -110,6 +110,15 @@ ________________________________________________________________________________ List all installed extensions. ________________________________________________________________________________ +|:exto| |:extoptions| + +|:extp| |:extpreferences| + +||:exto[ptions][!] {extension}|| + +||:extp[references][!] {extension}|| + +________________________________________________________________________________ +Open the preferences dialog for an extension. If [!] is given, open a dialog, +otherwise open a buffer. See also 'newtab'. +________________________________________________________________________________ + section:Sidebar[sidebar] |:dpcl| |:dpclose| + diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt index deb52099..d84da1b7 100644 --- a/xulmus/locale/en-US/index.txt +++ b/xulmus/locale/en-US/index.txt @@ -100,7 +100,7 @@ section:Normal{nbsp}mode[normal-index] ||[m]o[m]|| Open one or more URLs + ||[m]p[m]|| Open (put) a URL based on the current clipboard contents in the current buffer + ||[m]q[m]|| Record a key sequence into a macro + -||[m]r[m]|| Reload current web page + +||[m]r[m]|| Reload the current web page + ||[m]t[m]|| Open one or more URLs in a new tab + ||[m]u[m]|| Undo closing of a tab + ||[m]y[m]|| Yank current location to the clipboard + @@ -225,6 +225,7 @@ section:Ex{nbsp}commands[ex-cmd-index,:index] ||[c]:extdisable[c]|| ||[c]:extenable[c]|| ||[c]:extensions[c]|| List all installed extensions + +||[c]:extoptions[c]|| ||[c]:exusage[c]|| List all Ex commands with a short description + ||[c]:filter[c]|| Filter and show the tracks as a view + ||[c]:finish[c]|| Stop sourcing a script file + diff --git a/xulmus/locale/en-US/map.txt b/xulmus/locale/en-US/map.txt index aae4407b..025685d1 100644 --- a/xulmus/locale/en-US/map.txt +++ b/xulmus/locale/en-US/map.txt @@ -1,21 +1,25 @@ heading:Key{nbsp}mappings,{nbsp}abbreviations,{nbsp}and{nbsp}user-defined{nbsp}commands.[] -section:Key{nbsp}mapping[key-mapping,mapping,macro] +section:Key{nbsp}mapping[key-mapping,mapping,map,macro] The key mapping commands can be used to either redefine the standard key -bindings or define new ones. A mapping consists of a key, or sequence of keys, -which are translated to a string of characters. Example: +bindings or define new ones. A mapping consists of a key, or [j]key-sequence[j], +which is translated to a string of characters. Example: \{nbsp}[c]:map :echo new Date().toDateString()[c] will echo the current date to the command line when [m][m] is pressed. -There are separate key mapping tables for each of the Normal, Insert, and -Command-line modes. +|:map-modes| + +Keys can be mapped in four distinct modes: -Please note that, unlike Vim and other applications, mappings containing -the Shift key are specified with the capital letter, so e.g. [m][m] is -different from [m][m], the latter being the only way to map Shift-Ctrl-n. +* Normal mode: When browsing normally -- +* Visual mode: When selecting text with the cursor keys -- +* Insert mode: When interacting with text fields on a website -- +* Command-line mode: When typing into the Xulmus command line. -- + +Warning: Mappings are NOT saved between sessions, make sure you put them in your +xulmusrc file! subsection:Map{nbsp}commands[:map-commands] @@ -30,11 +34,8 @@ subsection:Map{nbsp}commands[:map-commands] |:cm| |:cmap| ||:cm[ap] {lhs} {rhs}|| + ________________________________________________________________________________ -Map the key sequence {lhs} to {rhs} for the applicable mode(s). The {rhs} is +Map the [j]key-sequence[j] {lhs} to {rhs} for the applicable mode(s). The {rhs} is remapped, allowing for nested and recursive mappings. - -Warning: Mappings are NOT saved between sessions, make sure you put them in your -vimperatorrc file! ________________________________________________________________________________ @@ -49,7 +50,7 @@ ________________________________________________________________________________ |:cno| |:cnoremap| ||:cno[remap] {lhs} {rhs}|| + ________________________________________________________________________________ -Map the key sequence {lhs} to {rhs} for the applicable mode(s). No remapping of +Map the [j]key-sequence[j] {lhs} to {rhs} for the applicable mode(s). No remapping of the {rhs} is performed. ________________________________________________________________________________ @@ -122,16 +123,6 @@ When the first argument to one of the mapping commands is [c][c], {rhs} is not echoed to the command line, nor, for that matter, anything else until the command has completed. -subsection:Mapping{nbsp}and{nbsp}modes[:map-modes] - -Keys can be mapped in four distinct modes: - - * Normal mode - * Visual mode - * Insert mode - * Command-line mode - -|map-overview| |map-modes| + Below is an overview of which modes each map command applies to: @@ -143,6 +134,45 @@ Below is an overview of which modes each map command applies to: :imap :inoremap :iunmap :imapclear - Insert mode :cmap :cnoremap :cunmap :cmapclear - Command-line mode +subsection:Key{nbsp}sequences[:<>,key-sequence] + +For most keys, the key-sequence is the same as the character you see when you +type that key, however there are some exceptions which allow for a much larger +number of keys to be used in mappings. + + * [c][c], [c]\<[c], [c][c], [c]\ [c] allow a literal [c]<[c] or space character. + * [c]\'[c], [c]\"[c] and [c]\\[c] must be used to avoid escaping issues when mapping a quote or backslash. + * [c][c] [c][c] [c][c] [c][c] [c][c] [c][c] [c][c] [c][c] (for carriage return/enter) + * [c][c] [c][c] [c][c] [c][c] [c][c] [c][c] (for a backspace) + * [c][c] through [c][c] work as expected + +Most keyboards have some modifiers such as the control, alt or meta keys. In +order to create a mapping that uses these keys the correct prefix must be used +within the angle brackets. + + * [c][c]: The control or ctrl key. + * [c][c]: The alt key. + * [c][c]: The meta key, windows key, or command key + * [c][c]: The shift key. + +These prefixes can be combined however you see fit, though you should note that +within angle brackets all alphabetic characters are read as lowercase. In order +to force them to be uppercase, you must specify the S- prefix as well. +Additionally, you should never use the S- prefix with a number of piece of +punctuation, even if you require a shift to type that character; doing so will +give you a mapping that cannot be typed. With non-character keys, tab and +space, the S- modifier works just like C- A- and M-. Some examples may clarify +the situation: + + * [c]xc[c]: type x, and then type c + * [c]c[c]: hold control and type x, then type c without control + * [c][c]: type 2 while holding control + * [c][c]: type @ while holding control + * [c][c]: press space while holding shift + * [c][c]: press j while holding control and alt + * [c][c]: exactly the same as above + * [c][c]: press J while holding control and alt + subsection:Special{nbsp}characters[:map-special-chars] || + diff --git a/xulmus/locale/en-US/options.txt b/xulmus/locale/en-US/options.txt index 9b64a0ff..46a636a4 100644 --- a/xulmus/locale/en-US/options.txt +++ b/xulmus/locale/en-US/options.txt @@ -554,6 +554,7 @@ The possible values: *all* All commands *addons* [c]:addo[ns][c] command *downloads* [c]:downl[oads][c] command +*extoptions* [c]:exto[ptions][c] command *help* [c]:h[elp][c] command *javascript* [c]:javascript![c] or [c]:js![c] command *prefs* [c]:pref[erences]![c] or [c]:prefs![c] command @@ -766,7 +767,8 @@ Set the separator regex used to separate multiple URL args. Multiple arguments can be specified for [c]:open[c], and similar commands, using this regex as the separator. Using whitespace alone is not generally useful since it is often contained in a single argument. E.g. [c]:open linus torvalds[c] should perform -a single search for the key words "linus" and "torvalds" +a single search for the key words "linus" and "torvalds". If this is set to the +empty string then these arguments will never be split. ____ diff --git a/xulmus/locale/en-US/starting.txt b/xulmus/locale/en-US/starting.txt index a95cb8e5..7ff84d4e 100644 --- a/xulmus/locale/en-US/starting.txt +++ b/xulmus/locale/en-US/starting.txt @@ -10,7 +10,7 @@ E.g firefox -liberator "\++cmd=\'set exrc' +u=\'tempRcFile' \++noplugin" ||+c={command}|| ________________________________________________________________________________ Execute a single Ex command after all initialization has been performed. See -help:initialization[starting.html#Initialization]. +[j]initialization[j]. ________________________________________________________________________________ @@ -18,7 +18,7 @@ ________________________________________________________________________________ ||\++cmd={command}|| ________________________________________________________________________________ Execute a single Ex command before any initialization has been performed. See -help:initialization[starting.html#Initialization]. +[j]initialization[j]. ________________________________________________________________________________ diff --git a/xulmus/locale/en-US/tabs.txt b/xulmus/locale/en-US/tabs.txt index c25a0a21..8a9ea985 100644 --- a/xulmus/locale/en-US/tabs.txt +++ b/xulmus/locale/en-US/tabs.txt @@ -37,7 +37,7 @@ duplicate the tab [count] times. ________________________________________________________________________________ //TODO: should the tab commands be moved back here? -See help::open[browsing.html#opening] for other ways to open new tabs. +See [j]opening[j] for other ways to open new tabs. section:Changing{nbsp}tabs[changing-tabs]