diff --git a/common/content/help.xsl b/common/content/help.xsl index 2edb85cd..b40d1a24 100644 --- a/common/content/help.xsl +++ b/common/content/help.xsl @@ -88,7 +88,7 @@ - + + @@ -127,6 +127,10 @@ + + + + diff --git a/common/content/liberator.js b/common/content/liberator.js index 61b9962a..def9fd12 100644 --- a/common/content/liberator.js +++ b/common/content/liberator.js @@ -215,7 +215,7 @@ const liberator = (function () //{{{ options.add(["helpfile", "hf"], "Name of the main help file", - "string", "intro.html"); + "string", "intro"); options.add(["loadplugins", "lpl"], "Load plugin scripts when starting up", diff --git a/common/content/style.js b/common/content/style.js index ed21a0e5..3edce8da 100644 --- a/common/content/style.js +++ b/common/content/style.js @@ -184,6 +184,7 @@ Highlights.prototype.CSS = -all + +all diff --git a/vimperator/locale/en-US/autocommands.xml b/vimperator/locale/en-US/autocommands.xml index dfeee89d..072b5ada 100644 --- a/vimperator/locale/en-US/autocommands.xml +++ b/vimperator/locale/en-US/autocommands.xml @@ -103,13 +103,13 @@

Examples

-

Enable _passthrough_ mode on all Google sites:

+

Enable passthrough mode on all Google sites:

:autocmd LocationChange .* js modes.passAllKeys = /google\.com/.test(buffer.URL)

-

Enable _passthrough_ mode on *some* Google sites:

+

Enable passthrough mode on *some* Google sites:

:autocmd LocationChange .* js modes.passAllKeys = /(www|mail)\.google\.com/.test(buffer.URL) @@ -124,7 +124,7 @@

- :autocmd LocationChange mail\.google\.com :set editor=gvim -f -c 'set ft=mail' + :autocmd LocationChange mail\\.google\\.com :set editor=gvim -f -c 'set ft=mail'

diff --git a/vimperator/locale/en-US/buffer.xml b/vimperator/locale/en-US/buffer.xml index d164a285..80c4be13 100644 --- a/vimperator/locale/en-US/buffer.xml +++ b/vimperator/locale/en-US/buffer.xml @@ -157,7 +157,9 @@ Vimperator holds exactly one buffer object for each tab. It is usually an

Scroll document to the left. If count is specified then move count times as - much to the left. + + much to the left. +

+

If the document cannot scroll more, a beep is emitted (unless visualbell is set).

@@ -171,7 +173,9 @@ Vimperator holds exactly one buffer object for each tab. It is usually an

Scroll document down. If count is specified then move count times as much - down. + + down. +

+

If the document cannot scroll more, a beep is emitted (unless visualbell is set).

@@ -184,7 +188,9 @@ Vimperator holds exactly one buffer object for each tab. It is usually an countk

- Scroll document up. If count is specified then move count times as much up. + + Scroll document up. If count is specified then move count times as much up. +

+

If the document cannot scroll more, a beep is emitted (unless visualbell is set).

@@ -198,7 +204,9 @@ Vimperator holds exactly one buffer object for each tab. It is usually an

Scroll document to the right. If count is specified then move count times - as much to the right. + + as much to the right. +

+

If the document cannot scroll more, a beep is emitted (unless visualbell is set).

@@ -348,10 +356,10 @@ default zoom levels are 30%, 50%, 67%, 80%, 90%, 100%, 110%, 120%, 133%, 150%, 170%, 200%, 240%, 300%. The available zoom range can be changed by setting the -'zoom.minPercent' and -'zoom.maxPercent' Firefox +'zoom.minPercent' and +'zoom.maxPercent' Firefox preferences. The zoom levels can be changed using the -'toolkit.ZoomManager.zoomLevels' +'toolkit.ZoomManager.zoomLevels' preference. diff --git a/vimperator/locale/en-US/intro.xml b/vimperator/locale/en-US/intro.xml index 7158b439..29cf284a 100644 --- a/vimperator/locale/en-US/intro.xml +++ b/vimperator/locale/en-US/intro.xml @@ -1,29 +1,35 @@ + + + + - -

+ First there was a Navigator, then there was an Explorer. Later it was time for a Konqueror. Now it's time for an Imperator, the VIMperator :) - +

Introduction

-&appname; is a free browser add-on for &hostapp;, +&appname; is a free browser add-on for &hostapp;, which makes it look and behave like the -Vim +Vim text editor. It has similar key bindings, and you could call it a modal web browser, as key bindings differ according to which mode you are in. To provide the most authentic Vim experience, the &hostapp; menubar and toolbar are hidden. -

If you really need them, type: [c]:set guioptions+=mT[c] to get them back.

+ +

If you really need them, type: :set guioptions+=mT to get them back.

If you don't like &appname; at all, you can uninstall it by typing :extdelete &appname; or :extdisable &appname; to disable it. @@ -36,20 +42,20 @@ web browser, as key bindings differ according to which mode you are in. author donaton sponsor

&appname; was initially written by - Martin + Martin Stubenschrott but has found many other - contributors + contributors in the meanwhile. If you appreciate the work on &appname; and want to encourage us working on it more, you can send us greetings, patches, or donations (thanks a lot to - these + these people who already did):

- +
@@ -57,55 +63,54 @@ web browser, as key bindings differ according to which mode you are in.

If you prefer getting some nice products for your money, you can also support us by buying some cool - merchandise like + merchandise like t-shirts or mugs. Of course, as we believe in free, open source software, only support us financially if you really like &appname; and the money doesn't hurt — otherwise just use it, recommend it, and like it :)

-section::Help{nbsp}topics[overview]

Help topics

  1. - Quick-start tutorial: + Quick-start tutorial: A quick-start tutorial for new users.
  2. - Starting &appname;: + Starting &appname;: How &appname; starts up, where it reads the config file…
  3. - Browsing: + Browsing: Basic mappings and commands needed for a browsing session (how to open a web page or go back in history).
  4. - Buffer: + Buffer: Operations on the current document like scrolling or copying text.
  5. - Command-line mode: + Command-line mode: Command-line editing.
  6. - Insert mode: + Insert mode: Insert-mode editing.
  7. - Options: + Options: A description of all options.
  8. - Text search commands: + Text search commands: Searching for text in the current buffer.
  9. - Tabs: + Tabs: Managing your tabbed browsing session.
  10. - Hints: + Hints: Selecting hyperlinks and other page elements.
  11. @@ -113,47 +118,47 @@ section::Help{nbsp}topics[overview] Defining new key mappings, abbreviations and user commands.
  12. - Expression evaluation: + Expression evaluation: Executing JavaScript.
  13. - Marks: + Marks: Using bookmarks, QuickMarks, history and local marks.
  14. - Repeating commands: + Repeating commands: Using macros to repeat recurring workflows.
  15. - Automatic commands: + Automatic commands: Automatically executing code on certain events.
  16. - Printing: + Printing: Printing pages.
  17. - &appname;'s GUI: + &appname;'s GUI: Accessing &hostapp; menus, dialogs and the sidebar.
  18. - Styling the GUI and web pages: + Styling the GUI and web pages: Changing the styling of content pages and &appname; itself.
  19. - Error and informational messages: + Error and informational messages: A description of messages and error messages.
  20. - Developer information: + Developer information: How to write docs or plugins.
  21. - Various commands: + Various commands: Other help which didn't fit into any other category.
  22. - Index: + Index: An index of all commands and options.
@@ -166,19 +171,19 @@ or :help :set.

Features

    -
  • Vim-like keybindings ([m]h[m], [m]j[m], [m]k[m], [m]l[m], [m]gg[m], [m]G[m], [m]0[m], [m]$[m], [m]ZZ[m], [m][m], etc.)
    • +
  • Vim-like keybindings (h, j, k, l, gg, G, 0, $, ZZ, , etc.)
  • Ex commands (:quit, :open www.foo.com, …)
  • Tab completion available for all commands with support for "longest" matching when set in 'wildmode'
    • -
  • Hit-a-hint like navigation of links (start with [m]f[m] to follow a link)
    • +
  • Hit-a-hint like navigation of links (start with f to follow a link)
  • Advanced completion of bookmark and history URLs (searching also in title, not only URL)
  • Vim-like statusline with a Wget-like progress bar
  • Minimal GUI (easily hide useless menubar and toolbar with :set guioptions=)
    • -
  • Ability to :source JavaScript files, and to use a [a]~/.vimperatorrc[a] file with syntax highlighting if you install http://vimperator.org/trac/ticket/26[vimperator.vim]
    • +
  • Ability to :source JavaScript files, and to use a ~/.vimperatorrc file with syntax highlighting if you install vimperator.vim
  • Easy quick searches (:open foo will search for "foo" in google, :open ebay terminator will search for "terminator" on ebay) with support for &hostapp; keyword bookmarks and search engines
    • -
  • Count supported for many commands ([m]3[m] will go back 3 pages)
    • +
  • Count supported for many commands (3 will go back 3 pages)
  • Beep on errors
    • -
  • Marks support ([m]m[m][a]a[a] to set mark a on a web page, [m]'[m][a]a[a] to go there)
    • -
  • QuickMarks support (quickly go to previously marked web pages with [m]go[m][a]{a-zA-Z0-9}[a])
    • +
  • Marks support (ma to set mark a on a web page, 'a to go there)
    • +
  • QuickMarks support (quickly go to previously marked web pages with goa-zA-Z0-9)
  • :map and :command support (and feedkeys() for script writers)
  • :time support for profiling
  • Move the text cursor and select text with Vim keys and a Visual mode
    • @@ -193,10 +198,10 @@ or :help :set.

    Please send comments/bug reports/patches to the mailing list, where we will properly answer any questions. You can also join the - #vimperator IRC channel - on Freenode or check the - Wiki for - + #vimperator IRC channel + on Freenode or check the + Wiki for + frequently asked questions (FAQ) . Make sure, you have read the TODO file first, as we are aware of many things which can be improved when we find time for it or receive patches. diff --git a/vimperator/locale/en-US/map.xml b/vimperator/locale/en-US/map.xml index 15879689..cd25e207 100644 --- a/vimperator/locale/en-US/map.xml +++ b/vimperator/locale/en-US/map.xml @@ -14,7 +14,7 @@

    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 [j]key-sequence[j], + bindings or define new ones. A mapping consists of a key, or key-sequence, which is translated to a string of characters. Example:

    :map :echo new Date().toDateString() @@ -55,7 +55,7 @@ :cmap lhs rhs

    - Map the [j]key-sequence[j] lhs to rhs for the applicable mode(s). The rhs is + Map the key-sequence lhs to rhs for the applicable mode(s). The rhs is remapped, allowing for nested and recursive mappings.

    @@ -75,7 +75,7 @@ :cnoremap lhs rhs

    - Map the [j]key-sequence[j] lhs to rhs for the applicable mode(s). No remapping of + Map the key-sequence lhs to rhs for the applicable mode(s). No remapping of the rhs is performed.

    diff --git a/vimperator/locale/en-US/marks.xml b/vimperator/locale/en-US/marks.xml index 35b07fbe..a50a2c02 100644 --- a/vimperator/locale/en-US/marks.xml +++ b/vimperator/locale/en-US/marks.xml @@ -59,8 +59,8 @@

    Toggle bookmarked state of current URL. Add/remove a bookmark for the current location, depending on if it is already bookmarked or not. In contrast to the - :bmark command, the bookmark is just _starred_ which means it is placed - in the _Unfiled Bookmarks Folder_ instead of the bookmarks menu. + :bmark command, the bookmark is just starred which means it is placed + in the Unfiled Bookmarks Folder instead of the bookmarks menu.

    diff --git a/vimperator/locale/en-US/message.xml b/vimperator/locale/en-US/message.xml index 1451c36c..0d24573d 100644 --- a/vimperator/locale/en-US/message.xml +++ b/vimperator/locale/en-US/message.xml @@ -74,7 +74,7 @@
    q, or CTRL-C
    stop the listing
    :
    stop the listing and enter a command-line
    -
    ;
    start an [j]extended-hints[j] command
    +
    ;
    start an extended-hints command
    yank (copy) a modeless selection to the clipboard
    diff --git a/vimperator/locale/en-US/options.xml b/vimperator/locale/en-US/options.xml index cf6e6ec3..270923d4 100644 --- a/vimperator/locale/en-US/options.xml +++ b/vimperator/locale/en-US/options.xml @@ -84,8 +84,8 @@ :set opt=foo,bar

    then,

    :set opt!=foo,baz -

    results in

    - opt=bar,baz +

    has the same result as

    + :set opt=bar,baz @@ -206,8 +206,8 @@

    Environment variables are expanded for path options like cdpath and - runtimepath. The variable notation is _$VAR_ (terminated by a non-word - character) or _$\\VAR_. _%VAR%_ is also supported on Windows. + runtimepath. The variable notation is $VAR (terminated by a non-word + character) or $VAR. %VAR% is also supported on Windows.

    Setting &hostapp; options

    @@ -261,9 +261,9 @@

    The following preferences are set:

      -
    • dom.popup_allowed_events
      • -
    • accessibility.typeaheadfind.autostart
      • -
    • accessibility.typeaheadfind
      • +
    • dom.popup_allowed_events
      • +
    • accessibility.typeaheadfind.autostart
      • +
    • accessibility.typeaheadfind
    @@ -294,7 +294,7 @@ 'cd' 'cdpath' 'cdpath' 'cd' string - equivalent to _$CDPATH_ or ",," + equivalent to $CDPATH or ,,

    List of directories searched when executing the :cd @@ -549,7 +549,7 @@ 'hf' 'helpfile' 'helpfile' 'hf' string - intro.html + intro

    Name of the main help file. This is the tail component of the chrome @@ -963,7 +963,7 @@

    - On startup, if the environment variable _$VIMPERATOR_RUNTIME_ does not + On startup, if the environment variable $VIMPERATOR_RUNTIME does not exist, &appname; will set it to match this value.

    @@ -1272,7 +1272,7 @@

    List of file patterns to ignore when completing files. E.g., to ignore object files and Vim swap files - :set wildignore=.\.o,\..\.s[a-z]\\2 + :set wildignore=.\\.o,\\..\\.s[a-z]\\2

    Unlike Vim each pattern is a regex rather than a glob. diff --git a/vimperator/locale/en-US/starting.xml b/vimperator/locale/en-US/starting.xml index 4749a20a..d9974e67 100644 --- a/vimperator/locale/en-US/starting.xml +++ b/vimperator/locale/en-US/starting.xml @@ -24,7 +24,7 @@

    Execute a single Ex command after all initialization has been performed. See - [j]initialization[j]. + initialization.

    This option can be specified multiple times.

    @@ -38,7 +38,7 @@

    Execute a single Ex command before any initialization has been performed. See - [j]initialization[j]. + initialization.

    This option can be specified multiple times.

    @@ -53,7 +53,7 @@

    The file rcfile is used for user initialization commands. If rcfile is "NORC" then no startup initialization is performed except for the loading of - plugins, i.e., steps 1. and 2. in [j]initialization[j] are skipped. If rcfile + plugins, i.e., steps 1. and 2. in initialization are skipped. If rcfile is "NONE" then plugin loading is also skipped.

    diff --git a/vimperator/locale/en-US/tabs.xml b/vimperator/locale/en-US/tabs.xml index 14d0c7f9..2a621244 100644 --- a/vimperator/locale/en-US/tabs.xml +++ b/vimperator/locale/en-US/tabs.xml @@ -96,7 +96,7 @@ -See [j]opening[j] for other ways to open new tabs. +See opening for other ways to open new tabs.

    Changing tabs

    @@ -219,7 +219,7 @@ See [j]opening[j] for other ways to open new tabs. shortcut to open this prompt.

    -

    If argument is [a]#[a], the alternate buffer will be selected (see ).

    +

    If argument is #, the alternate buffer will be selected (see ).

    If no argument is given the current buffer remains current.

     diff --git a/vimperator/locale/en-US/tutorial.xml b/vimperator/locale/en-US/tutorial.xml index c60d2256..180d847e 100644 --- a/vimperator/locale/en-US/tutorial.xml +++ b/vimperator/locale/en-US/tutorial.xml @@ -22,7 +22,7 @@ If you've started using &appname; from scratch (i.e., without any customization), you should be looking at this help page in a relatively bare-looking window. The menubar, navigation bar, and bookmark bars are hidden. - In case you missed the notice in the help:Introduction[intro.html], you can + In case you missed the notice in the intro, you can regain these by issuing the command

    @@ -37,7 +37,7 @@ However, in this author's opinion, the best way to get familiar with &appname; is to leave these disabled for now. (The above action can be reversed with :set go=) You can look at the entry for guioptions in - help:options[options.html] for more information on this. + options for more information on this.

    &appname;'s modal interface

    @@ -45,8 +45,8 @@

    &appname;'s power, like Vim's, comes from it's modal interface. Keys have different meanings depending on which mode the browser is in. &appname; has - several modes, but the 2 most important are ``Normal'' mode and - ``Command-line'' mode. + several modes, but the 2 most important are Normal mode and + Command-line mode.

    @@ -56,8 +56,8 @@

    The other core mode of &appname;, Command-line mode, can be entered from - Normal mode by typing a \':' (colon). You will frequently see &appname; - commands start with a \':', indicating that what follows is a command. + Normal mode by typing a : (colon). You will frequently see &appname; + commands start with a :, indicating that what follows is a command.

    @@ -145,7 +145,7 @@

    History and tabs

    - History navigation (e.g., ``Back'', ``Forward'') are done similarly to + History navigation (e.g., Back, Forward) are done similarly to scrolling.

    @@ -194,12 +194,12 @@

    So now you can navigate around in &appname;. But wait… how do you open a - page or tab linked in a web page? How do you ``click'' on all those links + page or tab linked in a web page? How do you click on all those links without your tailed friend?

    - The answer is ``hints''. Activating hints displays a number next to every link + The answer is hints. Activating hints displays a number next to every link &appname; can find. To follow the link, simply type the number corresponding to the hint, a white number inside a red square by default.

    @@ -218,18 +218,18 @@

    - The most common hint mode is called help:QuickHint mode[various.html,f]. + The most common hint mode is called quick-hints. To activate QuickHint mode, press either f or F. The lower-case f will open the resulting link in the current tab, while the upper-case F will open it in a new tab.

    - To test it, try this link: http://vimperator.org/[&appname; Homepage]. + To test it, try this link: &appname; Homepage. Activate QuickHint mode with f or F to highlight all currently visible links. Then start typing the text of the link. The link should be uniquely identified soon, and &appname; will open it. Once you're done, - remember to use (``History Back'') or d (``Delete Buffer'') + remember to use (History Back) or d (Delete Buffer) to return here, depending on which key you used to activate QuickHint mode.

    @@ -248,7 +248,7 @@ following:

    -Esc +

    Saving for posterity - vimperatorrc

    @@ -320,7 +320,7 @@ remember to use the gt/gT mappings to get back to this page. If using the :open command, use the history keys (e.g., H) to return. If you get hopelessly lost, just type :help and click the - ``Tutorial'' link to return. + Tutorial link to return.

    @@ -346,15 +346,15 @@

    -

    I'm interested…but lost!

    +

    I'm interested… but lost!

    &appname; has an energetic and growing user base. If you've run into a problem that you can't seem to solve with &appname;, or if you think you might have found a bug, please let us know! There is support available on the - http://code.google.com/p/vimperator-labs/w/list?q=label%3Aproject-vimperator[wiki], - or in the #vimperator IRC - channel on http://freenode.net/[freenode]. + wiki + or in the #vimperator IRC + channel on freenode.

    @@ -362,7 +362,7 @@ hear from you as well. Developers work on &appname; whenever possible, but we are neither infinite nor omnipotent; please bear with us. If you can't wait for us to get around to it, rest assured patches are welcome! See the - help:Developer[developer.html] page for more information. + developer page for more information.