diff --git a/common/content/abbreviations.js b/common/content/abbreviations.js index ccc666e8..5b3c7304 100644 --- a/common/content/abbreviations.js +++ b/common/content/abbreviations.js @@ -203,9 +203,9 @@ var Abbreviations = Module("abbreviations", { let list = - - + + + { diff --git a/common/content/commandline.js b/common/content/commandline.js index 5cf8a9bc..caf18a57 100644 --- a/common/content/commandline.js +++ b/common/content/commandline.js @@ -1629,7 +1629,7 @@ var ItemList = Class("ItemList", { _init: function _init() { this._div = this._dom(
-
No Completions
+
{_("completion.noCompletions")}
{ diff --git a/common/content/dactyl.js b/common/content/dactyl.js index 845dfb3e..151807a5 100644 --- a/common/content/dactyl.js +++ b/common/content/dactyl.js @@ -689,7 +689,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), { unescape(encodeURI( // UTF-8 handling hack. -

Using Plugins

+

{_("help.title.Using Plugins")}

{body} @@ -1078,7 +1078,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), { * These are set and accessed with the "g:" prefix. */ _globalVariables: {}, - globalVariables: deprecated(/*L*/"the options system", { + globalVariables: deprecated(_("deprecated.for.theOptionsSystem"), { get: function globalVariables() this._globalVariables }), @@ -1967,11 +1967,11 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), { commandline.commandOutput(
- ModeAbbrevReplacement{_("title.Mode")}{_("title.Abbrev")}{_("title.Replacement")}
- + - - - + + +
Code execution summary{_("title.Code execution summary")}
  Executed:{count}times
  Average time:{each.toFixed(2)}{eachUnits}
  Total time:{total.toFixed(2)}{totalUnits}
  {_("title.Executed")}:{count}times
  {_("title.Average time")}:{each.toFixed(2)}{eachUnits}
  {_("title.Total time")}:{total.toFixed(2)}{totalUnits}
); } else { diff --git a/common/content/editor.js b/common/content/editor.js index 3fd78fbe..bbc9c0c3 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -321,7 +321,7 @@ var Editor = Module("editor", { try { var tmpfile = io.createTempFile(); if (!tmpfile) - throw Error(/*L*/"Couldn't create temporary file"); + throw Error(_("io.cantCreateTempFile")); if (textBox) { highlight.highlightNode(textBox, origGroup + " EditorEditing"); @@ -329,8 +329,7 @@ var Editor = Module("editor", { } if (!tmpfile.write(text)) - throw Error(/*L*/"Input contains characters not valid in the current " + - "file encoding"); + throw Error(_("io.cantEncode")); var lastUpdate = Date.now(); diff --git a/common/content/history.js b/common/content/history.js index 0d34acc7..f41dd860 100644 --- a/common/content/history.js +++ b/common/content/history.js @@ -219,7 +219,7 @@ var History = Module("history", { description: "The sort order of the results", completer: function (context, args) { context.compare = CompletionContext.Sort.unsorted; - return /*L*/array.flatten([ + return array.flatten([ "annotation", "date", "date added", @@ -230,8 +230,8 @@ var History = Module("history", { "uri", "visitcount" ].map(function (order) [ - ["+" + order.replace(" ", ""), "Sort by " + order + " ascending"], - ["-" + order.replace(" ", ""), "Sort by " + order + " descending"] + ["+" + order.replace(" ", ""), /*L*/"Sort by " + order + " ascending"], + ["-" + order.replace(" ", ""), /*L*/"Sort by " + order + " descending"] ])); } } diff --git a/common/content/mappings.js b/common/content/mappings.js index 5ed26659..b4751586 100644 --- a/common/content/mappings.js +++ b/common/content/mappings.js @@ -431,9 +431,9 @@ var Mappings = Module("mappings", { let list = - - + + + { diff --git a/common/locale/en-US/messages.properties b/common/locale/en-US/messages.properties index 163afaf0..719cac11 100644 --- a/common/locale/en-US/messages.properties +++ b/common/locale/en-US/messages.properties @@ -100,11 +100,14 @@ command.set.unknownOption-1 = E518: Unknown option: %S command.yank.yankedLine-1 = Yanked %S line command.yank.yankedLines-1 = Yanked %S lines +completion.additional = (additional) +completion.generating = Generating results... +completion.noCompletions = No Completions completion.waitingFor-1 = Waiting for %S completion.waitingForKeyPress = Waiting for key press completion.matchIndex-2 = match %S of %S -completion.generating = Generating results... +dactyl.created-1 = "(created %S)" dactyl.parsingCommandLine-1 = Parsing command line options: %S dactyl.notCommand-2 = E492: Not a %S command: %S dactyl.sourcingPlugins-1 = Sourcing plugin directory: %S... @@ -117,6 +120,8 @@ 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 +deprecated.for.theOptionsSystem = the options system + dialog.notAvailable-1 = Dialog %S not available # TODO: merge with addon.*? @@ -155,8 +160,10 @@ group.invalidName-1 = Invalid group name: %S group.noCurrent = No current group help.dontPanic = E478: Don't panic! +help.Example = Example help.noFile-1 = Sorry, help file %S not found help.noTopic-1 = Sorry, no help for %S +help.title.Using Plugins = Using Plugins hints.noMatcher-1 = Invalid 'hintmatching' type: %S @@ -164,23 +171,29 @@ history.noMatching-1 = No history matching %S history.none = No history set history.noURL = URL not found in history -io.noSuchDir-1 = E344: Can't find directory %S -io.noPrevDir = E186: No previous directory -io.notReadable-1 = Can't open file %S -io.notWriteable-1 = Can't open file %S for writing +io.callingShell-1 = Calling shell to execute: %S +io.cantCreateTempFile = Couldn't create temporary file +io.cantEncode = Input contains characters not valid in the current file encoding +io.commandFailed = E472: Command failed +io.definedAt = Defined at %S +io.downloadFinished-2 = Download of %S to %S finished +io.eNotDir = Not a directory io.exists = File exists (add ! to override) io.exists-1 = File %S exists (add ! to override) io.noCommand-1 = Command not found: %S -io.commandFailed = E472: Command failed -io.oneFileAllowed = E172: Only one file name allowed -io.callingShell-1 = Calling shell to execute: %S -io.sourcing-1 = sourcing %S -io.sourcingEnd-1 = finished sourcing %S +io.noPrevDir = E186: No previous directory +io.noSuchDir-1 = E344: Can't find directory %S +io.noSuchFile = File does not exist io.notInRTP-1 = not found in 'runtimepath': %S +io.notReadable-1 = Can't open file %S +io.notWriteable-1 = Can't open file %S for writing +io.oneFileAllowed = E172: Only one file name allowed io.searchingFor-1 = Searching for %S io.searchingFor-2 = Searching for %S in %S -io.downloadFinished-2 = Download of %S to %S finished io.shellReturn-1 = shell returned %S +io.sourcing-1 = sourcing %S +io.sourcingEnd-1 = finished sourcing %S +io.sourcingError-1 = Sourcing file: %S macro.canceled-1 = Canceled playback of macro '%S' macro.recorded-1 = Recorded macro '%S' @@ -246,6 +259,7 @@ plugin.searchingFor-1 = Searching for %S plugin.searchingForIn-2 = Searching for %S in %S plugin.notReplacingContext-1 = Not replacing plugin context for %S +pref.hostPreferences-1 = %S Preferences pref.prompt.resetAll-1 = Warning: Resetting all preferences may make %S unusable. Would you like to continue (yes/[no]): pref.safeSet.warnChanged-1 = Warning: Setting preference %S, but it's changed from its default value. @@ -273,13 +287,33 @@ style.inline = inline time.total-1 = Total time: %S +title.Abbrev = Abbrev +title.Action = Action +title.Args = Args +title.Average time = Average time +title.CSS = CSS +title.Code execution summary = Code execution summary +title.Command = Command +title.Complete = Complete +title.Definition = Definition +title.Description = Description +title.Executed = Executed +title.Filter = Filter +title.Jump = Jump +title.Mode = Mode +title.Name = Name title.Progress = Progress +title.Range = Range +title.Replacement = Replacement title.Source = Source title.Speed = Speed title.Status = Status title.Time remaining = Time remaining title.Title = Title +title.Total time = Total time title.Totals = Totals +title.URI = URI +title.Version = Version variable.none = No variables found diff --git a/common/modules/addons.jsm b/common/modules/addons.jsm index 58458c71..3b3fa7ce 100644 --- a/common/modules/addons.jsm +++ b/common/modules/addons.jsm @@ -282,11 +282,11 @@ var AddonList = Class("AddonList", { XML.ignoreWhitespace = true; util.xmlToDom(
- ModeCommandAction{_("title.Mode")}{_("title.Command")}{_("title.Action")}
- - - + + + +
NameVersionStatus{_("title.Name")}{_("title.Version")}{_("title.Status")} - Description{_("title.Description")}
, this.document, this.nodes); diff --git a/common/modules/base.jsm b/common/modules/base.jsm index e2bd782d..8b451b24 100644 --- a/common/modules/base.jsm +++ b/common/modules/base.jsm @@ -194,8 +194,10 @@ function require(obj, name, from) { if (arguments.length === 1) [obj, name] = [{}, obj]; + let caller = Components.stack.caller; + if (!loaded[name]) - defineModule.loadLog.push((from || "require") + ": loading " + name + (obj.NAME ? " into " + obj.NAME : "")); + defineModule.loadLog.push((from || "require") + ": loading " + name + " into " + (obj.NAME || caller.filename + ":" + caller.lineNumber)); JSMLoader.load(name + ".jsm", obj); return obj; diff --git a/common/modules/commands.jsm b/common/modules/commands.jsm index 63be6d4f..074b12b7 100644 --- a/common/modules/commands.jsm +++ b/common/modules/commands.jsm @@ -660,11 +660,11 @@ var Commands = Module("commands", { - Name - Args - Range - Complete - Definition + {_("title.Name")} + {_("title.Args")} + {_("title.Range")} + {_("title.Complete")} + {_("title.Definition")} { diff --git a/common/modules/completion.jsm b/common/modules/completion.jsm index 2e29c638..ec3a2b2b 100644 --- a/common/modules/completion.jsm +++ b/common/modules/completion.jsm @@ -960,7 +960,7 @@ var Completion = Module("completion", { context.title = ["URL", "Title"]; context.fork("additional", 0, this, function (context) { - context.title[0] += /*L*/" (additional)"; + context.title[0] += " " + _("completion.additional"); context.filter = context.parent.filter; // FIXME context.completions = context.parent.completions; // For items whose URL doesn't exactly match the filter, diff --git a/common/modules/config.jsm b/common/modules/config.jsm index e9f85fa9..3fd3bace 100644 --- a/common/modules/config.jsm +++ b/common/modules/config.jsm @@ -31,13 +31,14 @@ var ConfigBase = Class("ConfigBase", { }); }, - loadStyles: function loadStyles() { + loadStyles: function loadStyles(force) { const { highlight } = require("highlight"); + const { _ } = require("messages"); highlight.styleableChrome = this.styleableChrome; - highlight.loadCSS(this.CSS); - highlight.loadCSS(this.helpCSS); + highlight.loadCSS(this.CSS.replace(/__MSG_(.*?)__/g, function (m0, m1) _(m1))); + highlight.loadCSS(this.helpCSS.replace(/__MSG_(.*?)__/g, function (m0, m1) _(m1))); if (!util.haveGecko("2b")) highlight.loadCSS( - Name - Filter - CSS + {_("title.Name")} + {_("title.Filter")} + {_("title.CSS")} diff --git a/common/modules/template.jsm b/common/modules/template.jsm index b979e709..7b7813fb 100644 --- a/common/modules/template.jsm +++ b/common/modules/template.jsm @@ -363,9 +363,9 @@ var Template = Module("Template", { // return - - - + + + { this.map(Iterator(elems), function ([idx, val]) @@ -496,7 +496,7 @@ var Template = Module("Template", { let (name = item.name || item.names[0], frame = item.definedAt) !frame ? name : template.helpLink(help(item), name, "Title") + - Defined at {sourceLink(frame)} + {_("io.definedAt", sourceLink(frame))} } { item.columns ? template.map(item.columns, function (c) ) : "" }
JumpTitleURI{_("title.Jump")}{_("title.Title")}{_("title.URI")}
{c}