diff --git a/common/locale/en-US/messages.properties b/common/locale/en-US/messages.properties index c0d53b03..092a8688 100644 --- a/common/locale/en-US/messages.properties +++ b/common/locale/en-US/messages.properties @@ -124,6 +124,9 @@ dactyl.sourced-1 = Sourced: %S dactyl.prompt.openMany-1 = This will open %S new tabs. Would you like to continue? (yes/[no]): dactyl.yank-1 = Yank %S +dactyl.cheerUp = Cheer up +dactyl.somberDown = Somber down + deprecated.for.theOptionsSystem = the options system dialog.notAvailable-1 = Dialog %S not available diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml index 36d10ad7..bf334dbd 100644 --- a/common/locale/en-US/options.xml +++ b/common/locale/en-US/options.xml @@ -534,8 +534,9 @@ 'dls' 'dlsort' 'downloadsort' 'downloadsort' 'dlsort' 'dls' - stringlist - -active,+filename + + &option.downloadsort.type; + &option.downloadsort.default;

:downloads sort order, in order of precedence. diff --git a/common/modules/commands.jsm b/common/modules/commands.jsm index 28784a83..45b4d0d6 100644 --- a/common/modules/commands.jsm +++ b/common/modules/commands.jsm @@ -1183,7 +1183,7 @@ var Commands = Module("commands", { (?P (?:\d+ | %)? ) (?P (?: (?P ) : )? - (?P (?: | !)? )) + (?P (?:-? [()] | | !)? )) (?P !?) (?P \s*) ) @@ -1403,6 +1403,11 @@ var Commands = Module("commands", { commands: function initCommands(dactyl, modules, window) { const { commands, contexts } = modules; + commands.add(["(", "-("], "", + function (args) { dactyl.echoerr(_("dactyl.cheerUp")); }); + commands.add([")", "-)"], "", + function (args) { dactyl.echoerr(_("dactyl.somberDown")); }); + commands.add(["com[mand]"], "List or define commands", function (args) {