diff --git a/License.txt b/License.txt index f6a7a8b8..d8fcf815 100644 --- a/License.txt +++ b/License.txt @@ -8,16 +8,16 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/common/content/commandline.js b/common/content/commandline.js index 166c3ac3..cc3a5c61 100644 --- a/common/content/commandline.js +++ b/common/content/commandline.js @@ -149,7 +149,7 @@ const CommandWidgets = Class("CommandWidgets", { multilineOutput: Class.memoize(function () { let elem = document.getElementById("dactyl-multiline-output"); elem.contentDocument.body.id = "dactyl-multiline-output-content"; - document.getElementById("dactyl-context-copylink").style.listStyleImage = + document.getElementById("dactyl-context-copylink").style.listStyleImage = util.computedStyle(document.getElementById("context-copylink")).listStyleImage; return elem; }), diff --git a/common/content/help.xsl b/common/content/help.xsl index ae10f4de..1727dd42 100644 --- a/common/content/help.xsl +++ b/common/content/help.xsl @@ -411,7 +411,7 @@
Note: - +

@@ -420,7 +420,7 @@
Warning: - +

diff --git a/common/content/io.js b/common/content/io.js index c0d0c83a..96c74f7a 100644 --- a/common/content/io.js +++ b/common/content/io.js @@ -541,7 +541,7 @@ lookup: // NOTE: this command is only used in :source commands.add(["fini[sh]"], "Stop sourcing a script file", - function () { + function () { dactyl.assert(io.sourcing, "E168: :finish used outside of a sourced file"); io.sourcing.finished = true; }, diff --git a/common/locale/en-US/all.xml b/common/locale/en-US/all.xml index 1d6e5412..ccb98583 100644 --- a/common/locale/en-US/all.xml +++ b/common/locale/en-US/all.xml @@ -37,4 +37,5 @@ + diff --git a/common/locale/en-US/browsing.xml b/common/locale/en-US/browsing.xml index 8def5196..db139c85 100644 --- a/common/locale/en-US/browsing.xml +++ b/common/locale/en-US/browsing.xml @@ -31,7 +31,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - CTRL-V]]> CTRL-V @@ -42,7 +41,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to -

Opening web pages

@@ -104,7 +102,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - t :t :tabopen :tabnew :tabopen! arg1, arg2, … @@ -118,7 +115,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - T T @@ -129,7 +125,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - :tabdu :tabduplicate :counttabduplicate! @@ -142,7 +137,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - O O @@ -153,7 +147,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - w :winopen :wopen :winopen! arg1, arg2, … @@ -166,7 +159,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - W W @@ -177,7 +169,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - p]]> @@ -192,7 +183,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - P @@ -207,7 +197,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - gP @@ -221,7 +210,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - ]]> @@ -236,7 +224,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - ]]> @@ -249,7 +236,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - ~ ~ @@ -258,7 +244,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to -

Navigating

@@ -276,7 +261,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - CTRL-i :fo :fw :forward]]> :countforward url @@ -292,7 +276,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - :ju :jumps :jumps @@ -307,7 +290,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - gh gh @@ -316,7 +298,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - gH @@ -330,7 +311,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - gu countgu @@ -345,7 +325,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - gU gU @@ -360,7 +339,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to -

Reloading

@@ -371,7 +349,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - R R @@ -380,7 +357,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - :re :reload :reload! @@ -392,7 +368,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - :reloada :reloadall :reloadall! @@ -404,7 +379,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to -

Stopping

@@ -417,7 +391,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - :stopa :stopall :stopall @@ -426,7 +399,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to -

Writing

@@ -443,7 +415,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to -

Quitting

@@ -458,7 +429,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - :qa :qall :quita :quitall @@ -471,7 +441,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - :wc :wclose :winc :winclose :winclose @@ -480,7 +449,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - :winon :winonly :winonly @@ -489,7 +457,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - :xa :xall :wq :wqa :wqall :wqall @@ -504,7 +471,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - ZQ ZQ @@ -513,7 +479,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - ZZ ZZ @@ -525,7 +490,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to -

The current directory

@@ -541,7 +505,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - :pw :pwd :pwd @@ -550,7 +513,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to - diff --git a/common/locale/en-US/buffer.xml b/common/locale/en-US/buffer.xml index 64259652..155438c0 100644 --- a/common/locale/en-US/buffer.xml +++ b/common/locale/en-US/buffer.xml @@ -33,7 +33,6 @@ - ]]> g<C-g> @@ -42,7 +41,6 @@ - :pa :pageinfo :pageinfo items @@ -55,7 +53,6 @@ - gf @@ -68,7 +65,6 @@ - gF @@ -84,7 +80,6 @@ - :vie :viewsource :viewsource! url @@ -98,7 +93,6 @@ -

Motion commands

@@ -113,7 +107,6 @@ - $ $ @@ -122,7 +115,6 @@ - gg]]> @@ -136,7 +128,6 @@ - G]]> @@ -149,7 +140,6 @@ - N% count% @@ -158,7 +148,6 @@ - h]]> @@ -171,7 +160,6 @@ - j]]> @@ -184,7 +172,6 @@ - k]]> @@ -197,7 +184,6 @@ - l]]> @@ -210,7 +196,6 @@ - ]]> @@ -224,7 +209,6 @@ - ]]> @@ -238,7 +222,6 @@ - ]]> @@ -251,7 +234,6 @@ - ]]> @@ -264,7 +246,6 @@ -

Jumping to elements

@@ -275,7 +256,6 @@ - ]]> <S-Tab> @@ -284,7 +264,6 @@ - gi @@ -298,7 +277,6 @@ - ]f @@ -312,7 +290,6 @@ - [f @@ -326,7 +303,6 @@ - ]] @@ -340,7 +316,6 @@ - [[ @@ -354,7 +329,6 @@ -

Zooming

@@ -395,7 +369,6 @@ - zm @@ -405,7 +378,6 @@ - - zo countzo @@ -414,7 +386,6 @@ - zr countzr @@ -423,7 +394,6 @@ - zz @@ -437,7 +407,6 @@ - ZI zI countZI @@ -446,7 +415,6 @@ - ZM zM @@ -456,7 +424,6 @@ - ZO zO countZO @@ -465,7 +432,6 @@ - ZR zR countZR @@ -474,7 +440,6 @@ - ZZ zZ @@ -487,7 +452,6 @@ - :zo :zoom :zoom! value @@ -507,7 +471,6 @@ -

Working with frames

@@ -518,7 +481,6 @@ -

Copying text

@@ -535,7 +497,6 @@ - Y Y @@ -544,7 +505,6 @@ -

Alternate style sheets

Page authors may specify alternate style sheets for an HTML @@ -565,7 +525,6 @@ selecting their favorite. - diff --git a/common/locale/en-US/cmdline.xml b/common/locale/en-US/cmdline.xml index cd9d6e03..44700c27 100644 --- a/common/locale/en-US/cmdline.xml +++ b/common/locale/en-US/cmdline.xml @@ -45,7 +45,6 @@ -

Command-line editing

@@ -56,7 +55,6 @@ - ]]> <C-]> @@ -65,7 +63,6 @@ - ]]> @@ -78,7 +75,6 @@ - ]]> @@ -91,7 +87,6 @@ - c_]]> <S-Up> @@ -102,7 +97,6 @@ - c_]]> <S-Down> @@ -112,7 +106,6 @@ -

Command-line completion

@@ -129,7 +122,6 @@ - ]]> @@ -139,7 +131,6 @@ - ]]> @@ -152,7 +143,6 @@ - ]]> @@ -162,7 +152,6 @@ - diff --git a/common/locale/en-US/developer.xml b/common/locale/en-US/developer.xml index 9b2f3e00..f1bf3a0b 100644 --- a/common/locale/en-US/developer.xml +++ b/common/locale/en-US/developer.xml @@ -196,16 +196,16 @@ XML.prettyPrinting = false; triggers to toggle the playing of animation on the current page.

- 'flashblock' 'fb' - 'flashblock' 'fb' + 'flashblock' 'fb' + 'flashblock' 'fb' boolean true - +

Controls the blocking of flash animations. When true, place holders are substituted for flash animations on untrusted sites.

- + ... </plugin>; diff --git a/common/locale/en-US/eval.xml b/common/locale/en-US/eval.xml index 0aa564fc..7bd87320 100644 --- a/common/locale/en-US/eval.xml +++ b/common/locale/en-US/eval.xml @@ -44,7 +44,6 @@ - :echoe :echoerr :echoerr expr @@ -56,7 +55,6 @@ - :echom :echomsg :echomsg expr @@ -68,7 +66,6 @@ - :exe :execute :execute expr @@ -86,7 +83,6 @@ - :js :javas :javascript :javascript cmd @@ -138,7 +134,6 @@ - :let :let var-name [+-.]= expr1 @@ -154,7 +149,6 @@ - :unl :unlet :unlet! name … diff --git a/common/locale/en-US/gui.xml b/common/locale/en-US/gui.xml index 1e145433..2cb7a019 100644 --- a/common/locale/en-US/gui.xml +++ b/common/locale/en-US/gui.xml @@ -37,7 +37,6 @@ -

Dialogs

@@ -54,7 +53,6 @@ - :dia :dialog :dialog &dactyl.host;-dialog @@ -65,7 +63,6 @@ - :dl :downl :downloads @@ -79,7 +76,6 @@ -

Add-ons

@@ -93,7 +89,6 @@ - :extde :extdelete :extdelete extension @@ -106,7 +101,6 @@ - :extd :extdisable :extdisable extension @@ -119,7 +113,6 @@ - :exte :extenable :extenable extension @@ -132,7 +125,6 @@ - :exts :extens :extensions :extensions @@ -142,7 +134,6 @@ - :exto :extoptions :extoptions! extension @@ -156,7 +147,6 @@ -

Sidebar

@@ -167,7 +157,6 @@ - :sbope :sbopen :sb :sbar :sideb :sidebar :sidebar name @@ -180,7 +169,6 @@ -

Status line

@@ -248,7 +236,6 @@ - :tbh :tbhide :toolbarh :toolbarhide :toolbarhide name @@ -257,7 +244,6 @@ - :tbt :tbtoggle :toolbart :toolbartoggle :toolbartoggle name @@ -266,7 +252,6 @@ - diff --git a/common/locale/en-US/hints.xml b/common/locale/en-US/hints.xml index 6f30df3f..20d87e02 100644 --- a/common/locale/en-US/hints.xml +++ b/common/locale/en-US/hints.xml @@ -19,7 +19,7 @@ narrow them down. While the default action is to click the selected link, other actions are available, including saving the resulting link, copying its URL, or saving an image. For each - of these actions, only the set of applicable elements is + of these actions, only the set of applicable elements is highlighted.

@@ -56,7 +56,6 @@ - F @@ -72,8 +71,6 @@ - - extended-hints ; ExtendedHint @@ -126,4 +123,5 @@ + diff --git a/common/locale/en-US/index.xml b/common/locale/en-US/index.xml index e3f15dde..c533535f 100644 --- a/common/locale/en-US/index.xml +++ b/common/locale/en-US/index.xml @@ -22,7 +22,6 @@ This file contains a list of all available commands, mappings and options.
Expand an Insert-mode abbreviation
-

Normal mode

@@ -42,29 +41,24 @@ This file contains a list of all available commands, mappings and options.
Temporarily ignore all &dactyl.appName; key bindings
-
Focus content
-
Open help window
-
Rewind keyboard focus
Advance keyboard focus
-
0
Scroll to the absolute left of the document
$
Scroll to the absolute right of the document
-
A
Toggle bookmarked state of current URL
B
Show buffer list
@@ -83,7 +77,6 @@ This file contains a list of all available commands, mappings and options.
W
Open one or more URLs in a new window, based on current location
-
a
Open a prompt to bookmark the current URL
b
Open a prompt to switch buffers
@@ -106,22 +99,18 @@ This file contains a list of all available commands, mappings and options.
w
Open one or more URLs in a new window
-
;
Start an extended hint mode
-
:
Enter Command-line mode
-
~
Open home directory
-
/
Search forward for a pattern
?
Search backwards for a pattern
@@ -129,28 +118,23 @@ This file contains a list of all available commands, mappings and options.
#
Find word under cursor backwards
-
N%
Scroll to count percent of the document
-
'
Jump to the mark
-
@
Play a macro
-
.
Repeat the last keyboard command
@:
Repeat the last Ex command count times
-
]f
Focus next frame
[f
Focus previous frame
@@ -158,7 +142,6 @@ This file contains a list of all available commands, mappings and options.
[[
Follow the link labeled 'prev', 'previous' or '<' if it exists
-
g$
Go to the last tab
g<
Redisplay the last command output
@@ -181,7 +164,6 @@ This file contains a list of all available commands, mappings and options.
gu
Go to parent directory
-
ZQ
Quit and don't save the session
ZZ
Quit and save the session
@@ -197,25 +179,21 @@ This file contains a list of all available commands, mappings and options.
zz
Set text zoom value of current web page
-

Command-line editing

Quit Command-line mode without executing
-
Expand a command-line abbreviation
-
Recall the previous command line from the history list which matches the current command line
Recall the next command line from the history list which matches the current command line
-
Complete the word in front of the cursor according to the behavior specified in wildmode
Complete the previous full match when wildmode contains "full"
@@ -223,7 +201,6 @@ This file contains a list of all available commands, mappings and options.
Complete the previous full match when altwildmode contains "full"
-

Ex commands

@@ -376,7 +353,6 @@ This file contains a list of all available commands, mappings and options.
:zoom
Set zoom value of current web page
-

Options

@@ -446,6 +422,6 @@ This file contains a list of all available commands, mappings and options.
wordseparators
How words are split for hintmatching
- + diff --git a/common/locale/en-US/insert.xml b/common/locale/en-US/insert.xml index 7f3f2706..7a7e1d7a 100644 --- a/common/locale/en-US/insert.xml +++ b/common/locale/en-US/insert.xml @@ -27,8 +27,6 @@ - -

Insert-mode special keys

@@ -58,6 +56,6 @@ - + diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml index ff1ce0ed..b50a9bf9 100644 --- a/common/locale/en-US/map.xml +++ b/common/locale/en-US/map.xml @@ -100,7 +100,6 @@ -

Map options

Any of the map commands may be given the following options: @@ -118,7 +117,6 @@

-silent
Do not echo any generated keys to the command-line (short name -s, also <silent> for Vim compatibility)
- :no :noremap :noremap lhs rhs @@ -143,7 +141,6 @@ - :unm :unmap :map lhs rhs @@ -160,7 +157,6 @@ - :mapc :mapclear :mapclear @@ -179,7 +175,6 @@ - :map :nmap @@ -191,7 +186,6 @@ - :map_l :map lhs @@ -208,8 +202,6 @@ - -

Special arguments

:map-<silent> @@ -343,7 +335,6 @@ - map_return]]> @@ -357,7 +348,6 @@ - mapleader \]]> @@ -377,7 +367,6 @@ -

Abbreviations

@@ -430,7 +419,6 @@ - :ca :cabbrev :cabbrev lhs rhs @@ -445,7 +433,6 @@ - :ia :iabbrev :iabbrev lhs rhs @@ -459,7 +446,6 @@ - :una :unabbreviate :unabbreviate lhs @@ -468,7 +454,6 @@ - :cuna :cunabbrev :cunabbrev lhs @@ -481,7 +466,6 @@ - :iuna :iunabbrev :iunabbrev lhs @@ -494,7 +478,6 @@ - :abc :abclear :abclear @@ -503,7 +486,6 @@ - :cabc :cabclear :cabclear @@ -512,7 +494,6 @@ - :iabc :iabclear :iabclear @@ -521,7 +502,6 @@ -

User-defined commands

@@ -543,7 +523,6 @@ - :command cmd @@ -551,7 +530,6 @@ - :command! attr… cmd rep @@ -704,7 +682,6 @@ - :comc :comclear :comclear @@ -713,7 +690,6 @@ - :delc :delcommand :delcommand cmd @@ -722,7 +698,6 @@ -

Examples

Add a :Google command to search via google:

@@ -731,4 +706,5 @@ + diff --git a/common/locale/en-US/marks.xml b/common/locale/en-US/marks.xml index 6679fdad..776ec1e5 100644 --- a/common/locale/en-US/marks.xml +++ b/common/locale/en-US/marks.xml @@ -454,6 +454,7 @@

+ diff --git a/common/locale/en-US/message.xml b/common/locale/en-US/message.xml index 1ec9b9ac..43f16308 100644 --- a/common/locale/en-US/message.xml +++ b/common/locale/en-US/message.xml @@ -28,7 +28,6 @@ - :messc :messclear :messclear @@ -37,7 +36,6 @@ - @@ -84,4 +82,5 @@ + diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml index b9c85c4b..a94d3978 100644 --- a/common/locale/en-US/options.xml +++ b/common/locale/en-US/options.xml @@ -422,7 +422,6 @@ - 'cpt' 'complete' 'complete' 'cpt' @@ -454,7 +453,6 @@ - 'ds' 'defsearch' 'defsearch' 'ds' @@ -477,7 +475,6 @@ - 'editor' 'editor' @@ -498,7 +495,6 @@ - 'enc' 'encoding' 'encoding' @@ -512,7 +508,6 @@ - 'noeb' 'noerrorbells' 'eb' 'errorbells' @@ -527,7 +522,6 @@ - 'ei' 'eventignore' 'eventignore' @@ -542,7 +536,6 @@ - 'noex' 'noexrc' 'ex' 'exrc' @@ -558,7 +551,6 @@ - 'eht' 'extendedhinttags' 'extendedhinttags' 'eht' @@ -574,7 +566,6 @@ - 'fenc' 'fileencoding' 'fileencoding' @@ -588,7 +579,6 @@ - 'fh' 'followhints' 'followhints' 'fh' @@ -607,7 +597,6 @@ - 'nofs' 'nofullscreen' 'fs' 'fullscreen' @@ -622,7 +611,6 @@ - 'go' 'guioptions' 'guioptions' 'go' @@ -653,7 +641,6 @@ - 'hf' 'helpfile' 'helpfile' 'hf' @@ -667,7 +654,6 @@ - 'hin' 'hintinputs' 'hintinputs' 'hin' @@ -689,7 +675,6 @@ - 'hk' 'hintkeys' 'hintkeys' 'hk' @@ -706,7 +691,6 @@ - 'hm' 'hintmatching' 'hintmatching' 'hm' @@ -759,7 +743,6 @@ - 'ht' 'hinttags' 'hinttags' 'ht' @@ -775,7 +758,6 @@ - 'hto' 'hinttimeout' 'hinttimeout' 'hto' @@ -790,7 +772,6 @@ - 'hi' 'history' 'history' 'hi' @@ -804,7 +785,6 @@ - 'nohls' 'nohlsearch' 'hls' 'hlsearch' @@ -816,7 +796,6 @@ - 'noic' 'noignorecase' 'ic' 'ignorecase' @@ -828,7 +807,6 @@ - 'nois' 'noincsearch' 'is' 'incsearch' @@ -840,7 +818,6 @@ - 'noim' 'noinsertmode' 'im' 'insertmode' @@ -861,7 +838,6 @@ - 'jsd' 'jsdebugger' 'jsdebugger' 'jsd' @@ -874,7 +850,6 @@ - 'ls' 'laststatus' 'laststatus' 'ls' @@ -895,7 +870,6 @@ - 'nolks' 'nolinksearch' 'lks' 'linksearch' @@ -912,7 +886,6 @@ - 'nolpl' 'lpl' 'noloadplugins' 'loadplugins' @@ -952,7 +925,6 @@ - 'maxitems' 'maxitems' @@ -963,7 +935,6 @@ - 'msgs' 'messages' 'messages' 'msgs' @@ -974,7 +945,6 @@ - 'nomore' 'more' 'more' @@ -988,7 +958,6 @@ - 'newtab' 'newtab' @@ -1017,7 +986,6 @@ - 'nextpattern' 'nextpattern' @@ -1034,7 +1002,6 @@ - 'noonline' 'online' 'online' @@ -1048,7 +1015,6 @@ - 'pageinfo' 'pa' 'pageinfo' 'pa' @@ -1073,7 +1039,6 @@ - 'pps' 'popups' 'popups' 'pps' @@ -1108,7 +1073,6 @@ - 'previouspattern' 'previouspattern' @@ -1125,7 +1089,6 @@ - 'noprivate' 'private' 'private' @@ -1143,7 +1106,6 @@ - $&dactyl.idName;_RUNTIME 'rtp' 'runtimepath' @@ -1178,7 +1140,6 @@ - 'si' 'sanitizeitems' 'sanitizeitems' 'si' @@ -1193,7 +1154,6 @@ - 'sts' 'sanitizetimespan' 'sanitizetimespan' 'sts' @@ -1217,7 +1177,6 @@ - 'scr' 'scroll' 'scroll' 'scr' @@ -1234,7 +1193,6 @@ - 'shell' 'sh' 'shell' 'sh' @@ -1245,7 +1203,6 @@ - 'shellcmdflag' 'shcf' 'shellcmdflag' 'shcf' @@ -1257,7 +1214,6 @@ - 'nosmd' 'noshowmode' 'smd' 'showmode' @@ -1269,7 +1225,6 @@ - 'ssli' 'showstatuslinks' 'showstatuslinks' 'ssli' @@ -1292,7 +1247,6 @@ - 'stal' 'showtabline' 'showtabline' 'stal' @@ -1311,7 +1265,6 @@ - 'noscs' 'nosmartcase' 'scs' 'smartcase' @@ -1327,7 +1280,6 @@ - 'nosf' 'nostrictfocus' 'sf' 'strictfocus' @@ -1341,7 +1293,6 @@ - 'suggestengines' 'suggestengines' @@ -1355,7 +1306,6 @@ - 'titlestring' 'titlestring' @@ -1370,7 +1320,6 @@ - 'urlseparator' 'urlseparator' @@ -1387,7 +1336,6 @@ - 'noum' 'nousermode' 'um' 'usermode' @@ -1399,7 +1347,6 @@ - 'vbs' 'verbose' 'verbose' 'vbs' @@ -1417,7 +1364,6 @@ - 'novb' 'novisualbell' 'vb' 'visualbell' @@ -1561,4 +1507,5 @@ + diff --git a/common/locale/en-US/pattern.xml b/common/locale/en-US/pattern.xml index b77edc05..f4448ecb 100644 --- a/common/locale/en-US/pattern.xml +++ b/common/locale/en-US/pattern.xml @@ -73,7 +73,6 @@ - ? ?pattern? @@ -82,7 +81,6 @@ - n n @@ -91,7 +89,6 @@ - N N @@ -100,7 +97,6 @@ - * * @@ -109,7 +105,6 @@ - # # @@ -118,7 +113,6 @@ - :noh :nohlsearch @@ -133,4 +127,5 @@ + diff --git a/common/locale/en-US/print.xml b/common/locale/en-US/print.xml index aa2e9283..d0213c53 100644 --- a/common/locale/en-US/print.xml +++ b/common/locale/en-US/print.xml @@ -23,7 +23,6 @@ - :hardcopy! >filename @@ -33,7 +32,6 @@ -

&dactyl.host; printing dialogs

@@ -50,4 +48,5 @@

+ diff --git a/common/locale/en-US/repeat.xml b/common/locale/en-US/repeat.xml index 5ec7dae0..89c67569 100644 --- a/common/locale/en-US/repeat.xml +++ b/common/locale/en-US/repeat.xml @@ -32,7 +32,6 @@ - @: @@ -42,8 +41,6 @@ - -

Macros

@@ -60,7 +57,6 @@ - :macros :macros pat @@ -72,7 +68,6 @@ - :delmac :delmacros :delmacros pat @@ -85,7 +80,6 @@ - @ count@a-z0-9 @@ -97,7 +91,6 @@ - @@ count@@ @@ -106,8 +99,6 @@ - -

Using scripts

@@ -156,14 +147,14 @@ and modules objects are accessible to your script as global variables.

- +

Files in ~/.&dactyl.name;/plugins may additionally be accessed in plugins.filename where filename is the last component of the file's path stripped of any extensions, with all hyphens stripped and any letter following a hyphen capitalized. So, the file - ~/.&dactyl.name;/plugins/foo-bar.js may be accessed as + ~/.&dactyl.name;/plugins/foo-bar.js may be accessed as plugins.fooBar. See also writing-plugins

@@ -186,7 +177,6 @@ - :lpl :loadplugins @@ -204,7 +194,6 @@ - :ru :runtime :runtime! file … @@ -219,7 +208,6 @@ - :scrip :scriptnames :scriptnames @@ -228,7 +216,6 @@ - :fini :finish @@ -241,7 +228,6 @@ -

Profiling

@@ -265,4 +251,5 @@ + diff --git a/common/locale/en-US/starting.xml b/common/locale/en-US/starting.xml index f99bdf20..9f70105d 100644 --- a/common/locale/en-US/starting.xml +++ b/common/locale/en-US/starting.xml @@ -32,7 +32,6 @@ - ++cmd ++cmd command @@ -46,7 +45,6 @@ - +u +u rcfile @@ -60,7 +58,6 @@ - ++noplugin ++noplugin @@ -69,7 +66,6 @@ -

Initialization

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

@@ -164,7 +160,6 @@ -

Restarting

@@ -175,7 +170,6 @@ - - + diff --git a/common/locale/en-US/styling.xml b/common/locale/en-US/styling.xml index 40805532..3c3d98f0 100644 --- a/common/locale/en-US/styling.xml +++ b/common/locale/en-US/styling.xml @@ -35,7 +35,6 @@ - :hi :highlight :highlight! groupselector @@ -130,7 +129,6 @@ - :highlight-clear :highlight clear group @@ -142,7 +140,6 @@ - :sty :style :style! -name=name -append filter css @@ -175,7 +172,6 @@ - :dels :delstyle :delstyle -name=name -index=index filter css @@ -198,7 +194,6 @@ - :styleenable :stylee :styenable :stye @@ -208,7 +203,6 @@ - :styledisable :styled :stydisable :styd @@ -218,7 +212,6 @@ - :styletoggle :stylet :stytoggle :styt @@ -228,7 +221,6 @@ - - + diff --git a/common/locale/en-US/tabs.xml b/common/locale/en-US/tabs.xml index 5a6db17d..99760426 100644 --- a/common/locale/en-US/tabs.xml +++ b/common/locale/en-US/tabs.xml @@ -47,7 +47,6 @@ - :keepa :keepalt :keepalt cmd @@ -56,7 +55,6 @@ -

Opening tabs

@@ -71,7 +69,6 @@ - :window :wind @@ -84,7 +81,6 @@ - :tabdu :tabduplicate :counttabduplicate @@ -115,7 +111,6 @@ - gB @@ -127,7 +122,6 @@ - gt @@ -140,7 +134,6 @@ - ]]> @@ -153,7 +146,6 @@ - gT]]> @@ -166,7 +158,6 @@ - :tabn :tabnext :counttabnext count @@ -182,7 +173,6 @@ - :bN :bNext :bp :bprevious :countbprevious count @@ -200,7 +190,6 @@ - ]]> count<C-^> @@ -212,7 +201,6 @@ - b :b :buffer :countbuffer! url|index @@ -238,7 +226,6 @@ - g^ g0 g0 @@ -256,7 +243,6 @@ - g$ :bl :blast :tabl :tablast :tablast @@ -267,7 +253,6 @@ - :tabde :tabdetach @@ -281,7 +266,6 @@ - :taba :tabattach :tabattach window-index buffer-index @@ -296,7 +280,6 @@ -

Reordering tabs

@@ -314,8 +297,6 @@ - -

Closing tabs

@@ -338,7 +319,6 @@ - D countD @@ -347,7 +327,6 @@ - :tabo :tabonly :tabonly @@ -356,7 +335,6 @@ - u :u :undo :countundo url @@ -370,7 +348,6 @@ - :undoa :undoall :undoall @@ -379,8 +356,6 @@ - -

Looping over tabs

@@ -400,6 +375,6 @@ - + diff --git a/common/locale/en-US/various.xml b/common/locale/en-US/various.xml index 2c948fc3..31aceb41 100644 --- a/common/locale/en-US/various.xml +++ b/common/locale/en-US/various.xml @@ -30,7 +30,6 @@ - :norm :normal :normal! keys @@ -45,7 +44,6 @@ - CTRL-L :redr :redraw]]> @@ -55,7 +53,6 @@ - :run :! :!cmd @@ -70,7 +67,6 @@ - :!! :!! @@ -79,7 +75,6 @@ - :sil :silent :silent command @@ -92,7 +87,6 @@ - :verb :verbose :countverbose command @@ -104,7 +98,6 @@ - :ve :version @@ -221,7 +214,6 @@ -

Online help

@@ -238,7 +230,6 @@ - :helpall :helpa help-all :helpall subject @@ -249,7 +240,6 @@ - :exu :exusage :exusage! @@ -261,7 +251,6 @@ - :optionu :optionusage :optionusage! @@ -273,7 +262,6 @@ - :viu :viusage :viusage! @@ -285,8 +273,6 @@ - - 42

@@ -295,7 +281,6 @@ unfortunately. So now you might wonder what the meaning of death is...

-

Uncategorized help

@@ -310,7 +295,6 @@ - i]]> @@ -324,6 +308,6 @@ - + diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS index 72b48421..8a10e94c 100644 --- a/pentadactyl/NEWS +++ b/pentadactyl/NEWS @@ -74,7 +74,7 @@ * Page zoom information is now shown in the status bar, and change in zoom status no longer appears in :messages. * Added ZO, ZI, ZM, and ZR as aliases for zO, zI, zM, and zR. - * Completion list now behaves better when the multi-line output + * Completion list now behaves better when the multi-line output window is displayed. * Major help system improvements: - Plugins may now provide full-fledged ':help' documentation. diff --git a/pentadactyl/locale/en-US/intro.xml b/pentadactyl/locale/en-US/intro.xml index 94b91b51..3f07536f 100644 --- a/pentadactyl/locale/en-US/intro.xml +++ b/pentadactyl/locale/en-US/intro.xml @@ -178,4 +178,5 @@

+ diff --git a/pentadactyl/locale/en-US/tutorial.xml b/pentadactyl/locale/en-US/tutorial.xml index 8a384f5d..dbe609ba 100644 --- a/pentadactyl/locale/en-US/tutorial.xml +++ b/pentadactyl/locale/en-US/tutorial.xml @@ -343,10 +343,8 @@ Tutorial link to return.

- -

Get me out of here!

@@ -365,7 +363,6 @@ as above, with :set go+=m, and select Add-ons from the Tools menu.

-

I'm interested… but lost!

@@ -386,4 +383,5 @@

+ diff --git a/teledactyl/locale/en-US/intro.xml b/teledactyl/locale/en-US/intro.xml index 12129de9..bcf44ca9 100644 --- a/teledactyl/locale/en-US/intro.xml +++ b/teledactyl/locale/en-US/intro.xml @@ -174,6 +174,6 @@ or :help :set. issue tracker.

- + diff --git a/xulmus/chrome.manifest b/xulmus/chrome.manifest index 3508fd0c..00463dd8 100644 --- a/xulmus/chrome.manifest +++ b/xulmus/chrome.manifest @@ -1,4 +1,4 @@ -# Songbird +# Songbird content xulmus content/ skin xulmus classic/1.0 skin/ locale xulmus en-US locale/en-US/ diff --git a/xulmus/locale/en-US/gui.xml b/xulmus/locale/en-US/gui.xml index 36426c8e..8acfbf51 100644 --- a/xulmus/locale/en-US/gui.xml +++ b/xulmus/locale/en-US/gui.xml @@ -44,9 +44,9 @@ :displaypane pane

- Open the specified display pane. pane is any of "service - pane left", "service pane bottom", "content pane bottom" or "right - sidebar". + Open the specified display pane. pane is any of "service + pane left", "service pane bottom", "content pane bottom" or "right + sidebar".

diff --git a/xulmus/locale/en-US/player.xml b/xulmus/locale/en-US/player.xml index 5cf0458e..4342a897 100644 --- a/xulmus/locale/en-US/player.xml +++ b/xulmus/locale/en-US/player.xml @@ -29,7 +29,6 @@ - p_z :playerpr :playerprev :playerprev @@ -41,7 +40,6 @@ - p_b :playern :playernext :playernext @@ -53,7 +51,6 @@ - p_c :playerpa :playerpause :playerpause @@ -65,7 +62,6 @@ - p_v :playerps :playerstop :playerpstop @@ -77,7 +73,6 @@ - p_x x @@ -88,7 +83,6 @@ - p_r r @@ -99,7 +93,6 @@ - p_i i @@ -110,7 +103,6 @@ -

Queueing tracks

@@ -128,7 +120,6 @@ -

Filtering the library

@@ -145,7 +136,6 @@ -

Seeking to a track position

@@ -158,7 +148,6 @@ - p_l]]> countl @@ -169,7 +158,6 @@ - p_H]]> countH @@ -180,7 +168,6 @@ - p_L]]> countL @@ -191,7 +178,6 @@ - :see :seek :seek [HH:]MM:SS] @@ -209,7 +195,6 @@ -

Adjusting the volume

@@ -223,7 +208,6 @@ - p_- - @@ -234,7 +218,6 @@ - :vol :volume vol[ume] value @@ -247,7 +230,6 @@ -

Managing playlists

@@ -261,7 +243,6 @@ -

Changing media views

@@ -275,7 +256,6 @@ -

Search commands

@@ -289,7 +269,6 @@ - - p_n n @@ -315,7 +293,6 @@ - p_N N @@ -328,7 +305,6 @@ -

Rating tracks

@@ -346,7 +322,6 @@ -