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

@@ -1,3 +1,5 @@
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
+
 <xsl:stylesheet version="1.0"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:liberator="http://vimperator.org/namespaces/liberator"
@@ -8,6 +10,9 @@
 
     <xsl:output method="xml"/>
 
+    <xsl:variable name="local" select="concat('chrome://&liberator.name;/locale/', /liberator:document/@name, '.xml')"/>
+    <xsl:variable name="localdoc" select="document($local)/liberator:document"/>
+
     <xsl:template match="liberator:document">
         <html:html liberator:highlight="Help">
             <html:head>
@@ -137,6 +142,33 @@
         </xsl:call-template>
     </xsl:template>
 
+    <xsl:template name="splice-locals">
+        <xsl:param name="elem"/>
+        <xsl:param name="tag"/>
+        <xsl:for-each select="$localdoc/*[@insertbefore=$tag]">
+            <xsl:apply-templates select="."/>
+        </xsl:for-each>
+        <xsl:for-each select="$elem">
+            <xsl:copy><xsl:apply-templates select="node()"/></xsl:copy>
+        </xsl:for-each>
+        <xsl:for-each select="$localdoc/*[@insertafter=$tag]">
+            <xsl:apply-templates select="."/>
+        </xsl:for-each>
+    </xsl:template>
+
+    <xsl:template match="liberator:document/*[liberator:tags]">
+        <xsl:call-template name="splice-locals">
+            <xsl:with-param name="tag" select="substring-before(concat(liberator:tags, ' '), ' ')"/>
+            <xsl:with-param name="elem" select="self::node()"/>
+        </xsl:call-template>
+    </xsl:template>
+    <xsl:template match="liberator:*[@tag]">
+        <xsl:call-template name="splice-locals">
+            <xsl:with-param name="tag" select="substring-before(concat(@tag, ' '), ' ')"/>
+            <xsl:with-param name="elem" select="self::node()"/>
+        </xsl:call-template>
+    </xsl:template>
+
     <xsl:template match="@*|node()">
         <xsl:copy>
             <xsl:apply-templates select="@*|node()"/>

common/locale/en-US/all.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="all"
-    title="&appname; All"
+    title="&liberator.appname; All"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <tags>all</tags>

common/locale/en-US/autocommands.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="autocommands"
-    title="&appname; Autocommands"
+    title="&liberator.appname; Autocommands"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h2 tag="autocommands">Automatic commands</h2>

common/locale/en-US/browsing.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="browsing"
-    title="&appname; Browsing"
+    title="&liberator.appname; Browsing"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h2 tag="surfing browsing">Browsing</h2>

common/locale/en-US/buffer.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="buffer"
-    title="&appname; Buffer"
+    title="&liberator.appname; Buffer"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h2 tag="buffer document">Buffer</h2>

common/locale/en-US/cmdline.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="cmdline"
-    title="&appname; Command-line"
+    title="&liberator.appname; Command-line"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h2 tag="Command-line-mode Command-line mode-cmdline">Command-line mode</h2>

common/locale/en-US/developer.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="developer"
-    title="&appname; Developer information"
+    title="&liberator.appname; Developer information"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h2 tag="developer-information">Developer information</h2>

common/locale/en-US/eval.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="eval"
-    title="&appname; Expression Evaluation"
+    title="&liberator.appname; Expression Evaluation"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="expression expr eval">Expression evaluation</h1>

common/locale/en-US/gui.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="gui"
-    title="&appname; GUI"
+    title="&liberator.appname; GUI"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
-<h2 tag="gui">&appname;'s GUI</h2>
+<h2 tag="gui">&liberator.appname;'s GUI</h2>
 
 <p>
-    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 @@
     <description>
         <p>
             Execute <a>menu</a> from the command line. This command provides command-line access
-            to all menu items available from the main &hostapp; menubar. <a>menu</a> is a
+            to all menu items available from the main &liberator.host; menubar. <a>menu</a> is a
             hierarchical path to the menu item with each submenu separated by a period.
             E.g. <ex>:emenu File.Open File…</ex>
         </p>
@@ -40,10 +40,10 @@
     <spec>:addo<oa>ns</oa></spec>
     <description>
         <p>
-            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
+            Be aware that not all &liberator.host; extensions work, because &liberator.appname; overrides
-            some key bindings and changes &hostapp;'s GUI.
+            some key bindings and changes &liberator.host;'s GUI.
         </p>
     </description>
 </item>
@@ -53,11 +53,11 @@
     <tags>:dia :dialog</tags>
     <spec>:dia<oa>log</oa> <oa>firefox-dialog</oa></spec>
     <description>
-        <p>Open a &hostapp; dialog.</p>
+        <p>Open a &liberator.host; dialog.</p>
 
         <p>Available dialogs:</p>
         <dl>
-            <dt>about</dt>           <dd>About Mozilla &hostapp;;</dd>
+            <dt>about</dt>           <dd>About Mozilla &liberator.host;;</dd>
             <dt>addbookmark</dt>     <dd>Add bookmark for the current page</dd>
             <dt>addons</dt>          <dd>Manage Add-ons</dd>
             <dt>bookmarks</dt>       <dd>List your bookmarks</dd>
@@ -74,7 +74,7 @@
             <dt>pageinfo</dt>        <dd>Show information about the current page</dd>
             <dt>pagesource</dt>      <dd>View page source</dd>
             <dt>places</dt>          <dd>Places Organizer: Manage your bookmarks and history</dd>
-            <dt>preferences</dt>     <dd>Show &hostapp; preferences dialog</dd>
+            <dt>preferences</dt>     <dd>Show &liberator.host; preferences dialog</dd>
             <dt>printpreview</dt>    <dd>Preview the page before printing</dd>
             <dt>printsetup</dt>      <dd>Setup the page size and orientation before printing</dd>
             <dt>print</dt>           <dd>Show print dialog</dd>
@@ -92,7 +92,7 @@
     <spec>:downl<oa>oads</oa></spec>
     <description>
         <p>
-            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.
         </p>
     </description>
@@ -189,7 +189,7 @@
     <description>
         <p>
             Open the sidebar window. <a>name</a> 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.
         </p>
     </description>
@@ -229,7 +229,7 @@
     </li>
     <li>
         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.
         <ul>
             <li>black – the site's identity is unverified and the connection is unencrypted</li>
@@ -240,7 +240,7 @@
     </li>
     <li>
         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.
     </li>
 </ul>
 

common/locale/en-US/hints.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="hints"
-    title="&appname; Hints"
+    title="&liberator.appname; Hints"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="quick-hints hints">Hints</h1>

common/locale/en-US/index.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="index"
-    title="&appname; Index"
+    title="&liberator.appname; Index"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="index">Index</h1>
@@ -36,7 +36,7 @@ This file contains a list of all available commands, mappings and options.
     <dt><k name="C-u"/></dt> <dd>Scroll window upwards in the buffer</dd>
     <dt><k name="C-v"/></dt> <dd>Pass through next key</dd>
     <dt><k name="C-x"/></dt> <dd>Decrement last number in URL</dd>
-    <dt><k name="C-z"/></dt> <dd>Temporarily ignore all &appname; key bindings</dd>
+    <dt><k name="C-z"/></dt> <dd>Temporarily ignore all &liberator.appname; key bindings</dd>
 </dl>
 
 
@@ -257,7 +257,7 @@ This file contains a list of all available commands, mappings and options.
     <dt><ex>:delmarks</ex></dt> <dd>Delete the specified marks</dd>
     <dt><ex>:delqmarks</ex></dt> <dd>Delete the specified QuickMarks</dd>
     <dt><ex>:delstyle</ex></dt> <dd>Delete any matching styles</dd>
-    <dt><ex>:dialog</ex></dt> <dd>Open a &hostapp; dialog</dd>
+    <dt><ex>:dialog</ex></dt> <dd>Open a &liberator.host; dialog</dd>
     <dt><ex>:doautoall</ex></dt> <dd>Apply the autocommands matching the specified URL to all buffers</dd>
     <dt><ex>:doautocmd</ex></dt> <dd>Apply the autocommands matching the specified URL to the current buffer</dd>
     <dt><ex>:downloads</ex></dt> <dd>Show progress of current downloads</dd>
@@ -279,7 +279,7 @@ This file contains a list of all available commands, mappings and options.
     <dt><ex>:hardcopy</ex></dt> <dd>Print current document</dd>
     <dt><ex>:help</ex></dt> <dd>Open the help page</dd>
     <dt><ex>:helpall</ex></dt> <dd>Open the single unchunked help page</dd>
-    <dt><ex>:highlight</ex></dt> <dd>Style &appname;</dd>
+    <dt><ex>:highlight</ex></dt> <dd>Style &liberator.appname;</dd>
     <dt><ex>:history</ex></dt> <dd>Show recently visited URLs</dd>
     <dt><ex>:iabbrev</ex></dt> <dd>Abbreviate a key sequence in Insert mode</dd>
     <dt><ex>:iabclear</ex></dt> <dd>Remove all abbreviations in Insert mode</dd>
@@ -313,12 +313,12 @@ This file contains a list of all available commands, mappings and options.
     <dt><ex>:pageinfo</ex></dt> <dd>Show various page information</dd>
     <dt><ex>:pagestyle</ex></dt> <dd>Select the author style sheet to apply</dd>
     <dt><ex>:play</ex></dt> <dd>Replay a recorded macro</dd>
-    <dt><ex>:preferences</ex></dt> <dd>Show &hostapp; preferences dialog</dd>
+    <dt><ex>:preferences</ex></dt> <dd>Show &liberator.host; preferences dialog</dd>
     <dt><ex>:pwd</ex></dt> <dd>Print the current directory name</dd>
     <dt><ex>:qmark</ex></dt> <dd>Mark a URL with a letter for quick access</dd>
     <dt><ex>:qmarks</ex></dt> <dd>Show all QuickMarks</dd>
     <dt><ex>:quit</ex></dt> <dd>Quit current tab</dd>
-    <dt><ex>:quitall</ex></dt> <dd>Quit &appname;</dd>
+    <dt><ex>:quitall</ex></dt> <dd>Quit &liberator.appname;</dd>
     <dt><ex>:redraw</ex></dt> <dd>Redraw the screen</dd>
     <dt><ex>:reload</ex></dt> <dd>Reload the current web page</dd>
     <dt><ex>:reloadall</ex></dt> <dd>Reload all tab pages</dd>
@@ -336,7 +336,7 @@ This file contains a list of all available commands, mappings and options.
     <dt><ex>:source</ex></dt> <dd>Read Ex commands from a file</dd>
     <dt><ex>:stop</ex></dt> <dd>Stop loading the current web page</dd>
     <dt><ex>:stopall</ex></dt> <dd>Stop loading all tab pages</dd>
-    <dt><ex>:style</ex></dt> <dd>Style &appname; and web sites</dd>
+    <dt><ex>:style</ex></dt> <dd>Style &liberator.appname; and web sites</dd>
     <dt><ex>:styledisable</ex></dt> <dd>Disable a user style sheet</dd>
     <dt><ex>:styleenable</ex></dt> <dd>Enable a user style sheet</dd>
     <dt><ex>:styletoggle</ex></dt> <dd>Toggle a user style sheet</dd>
@@ -391,7 +391,7 @@ This file contains a list of all available commands, mappings and options.
     <dt><o>eventignore</o></dt> <dd>List of autocommand event names which should be ignored</dd>
     <dt><o>exrc</o></dt> <dd>Allow reading of an RC file in the current directory</dd>
     <dt><o>extendedhinttags</o></dt> <dd>XPath string of hintable elements activated by <k>;</k></dd>
-    <dt><o>fileencoding</o></dt> <dd>Changes the character encoding that &appname; uses to read and write files</dd>
+    <dt><o>fileencoding</o></dt> <dd>Changes the character encoding that &liberator.appname; uses to read and write files</dd>
     <dt><o>focuscontent</o></dt> <dd>Try to stay in Normal mode after loading a web page</dd>
     <dt><o>followhints</o></dt> <dd>Change the behaviour of <k name="Return"/> in Hints mode</dd>
     <dt><o>fullscreen</o></dt> <dd>Show the current window fullscreen</dd>

common/locale/en-US/insert.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="insert"
-    title="&appname; Insert Mode"
+    title="&liberator.appname; Insert Mode"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h2 tag="Insert-mode Insert mode-insert">Insert mode</h2>

common/locale/en-US/intro.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="intro"
-    title="&appname; Introduction"
+    title="&liberator.appname; Introduction"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 
@@ -19,20 +19,20 @@ VIMperator :)
 
 <h1 tag="intro">Introduction</h1>
 
-<link topic="http://vimperator.org">&appname;</link> is a free browser add-on for &hostapp;,
+<link topic="http://vimperator.org">&liberator.appname;</link> is a free browser add-on for &liberator.host;,
 which makes it look and behave like the
 <link topic="http://www.vim.org">Vim</link>
 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.
 
 <warning tag="warning">
-    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.
 </warning>
 
 <p>If you really need them, type: <ex>:set guioptions+=mT</ex> to get them back.</p>
 <p>
-    If you don't like &appname; at all, you can uninstall it by typing
+    If you don't like &liberator.appname; at all, you can uninstall it by typing
-    <ex>:extdelete &appname;</ex> or <ex>:extdisable &appname;</ex> to disable it.
+    <ex>:extdelete &liberator.appname;</ex> or <ex>:extdisable &liberator.appname;</ex> to disable it.
 </p>
 <p>
     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.
 
 <tags>author donaton sponsor</tags>
 <p>
-    &appname; was initially written by 
+    &liberator.appname; was initially written by 
     <link topic="mailto:stubenschrott@vimperator.org">Martin
     Stubenschrott</link> but has found many other
-    <link topic="http://vimperator.org/trac/wiki/&appname;/Authors">contributors</link>
+    <link topic="http://vimperator.org/trac/wiki/&liberator.appname;/Authors">contributors</link>
-    in the meanwhile. If you appreciate the work on &appname; and want to
+    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
-    <link topic="http://vimperator.org/trac/wiki/&appname;/Donors">these
+    <link topic="http://vimperator.org/trac/wiki/&liberator.appname;/Donors">these
         people</link>
     who already did):
 </p>
@@ -65,7 +65,7 @@ web browser, as key bindings differ according to which mode you are in.
     us by buying some cool 
     <link topic="http://www.zazzle.com/maxauthority*">merchandise</link> 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 :)
 </p>
 
@@ -77,8 +77,8 @@ web browser, as key bindings differ according to which mode you are in.
         A quick-start tutorial for new users.
     </li>
     <li>
-        <link topic="starting">Starting &appname;</link>:
+        <link topic="starting">Starting &liberator.appname;</link>:
-        How &appname; starts up, where it reads the config file…
+        How &liberator.appname; starts up, where it reads the config file…
     </li>
     <li>
         <link topic="browsing">Browsing</link>:
@@ -138,12 +138,12 @@ web browser, as key bindings differ according to which mode you are in.
         Printing pages.
     </li>
     <li>
-        <link topic="gui">&appname;'s GUI</link>:
+        <link topic="gui">&liberator.appname;'s GUI</link>:
-        Accessing &hostapp; menus, dialogs and the sidebar.
+        Accessing &liberator.host; menus, dialogs and the sidebar.
     </li>
     <li>
         <link topic="styling">Styling the GUI and web pages</link>:
-        Changing the styling of content pages and &appname; itself.
+        Changing the styling of content pages and &liberator.appname; itself.
     </li>
     <li>
         <link topic="message">Error and informational messages</link>:
@@ -179,7 +179,7 @@ or <ex>:help :set</ex>.
     <li>Vim-like statusline with a Wget-like progress bar</li>
     <li>Minimal GUI (easily hide useless menubar and toolbar with <ex>:set guioptions=</ex>)</li>
     <li>Ability to <ex>:source</ex> JavaScript files, and to use a <em>~/.vimperatorrc</em> file with syntax highlighting if you install vimperator.vim</li>
-    <li>Easy quick searches (<ex>:open foo</ex> will search for "foo" in google, <ex>:open ebay terminator</ex> will search for "terminator" on ebay) with support for &hostapp; keyword bookmarks and search engines</li>
+    <li>Easy quick searches (<ex>:open foo</ex> will search for "foo" in google, <ex>:open ebay terminator</ex> will search for "terminator" on ebay) with support for &liberator.host; keyword bookmarks and search engines</li>
     <li>Count supported for many commands (<em>3</em><k name="C-o"/> will go back 3 pages)</li>
     <li>Beep on errors</li>
     <li>Marks support (<k>m</k><em>a</em> to set mark a on a web page, <k>'</k><em>a</em> to go there)</li>
@@ -200,8 +200,8 @@ or <ex>:help :set</ex>.
     properly answer any questions. You can also join the
     <link topic="irc://irc.freenode.net/vimperator">#vimperator</link> IRC channel
     on <link target="http://www.freenode.net/">Freenode</link> or check the
-    <link topic="http://vimperator.org/trac/wiki/&appname;/Wiki">Wiki</link> for
+    <link topic="http://vimperator.org/trac/wiki/&liberator.appname;/Wiki">Wiki</link> for
-    <link topic="http://vimperator.org/trac/wiki/&appname;/FAQ">
+    <link topic="http://vimperator.org/trac/wiki/&liberator.appname;/FAQ">
         frequently asked questions (FAQ)
     </link>. 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.

common/locale/en-US/map.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="map"
-    title="&appname; Key Mappings"
+    title="&liberator.appname; Key Mappings"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1>Key mappings, abbreviations, and user-defined commands</h1>
@@ -32,7 +32,7 @@
     <li>Normal mode: When browsing normally</li>
     <li>Visual mode: When selecting text with the cursor keys</li>
     <li>Insert mode: When interacting with text fields on a website</li>
-    <li>Command-line mode: When typing into the &appname; command line</li>
+    <li>Command-line mode: When typing into the &liberator.appname; command line</li>
 </ul>
 
 <warning>
@@ -278,7 +278,7 @@
 <h2 tag="abbreviations">Abbreviations</h2>
 
 <p>
-    &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 @@
             <dt>buffer</dt>       <dd>buffers</dd>
             <dt>color</dt>        <dd>color schemes</dd>
             <dt>command</dt>      <dd>Ex commands</dd>
-            <dt>dialog</dt>       <dd>&hostapp; dialogs</dd>
+            <dt>dialog</dt>       <dd>&liberator.host; dialogs</dd>
             <dt>dir</dt>          <dd>directories</dd>
             <dt>environment</dt>  <dd>environment variables</dd>
             <dt>event</dt>        <dd>autocommand events</dd>
@@ -485,8 +485,8 @@
             <dt>macro</dt>        <dd>named macros</dd>
             <dt>mapping</dt>      <dd>user mappings</dd>
             <dt>menu</dt>         <dd>menu items</dd>
-            <dt>option</dt>       <dd>&appname; options</dd>
+            <dt>option</dt>       <dd>&liberator.appname; options</dd>
-            <dt>preference</dt>   <dd>&hostapp; preferences</dd>
+            <dt>preference</dt>   <dd>&liberator.host; preferences</dd>
             <dt>search</dt>       <dd>search engines and keywords</dd>
             <dt>shellcmd</dt>     <dd>shell commands</dd>
             <dt>sidebar</dt>      <dd>sidebar panels</dd>

common/locale/en-US/marks.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="marks"
-    title="&appname; Marks"
+    title="&liberator.appname; Marks"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="different-marks marks">Marks</h1>

common/locale/en-US/message.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="message"
-    title="&appname; Messages"
+    title="&liberator.appname; Messages"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="messages">Error and informational messages</h1>
@@ -13,7 +13,7 @@
 <tags>message-history</tags>
 
 <p>
-    &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 <o>verbose</o> option. The number of stored messages can be set
     with the <o>messages</o> option.

common/locale/en-US/options.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="options"
-    title="&appname; Options"
+    title="&liberator.appname; Options"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="options">Options</h1>
 
 <p>
-    &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:
 </p>
 
@@ -210,19 +210,19 @@
     character) or <em>$<a>VAR</a></em>. <em>%VAR%</em> is also supported on Windows.
 </p>
 
-<h2 tag="firefox-options preferences">Setting &hostapp; options</h2>
+<h2 tag="firefox-options preferences">Setting &liberator.host; options</h2>
 
-<p>&hostapp; options can be viewed and set with the following commands:</p>
+<p>&liberator.host; options can be viewed and set with the following commands:</p>
 
 <item>
     <tags>:prefs :preferences</tags>
     <spec>:pref[erences]</spec>
     <description>
         <p>
-            Show the &hostapp; preferences dialog. You can change the browser
+            Show the &liberator.host; preferences dialog. You can change the browser
-            preferences from this dialog. Be aware that not all &hostapp;
+            preferences from this dialog. Be aware that not all &liberator.host;
-            preferences work, because &appname; overrides some key bindings and
+            preferences work, because &liberator.appname; overrides some key bindings and
-            changes &hostapp;'s GUI.
+            changes &liberator.host;'s GUI.
         </p>
     </description>
 </item>
@@ -232,7 +232,7 @@
     <spec>:pref[erences]!</spec>
     <description>
         <p>
-            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.
         </p>
     </description>
@@ -243,7 +243,7 @@
     <spec>:se[t]! <a>preference</a>=<a>value</a></spec>
     <description>
         <p>
-            Change any &hostapp; <a>preference</a> (those in the about:config
+            Change any &liberator.host; <a>preference</a> (those in the about:config
             window). You can also reset/delete those preferences with
             <ex>:set! <a>preference</a>&amp;</ex>.
         </p>
@@ -253,7 +253,7 @@
 <tags>overridden-preferences</tags>
 
 <p>
-    &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
     <ex>:set! <a>preference</a>=<a>value</a></ex>
 </p>
@@ -316,7 +316,7 @@
         <dl>
             <dt>s</dt>     <dd>Search engines and keyword URLs</dd>
             <dt>f</dt>     <dd>Local files</dd>
-            <dt>l</dt>     <dd>&hostapp; location bar entries (bookmarks and history sorted in an intelligent way)</dd>
+            <dt>l</dt>     <dd>&liberator.host; location bar entries (bookmarks and history sorted in an intelligent way)</dd>
             <dt>b</dt>     <dd>Bookmarks</dd>
             <dt>h</dt>     <dd>History</dd>
             <dt>S</dt>     <dd>Search engine suggestions</dd>
@@ -355,7 +355,7 @@
         </p>
 
         <p>
-            If <o>defsearch</o> is empty, then &hostapp; will always attempt to
+            If <o>defsearch</o> is empty, then &liberator.host; will always attempt to
             open the raw [arg].
         </p>
     </description>
@@ -375,7 +375,7 @@
         </p>
 
         <warning>
-            &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.
         </warning>
     </description>
@@ -459,7 +459,7 @@
     <type>string</type>
     <default>UTF-8</default>
     <description>
-        <p>Changes the character encoding that &appname; uses to read and write files.</p>
+        <p>Changes the character encoding that &liberator.appname; uses to read and write files.</p>
     </description>
 </item>
 
@@ -707,7 +707,7 @@
     <description>
         <p>
             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.
         </p>
@@ -913,7 +913,7 @@
             effective.
         </p>
 
-        <note>This option does not change the popup blocker of &hostapp; in any way.</note>
+        <note>This option does not change the popup blocker of &liberator.host; in any way.</note>
     </description>
 </item>
 
@@ -964,7 +964,7 @@
 
         <p>
             On startup, if the environment variable <em>$VIMPERATOR_RUNTIME</em> does not
-            exist, &appname; will set it to match this value.
+            exist, &liberator.appname; will set it to match this value.
         </p>
     </description>
 </item>
@@ -1163,15 +1163,15 @@
     <tags>'titlestring'</tags>
     <spec>'titlestring'</spec>
     <type>string</type>
-    <default>&appname;</default>
+    <default>&liberator.appname;</default>
     <description>
         <p>
-            Change the title of the browser window.  &appname; changes the
+            Change the title of the browser window.  &liberator.appname; changes the
-            browser title from <str>Title of web page - Mozilla &hostapp;</str>
+            browser title from <str>Title of web page - Mozilla &liberator.host;</str>
-            to <str>Title of web page - &appname;</str>.  If you don't like
+            to <str>Title of web page - &liberator.appname;</str>.  If you don't like
             that, you can restore it with: 
         </p>
-        <code><ex>:set titlestring=<str>Mozilla &hostapp;</str></ex></code>
+        <code><ex>:set titlestring=<str>Mozilla &liberator.host;</str></ex></code>
     </description>
 </item>
 
@@ -1217,7 +1217,7 @@
     <description>
         <p>
             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 <ex>:messages</ex> command. The highest
             value is 15, being the most verbose mode.
         </p>

common/locale/en-US/pattern.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="pattern"
-    title="&appname; Patterns"
+    title="&liberator.appname; Patterns"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="text-search-commands">Text search commands</h1>
 
 <p>
-    &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.
 </p>
 

common/locale/en-US/print.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="print"
-    title="&appname; Printing"
+    title="&liberator.appname; Printing"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="printing">Printing</h1>
@@ -33,7 +33,7 @@
 </item>
 
 
-<h2 tag="firefox-print-dialogs">&hostapp; printing dialogs</h2>
+<h2 tag="firefox-print-dialogs">&liberator.host; printing dialogs</h2>
 
 <p>
     The "Print Preview" and "Page Setup" dialogs can be opened via the <ex>:dialog</ex>

common/locale/en-US/repeat.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="repeat"
-    title="&appname; Repeating Commands"
+    title="&liberator.appname; Repeating Commands"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="repeating">Repeating commands</h1>
 
-<p>&appname; can repeat a number of commands and record macros.</p>
+<p>&liberator.appname; can repeat a number of commands and record macros.</p>
 
 <h2 tag="single-repeat">Single repeats</h2>
 
@@ -20,7 +20,7 @@
     <description>
         <p>
             Repeat the last keyboard mapping <oa>count</oa> 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.
         </p>
     </description>
@@ -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;.
         </p>
     </description>
 </item>
@@ -193,7 +193,7 @@ function hello2() {
     <spec>:fini<oa>sh</oa></spec>
     <description>
         <p>
-            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.
         </p>
     </description>
@@ -212,7 +212,7 @@ function hello2() {
             which might be slow, so take the results with a grain of salt.
         </p>
         
-        <p>If <a>code</a> starts with a <ex>:</ex>, it is executed as a &appname; command.</p>
+        <p>If <a>code</a> starts with a <ex>:</ex>, it is executed as a &liberator.appname; command.</p>
         
         <p>
             Use the special version with <oa>!</oa> if you just want to run any command multiple

common/locale/en-US/starting.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="starting"
-    title="&appname; Starting"
+    title="&liberator.appname; Starting"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
-<h1 tag="starting">Starting &appname;</h1>
+<h1 tag="starting">Starting &liberator.appname;</h1>
 
 <tags>startup-options</tags>
 
 <p>
-    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 <str>++cmd 'set exrc' +u 'tempRcFile' ++noplugin</str>
 </p>
@@ -71,10 +71,10 @@
 
 <h2 tag="initialization startup">Initialization</h2>
 
-<p>At startup, &appname; completes the following tasks in order. </p>
+<p>At startup, &liberator.appname; completes the following tasks in order. </p>
 
 <ol>
-    <li> &appname; can perform user initialization commands. When
+    <li> &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  <em>$HOME</em> is used.
-* On Windows, &appname; checks for the existence of <em>%HOME%</em>, then
+* On Windows, &liberator.appname; checks for the existence of <em>%HOME%</em>, then
 <em>%USERPROFILE%</em>, and then <em>%HOMEDRIVE%%HOMEPATH%</em>. It uses the first one
 it finds.
 
@@ -149,7 +149,7 @@ it finds.
     <tags>:res :restart</tags>
     <spec>:res<oa>tart</oa></spec>
     <description>
-        <p>Force &hostapp; to restart. Useful when installing extensions.</p>
+        <p>Force &liberator.host; to restart. Useful when installing extensions.</p>
     </description>
 </item>
 

common/locale/en-US/styling.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="styling"
-    title="&appname; Styling"
+    title="&liberator.appname; Styling"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="styling">Styling the GUI and web pages</h1>
 
 <p>
-    &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 <ex>:style</ex> command, most &appname; elements can be styled with the
+    via the <ex>:style</ex> command, most &liberator.appname; elements can be styled with the
     <ex>:highlight</ex> command, for convenience.
 </p>
 
@@ -42,7 +42,7 @@
             Highlight <a>group</a> with <a>css</a>. <a>css</a> is one or more comma separated CSS
             declarations (E.g. <em>color: blue; background-color: red</em>). Normally, <a>css</a> is
             checked for valid syntax before it's applied. Once you're certain it's valid,
-            <oa>!</oa> can be used to skip the check to speed up &appname; startup. <a>selector</a>
+            <oa>!</oa> can be used to skip the check to speed up &liberator.appname; startup. <a>selector</a>
             can be any valid CSS selector, such as <ex>:hover</ex>, and, if provided, will
             restrict the match to matching elements.
         </p>
@@ -50,7 +50,7 @@
         <p>Valid groups are:</p>
         
         <dl>
-            <dt>Bell</dt>              <dd>&appname;'s visual bell</dd>
+            <dt>Bell</dt>              <dd>&liberator.appname;'s visual bell</dd>
             <dt>Boolean</dt>           <dd>A JavaScript Boolean object</dd>
             <dt>CmdLine</dt>           <dd>The command line</dd>
             <dt>CmdOutput</dt>         <dd></dd>

common/locale/en-US/tabs.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="tabs"
-    title="&appname; Tabs"
+    title="&liberator.appname; Tabs"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="tabs">Tabs</h1>
@@ -354,7 +354,7 @@ See <t>opening</t> for other ways to open new tabs.
     <spec>:undoa<oa>ll</oa></spec>
     <description>
         <p>
-            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.
         </p>
     </description>

common/locale/en-US/tutorial.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="tutorial"
-    title="&appname; Tutorial"
+    title="&liberator.appname; Tutorial"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <!-- Initial revision: Sun Jun  8 10:07:05 UTC 2008 (penryu) -->
@@ -14,12 +14,12 @@
 
 <html:p style="text-align: center">
     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.
 </html:p>
 
 <p>
-    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 <t>intro</t>, you can
@@ -35,43 +35,43 @@
 
 <p>
     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 <ex>:set go=<key name="CR"/></ex>) You can look at the entry for <o>guioptions</o> in
     <t>options</t> for more information on this.
 </p>
 
-<h2 tag="modal">&appname;'s modal interface</h2>
+<h2 tag="modal">&liberator.appname;'s modal interface</h2>
 
 <p>
-    &appname;'s power, like Vim's, comes from it's modal interface. Keys have
+    &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. &appname; has
+    different meanings depending on which mode the browser is in. &liberator.appname; has
     several modes, but the 2 most important are <em>Normal</em> mode and
     <em>Command-line</em> mode.
 </p>
 
 <p>
-    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.
 </p>
 
 <p>
-    The other core mode of &appname;, Command-line mode, can be entered from
+    The other core mode of &liberator.appname;, Command-line mode, can be entered from
-    Normal mode by typing a <k>:</k> (colon). You will frequently see &appname;
+    Normal mode by typing a <k>:</k> (colon). You will frequently see &liberator.appname;
     commands start with a <k>:</k>, indicating that what follows is a command.
 </p>
 
 <p>
     To return to Normal mode from Command-line mode, type <k name="Esc"/>. Pressing
     <k name="Esc"/> will also return you to Normal mode from most other modes in
-    &appname;.
+    &liberator.appname;.
 </p>
 
 <h2 tag="getting-help">Getting help</h2>
 
 <p>
     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.
+    users will probably have to look at &liberator.appname; documentation sooner or later.
-    Most of the documentation for &appname;'s features are easily found using the
+    Most of the documentation for &liberator.appname;'s features are easily found using the
     <ex>:help</ex> command. For example, you can find help on the <ex>:help</ex> command
     by typing
 </p>
@@ -104,16 +104,16 @@
 <em>– or how I learned to stop worrying and love the 80+ buttons I already have.</em>
 
 <p>
-    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.
 </p>
 
 <p>
     Here are some areas where the mouse is typically considered indisposable, and
-    how &appname; challenges this preconception.
+    how &liberator.appname; challenges this preconception.
 </p>
 
 <h2 tag="keyboard-scrolling">Scrolling</h2>
@@ -193,27 +193,27 @@
 <h2 tag="hints-tutorial">Some hints about surfing…</h2>
 
 <p>
-    So now you can navigate around in &appname;. But wait… how do you <em>open</em> a
+    So now you can navigate around in &liberator.appname;. But wait… how do you <em>open</em> a
     page or tab linked in a web page? How do you <em>click</em> on all those links
     without your tailed friend?
 </p>
 
 <p>
     The answer is <em>hints</em>. 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.
 </p>
 
 <p>
     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.
 </p>
 
 <p>
-    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 <k name="Enter"/> to open it.
 </p>
 
@@ -225,10 +225,10 @@
 </p>
 
 <p>
-    To test it, try this link: <link target="http://vimperator.org/">&appname; Homepage</link>.
+    To test it, try this link: <link target="http://vimperator.org/">&liberator.appname; Homepage</link>.
     Activate QuickHint mode with <k>f</k> or <k>F</k> 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 <k name="C-o"/> (<em>History Back</em>) or <k>d</k> (<em>Delete Buffer</em>)
     to return here, depending on which key you used to activate QuickHint mode.
 </p>
@@ -253,14 +253,14 @@
 <h2 tag="vimperatorrc">Saving for posterity - vimperatorrc</h2>
 
 <p>
-    Once you get &appname; set up with your desired options, maps, and commands,
+    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 &appname;.
+    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.
 </p>
 
 <p>
     To save your current settings and allow them to be loaded automatically
-    next time you start &appname;, issue the <ex>:mkv</ex> command.
+    next time you start &liberator.appname;, issue the <ex>:mkv</ex> command.
 </p>
 
 <p>
@@ -272,7 +272,7 @@
 <h2 tag="quitting-without-menus">Find the exit nearest you</h2>
 
 <p>
-    &appname; supports all of Vim's classic methods of exiting.
+    &liberator.appname; supports all of Vim's classic methods of exiting.
 </p>
 
 <ul>
@@ -287,31 +287,31 @@
     </li>
 </ul>
 
-<h2 tag="whither-firefox">Where did &hostapp; go?</h2>
+<h2 tag="whither-firefox">Where did &liberator.host; go?</h2>
 
 <p>
-    You might feel pretty disoriented now. Don't worry. This is still &hostapp;
+    You might feel pretty disoriented now. Don't worry. This is still &liberator.host;
-    underneath. Here are some ways &appname; allows &hostapp; to shine through. See
+    underneath. Here are some ways &liberator.appname; allows &liberator.host; to shine through. See
     the <ex>:help</ex> for these commands and mappings for more information on how to
     make the best use of them.
 </p>
 
 <ul>
     <li><ex>:dialog</ex> –
-        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
         <ex>:dialog</ex> command. See <ex>:help :dialog</ex>.
     </li>
     <li><ex>:bmarks</ex> –
-        &appname; provides a new interface to bookmarks, but they're still your
+        &liberator.appname; provides a new interface to bookmarks, but they're still your
-        standard &hostapp; bookmarks under the hood. <ex>:bmark</ex> will add a new
+        standard &liberator.host; bookmarks under the hood. <ex>:bmark</ex> will add a new
         bookmark, while <ex>:bmarks</ex> will list the bookmarks currently defined.
     </li>
     <li><ex>:history</ex> –
         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.
     </li>
     <li><ex>:emenu</ex> –
-        Access the &hostapp; menus through the &appname; command line.
+        Access the &liberator.host; menus through the &liberator.appname; command line.
     </li>
 </ul>
 
@@ -334,9 +334,9 @@
 </p>
 
 <p>
-    The &appname; way to do this is with the command <ex>:addons</ex>. Issuing this
+    The &liberator.appname; way to do this is with the command <ex>:addons</ex>. Issuing this
-    command brings up the &hostapp; Add-ons dialog window; you can then remove it as
+    command brings up the &liberator.host; Add-ons dialog window; you can then remove it as
-    normal, selecting &appname; from the list and clicking (yes, clicking)
+    normal, selecting &liberator.appname; from the list and clicking (yes, clicking)
     <em>Uninstall</em>.
 </p>
 
@@ -349,8 +349,8 @@
 <h2 tag="support">I'm interested… but lost!</h2>
 
 <p>
-    &appname; has an energetic and growing user base. If you've run into a problem
+    &liberator.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
+    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
     <link target="http://code.google.com/p/vimperator-labs/w/list?q=label%3Aproject-vimperator">wiki</link>
     or in the <link target="irc://irc.freenode.net/vimperator">#vimperator</link> IRC
@@ -359,7 +359,7 @@
 
 <p>
     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
     <t>developer</t> page for more information.

common/locale/en-US/various.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://liberator/locale/liberator.dtd">
+<!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
     name="various"
-    title="&appname; Other"
+    title="&liberator.appname; Other"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1>Other help</h1>
@@ -57,7 +57,7 @@
         
         <p>
             Warning: Input redirection (&lt; 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. <ex>:! xterm &amp;</ex>).
         </p>
     </description>
@@ -126,7 +126,7 @@
     <spec>:ve<oa>rsion</oa><oa>!</oa></spec>
     <description>
         <p>
-            Show version information. You can show the &hostapp; version page with
+            Show version information. You can show the &liberator.host; version page with
             <ex>:version!</ex>.
         </p>
     </description>

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/

vimperator/content/liberator.dtd

@@ -1,6 +1,8 @@
 
 <!ENTITY liberator.mainWindow "main-window">
 <!ENTITY liberator.name "vimperator">
+<!ENTITY liberator.appname "Vimperator">
+<!ENTITY liberator.host "Firefox">
 <!ENTITY liberator.statusBefore "statusbar-display">
 <!ENTITY liberator.statusAfter "">
 

vimperator/locale/en-US/liberator.dtd

@@ -1,5 +1,4 @@
 
 <!ENTITY appname "Vimperator">
 <!ENTITY hostapp "Firefox">
-<!ELEMENT default (#PCDATA)>