From 8b222085ec42fbebf8ac21ffbe23548ee7ecd37d Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Sat, 24 Oct 2009 16:17:33 -0400 Subject: [PATCH] Add machinery to splice in app-specific help entries. --HG-- branch : xslt rename : vimperator/locale/en-US/all.xml => common/locale/en-US/all.xml rename : vimperator/locale/en-US/autocommands.xml => common/locale/en-US/autocommands.xml rename : vimperator/locale/en-US/browsing.xml => common/locale/en-US/browsing.xml rename : vimperator/locale/en-US/buffer.xml => common/locale/en-US/buffer.xml rename : vimperator/locale/en-US/cmdline.xml => common/locale/en-US/cmdline.xml rename : vimperator/locale/en-US/developer.xml => common/locale/en-US/developer.xml rename : vimperator/locale/en-US/eval.xml => common/locale/en-US/eval.xml rename : vimperator/locale/en-US/gui.xml => common/locale/en-US/gui.xml rename : vimperator/locale/en-US/hints.xml => common/locale/en-US/hints.xml rename : vimperator/locale/en-US/index.xml => common/locale/en-US/index.xml rename : vimperator/locale/en-US/insert.xml => common/locale/en-US/insert.xml rename : vimperator/locale/en-US/intro.xml => common/locale/en-US/intro.xml rename : vimperator/locale/en-US/map.xml => common/locale/en-US/map.xml rename : vimperator/locale/en-US/marks.xml => common/locale/en-US/marks.xml rename : vimperator/locale/en-US/message.xml => common/locale/en-US/message.xml rename : vimperator/locale/en-US/options.xml => common/locale/en-US/options.xml rename : vimperator/locale/en-US/pattern.xml => common/locale/en-US/pattern.xml rename : vimperator/locale/en-US/print.xml => common/locale/en-US/print.xml rename : vimperator/locale/en-US/repeat.xml => common/locale/en-US/repeat.xml rename : vimperator/locale/en-US/starting.xml => common/locale/en-US/starting.xml rename : vimperator/locale/en-US/styling.xml => common/locale/en-US/styling.xml rename : vimperator/locale/en-US/tabs.xml => common/locale/en-US/tabs.xml rename : vimperator/locale/en-US/tutorial.xml => common/locale/en-US/tutorial.xml rename : vimperator/locale/en-US/various.xml => common/locale/en-US/various.xml --- common/content/help.xsl | 32 +++++++ {vimperator => common}/locale/en-US/all.xml | 4 +- .../locale/en-US/autocommands.xml | 4 +- .../locale/en-US/browsing.xml | 4 +- .../locale/en-US/buffer.xml | 4 +- .../locale/en-US/cmdline.xml | 4 +- .../locale/en-US/developer.xml | 4 +- {vimperator => common}/locale/en-US/eval.xml | 4 +- {vimperator => common}/locale/en-US/gui.xml | 30 +++---- {vimperator => common}/locale/en-US/hints.xml | 4 +- {vimperator => common}/locale/en-US/index.xml | 18 ++-- .../locale/en-US/insert.xml | 4 +- {vimperator => common}/locale/en-US/intro.xml | 38 ++++----- {vimperator => common}/locale/en-US/map.xml | 14 ++-- {vimperator => common}/locale/en-US/marks.xml | 4 +- .../locale/en-US/message.xml | 6 +- .../locale/en-US/options.xml | 50 +++++------ .../locale/en-US/pattern.xml | 8 +- {vimperator => common}/locale/en-US/print.xml | 6 +- .../locale/en-US/repeat.xml | 14 ++-- .../locale/en-US/starting.xml | 16 ++-- .../locale/en-US/styling.xml | 12 +-- {vimperator => common}/locale/en-US/tabs.xml | 6 +- .../locale/en-US/tutorial.xml | 84 +++++++++---------- .../locale/en-US/various.xml | 8 +- vimperator/chrome.manifest | 3 +- vimperator/content/liberator.dtd | 2 + vimperator/locale/en-US/liberator.dtd | 1 - 28 files changed, 211 insertions(+), 177 deletions(-) rename {vimperator => common}/locale/en-US/all.xml (93%) rename {vimperator => common}/locale/en-US/autocommands.xml (98%) rename {vimperator => common}/locale/en-US/browsing.xml (99%) rename {vimperator => common}/locale/en-US/buffer.xml (99%) rename {vimperator => common}/locale/en-US/cmdline.xml (96%) rename {vimperator => common}/locale/en-US/developer.xml (94%) rename {vimperator => common}/locale/en-US/eval.xml (97%) rename {vimperator => common}/locale/en-US/gui.xml (88%) rename {vimperator => common}/locale/en-US/hints.xml (97%) rename {vimperator => common}/locale/en-US/index.xml (97%) rename {vimperator => common}/locale/en-US/insert.xml (90%) rename {vimperator => common}/locale/en-US/intro.xml (86%) rename {vimperator => common}/locale/en-US/map.xml (97%) rename {vimperator => common}/locale/en-US/marks.xml (98%) rename {vimperator => common}/locale/en-US/message.xml (93%) rename {vimperator => common}/locale/en-US/options.xml (95%) rename {vimperator => common}/locale/en-US/pattern.xml (89%) rename {vimperator => common}/locale/en-US/print.xml (86%) rename {vimperator => common}/locale/en-US/repeat.xml (94%) rename {vimperator => common}/locale/en-US/starting.xml (88%) rename {vimperator => common}/locale/en-US/styling.xml (95%) rename {vimperator => common}/locale/en-US/tabs.xml (98%) rename {vimperator => common}/locale/en-US/tutorial.xml (75%) rename {vimperator => common}/locale/en-US/various.xml (95%) diff --git a/common/content/help.xsl b/common/content/help.xsl index b40d1a24..7736d18c 100644 --- a/common/content/help.xsl +++ b/common/content/help.xsl @@ -1,3 +1,5 @@ + + + + + @@ -137,6 +142,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vimperator/locale/en-US/all.xml b/common/locale/en-US/all.xml similarity index 93% rename from vimperator/locale/en-US/all.xml rename to common/locale/en-US/all.xml index fad2fde9..465a09a5 100644 --- a/vimperator/locale/en-US/all.xml +++ b/common/locale/en-US/all.xml @@ -1,11 +1,11 @@ - + all diff --git a/vimperator/locale/en-US/autocommands.xml b/common/locale/en-US/autocommands.xml similarity index 98% rename from vimperator/locale/en-US/autocommands.xml rename to common/locale/en-US/autocommands.xml index 072b5ada..2524c0b1 100644 --- a/vimperator/locale/en-US/autocommands.xml +++ b/common/locale/en-US/autocommands.xml @@ -1,11 +1,11 @@ - +

Automatic commands

diff --git a/vimperator/locale/en-US/browsing.xml b/common/locale/en-US/browsing.xml similarity index 99% rename from vimperator/locale/en-US/browsing.xml rename to common/locale/en-US/browsing.xml index c670fa43..fe4b2d69 100644 --- a/vimperator/locale/en-US/browsing.xml +++ b/common/locale/en-US/browsing.xml @@ -1,11 +1,11 @@ - +

Browsing

diff --git a/vimperator/locale/en-US/buffer.xml b/common/locale/en-US/buffer.xml similarity index 99% rename from vimperator/locale/en-US/buffer.xml rename to common/locale/en-US/buffer.xml index 80c4be13..9fc9b8e3 100644 --- a/vimperator/locale/en-US/buffer.xml +++ b/common/locale/en-US/buffer.xml @@ -1,11 +1,11 @@ - +

Buffer

diff --git a/vimperator/locale/en-US/cmdline.xml b/common/locale/en-US/cmdline.xml similarity index 96% rename from vimperator/locale/en-US/cmdline.xml rename to common/locale/en-US/cmdline.xml index 171fd2ef..9c548499 100644 --- a/vimperator/locale/en-US/cmdline.xml +++ b/common/locale/en-US/cmdline.xml @@ -1,11 +1,11 @@ - +

Command-line mode

diff --git a/vimperator/locale/en-US/developer.xml b/common/locale/en-US/developer.xml similarity index 94% rename from vimperator/locale/en-US/developer.xml rename to common/locale/en-US/developer.xml index a12b202f..ed743938 100644 --- a/vimperator/locale/en-US/developer.xml +++ b/common/locale/en-US/developer.xml @@ -1,11 +1,11 @@ - +

Developer information

diff --git a/vimperator/locale/en-US/eval.xml b/common/locale/en-US/eval.xml similarity index 97% rename from vimperator/locale/en-US/eval.xml rename to common/locale/en-US/eval.xml index 0205c1c6..d68b7c4d 100644 --- a/vimperator/locale/en-US/eval.xml +++ b/common/locale/en-US/eval.xml @@ -1,11 +1,11 @@ - +

Expression evaluation

diff --git a/vimperator/locale/en-US/gui.xml b/common/locale/en-US/gui.xml similarity index 88% rename from vimperator/locale/en-US/gui.xml rename to common/locale/en-US/gui.xml index ebea6bbf..949e0ed8 100644 --- a/vimperator/locale/en-US/gui.xml +++ b/common/locale/en-US/gui.xml @@ -1,17 +1,17 @@ - + -

&appname;'s GUI

+

&liberator.appname;'s GUI

- Although &appname; offers the most frequently used &hostapp; functionality via + Although &liberator.appname; offers the most frequently used &liberator.host; functionality via Ex and Normal mode commands there may be times when directly accessing the GUI is required. There are commands for accessing the menu system, standard dialogs and the sidebar. @@ -25,7 +25,7 @@

Execute menu from the command line. This command provides command-line access - to all menu items available from the main &hostapp; menubar. menu is a + to all menu items available from the main &liberator.host; menubar. menu is a hierarchical path to the menu item with each submenu separated by a period. E.g. :emenu File.Open File…

@@ -40,10 +40,10 @@ :addons

- Show available &hostapp; Extensions and Themes. + Show available &liberator.host; Extensions and Themes. You can add/remove/disable browser extensions from this dialog. - Be aware that not all &hostapp; extensions work, because &appname; overrides - some key bindings and changes &hostapp;'s GUI. + Be aware that not all &liberator.host; extensions work, because &liberator.appname; overrides + some key bindings and changes &liberator.host;'s GUI.

@@ -53,11 +53,11 @@ :dia :dialog :dialog firefox-dialog -

Open a &hostapp; dialog.

+

Open a &liberator.host; dialog.

Available dialogs:

-
about
About Mozilla &hostapp;;
+
about
About Mozilla &liberator.host;;
addbookmark
Add bookmark for the current page
addons
Manage Add-ons
bookmarks
List your bookmarks
@@ -74,7 +74,7 @@
pageinfo
Show information about the current page
pagesource
View page source
places
Places Organizer: Manage your bookmarks and history
-
preferences
Show &hostapp; preferences dialog
+
preferences
Show &liberator.host; preferences dialog
printpreview
Preview the page before printing
printsetup
Setup the page size and orientation before printing
print
Show print dialog
@@ -92,7 +92,7 @@ :downloads

- Show progress of current downloads. Open the original &hostapp; download dialog + Show progress of current downloads. Open the original &liberator.host; download dialog in a new tab. Here, downloads can be paused, canceled and resumed.

@@ -189,7 +189,7 @@

Open the sidebar window. name is any of the menu items listed under the - standard &hostapp; View->Sidebar menu. Add-ons, Preferences and Downloads are + standard &liberator.host; View->Sidebar menu. Add-ons, Preferences and Downloads are also available in the sidebar.

@@ -229,7 +229,7 @@
  • Security: The security information button is displayed when appropriate - as per &hostapp;. The color of the status bar also changes to reflect the + as per &liberator.host;. The color of the status bar also changes to reflect the current security status of the loaded page.
    • black – the site's identity is unverified and the connection is unencrypted
      • @@ -240,7 +240,7 @@
    • Extensions: Any extension buttons that would normally be installed to the - &hostapp; status bar are appended to the end of the status line. + &liberator.host; status bar are appended to the end of the status line.
    diff --git a/vimperator/locale/en-US/hints.xml b/common/locale/en-US/hints.xml similarity index 97% rename from vimperator/locale/en-US/hints.xml rename to common/locale/en-US/hints.xml index f1a324f2..cc22babc 100644 --- a/vimperator/locale/en-US/hints.xml +++ b/common/locale/en-US/hints.xml @@ -1,11 +1,11 @@ - +

    Hints

    diff --git a/vimperator/locale/en-US/index.xml b/common/locale/en-US/index.xml similarity index 97% rename from vimperator/locale/en-US/index.xml rename to common/locale/en-US/index.xml index 58903c9f..2d94c576 100644 --- a/vimperator/locale/en-US/index.xml +++ b/common/locale/en-US/index.xml @@ -1,11 +1,11 @@ - +

    Index

    @@ -36,7 +36,7 @@ This file contains a list of all available commands, mappings and options.
    Scroll window upwards in the buffer
    Pass through next key
    Decrement last number in URL
    -
    Temporarily ignore all &appname; key bindings
    +
    Temporarily ignore all &liberator.appname; key bindings
    • @@ -257,7 +257,7 @@ This file contains a list of all available commands, mappings and options.
    :delmarks
    Delete the specified marks
    :delqmarks
    Delete the specified QuickMarks
    :delstyle
    Delete any matching styles
    -
    :dialog
    Open a &hostapp; dialog
    +
    :dialog
    Open a &liberator.host; dialog
    :doautoall
    Apply the autocommands matching the specified URL to all buffers
    :doautocmd
    Apply the autocommands matching the specified URL to the current buffer
    :downloads
    Show progress of current downloads
    @@ -279,7 +279,7 @@ This file contains a list of all available commands, mappings and options.
    :hardcopy
    Print current document
    :help
    Open the help page
    :helpall
    Open the single unchunked help page
    -
    :highlight
    Style &appname;
    +
    :highlight
    Style &liberator.appname;
    :history
    Show recently visited URLs
    :iabbrev
    Abbreviate a key sequence in Insert mode
    :iabclear
    Remove all abbreviations in Insert mode
    @@ -313,12 +313,12 @@ This file contains a list of all available commands, mappings and options.
    :pageinfo
    Show various page information
    :pagestyle
    Select the author style sheet to apply
    :play
    Replay a recorded macro
    -
    :preferences
    Show &hostapp; preferences dialog
    +
    :preferences
    Show &liberator.host; preferences dialog
    :pwd
    Print the current directory name
    :qmark
    Mark a URL with a letter for quick access
    :qmarks
    Show all QuickMarks
    :quit
    Quit current tab
    -
    :quitall
    Quit &appname;
    +
    :quitall
    Quit &liberator.appname;
    :redraw
    Redraw the screen
    :reload
    Reload the current web page
    :reloadall
    Reload all tab pages
    @@ -336,7 +336,7 @@ This file contains a list of all available commands, mappings and options.
    :source
    Read Ex commands from a file
    :stop
    Stop loading the current web page
    :stopall
    Stop loading all tab pages
    -
    :style
    Style &appname; and web sites
    +
    :style
    Style &liberator.appname; and web sites
    :styledisable
    Disable a user style sheet
    :styleenable
    Enable a user style sheet
    :styletoggle
    Toggle a user style sheet
    @@ -391,7 +391,7 @@ This file contains a list of all available commands, mappings and options.
    eventignore
    List of autocommand event names which should be ignored
    exrc
    Allow reading of an RC file in the current directory
    extendedhinttags
    XPath string of hintable elements activated by ;
    -
    fileencoding
    Changes the character encoding that &appname; uses to read and write files
    +
    fileencoding
    Changes the character encoding that &liberator.appname; uses to read and write files
    focuscontent
    Try to stay in Normal mode after loading a web page
    followhints
    Change the behaviour of in Hints mode
    fullscreen
    Show the current window fullscreen
    diff --git a/vimperator/locale/en-US/insert.xml b/common/locale/en-US/insert.xml similarity index 90% rename from vimperator/locale/en-US/insert.xml rename to common/locale/en-US/insert.xml index 128bc3b2..d13f406f 100644 --- a/vimperator/locale/en-US/insert.xml +++ b/common/locale/en-US/insert.xml @@ -1,11 +1,11 @@ - +

    Insert mode

    diff --git a/vimperator/locale/en-US/intro.xml b/common/locale/en-US/intro.xml similarity index 86% rename from vimperator/locale/en-US/intro.xml rename to common/locale/en-US/intro.xml index 29cf284a..751530e4 100644 --- a/vimperator/locale/en-US/intro.xml +++ b/common/locale/en-US/intro.xml @@ -1,11 +1,11 @@ - + @@ -19,20 +19,20 @@ VIMperator :)

    Introduction

    -&appname; is a free browser add-on for &hostapp;, +&liberator.appname; is a free browser add-on for &liberator.host;, which makes it look and behave like the 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. + To provide the most authentic Vim experience, the &liberator.host; menubar and toolbar are hidden.

    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. + If you don't like &liberator.appname; at all, you can uninstall it by typing + :extdelete &liberator.appname; or :extdisable &liberator.appname; to disable it.

    If you like it but can't remember the shortcuts, then press @@ -41,14 +41,14 @@ web browser, as key bindings differ according to which mode you are in. author donaton sponsor

    - &appname; was initially written by + &liberator.appname; was initially written by Martin Stubenschrott but has found many other - contributors - in the meanwhile. If you appreciate the work on &appname; and want to + contributors + in the meanwhile. If you appreciate the work on &liberator.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):

    @@ -65,7 +65,7 @@ web browser, as key bindings differ according to which mode you are in. us by buying some cool 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 + support us financially if you really like &liberator.appname; and the money doesn't hurt — otherwise just use it, recommend it, and like it :)

    @@ -77,8 +77,8 @@ web browser, as key bindings differ according to which mode you are in. A quick-start tutorial for new users.
  • - Starting &appname;: - How &appname; starts up, where it reads the config file… + Starting &liberator.appname;: + How &liberator.appname; starts up, where it reads the config file…
  • Browsing: @@ -138,12 +138,12 @@ web browser, as key bindings differ according to which mode you are in. Printing pages.
  • - &appname;'s GUI: - Accessing &hostapp; menus, dialogs and the sidebar. + &liberator.appname;'s GUI: + Accessing &liberator.host; menus, dialogs and the sidebar.
  • Styling the GUI and web pages: - Changing the styling of content pages and &appname; itself. + Changing the styling of content pages and &liberator.appname; itself.
  • Error and informational messages: @@ -179,7 +179,7 @@ or :help :set.
  • 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 ~/.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
    • +
  • Easy quick searches (:open foo will search for "foo" in google, :open ebay terminator will search for "terminator" on ebay) with support for &liberator.host; keyword bookmarks and search engines
  • Count supported for many commands (3 will go back 3 pages)
  • Beep on errors
  • Marks support (ma to set mark a on a web page, 'a to go there)
    • @@ -200,8 +200,8 @@ or :help :set. properly answer any questions. You can also join the #vimperator IRC channel on Freenode or check the - Wiki for - + 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/common/locale/en-US/map.xml similarity index 97% rename from vimperator/locale/en-US/map.xml rename to common/locale/en-US/map.xml index cd25e207..c5fb6f5c 100644 --- a/vimperator/locale/en-US/map.xml +++ b/common/locale/en-US/map.xml @@ -1,11 +1,11 @@ - +

    Key mappings, abbreviations, and user-defined commands

    @@ -32,7 +32,7 @@
  • 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 &appname; command line
    • +
  • Command-line mode: When typing into the &liberator.appname; command line
    • @@ -278,7 +278,7 @@

    Abbreviations

    - &appname; can automatically replace words identified as abbreviations, + &liberator.appname; can automatically replace words identified as abbreviations, which may be used to save typing or to correct commonly misspelled words. An abbreviation can be one of three types that are defined by the types of constituent characters. Whitespace and quotes are non-keyword @@ -474,7 +474,7 @@

    buffer
    buffers
    color
    color schemes
    command
    Ex commands
    -
    dialog
    &hostapp; dialogs
    +
    dialog
    &liberator.host; dialogs
    dir
    directories
    environment
    environment variables
    event
    autocommand events
    @@ -485,8 +485,8 @@
    macro
    named macros
    mapping
    user mappings
    menu
    menu items
    -
    option
    &appname; options
    -
    preference
    &hostapp; preferences
    +
    option
    &liberator.appname; options
    +
    preference
    &liberator.host; preferences
    search
    search engines and keywords
    shellcmd
    shell commands
    sidebar
    sidebar panels
    diff --git a/vimperator/locale/en-US/marks.xml b/common/locale/en-US/marks.xml similarity index 98% rename from vimperator/locale/en-US/marks.xml rename to common/locale/en-US/marks.xml index a50a2c02..084cc64b 100644 --- a/vimperator/locale/en-US/marks.xml +++ b/common/locale/en-US/marks.xml @@ -1,11 +1,11 @@ - +

    Marks

    diff --git a/vimperator/locale/en-US/message.xml b/common/locale/en-US/message.xml similarity index 93% rename from vimperator/locale/en-US/message.xml rename to common/locale/en-US/message.xml index 0d24573d..e4b134ef 100644 --- a/vimperator/locale/en-US/message.xml +++ b/common/locale/en-US/message.xml @@ -1,11 +1,11 @@ - +

    Error and informational messages

    @@ -13,7 +13,7 @@ message-history

    - &appname; stores all info and error messages in a message + &liberator.appname; stores all info and error messages in a message history. The type of info messages output can be controlled by the verbose option. The number of stored messages can be set with the messages option. diff --git a/vimperator/locale/en-US/options.xml b/common/locale/en-US/options.xml similarity index 95% rename from vimperator/locale/en-US/options.xml rename to common/locale/en-US/options.xml index 270923d4..f891c79c 100644 --- a/vimperator/locale/en-US/options.xml +++ b/common/locale/en-US/options.xml @@ -1,17 +1,17 @@ - +

    Options

    - &appname; has a number of internal variables and switches which can be set to + &liberator.appname; has a number of internal variables and switches which can be set to achieve special effects. These options come in 5 forms:

    @@ -210,19 +210,19 @@ character) or $VAR. %VAR% is also supported on Windows.

    -

    Setting &hostapp; options

    +

    Setting &liberator.host; options

    -

    &hostapp; options can be viewed and set with the following commands:

    +

    &liberator.host; options can be viewed and set with the following commands:

    :prefs :preferences :pref[erences]

    - Show the &hostapp; preferences dialog. You can change the browser - preferences from this dialog. Be aware that not all &hostapp; - preferences work, because &appname; overrides some key bindings and - changes &hostapp;'s GUI. + Show the &liberator.host; preferences dialog. You can change the browser + preferences from this dialog. Be aware that not all &liberator.host; + preferences work, because &liberator.appname; overrides some key bindings and + changes &liberator.host;'s GUI.

    @@ -232,7 +232,7 @@ :pref[erences]!

    - Opens about:config in the current tab where you can change advanced &hostapp; + Opens about:config in the current tab where you can change advanced &liberator.host; preferences.

    @@ -243,7 +243,7 @@ :se[t]! preference=value

    - Change any &hostapp; preference (those in the about:config + Change any &liberator.host; preference (those in the about:config window). You can also reset/delete those preferences with :set! preference&.

    @@ -253,7 +253,7 @@ overridden-preferences

    - &appname; sets several &hostapp; preferences at startup. If this is undesirable, + &liberator.appname; sets several &liberator.host; preferences at startup. If this is undesirable, they can be changed to a different value in your RC file using :set! preference=value

    @@ -316,7 +316,7 @@
    s
    Search engines and keyword URLs
    f
    Local files
    -
    l
    &hostapp; location bar entries (bookmarks and history sorted in an intelligent way)
    +
    l
    &liberator.host; location bar entries (bookmarks and history sorted in an intelligent way)
    b
    Bookmarks
    h
    History
    S
    Search engine suggestions
    @@ -355,7 +355,7 @@

    - If defsearch is empty, then &hostapp; will always attempt to + If defsearch is empty, then &liberator.host; will always attempt to open the raw [arg].

    @@ -375,7 +375,7 @@

    - &appname; will not behave correctly if the editor forks its own + &liberator.appname; will not behave correctly if the editor forks its own process, such as with gvim without the -f argument. @@ -459,7 +459,7 @@ string UTF-8 -

    Changes the character encoding that &appname; uses to read and write files.

    +

    Changes the character encoding that &liberator.appname; uses to read and write files.

     @@ -707,7 +707,7 @@

    Use Insert mode as the default for text areas. This is useful if you - want to use the known &hostapp; interface for editing text areas. + want to use the known &liberator.host; interface for editing text areas. Input fields default to this behaviour irrespective of this option's setting.

    @@ -913,7 +913,7 @@ effective.

    - This option does not change the popup blocker of &hostapp; in any way. + This option does not change the popup blocker of &liberator.host; in any way.     @@ -964,7 +964,7 @@

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

    @@ -1163,15 +1163,15 @@ 'titlestring' 'titlestring' string - &appname; + &liberator.appname;

    - Change the title of the browser window. &appname; changes the - browser title from Title of web page - Mozilla &hostapp; - to Title of web page - &appname;. If you don't like + Change the title of the browser window. &liberator.appname; changes the + browser title from Title of web page - Mozilla &liberator.host; + to Title of web page - &liberator.appname;. If you don't like that, you can restore it with:

    - :set titlestring=Mozilla &hostapp; + :set titlestring=Mozilla &liberator.host;     @@ -1217,7 +1217,7 @@

    Define which info messages are displayed. When bigger than zero, - &appname; will give messages about what it is doing. These can be + &liberator.appname; will give messages about what it is doing. These can be viewed at any time with the :messages command. The highest value is 15, being the most verbose mode.

    diff --git a/vimperator/locale/en-US/pattern.xml b/common/locale/en-US/pattern.xml similarity index 89% rename from vimperator/locale/en-US/pattern.xml rename to common/locale/en-US/pattern.xml index 70bf8f45..3d1277e6 100644 --- a/vimperator/locale/en-US/pattern.xml +++ b/common/locale/en-US/pattern.xml @@ -1,19 +1,19 @@ - +

    Text search commands

    - &appname; provides a Vim-like interface to &hostapp;'s standard text search + &liberator.appname; provides a Vim-like interface to &liberator.host;'s standard text search functionality. There is no support for using regular expressions in search - commands as &hostapp; does not provide native regex support. It is unlikely that + commands as &liberator.host; does not provide native regex support. It is unlikely that this will ever be available.

    diff --git a/vimperator/locale/en-US/print.xml b/common/locale/en-US/print.xml similarity index 86% rename from vimperator/locale/en-US/print.xml rename to common/locale/en-US/print.xml index 7ecd51cb..9c9c30b7 100644 --- a/vimperator/locale/en-US/print.xml +++ b/common/locale/en-US/print.xml @@ -1,11 +1,11 @@ - +

    Printing

    @@ -33,7 +33,7 @@ -

    &hostapp; printing dialogs

    +

    &liberator.host; printing dialogs

    The "Print Preview" and "Page Setup" dialogs can be opened via the :dialog diff --git a/vimperator/locale/en-US/repeat.xml b/common/locale/en-US/repeat.xml similarity index 94% rename from vimperator/locale/en-US/repeat.xml rename to common/locale/en-US/repeat.xml index 02d2193b..e57a4230 100644 --- a/vimperator/locale/en-US/repeat.xml +++ b/common/locale/en-US/repeat.xml @@ -1,16 +1,16 @@ - +

    Repeating commands

    -

    &appname; can repeat a number of commands and record macros.

    +

    &liberator.appname; can repeat a number of commands and record macros.

    Single repeats

    @@ -20,7 +20,7 @@

    Repeat the last keyboard mapping count times. Note that, unlike in Vim, this - does not apply solely to editing commands, mainly because &appname; doesn't + does not apply solely to editing commands, mainly because &liberator.appname; doesn't have them.

    @@ -157,7 +157,7 @@ function hello2() { loaded after vimperatorrc is sourced, this command must be placed early in the vimperatorrc file if vimperatorrc also includes commands that are implemented by plugins. Additionally, this command allows for sourcing - new plugins without restarting &appname;. + new plugins without restarting &liberator.appname;.

    @@ -193,7 +193,7 @@ function hello2() { :finish

    - Stop sourcing a script file. This can only be called from within a &appname; + Stop sourcing a script file. This can only be called from within a &liberator.appname; script file.

    @@ -212,7 +212,7 @@ function hello2() { which might be slow, so take the results with a grain of salt.

    -

    If code starts with a :, it is executed as a &appname; command.

    +

    If code starts with a :, it is executed as a &liberator.appname; command.

    Use the special version with ! if you just want to run any command multiple diff --git a/vimperator/locale/en-US/starting.xml b/common/locale/en-US/starting.xml similarity index 88% rename from vimperator/locale/en-US/starting.xml rename to common/locale/en-US/starting.xml index d9974e67..bd074d47 100644 --- a/vimperator/locale/en-US/starting.xml +++ b/common/locale/en-US/starting.xml @@ -1,19 +1,19 @@ - + -

    Starting &appname;

    +

    Starting &liberator.appname;

    startup-options

    - Command-line options can be passed to &appname; via the -vimperator &hostapp; + Command-line options can be passed to &liberator.appname; via the -vimperator &liberator.host; option. These are passed as single string argument. E.g., firefox -vimperator ++cmd 'set exrc' +u 'tempRcFile' ++noplugin

    @@ -71,10 +71,10 @@

    Initialization

    -

    At startup, &appname; completes the following tasks in order.

    +

    At startup, &liberator.appname; completes the following tasks in order.

      -
    1. &appname; can perform user initialization commands. When +
    2. &liberator.appname; can perform user initialization commands. When one of the following is successfully located, it is executed, and no further locations are tried. @@ -118,7 +118,7 @@ The user's ~ (i.e., "home") directory is determined as follows: * On Unix and Mac, the environment variable $HOME is used. -* On Windows, &appname; checks for the existence of %HOME%, then +* On Windows, &liberator.appname; checks for the existence of %HOME%, then %USERPROFILE%, and then %HOMEDRIVE%%HOMEPATH%. It uses the first one it finds. @@ -149,7 +149,7 @@ it finds. :res :restart :restart -

      Force &hostapp; to restart. Useful when installing extensions.

      +

      Force &liberator.host; to restart. Useful when installing extensions.

       diff --git a/vimperator/locale/en-US/styling.xml b/common/locale/en-US/styling.xml similarity index 95% rename from vimperator/locale/en-US/styling.xml rename to common/locale/en-US/styling.xml index 095fbd26..8ce7fa0c 100644 --- a/vimperator/locale/en-US/styling.xml +++ b/common/locale/en-US/styling.xml @@ -1,19 +1,19 @@ - +

      Styling the GUI and web pages

      - &appname; allows you to style both the browser and any web pages you view. All + &liberator.appname; allows you to style both the browser and any web pages you view. All styling is specified via CSS. Although you may style any user interface element - via the :style command, most &appname; elements can be styled with the + via the :style command, most &liberator.appname; elements can be styled with the :highlight command, for convenience.

      @@ -42,7 +42,7 @@ Highlight group with css. css is one or more comma separated CSS declarations (E.g. color: blue; background-color: red). Normally, css is checked for valid syntax before it's applied. Once you're certain it's valid, - ! can be used to skip the check to speed up &appname; startup. selector + ! can be used to skip the check to speed up &liberator.appname; startup. selector can be any valid CSS selector, such as :hover, and, if provided, will restrict the match to matching elements.

      @@ -50,7 +50,7 @@

      Valid groups are:

      -
      Bell
      &appname;'s visual bell
      +
      Bell
      &liberator.appname;'s visual bell
      Boolean
      A JavaScript Boolean object
      CmdLine
      The command line
      CmdOutput
      diff --git a/vimperator/locale/en-US/tabs.xml b/common/locale/en-US/tabs.xml similarity index 98% rename from vimperator/locale/en-US/tabs.xml rename to common/locale/en-US/tabs.xml index 2a621244..bf75f153 100644 --- a/vimperator/locale/en-US/tabs.xml +++ b/common/locale/en-US/tabs.xml @@ -1,11 +1,11 @@ - +

      Tabs

      @@ -354,7 +354,7 @@ See opening for other ways to open new tabs. :undoall

      - Undo closing of all closed tabs. &hostapp; stores up to 10 closed tabs, even + Undo closing of all closed tabs. &liberator.host; stores up to 10 closed tabs, even after a browser restart.

      diff --git a/vimperator/locale/en-US/tutorial.xml b/common/locale/en-US/tutorial.xml similarity index 75% rename from vimperator/locale/en-US/tutorial.xml rename to common/locale/en-US/tutorial.xml index 180d847e..c6b43358 100644 --- a/vimperator/locale/en-US/tutorial.xml +++ b/common/locale/en-US/tutorial.xml @@ -1,11 +1,11 @@ - + @@ -14,12 +14,12 @@ This is a quickstart tutorial to help get new users up and running - in &appname;. It is not intended as a full reference explaining all + in &liberator.appname;. It is not intended as a full reference explaining all features.

      - If you've started using &appname; from scratch (i.e., without any + If you've started using &liberator.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 intro, you can @@ -35,43 +35,43 @@

      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 + &liberator.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 options for more information on this.

      -

      &appname;'s modal interface

      +

      &liberator.appname;'s modal interface

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

      - When &appname; starts, it is in Normal mode by default. This is probably where + When &liberator.appname; starts, it is in Normal mode by default. This is probably where you will spend the majority of your time.

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

      To return to Normal mode from Command-line mode, type . Pressing will also return you to Normal mode from most other modes in - &appname;. + &liberator.appname;.

      Getting help

      Vim is a great editor but it's not much of a web browser. So even seasoned Vim - users will probably have to look at &appname; documentation sooner or later. - Most of the documentation for &appname;'s features are easily found using the + users will probably have to look at &liberator.appname; documentation sooner or later. + Most of the documentation for &liberator.appname;'s features are easily found using the :help command. For example, you can find help on the :help command by typing

      @@ -104,16 +104,16 @@ – or how I learned to stop worrying and love the 80+ buttons I already have.

      - The efficiency of &appname;, as with the legendary editor it was inspired by, + The efficiency of &liberator.appname;, as with the legendary editor it was inspired by, relies on the user being able to keep his fingers on the keyboard where they can do the most good. While there are some areas where the mouse is clearly - superior at, such as GUI design or some games, &appname; acts on the + superior at, such as GUI design or some games, &liberator.appname; acts on the assumption that a web browser doesn't have to be one of those.

      Here are some areas where the mouse is typically considered indisposable, and - how &appname; challenges this preconception. + how &liberator.appname; challenges this preconception.

      Scrolling

      @@ -193,27 +193,27 @@

      Some hints about surfing…

      - So now you can navigate around in &appname;. But wait… how do you open a + So now you can navigate around in &liberator.appname;. But wait… how do you open a 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 - &appname; can find. To follow the link, simply type the number corresponding + &liberator.appname; can find. To follow the link, simply type the number corresponding to the hint, a white number inside a red square by default.

      For text links, there's an additional shortcut; you can type some text - contained in the link and &appname; will search all the links it can find and + contained in the link and &liberator.appname; will search all the links it can find and only hint the matching links, further narrowing down the list. If the text you - type uniquely identifies any given link, &appname; will follow that link + type uniquely identifies any given link, &liberator.appname; will follow that link immediately without any further user input.

      - Whichever way you choose to indicate your target link, once &appname; has + Whichever way you choose to indicate your target link, once &liberator.appname; has highlighted the link you want, simply hit to open it.

      @@ -225,10 +225,10 @@

      - To test it, try this link: &appname; Homepage. + To test it, try this link: &liberator.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, + uniquely identified soon, and &liberator.appname; will open it. Once you're done, remember to use (History Back) or d (Delete Buffer) to return here, depending on which key you used to activate QuickHint mode.

      @@ -253,14 +253,14 @@

      Saving for posterity - vimperatorrc

      - Once you get &appname; set up with your desired options, maps, and commands, - you'll probably want them to be available the next time you open &appname;. + Once you get &liberator.appname; set up with your desired options, maps, and commands, + you'll probably want them to be available the next time you open &liberator.appname;. Continuing the Vim theme, this is done with a vimperatorrc file.

      To save your current settings and allow them to be loaded automatically - next time you start &appname;, issue the :mkv command. + next time you start &liberator.appname;, issue the :mkv command.

      @@ -272,7 +272,7 @@

      Find the exit nearest you

      - &appname; supports all of Vim's classic methods of exiting. + &liberator.appname; supports all of Vim's classic methods of exiting.

        @@ -287,31 +287,31 @@
      -

      Where did &hostapp; go?

      +

      Where did &liberator.host; go?

      - You might feel pretty disoriented now. Don't worry. This is still &hostapp; - underneath. Here are some ways &appname; allows &hostapp; to shine through. See + You might feel pretty disoriented now. Don't worry. This is still &liberator.host; + underneath. Here are some ways &liberator.appname; allows &liberator.host; to shine through. See the :help for these commands and mappings for more information on how to make the best use of them.

      • :dialog – - To access some of &hostapp;'s many dialog windows, you can use the + To access some of &liberator.host;'s many dialog windows, you can use the :dialog command. See :help :dialog.
      • :bmarks – - &appname; provides a new interface to bookmarks, but they're still your - standard &hostapp; bookmarks under the hood. :bmark will add a new + &liberator.appname; provides a new interface to bookmarks, but they're still your + standard &liberator.host; bookmarks under the hood. :bmark will add a new bookmark, while :bmarks will list the bookmarks currently defined.
      • :history – It's exactly what it sounds like. This command will display a colorized, - scrollable and clickable list of the locations in &appname;'s history. + scrollable and clickable list of the locations in &liberator.appname;'s history.
      • :emenu – - Access the &hostapp; menus through the &appname; command line. + Access the &liberator.host; menus through the &liberator.appname; command line.
      @@ -334,9 +334,9 @@

      - The &appname; way to do this is with the command :addons. Issuing this - command brings up the &hostapp; Add-ons dialog window; you can then remove it as - normal, selecting &appname; from the list and clicking (yes, clicking) + The &liberator.appname; way to do this is with the command :addons. Issuing this + command brings up the &liberator.host; Add-ons dialog window; you can then remove it as + normal, selecting &liberator.appname; from the list and clicking (yes, clicking) Uninstall.

      @@ -349,8 +349,8 @@

      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 + &liberator.appname; has an energetic and growing user base. If you've run into a problem + that you can't seem to solve with &liberator.appname;, or if you think you might have found a bug, please let us know! There is support available on the wiki or in the #vimperator IRC @@ -359,7 +359,7 @@

      If you have any feature requests or (even better) offers to help, we'd love to - hear from you as well. Developers work on &appname; whenever possible, but we + hear from you as well. Developers work on &liberator.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 developer page for more information. diff --git a/vimperator/locale/en-US/various.xml b/common/locale/en-US/various.xml similarity index 95% rename from vimperator/locale/en-US/various.xml rename to common/locale/en-US/various.xml index 37aaa753..cec82832 100644 --- a/vimperator/locale/en-US/various.xml +++ b/common/locale/en-US/various.xml @@ -1,11 +1,11 @@ - +

      Other help

      @@ -57,7 +57,7 @@

      Warning: Input redirection (< foo) not done, also do not run commands which - require stdin or it will hang &hostapp;! It is possible to launch background + require stdin or it will hang &liberator.host;! It is possible to launch background processes, though (e.g. :! xterm &).

      @@ -126,7 +126,7 @@ :version!

      - Show version information. You can show the &hostapp; version page with + Show version information. You can show the &liberator.host; version page with :version!.

      diff --git a/vimperator/chrome.manifest b/vimperator/chrome.manifest index 45dc03bc..1066edbe 100644 --- a/vimperator/chrome.manifest +++ b/vimperator/chrome.manifest @@ -1,7 +1,8 @@ # Firefox content vimperator content/ skin vimperator classic/1.0 skin/ -locale liberator en-US locale/en-US/ +locale vimperator en-US locale/en-US/ +locale liberator en-US ../common/locale/en-US/ content liberator ../common/content/ resource liberator ../common/modules/ diff --git a/vimperator/content/liberator.dtd b/vimperator/content/liberator.dtd index 3dfe25c3..74cee4bf 100644 --- a/vimperator/content/liberator.dtd +++ b/vimperator/content/liberator.dtd @@ -1,6 +1,8 @@ + + diff --git a/vimperator/locale/en-US/liberator.dtd b/vimperator/locale/en-US/liberator.dtd index d2f09db8..173cf95d 100644 --- a/vimperator/locale/en-US/liberator.dtd +++ b/vimperator/locale/en-US/liberator.dtd @@ -1,5 +1,4 @@ -