diff options
author | Kris Maglione <maglione.k@gmail.com> | 2011-03-04 23:04:06 -0500 |
---|---|---|
committer | Kris Maglione <maglione.k@gmail.com> | 2011-03-04 23:04:06 -0500 |
commit | 96c5044ac40f08e2e87d8ae903de1314556c2f71 (patch) | |
tree | 5c1e86c34a10f0a2a6d54d6cb8d49afc4ca64011 /common/locale/en-US | |
parent | 058094f87d4ee0956ac38389ac63aa12d6e0ed73 (diff) | |
download | pentadactyl-96c5044ac40f08e2e87d8ae903de1314556c2f71.tar.gz |
Localization-related changes. Fix dead help links.
Diffstat (limited to 'common/locale/en-US')
-rw-r--r-- | common/locale/en-US/developer.xml | 4 | ||||
-rw-r--r-- | common/locale/en-US/editing.xml | 2 | ||||
-rw-r--r-- | common/locale/en-US/hints.xml | 2 | ||||
-rw-r--r-- | common/locale/en-US/map.xml | 53 | ||||
-rw-r--r-- | common/locale/en-US/message.xml | 47 | ||||
-rw-r--r-- | common/locale/en-US/options.xml | 4 | ||||
-rw-r--r-- | common/locale/en-US/privacy.xml | 2 | ||||
-rw-r--r-- | common/locale/en-US/various.xml | 2 |
8 files changed, 65 insertions, 51 deletions
diff --git a/common/locale/en-US/developer.xml b/common/locale/en-US/developer.xml index 8e0602b5..43fb99ed 100644 --- a/common/locale/en-US/developer.xml +++ b/common/locale/en-US/developer.xml @@ -102,8 +102,8 @@ </dd> <dt>&tab;@mode</dt> <dd>The mode attribute to <k>. Some keys have different functions in different modes. You can use this attribute to specify which of the modes (other than Normal) a key pertains to. - The <<a>value</a>> is prepended to the element's contents, i.e., <em><k name="C-i" mode="i"/></em> - becomes <em><k name="C-i" mode="i"/></em>, and <em><k mode="i">i</k></em> becomes <em><k mode="i">i</k></em>. + The <<a>value</a>> is prepended to the element's contents, i.e., <em><k name="C-i" mode="I"/></em> + becomes <em><k name="C-i" mode="I"/></em>, and <em><k mode="t">i</k></em> becomes <em><k mode="t">i</k></em>. </dd> <dt>t</dt> <dd>Links to an arbitrary help topic. (HelpTopic)</dd> </dl> diff --git a/common/locale/en-US/editing.xml b/common/locale/en-US/editing.xml index 608a77c0..1ad5b62c 100644 --- a/common/locale/en-US/editing.xml +++ b/common/locale/en-US/editing.xml @@ -31,7 +31,7 @@ <p> Text Edit mode provides basic Vim-like text editing. It can be entered - from Insert mode by pressing <k name="C-t" mode="i"/> or started directly + from Insert mode by pressing <k name="C-t" mode="I"/> or started directly when a text area is focused if <o>insertmode</o> is unset. See the <link topic="t-map-index">index</link> for a list of currently supported mappings. diff --git a/common/locale/en-US/hints.xml b/common/locale/en-US/hints.xml index 0fb2c512..c69849a2 100644 --- a/common/locale/en-US/hints.xml +++ b/common/locale/en-US/hints.xml @@ -65,7 +65,7 @@ <description> <p> Start <t>QuickHint</t> mode, but the selected elements - are clicked with the <k name="Shift"/> key pressed, + are clicked with the <k name="Shift" link="false"/> key pressed, which has the normal effect of opening it in a new tab (depending on the value of the <pref>browser.tabs.loadInBackground</pref> preference). diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml index f83b99b1..9cdb9390 100644 --- a/common/locale/en-US/map.xml +++ b/common/locale/en-US/map.xml @@ -37,11 +37,11 @@ For instance, </p> -<code><ex>:map <k name="F2"/></ex> <ex>:echo Date()<k name="CR"/></ex></code> +<code><ex>:map <k name="F2" link="false"/></ex> <ex>:echo Date()<k name="CR"/></ex></code> <p> causes “<ex>:echo Date()<k name="CR"/></ex>” to be typed out - whenever <k name="F2"/> is pressed, thus echoing the full date + whenever <k name="F2" link="false"/> is pressed, thus echoing the full date to the command line. </p> @@ -221,15 +221,6 @@ <h3 tag=":map-arguments">Special arguments</h3> -<tags>:map-<silent></tags> - -<p> - When the first argument to one of the mapping commands is - <k name="silent"/>, the keys in <a>rhs</a> are not shown in the - command line as they are generated. Nor, for that matter, is - anything else until the command has completed. -</p> - <p> Below is an overview of which modes each map command applies to: </p> @@ -262,7 +253,7 @@ quotation marks or back-slashes. A space may additionally be typed as <k name="Space"/>. </li> - <li> + <li key="<lt>"> As special key names start with the <em><</em> character, a literal < must be typed as <k name="lt"/>. </li> @@ -271,8 +262,8 @@ and <k name="Down"/> represent the standard arrow keys. </li> <li> - <k name="CapsLock"/>, <k name="NumLock"/>, <k name="Ins"/> - <k name="Del"/>, <k name="Tab"/>, <k name="PageUp"/>, + <k name="CapsLock" link="false"/>, <k name="NumLock" link="false"/>, <k name="Insert"/> + <k name="Del" link="false"/>, <k name="Tab"/>, <k name="PageUp"/>, <k name="PageDown"/>, and <k name="Esc"/> work as expected. </li> @@ -280,16 +271,16 @@ <k name="Return" link="false"/> or <k name="CR"/> represent the carriage return key. </li> - <li><k name="BS"/> represents the backspace key.</li> - <li><k name="F1"/> through <k name="F12"/> work as expected.</li> + <li><k name="BS" link="false"/> represents the backspace key.</li> + <li><k name="F1"/> through <k name="F12" link="false"/> work as expected.</li> <li> - <k name="K0"/> through <k name="K9"/> represent keys on the + <k name="K0" link="false"/> through <k name="K9" link="false"/> represent keys on the numeric keypad. </li> <li> - <k name="Uxxxx"/>, where <em>xxxx</em> is any 4 hexadecimal + <k name="Uxxxx" link="false"/>, where <em>xxxx</em> is any 4 hexadecimal digits, represents the character at that Unicode codepoint. - For instance, <k name="U263a"/> represents ☺. + For instance, <k name="U263a" link="false"/> represents ☺. </li> </ul> @@ -299,10 +290,10 @@ </p> <ol> - <li><k name="C-␣"/>: The control or ctrl key.</li> - <li><k name="A-␣"/>: The alt key.</li> - <li><k name="M-␣"/>: The meta key, windows key, or command key.</li> - <li><k name="S-␣"/>: The shift key.</li> + <li><k name="C-␣" link="false"/>: The control or ctrl key.</li> + <li><k name="A-␣" link="false"/>: The alt key.</li> + <li><k name="M-␣" link="false"/>: The meta key, windows key, or command key.</li> + <li><k name="S-␣" link="false"/>: The shift key.</li> </ol> <p> @@ -319,31 +310,31 @@ </p> <dl dt="width: 10em;"> - <dt><k>xc</k></dt> + <dt><k link="false">xc</k></dt> <dd>Type the ‘X’ key followed by the ‘C’ key.</dd> - <dt><k name="C-x">c</k></dt> + <dt><k name="C-x" link="false">c</k></dt> <dd> Type the ‘X’ key while holding the ‘Control’ key, followed by the ‘C’ key. </dd> - <dt><k name="C-2"/></dt> + <dt><k name="C-2" link="false"/></dt> <dd>Type the ‘2’ while holding the ‘Control’ key.</dd> - <dt><k name="C-@"/></dt> + <dt><k name="C-@" link="false"/></dt> <dd>Type the ‘@’ key while holding the ‘Control’ key.</dd> - <dt><k name="S-Space"/></dt> + <dt><k name="S-Space" link="false"/></dt> <dd>Press the space bar while holding the ‘Shift’ key.</dd> - <dt><k name="C-A-j"/></dt> + <dt><k name="C-A-j" link="false"/></dt> <dd>Type the ‘J’ key while while holding both the ‘Control’ and ‘Alt’ keys.</dd> - <dt><k name="C-A-J"/></dt> + <dt><k name="C-A-J" link="false"/></dt> <dd>Exactly the same as above.</dd> - <dt><k name="C-A-S-j"/></dt> + <dt><k name="C-A-S-j" link="false"/></dt> <dd>Type the ‘J’ key while while holding both the ‘Control’, ‘Alt’, and ‘Shift’ keys.</dd> </dl> diff --git a/common/locale/en-US/message.xml b/common/locale/en-US/message.xml index b96da815..a51edd43 100644 --- a/common/locale/en-US/message.xml +++ b/common/locale/en-US/message.xml @@ -66,20 +66,43 @@ </p> <dl> - <dt><k name="CR"/> or j or <k name="Down"/></dt> <dd>one more line</dd> - <dt>d</dt> <dd>down a page (half a screen)</dd> - <dt><k name="Space"/> or <k name="PageDown"/></dt><dd>down a screen</dd> - <dt>G</dt> <dd>down all the way, until the hit-enter prompt</dd> + <dt><k name="CR" link="false"/> or j or <k name="Down" link="false"/></dt> + <dd>one more line</dd> + + <dt>d</dt> + <dd>down a page (half a screen)</dd> + + <dt><k name="Space" link="false"/> or <k name="PageDown" link="false"/></dt> + <dd>down a screen</dd> + + <dt>G</dt> + <dd>down all the way, until the hit-enter prompt</dd> + <dt/><dd/> - <dt><k name="BS"/> or k or <k name="Up"/></dt> <dd>one line back</dd> - <dt>u</dt> <dd>up a page (half a screen)</dd> - <dt>b or <k name="PageUp"/></dt> <dd>back a screen</dd> - <dt>g</dt> <dd>back to the start</dd> + <dt><k name="BS" link="false"/> or k or <k name="Up" link="false"/></dt> + <dd>one line back</dd> + + <dt>u</dt> + <dd>up a page (half a screen)</dd> + + <dt>b or <k name="PageUp" link="false"/></dt> + <dd>back a screen</dd> + + <dt>g</dt> + <dd>back to the start</dd> + <dt/><dd/> - <dt>q, <k name="Esc"/> or <k name="C-c"></k></dt> <dd>stop the listing</dd> - <dt>:</dt> <dd>stop the listing and enter a command line</dd> - <dt>;</dt> <dd>start an <t>extended-hints</t> command</dd> - <dt><k name="C-y"/></dt> <dd>yank (copy) a modeless selection to the clipboard</dd> + <dt>q, <k name="Esc" link="false"/> or <k name="C-c"></k></dt> + <dd>stop the listing</dd> + + <dt>:</dt> + <dd>stop the listing and enter a command line</dd> + + <dt>;</dt> + <dd>start an <t>extended-hints</t> command</dd> + + <dt><k name="C-y" link="false"/></dt> + <dd>yank (copy) a modeless selection to the clipboard</dd> </dl> </document> diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml index 488f6ce1..9f911abf 100644 --- a/common/locale/en-US/options.xml +++ b/common/locale/en-US/options.xml @@ -548,7 +548,7 @@ <description> <p> Set the external text editor. - This is the editor used by <k name="C-i" mode="i"/>, <k>gF</k>, and + This is the editor used by <k name="C-i" mode="I"/>, <k>gF</k>, and other commands which launch an external text editor. </p> @@ -930,7 +930,7 @@ </p> <p> - TextEdit mode can be entered with <k name="C-t" mode="i"/> from Insert mode. + TextEdit mode can be entered with <k name="C-t" mode="I"/> from Insert mode. </p> </description> </item> diff --git a/common/locale/en-US/privacy.xml b/common/locale/en-US/privacy.xml index 66092de2..84dafa98 100644 --- a/common/locale/en-US/privacy.xml +++ b/common/locale/en-US/privacy.xml @@ -147,7 +147,7 @@ If no <oa>action</oa> is given, the value of <o>cookies</o> is used. </p> - <example><ex>:map -b</ex> <k>c</k> <ex>:cookies</ex> <k name="A-Tab"/></example> + <example><ex>:map -b</ex> <k link="false">c</k> <ex>:cookies</ex> <k name="A-Tab" link="false"/></example> </description> </item> diff --git a/common/locale/en-US/various.xml b/common/locale/en-US/various.xml index ac5ee93f..78ade2e5 100644 --- a/common/locale/en-US/various.xml +++ b/common/locale/en-US/various.xml @@ -261,7 +261,7 @@ <description> <p> Start Caret mode. This mode resembles the Vim's Normal mode where - the text cursor is visible on the web page. The <k>v</k> key + the text cursor is visible on the web page. The <k link="false">v</k> key enters visual mode, where text is selected as the cursor moves. </p> </description> |