summaryrefslogtreecommitdiff
path: root/common/locale
diff options
context:
space:
mode:
Diffstat (limited to 'common/locale')
-rw-r--r--common/locale/en-US/browsing.xml12
-rw-r--r--common/locale/en-US/buffer.xml60
-rw-r--r--common/locale/en-US/repeat.xml38
3 files changed, 71 insertions, 39 deletions
diff --git a/common/locale/en-US/browsing.xml b/common/locale/en-US/browsing.xml
index fb48cf46..03011a37 100644
--- a/common/locale/en-US/browsing.xml
+++ b/common/locale/en-US/browsing.xml
@@ -20,7 +20,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
&dactyl.host; or to a web page, you have two options:
<item>
- <tags><![CDATA[pass-through <C-z> CTRL-Z]]></tags>
+ <tags><![CDATA[pass-through <pass-all-keys> <C-z> CTRL-Z]]></tags>
<spec>&lt;C-z></spec>
<description>
<p>
@@ -33,7 +33,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
</item>
<item>
- <tags><![CDATA[send-key <C-v> CTRL-V]]></tags>
+ <tags><![CDATA[send-key <pass-next-key> <C-v> CTRL-V]]></tags>
<spec>&lt;C-v></spec>
<description>
<p>
@@ -171,7 +171,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
</item>
<item>
- <tags><![CDATA[<MiddleMouse> p]]></tags>
+ <tags><![CDATA[<open-clipboard-url> <MiddleMouse> p]]></tags>
<strut/>
<spec>p</spec>
<description>
@@ -185,7 +185,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
</item>
<item>
- <tags>P</tags>
+ <tags>&lt;tab-open-clipboard-url> P</tags>
<strut/>
<spec>P</spec>
<description>
@@ -343,7 +343,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
<h2 tag="reloading">Reloading</h2>
<item>
- <tags>r</tags>
+ <tags>&lt;reload> r</tags>
<spec>r</spec>
<description short="true">
<p>Reload the current web page.</p>
@@ -351,7 +351,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
</item>
<item>
- <tags>R</tags>
+ <tags>&lt;full-reload> R</tags>
<spec>R</spec>
<description short="true">
<p>Reload the current web page without using the cache.</p>
diff --git a/common/locale/en-US/buffer.xml b/common/locale/en-US/buffer.xml
index 5dbcfae5..66d0d978 100644
--- a/common/locale/en-US/buffer.xml
+++ b/common/locale/en-US/buffer.xml
@@ -22,7 +22,7 @@
<h2 tag="buffer-information">Buffer information</h2>
<item>
- <tags><![CDATA[<C-g>]]></tags>
+ <tags><![CDATA[<page-info> <C-g>]]></tags>
<strut/>
<spec>&lt;C-g></spec>
<description>
@@ -35,7 +35,7 @@
</item>
<item>
- <tags><![CDATA[g<C-g>]]></tags>
+ <tags><![CDATA[<more-page-info> g<C-g>]]></tags>
<spec>g&lt;C-g></spec>
<description short="true">
<p>Print file information. Same as <ex>:pa<oa>geinfo</oa></ex>.</p>
@@ -95,7 +95,7 @@
<h2 tag="motion scrolling">Motion commands</h2>
<item>
- <tags>^ 0</tags>
+ <tags>&lt;scroll-begin> ^ 0</tags>
<strut/>
<spec>0</spec>
<description>
@@ -107,7 +107,7 @@
</item>
<item>
- <tags>$</tags>
+ <tags>&lt;scroll-end> $</tags>
<spec>$</spec>
<description short="true">
<p>Scroll to the absolute right of the document</p>
@@ -140,7 +140,7 @@
</item>
<item>
- <tags>N%</tags>
+ <tags>&lt;scroll-percent> N%</tags>
<spec><a>count</a>%</spec>
<description short="true">
<p>Scroll to <a>count</a> percent of the document.</p>
@@ -148,7 +148,7 @@
</item>
<item>
- <tags><![CDATA[<Left> h]]></tags>
+ <tags><![CDATA[<scroll-column-left> <Left> h]]></tags>
<strut/>
<spec><oa>count</oa>h</spec>
<description>
@@ -160,7 +160,7 @@
</item>
<item>
- <tags><![CDATA[<C-e> <Down> j]]></tags>
+ <tags><![CDATA[<scroll-line-down> <C-e> <Down> j]]></tags>
<strut/>
<spec><oa>count</oa>j</spec>
<description>
@@ -172,7 +172,7 @@
</item>
<item>
- <tags><![CDATA[<C-y> <Up> k]]></tags>
+ <tags><![CDATA[<scroll-line-up> <C-y> <Up> k]]></tags>
<strut/>
<spec><oa>count</oa>k</spec>
<description>
@@ -184,7 +184,7 @@
</item>
<item>
- <tags><![CDATA[<Right> l]]></tags>
+ <tags><![CDATA[<scroll-column-right> <Right> l]]></tags>
<strut/>
<spec><oa>count</oa>l</spec>
<description>
@@ -196,7 +196,7 @@
</item>
<item>
- <tags><![CDATA[<C-d>]]></tags>
+ <tags><![CDATA[<scroll-down> <C-d>]]></tags>
<strut/>
<spec><oa>count</oa>&lt;C-d></spec>
<description>
@@ -209,7 +209,7 @@
</item>
<item>
- <tags><![CDATA[<C-u>]]></tags>
+ <tags><![CDATA[<scroll-up> <C-u>]]></tags>
<strut/>
<spec><oa>count</oa>&lt;C-u></spec>
<description>
@@ -222,7 +222,7 @@
</item>
<item>
- <tags><![CDATA[<S-Space> <PageUp> <C-b>]]></tags>
+ <tags><![CDATA[<scroll-page-up> <S-Space> <PageUp> <C-b>]]></tags>
<strut/>
<spec><oa>count</oa>&lt;C-b></spec>
<description>
@@ -234,7 +234,7 @@
</item>
<item>
- <tags><![CDATA[<Space> <PageDown> <C-f>]]></tags>
+ <tags><![CDATA[<scroll-page-down> <Space> <PageDown> <C-f>]]></tags>
<strut/>
<spec><oa>count</oa>&lt;C-f></spec>
<description>
@@ -264,7 +264,7 @@
</item>
<item>
- <tags>gi</tags>
+ <tags>&lt;focus-input> gi</tags>
<strut/>
<spec><oa>count</oa>gi</spec>
<description>
@@ -277,7 +277,7 @@
</item>
<item>
- <tags>]f</tags>
+ <tags>&lt;next-frame> ]f</tags>
<strut/>
<spec><oa>count</oa>]f</spec>
<description>
@@ -290,7 +290,7 @@
</item>
<item>
- <tags>[f</tags>
+ <tags>&lt;previous-frame> [f</tags>
<strut/>
<spec><oa>count</oa>[f</spec>
<description>
@@ -303,7 +303,7 @@
</item>
<item>
- <tags>]]</tags>
+ <tags>&lt;next-page> ]]</tags>
<strut/>
<spec><oa>count</oa>]]</spec>
<description>
@@ -316,7 +316,7 @@
</item>
<item>
- <tags>[[</tags>
+ <tags>&lt;previous-page> [[</tags>
<strut/>
<spec><oa>count</oa>[[</spec>
<description>
@@ -361,7 +361,7 @@
</note>
<item>
- <tags>+ zi</tags>
+ <tags><![CDATA[<text-zoom-in> + zi]]></tags>
<spec><oa>count</oa>zi</spec>
<description short="true">
<p>Enlarge text zoom of current web page. Mnemonic: zoom in.</p>
@@ -369,7 +369,7 @@
</item>
<item>
- <tags>zm</tags>
+ <tags><![CDATA[<text-zoom-more> zm]]></tags>
<strut/>
<spec><oa>count</oa>zm</spec>
<description>
@@ -378,7 +378,7 @@
</item>
<item>
- <tags>- zo</tags>
+ <tags><![CDATA[<text-zoom-out> - zo]]></tags>
<spec><oa>count</oa>zo</spec>
<description short="true">
<p>Reduce text zoom of current web page. Mnemonic: zoom out.</p>
@@ -386,7 +386,7 @@
</item>
<item>
- <tags>zr</tags>
+ <tags><![CDATA[<text-zoom-reduce> zr]]></tags>
<spec><oa>count</oa>zr</spec>
<description short="true">
<p>Reduce text zoom of current web page by a larger amount. Mnemonic: zoom reduce.</p>
@@ -394,7 +394,7 @@
</item>
<item>
- <tags>zz</tags>
+ <tags><![CDATA[<text-zoom> zz]]></tags>
<strut/>
<spec><oa>count</oa>zz</spec>
<description>
@@ -407,7 +407,7 @@
</item>
<item>
- <tags>ZI zI</tags>
+ <tags><![CDATA[<full-zoom-in> ZI zI]]></tags>
<spec><oa>count</oa>ZI</spec>
<description short="true">
<p>Enlarge full zoom of current web page. Mnemonic: zoom in.</p>
@@ -415,7 +415,7 @@
</item>
<item>
- <tags>ZM zM</tags>
+ <tags><![CDATA[<full-zoom-more> ZM zM]]></tags>
<strut/>
<spec><oa>count</oa>ZM</spec>
<description>
@@ -424,7 +424,7 @@
</item>
<item>
- <tags>ZO zO</tags>
+ <tags><![CDATA[<full-zoom-out> ZO zO]]></tags>
<spec><oa>count</oa>ZO</spec>
<description short="true">
<p>Reduce full zoom of current web page. Mnemonic: zoom out.</p>
@@ -432,7 +432,7 @@
</item>
<item>
- <tags>ZR zR</tags>
+ <tags><![CDATA[<full-zoom-reduce> ZR zR]]></tags>
<spec><oa>count</oa>ZR</spec>
<description short="true">
<p>Reduce full zoom of current web page by a larger amount. Mnemonic: zoom reduce.</p>
@@ -440,7 +440,7 @@
</item>
<item>
- <tags>zZ</tags>
+ <tags><![CDATA[<full-zoom> zZ]]></tags>
<strut/>
<spec><oa>count</oa>zZ</spec>
<description>
@@ -489,7 +489,7 @@
</p>
<item>
- <tags>y</tags>
+ <tags>&lt;yank-location> y</tags>
<spec>y</spec>
<description short="true">
<p>Yank current location to the clipboard.</p>
@@ -497,7 +497,7 @@
</item>
<item>
- <tags>Y</tags>
+ <tags>&lt;yank-word> Y</tags>
<spec>Y</spec>
<description short="true">
<p>Copy currently selected text to the system clipboard.</p>
diff --git a/common/locale/en-US/repeat.xml b/common/locale/en-US/repeat.xml
index 753bc48f..8070ce21 100644
--- a/common/locale/en-US/repeat.xml
+++ b/common/locale/en-US/repeat.xml
@@ -21,7 +21,7 @@
<h2 tag="single-repeat">Single repeats</h2>
<item>
- <tags>.</tags>
+ <tags>&lt;repeat-key> .</tags>
<strut/>
<spec><oa>count</oa>.</spec>
<description>
@@ -45,7 +45,7 @@
<h2 tag="macros complex-repeat">Macros</h2>
<item>
- <tags>q</tags>
+ <tags>&lt;record-macro> q</tags>
<strut/>
<spec>q<a>0-9a-zA-Z</a></spec>
<description>
@@ -82,7 +82,7 @@
</item>
<item>
- <tags>@</tags>
+ <tags>&lt;play-macro> @</tags>
<spec><oa>count</oa>@<a>a-z0-9</a></spec>
<description>
<p>
@@ -100,6 +100,38 @@
</description>
</item>
+<h2 tag="macro-utilities">Macro utilities</h2>
+
+<p>
+ The following key bindings facilitate the recording of efficient
+ macros. They have no effect when typed normally, but are
+ recorded and take effect during macro playback.
+</p>
+
+<item>
+ <tags><sleep> <A-m>s</tags>
+ <strut/>
+ <spec><a>count</a>&lt;m>s</spec>
+ <description>
+ <p>
+ Sleep for <a>count</a> milliseconds before resuming playback.
+ </p>
+ </description>
+</item>
+
+<item>
+ <tags><![CDATA[<wait-for-page-load> <A-m>l]]></tags>
+ <strut/>
+ <spec><![CDATA[<A-m>l]]></spec>
+ <description>
+ <p>
+ Wait for the current page to finish loading before resuming
+ playback.
+ </p>
+ </description>
+</item>
+
+
<h2 tag="using-scripts">Using scripts</h2>
<item>