From 2a73dd35e2f91760083ea3d1053e6c3711c2d608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= Date: Tue, 12 Oct 2010 12:15:26 +0200 Subject: [PATCH] Unify "command-line" (adjective) and "command line" (substantive) usage. --- common/locale/en-US/cmdline.xml | 8 ++++---- common/locale/en-US/developer.xml | 2 +- common/locale/en-US/eval.xml | 12 ++++++------ common/locale/en-US/map.xml | 6 +++--- common/locale/en-US/message.xml | 2 +- common/locale/en-US/options.xml | 21 +++++++++++---------- common/locale/en-US/repeat.xml | 10 +++++----- common/locale/en-US/styling.xml | 2 +- 8 files changed, 32 insertions(+), 31 deletions(-) diff --git a/common/locale/en-US/cmdline.xml b/common/locale/en-US/cmdline.xml index 4e40f784..019fd28f 100644 --- a/common/locale/en-US/cmdline.xml +++ b/common/locale/en-US/cmdline.xml @@ -45,7 +45,7 @@ -

Command-line editing

+

Command line editing

]]> @@ -69,7 +69,7 @@ <Up>

- Recall from command history the previous command-line + Recall from command history the previous command line which begins with the current input value.

@@ -81,7 +81,7 @@ <Down>

- Recall from command history the next command-line + Recall from command history the next command line which begins with the current input value.

@@ -215,7 +215,7 @@ -

Ex command-line arguments

+

Ex command line arguments

Most Ex commands accept a number of options and arguments. Arguments and diff --git a/common/locale/en-US/developer.xml b/common/locale/en-US/developer.xml index f1bf3a0b..5114479f 100644 --- a/common/locale/en-US/developer.xml +++ b/common/locale/en-US/developer.xml @@ -73,7 +73,7 @@

Items
item
A help entry (HelpItem)
&tab;tags
See the 'Tagging' section (HelpTags)
-
&tab;spec
The specification for this item, such as an example command-line. (HelpSpec)
+
&tab;spec
The specification for this item, such as an example command line. (HelpSpec)
&tab;strut
A horizontal formatting strut which ensures that all previous <tags> and <spec> elements appear above the ones that follow.
&tab;type
For options, the type of the option. number, boolean, string, stringlist, or charlist. diff --git a/common/locale/en-US/eval.xml b/common/locale/en-US/eval.xml index 99ea8ac8..b6c0912e 100644 --- a/common/locale/en-US/eval.xml +++ b/common/locale/en-US/eval.xml @@ -15,11 +15,11 @@ Much of the power of &dactyl.appName; lies in its scriptable expression evaluation. &dactyl.appName; understands two kinds of expressions: Ex commands, and JavaScript. Ex commands are simple, easy to type, and - readily accessible from the command-line. They form a core part of - the user interface. JavaScript, on the other hand, is much less - straightforward, but allows for any number of complex actions to be - executed, with full access to all of the internals of &dactyl.appName; and - &dactyl.host;. Both expression evaluation methods support sophisticated + readily accessible from the command line. + They form a core part of the user interface. JavaScript, on the other hand, + is much less straightforward, but allows for any number of complex actions + to be executed, with full access to all of the internals of &dactyl.appName; + and &dactyl.host;. Both expression evaluation methods support sophisticated expression completion, including option lists and descriptions thereof, along with paren matching and syntax error highlighting.

@@ -33,7 +33,7 @@ string, in which case it is shown in the statusline, or any arbitrary JavaScript expression. If the expression results in anything other than a string, it is pretty-printed in a multiline - frame just above the command-line. The output depends on the type + frame just above the command line. The output depends on the type of object. Functions display their source, DOM nodes display the pretty-printed XML of the top-level node, XML literals are rendered as page content, and all other objects display their diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml index 4b125a2e..56d4e113 100644 --- a/common/locale/en-US/map.xml +++ b/common/locale/en-US/map.xml @@ -40,7 +40,7 @@

causes “:echo Date()” to be typed out whenever is pressed, thus echoing the full date - to the command-line. + to the command line.

@@ -117,7 +117,7 @@

-javascript
Execute rhs as JavaScript rather than keys (short names -js, -j)
-modes
Create this mapping in the given modes (short names -mode, -m)
-nopersist
Do not save this mapping to an auto-generated rc file (short name -n)
-
-silent
Do not echo any generated keys to the command-line (short name -s, also <silent> for Vim compatibility)
+
-silent
Do not echo any generated keys to the command line (short name -s, also <silent> for Vim compatibility)
@@ -520,7 +520,7 @@

Defining new commands is perhaps the most straightforward way of repeating commonly used actions. User-defined commands may be - entered from the command-line or scripts exactly like standard + entered from the command line or scripts exactly like standard commands, and may similarly accept arguments, options, counts, and !s, as well as provide command-line completion. These commands may be defined as either ordinary, diff --git a/common/locale/en-US/message.xml b/common/locale/en-US/message.xml index 43f16308..d19c04da 100644 --- a/common/locale/en-US/message.xml +++ b/common/locale/en-US/message.xml @@ -76,7 +76,7 @@

g
back to the start
q, or CTRL-C
stop the listing
-
:
stop the listing and enter a command-line
+
:
stop the listing and enter a command line
;
start an extended-hints command
yank (copy) a modeless selection to the clipboard
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml index 8821be64..bee682ed 100644 --- a/common/locale/en-US/options.xml +++ b/common/locale/en-US/options.xml @@ -367,12 +367,13 @@ Enables automatic completion for completion groups matching the given regular expressions. When automatic completion is enabled, the completion list is automatically opened when the - command-line is focused. Thereafter, any key press - triggers a completion update for the matching groups (hereafter - ‘contexts’). Non-matching contexts will only be updated when the - key is pressed. This option is useful for - disabling auto-completion for computationally intensive contexts - that don't perform well when your system is under load. + command line is focused. + Thereafter, any key press triggers a completion update for the + matching groups (hereafter ‘contexts’). Non-matching contexts will + only be updated when the key is pressed. + This option is useful for disabling auto-completion for + computationally intensive contexts that don't perform well when + your system is under load.

@@ -632,12 +633,12 @@
B
Bookmark bar
-
C
Always show the command-line outside of the status line
+
C
Always show the command line outside of the status line
M
Always show messages outside of the status line
N
Tab number over image
T
Toolbar
b
Bottom scrollbar
-
c
Always show the command-line, even when empty
+
c
Always show the command line, even when empty
l
Left scrollbar (l and r are mutually exclusive)
m
Menu bar
n
Tab number
@@ -1261,8 +1262,8 @@
0
Don't show link destination
-
1
Show the link's destination in the status-line
-
2
Show the link's destination in the command-line
+
1
Show the link's destination in the status line
+
2
Show the link's destination in the command line
diff --git a/common/locale/en-US/repeat.xml b/common/locale/en-US/repeat.xml index 89c67569..8875b65e 100644 --- a/common/locale/en-US/repeat.xml +++ b/common/locale/en-US/repeat.xml @@ -162,11 +162,11 @@

Ex command files are executed as if each line were entered into - the command-line individually. Additionally, certain - commands support the same ‘here document’ syntax supported by most - Unix shells and by the command-line. So, to execute a - JavaScript statement which does not comfortably fit on a single - line, you can use, + the command line individually. + Additionally, certain commands support the same ‘here document’ + syntax supported by most Unix shells and by the command line. + So, to execute a JavaScript statement which does not comfortably fit + on a single line, you can use

:js <<EOF diff --git a/common/locale/en-US/styling.xml b/common/locale/en-US/styling.xml index f5320164..a6ce6fb2 100644 --- a/common/locale/en-US/styling.xml +++ b/common/locale/en-US/styling.xml @@ -94,7 +94,7 @@
Null
A JavaScript Null object
Number
A JavaScript Number object
Object
A JavaScript Object
-
Preview
The completion preview displayed in the command-line
+
Preview
The completion preview displayed in the command line
Question
A prompt for a decision
Search
Highlighted search results in a web page
StatusLine
The status bar