Fix Xulmus, etc.

--HG--
branch : xslt

2 files changed, 14 insertions, 13 deletions

diff --git a/xulmus/locale/en-US/gui.xml b/xulmus/locale/en-US/gui.xml
index fb7ab79e..2c36d13e 100644
--- a/xulmus/locale/en-US/gui.xml
+++ b/xulmus/locale/en-US/gui.xml
@@ -8,7 +8,7 @@
     xmlns:html="http://www.w3.org/1999/xhtml">
 
 <dl tag="dialog-list" replace="dialog-list">
-    <dt>about</dt>           <dd>About &liberator.hostapp;</dd>
+    <dt>about</dt>           <dd>About &liberator.host;</dd>
     <dt>addons</dt>          <dd>Manage Add-ons</dd>
     <dt>checkupdates</dt>    <dd>Check for updates</dd>
     <dt>cleardata</dt>       <dd>Clear private data</dd>
@@ -21,7 +21,7 @@
     <dt>openfile</dt>        <dd>Open the file selector dialog</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 &liberator.hostapp; preferences dialog</dd>
+    <dt>preferences</dt>     <dd>Show &liberator.host; preferences dialog</dd>
     <dt>printsetup</dt>      <dd>Setup the page size and orientation before printing</dd>
     <dt>print</dt>           <dd>Show print dialog</dd>
     <dt>saveframe</dt>       <dd>Save frame to disk</dd>
diff --git a/xulmus/locale/en-US/intro.xml b/xulmus/locale/en-US/intro.xml
index 8d58b802..efb71702 100644
--- a/xulmus/locale/en-US/intro.xml
+++ b/xulmus/locale/en-US/intro.xml
@@ -4,8 +4,8 @@
 <!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
-    name="gui"
-    title="&liberator.appname; GUI"
+    name="intro"
+    title="&liberator.appname; Intro"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 
@@ -14,14 +14,15 @@
 <h2 tag="intro">Introduction</h2>
 
 <link topic="http://vimperator.org/%liberator.name;">&liberator.appname;</link>
-is a free media player add-on for &liberator.hostapp;, which
+is a free media player add-on for &liberator.host;, which
 combines the best features of the
 <link topic="http://cmus.sourceforge.net">CMus</link>
-music player and the http://www.vim.org[Vim] text editor.
+music player and the 
+<link topic="http://www.vim.org">Vim</link>
+text editor.
 
-|warning| +
 <warning tag="warning">
-    To provide the most authentic CMus/Vim experience, the &liberator.hostapp; toolbar
+    To provide the most authentic CMus/Vim experience, the &liberator.host; toolbar
     is hidden.
     If you really need it, type: <ex>:set guioptions+=T</ex> to get it back.
     If you don't like &liberator.appname; at all, you can uninstall it by typing
@@ -33,7 +34,7 @@ music player and the http://www.vim.org[Vim] text editor.
 <tags>author donation</tags>
 <p>
     &liberator.appname; was written by
-    mailto:prathyushthota@gmail.com[Prathyush Thota].  If you
+    <link topic="prathyushthota@gmail.com">Prathyush Thota</link>.  If you
     appreciate my work on &liberator.appname; and want to encourage
     me working on it more, you can either send me greetings, patches
     or make a donation:
@@ -41,11 +42,11 @@ music player and the http://www.vim.org[Vim] text editor.
 
 <!-- the PAYPAL code -->
 <div xmlns="http://www.w3.org/1999/xhtml">
-<form style="text-align: center;" action="https://www.paypal.com/cgi-bin/webscr" method="post"><fieldset class="paypal">
+<form style="text-align: center;" action="https://www.paypal.com/cgi-bin/webscr" method="post">
 <input type="hidden" name="cmd" value="_s-xclick"/>
 <input type="image" src="chrome://liberator/content/x-click-but21.gif" name="submit" alt="Make payments with PayPal - it\'s fast, free and secure!"/>
 <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----"/>
-</fieldset></form>
+</form>
 </div>
 <p>
     Of course as a believer in free open source software, only make
@@ -73,7 +74,7 @@ music player and the http://www.vim.org[Vim] text editor.
     <li><link topic="repeat">Repeating commands</link>: Using macros to repeat recurring workflows.</li>
     <li><link topic="autocommands">Automatic commands</link>: Automatically executing code on certain events.</li>
     <li><link topic="print">Printing</link>: Printing pages.</li>
-    <li><link topic="gui">&liberator.appname;'s GUI</link>: Accessing &liberator.hostapp; menus, dialogs and the display panels.</li>
+    <li><link topic="gui">&liberator.appname;'s GUI</link>: Accessing &liberator.host; menus, dialogs and the display panels.</li>
     <li><link topic="styling">Styling the GUI and web pages</link>: Changing the styling of content pages and &liberator.appname; itself.</li>
     <li><link topic="message">Error and informational messages</link>: A description of messages and error messages.</li>
     <li><link topic="developer">Developer information</link>: How to write docs or plugins.</li>
@@ -97,7 +98,7 @@ music player and the http://www.vim.org[Vim] text editor.
     <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 [a]~/.xulmusrc[a] file with syntax highlighting if you install http://code.google.com/p/vimperator-labs/issues/detail?id=50[xulmus.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 &liberator.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>