diff --git a/common/locale/en-US/messages.properties b/common/locale/en-US/messages.properties
index 45532960..6fd6fa01 100644
--- a/common/locale/en-US/messages.properties
+++ b/common/locale/en-US/messages.properties
@@ -166,11 +166,22 @@ mow.noPreviousOutput = No previous command output
option.noSuch = No such option
option.noSuch-1 = No such option: %S
option.replaceExisting-1 = Warning: %S already exists: replacing existing option
+option.intRequired = Integer value required
+option.operatorNotSupported-2 = Operator %S not supported for option type %S
+
+option.currentValue = Current Value
+option.defaultValue = Default Value
+
+option.bufferLocal = buffer local
+# The string 'passkeys' must appear exactly, including U0027 apostrophes
+option.passkeys.passedBy = passed by 'passkeys'
plugin.searchingFor-1 = Searching for %S
plugin.searchingForIn-2 = Searching for %S in %S
plugin.notReplacingContext-1 = Not replacing plugin context for %S
+prefs.prompt.resetAll-1 = Warning: Resetting all preferences may make %S unusable. Continue (yes/[no]):\
+
print.toFile-1 = Printing to file: %S
print.sending = Sending to printer...
print.sent = Print job sent
@@ -201,6 +212,7 @@ zoom.illegal = Illegal zoom value
error.clipboardEmpty = No clipboard data
error.countRequired-1 = Count required for %S
error.cantOpen-2 = Error opening %S: %S
+error.error-1 = Error: %S
error.interrupted = Interrupted
error.invalidSort-1 = Invalid sort order: %S
error.trailing = Trailing characters
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 708e5336..38f732a9 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -976,7 +976,8 @@ var ErrorBase = Class("ErrorBase", Error, {
}
this.fileName = frame.filename;
this.lineNumber = frame.lineNumber;
- }
+ },
+ toString: function () String(this.message)
});
/**
diff --git a/common/modules/completion.jsm b/common/modules/completion.jsm
index 1e8dbbaa..25d2ba62 100644
--- a/common/modules/completion.jsm
+++ b/common/modules/completion.jsm
@@ -396,7 +396,7 @@ var CompletionContext = Class("CompletionContext", {
}
catch (e) {
util.reportError(e);
- this.message = "Error: " + e;
+ this.message = _("error.error", e);
}
}
// XXX
@@ -495,7 +495,7 @@ var CompletionContext = Class("CompletionContext", {
return this.cache.filtered = filtered;
}
catch (e) {
- this.message = "Error: " + e;
+ this.message = _("error.error", e);
util.reportError(e);
return [];
}
diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index 4c9c089d..7afb0668 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -262,7 +262,7 @@ var Option = Class("Option", {
try {
var newValues = this._op(operator, values, scope, invert);
if (newValues == null)
- return "Operator " + operator + " not supported for option type " + this.type;
+ return _("option.operatorNotSupported", operator, this.type);
if (!this.isValidValue(newValues))
return this.invalidArgument(str || this.stringify(values), operator);
@@ -498,7 +498,7 @@ var Option = Class("Option", {
parse: {
number: function (value) let (val = Option.dequote(value))
- Option.validIf(Number(val) % 1 == 0, "Integer value required") && parseInt(val),
+ Option.validIf(Number(val) % 1 == 0, _("option.intRequired")) && parseInt(val),
boolean: function boolean(value) Option.dequote(value) == "true" || value == true ? true : false,
@@ -959,7 +959,9 @@ var Options = Module("options", {
format: {
description: function (map) (XML.ignoreWhitespace = false, XML.prettyPrinting = false, <>
{options.get("passkeys").has(map.name)
- ? (passed by {template.helpLink("'passkeys'")})
+ ? ({
+ tempate.linkifyHelp(_("option.passkeys.passedBy"))
+ })
: <>}
{template.linkifyHelp(map.description)}
)
@@ -974,7 +976,7 @@ var Options = Module("options", {
format: {
description: function (opt) (XML.ignoreWhitespace = false, XML.prettyPrinting = false, <>
{opt.scope == Option.SCOPE_LOCAL
- ? (buffer local) : ""}
+ ? ({_("option.bufferLocal")}) : ""}
{template.linkifyHelp(opt.description)}
),
help: function (opt) "'" + opt.name + "'"
@@ -1015,7 +1017,7 @@ var Options = Module("options", {
}
if (name == "all" && reset)
- modules.commandline.input("Warning: Resetting all preferences may make " + config.host + " unusable. Continue (yes/[no]): ",
+ modules.commandline.input(_("pref.prompt.resetAll", config.host),
function (resp) {
if (resp == "yes")
for (let pref in values(prefs.getNames()))
@@ -1105,8 +1107,8 @@ var Options = Module("options", {
context.pushProcessor(0, function (item, text, next) next(item, text.substr(0, 100)));
context.completions = [
- [prefs.get(filter), "Current Value"],
- [prefs.defaults.get(filter), "Default Value"]
+ [prefs.get(filter), _("opt.currentValue")],
+ [prefs.defaults.get(filter), _("opt.defaultValue")]
].filter(function (k) k[0] != null);
return null;
}
@@ -1131,11 +1133,11 @@ var Options = Module("options", {
let option = opt.option;
if (!option)
- return error(opt.name.length, "No such option: " + opt.name);
+ return error(opt.name.length, _("option.noSuch", opt.name));
context.advance(context.filter.indexOf("="));
if (option.type == "boolean")
- return error(context.filter.length, "Trailing characters");
+ return error(context.filter.length, _("error.trailing"));
context.advance(1);
if (opt.error)
@@ -1149,8 +1151,8 @@ var Options = Module("options", {
context.title = ["Extra Completions"];
context.pushProcessor(0, function (item, text, next) next(item, text.substr(0, 100)));
context.completions = [
- [option.stringValue, "Current value"],
- [option.stringDefaultValue, "Default value"]
+ [option.stringValue, _("option.currentValue")],
+ [option.stringDefaultValue, _("option.defaultValue")]
].filter(function (f) f[0] !== "");
context.quote = ["", util.identity, ""];
});
@@ -1352,7 +1354,7 @@ var Options = Module("options", {
var newValues = opt.parse(context.filter);
}
catch (e) {
- context.message = "Error: " + e;
+ context.message = _("error.error", e);
context.completions = [];
return;
}