diff --git a/README.md b/README.md
index 7baa1bb6df..2029c2b9cc 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@ Firebug
 =======
 *Web Development Evolved* [getfirebug.com](https://getfirebug.com)
 
+**On November 14, with the launch of Firefox Quantum (AKA 57), support for old school extensions will stop in Firefox. That means Firebug will no longer work for many developers. However, the work continues in the great Firefox devtools. You can try Firefox devtools by updating your [release browser](https://www.mozilla.org/en-US/firefox/new/?utm_source=github&utm_campaign=switch) or [downloading Developer Edition](https://www.mozilla.org/en-US/firefox/developer/?utm_source=github&utm_campaign=switch). Read more [here](https://hacks.mozilla.org/2017/10/saying-goodbye-to-firebug/)**
+
 [Download](https://addons.mozilla.org/en-US/firefox/addon/firebug/)
 
 License
diff --git a/extension/bootstrap.js b/extension/bootstrap.js
index 17784cb51e..6ee6a33a3f 100644
--- a/extension/bootstrap.js
+++ b/extension/bootstrap.js
@@ -74,8 +74,9 @@ function startup(params, reason)
     Services.obs.addObserver(windowWatcher, "chrome-document-global-created", false);
 
     // GCLI commands
-    Cu.import("resource://firebug/gcli.js");
-    FirebugGCLICommands.startup();
+    // Not supported anymore
+    //Cu.import("resource://firebug/gcli.js");
+    //FirebugGCLICommands.startup();
 }
 
 function shutdown(params, reason)
diff --git a/extension/content/firebug/branch.properties b/extension/content/firebug/branch.properties
index 8d67656750..c7381baa50 100644
--- a/extension/content/firebug/branch.properties
+++ b/extension/content/firebug/branch.properties
@@ -1,5 +1,5 @@
 # DO NOT MERGE INTO TRUNK
-RELEASE=.7
+RELEASE=.19
 VERSION=2.0
 TRUNK=
 # To allow build.xml to drop the xpi directly into the svn working copy for getfirebug.com
diff --git a/extension/content/firebug/bti/inProcess/browser.js b/extension/content/firebug/bti/inProcess/browser.js
index 9fb8a937e3..2de7fc527b 100644
--- a/extension/content/firebug/bti/inProcess/browser.js
+++ b/extension/content/firebug/bti/inProcess/browser.js
@@ -453,7 +453,7 @@ Browser.prototype.removeListener = function(listener)
         FBTrace.sysout("BTI.Browser.removeListener; ERROR Unknown listener " +
             (listener.dispatchName ? listener.dispatchName : ""));
 
-    // xxxHonza: should it be alwasy called or only if isConnected() == true?
+    // xxxHonza: should it be always called or only if isConnected() == true?
     //if (this.isConnected())
         Events.dispatch2([listener], "onDisconnect", [this]);
 };
diff --git a/extension/content/firebug/chrome/chrome.js b/extension/content/firebug/chrome/chrome.js
index 0463e739b3..1f9963a2a3 100644
--- a/extension/content/firebug/chrome/chrome.js
+++ b/extension/content/firebug/chrome/chrome.js
@@ -499,9 +499,9 @@ var FirebugChrome =
 
         if (!this.inDetachedScope)
         {
-            Dom.collapse(Firefox.getElementById('fbMainFrame'), !shouldShow);
+            Dom.collapse(Firefox.getElementById("fbMainFrame"), !shouldShow);
 
-            var contentSplitter = Firefox.getElementById('fbContentSplitter');
+            var contentSplitter = Firefox.getElementById("fbContentSplitter");
             if (contentSplitter)
                 contentSplitter.setAttribute("collapsed", !shouldShow);
         }
@@ -1040,6 +1040,17 @@ var FirebugChrome =
         splitter.setAttribute("dir", after ? "" : "reverse");
         container.insertBefore(splitter, after ? null: container.firstChild);
 
+        // See: https://code.google.com/p/fbug/issues/detail?id=7717
+        // There is a new <notificationbox> element placed whihin
+        // the <appcontent> right before <tabbrowser>.
+        // If Firebug is positioned at the top, the splitter must
+        // change height of the tab-browser (which is using 'flex')
+        // not height of the <notificationbox>.
+        if (pos == "top")
+            splitter.setAttribute("resizeafter", "flex");
+        else
+            splitter.removeAttribute("resizeafter");
+
         var frame = document.getElementById("fbMainFrame");
 
         var newFrame = frame.cloneNode(true);
diff --git a/extension/content/firebug/chrome/reps.js b/extension/content/firebug/chrome/reps.js
index b8fc503bdb..2f1518afaf 100644
--- a/extension/content/firebug/chrome/reps.js
+++ b/extension/content/firebug/chrome/reps.js
@@ -1717,7 +1717,7 @@ FirebugReps.CSSRule = domplate(Rep,
         {
             return "CSSMediaRule";
         }
-        else if (rule instanceof window.CSSCharsetRule)
+        else if (window.CSSCharsetRule && rule instanceof window.CSSCharsetRule)
         {
             return "CSSCharsetRule";
         }
@@ -1773,7 +1773,7 @@ FirebugReps.CSSRule = domplate(Rep,
         {
             return rule.media.mediaText;
         }
-        else if (rule instanceof window.CSSCharsetRule)
+        else if (window.CSSCharsetRule && rule instanceof window.CSSCharsetRule)
         {
             return rule.encoding;
         }
@@ -2349,7 +2349,7 @@ FirebugReps.XPathResult = domplate(FirebugReps.Arr,
         // xxxHonza: fix for test console/api/log-xpathresult
         // FirebugReps.Arr.hasSpecialProperties iterates object properties
         // (using Object.getOwnPropertyNames), but misses 'constructor' if the property
-        // is not explicitely accessed before. Any explanation for such behavior?
+        // is not explicitly accessed before. Any explanation for such behavior?
         // (btw. it was actually accessed, but order of 'supportsObject' calls changed when
         // 'Exception' rep moved into its own module, see issue: 6606)
         var ctor = array && array.constructor;
diff --git a/extension/content/firebug/chrome/tabWatcher.js b/extension/content/firebug/chrome/tabWatcher.js
index 6a6cc4be6a..9b87f35ff4 100644
--- a/extension/content/firebug/chrome/tabWatcher.js
+++ b/extension/content/firebug/chrome/tabWatcher.js
@@ -954,7 +954,7 @@ var TabProgressListener = Obj.extend(Http.BaseProgressListener,
             // switching to about:blank tab, see issue 4040
             //
             // 2) But we also want to skip "about:blank" in case a new tab is opened
-            // (new tab is about:blank at the beggining), no context exists and Firebug
+            // (new tab is about:blank at the beginning), no context exists and Firebug
             // is suspended for all contexts, see issue5916
             // There is a workaround for this case in {@TabWatchListener.showContext]
             //
diff --git a/extension/content/firebug/chrome/window.js b/extension/content/firebug/chrome/window.js
index e3b4ab6f41..96831292d2 100644
--- a/extension/content/firebug/chrome/window.js
+++ b/extension/content/firebug/chrome/window.js
@@ -17,7 +17,7 @@ var wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMe
 
 var Win = {};
 
-var window = {};     // these declarations exist to cause errors if we accidently
+var window = {};     // these declarations exist to cause errors if we accidentally
 var document = {};   // reference these globals
 
 // ********************************************************************************************* //
diff --git a/extension/content/firebug/console/autoCompleter.js b/extension/content/firebug/console/autoCompleter.js
index e470c49b11..def277fc84 100644
--- a/extension/content/firebug/console/autoCompleter.js
+++ b/extension/content/firebug/console/autoCompleter.js
@@ -1000,7 +1000,7 @@ JSAutoCompleter.transformScopeOperator = function(expr, fname)
     var search = 0;
     for (;;)
     {
-        // Find the next occurrance of .%.
+        // Find the next occurrence of .%.
         var end = sexpr.indexOf(".%", search);
         if (end === -1)
             break;
@@ -1864,7 +1864,7 @@ function setCompletionsFromObject(out, object, context)
                 // The object is a large array. To avoid RangeErrors from
                 // `target.push.apply` and a slow `Object.getOwnPropertyNames`,
                 // we just skip this level ("length" is also on the prototype,
-                // and numeric property would get hidden later anyway).
+                // and numeric properties would get hidden later anyway).
             }
             else
             {
@@ -2390,6 +2390,14 @@ function autoCompleteEval(context, preExpr, spreExpr, preParsed, spreParsed, opt
             });
         }
 
+        if (!spreExpr)
+        {
+            // For global completions, hide results starting with a digit, since they conflict
+            // with typing numbers. An interested user would type 'window.<name>', anyway.
+            var reValid = /^[^0-9]/;
+            out.completions = out.completions.filter((x) => reValid.test(x));
+        }
+
         // Sort the completions, and avoid duplicates.
         // Note: If we make it possible to show both regular and hidden completions
         // at the same time, completions should shadow hiddenCompletions here.
diff --git a/extension/content/firebug/console/closureInspector.js b/extension/content/firebug/console/closureInspector.js
index 3226f6c9b2..590efcd10d 100644
--- a/extension/content/firebug/console/closureInspector.js
+++ b/extension/content/firebug/console/closureInspector.js
@@ -159,7 +159,7 @@ var ClosureInspector =
         var objGlobal = Cu.getGlobalForObject(obj);
 
         // Do a security check. This is automatic in Fx33+, but do it manually
-        // (with the same error message) for compatiblity with older versions.
+        // (with the same error message) for compatibility with older versions.
         if (win !== objGlobal && !(win.document && objGlobal.document &&
             win.document.nodePrincipal.subsumes(objGlobal.document.nodePrincipal)))
         {
diff --git a/extension/content/firebug/console/commandEditor.js b/extension/content/firebug/console/commandEditor.js
index 8ab0e18274..95c3bb006a 100644
--- a/extension/content/firebug/console/commandEditor.js
+++ b/extension/content/firebug/console/commandEditor.js
@@ -11,13 +11,14 @@ define([
     "firebug/lib/options",
     "firebug/lib/promise",
     "firebug/lib/string",
+    "firebug/lib/devtools",
     "firebug/chrome/module",
     "firebug/chrome/menu",
     "firebug/console/autoCompleter",
     "firebug/console/commandLine",
     "firebug/editor/sourceEditor",
 ],
-function(Firebug, FBTrace, Obj, Events, Dom, Locale, Css, Options, Promise, Str, Module, Menu,
+function(Firebug, FBTrace, Obj, Events, Dom, Locale, Css, Options, Promise, Str, DevTools, Module, Menu,
     AutoCompleter, CommandLine, SourceEditor) {
 
 "use strict";
@@ -352,49 +353,32 @@ var CommandEditor = Obj.extend(Module,
             return;
 
         var worker = getPrettyPrintWorker();
+        if (!worker) {
+          return;
+        }
+
         var id = "firebug-" + Obj.getUniqueId();
         var deferred = Promise.defer();
 
-        var onReply = ({data}) =>
-        {
-            if (data.id !== id)
-                return;
-
-            worker.removeEventListener("message", onReply, false);
-
-            if (data.error)
-            {
-                TraceError.sysout("commandEditor.prettyPrint; ERROR " + data.error, data);
-
-                // Remove stack trace info from the error message (separated by a newline,
-                // see pretty-print-worker.js)
-                var message = Str.safeToString(data.error);
-                var index = message.indexOf("\n");
-                message = message.substr(0, index);
-
-                // Log only an error message into the Console panel.
-                Firebug.Console.logFormatted([message], context, "error", true);
-
-                deferred.reject(data.error);
-            }
-            else
-            {
-                this.setText(data.code);
-
-                deferred.resolve(data.code);
-            }
-        };
-
-        worker.addEventListener("message", onReply, false);
-
-        worker.postMessage({
-            id: id,
-            url: "(command-editor)",
-            indent: Options.get("replaceTabs"),
-            source: this.getText()
+        return worker.performTask("pretty-print", {
+          url: "(command-editor)",
+          indent: Options.get("replaceTabs"),
+          source: this.getText()
+        }).then(data => {
+          this.setText(data.code);
+        }).then(null, error => {
+          TraceError.sysout("commandEditor.prettyPrint; ERROR " + error, error);
+
+          // Remove stack trace info from the error message (separated by a newline,
+          // see pretty-print-worker.js)
+          var message = Str.safeToString(error);
+          var index = message.indexOf("\n");
+          if (index != -1)
+            message = message.substr(0, index);
+
+          // Log only an error message into the Console panel.
+          Firebug.Console.logFormatted([message], context, "error", true);
         });
-
-        return deferred.promise;
     }
 });
 
@@ -522,14 +506,15 @@ function getPrettyPrintWorker()
 {
     if (!prettyPrintWorker)
     {
-        prettyPrintWorker = new ChromeWorker(
-            "resource://gre/modules/devtools/server/actors/pretty-print-worker.js");
+        if (!DevTools.DevToolsWorker)
+          return null;
 
-        prettyPrintWorker.addEventListener("error", ({message, fileName, lineNo}) =>
-        {
-            TraceError.sysout("commandEditor.getPrettyPrintWorker; ERROR " + message +
-                " " + fileName + ":" + lineNo);
-        }, false);
+        prettyPrintWorker = new DevTools.DevToolsWorker(
+            DevTools.prettyPrintWorkerUrl, {
+                name: "pretty-print",
+                verbose: DevTools.DevToolsUtils.dumpn.wantLogging
+            }
+        );
     }
 
     return prettyPrintWorker;
diff --git a/extension/content/firebug/console/commandLineExposed.js b/extension/content/firebug/console/commandLineExposed.js
index f0cdc28c96..4b8ebe5468 100644
--- a/extension/content/firebug/console/commandLineExposed.js
+++ b/extension/content/firebug/console/commandLineExposed.js
@@ -237,8 +237,8 @@ function evaluateInGlobal(context, win, expr, origExpr, onSuccess, onError, opti
 {
     var dbgGlobal = DebuggerLib.getInactiveDebuggeeGlobal(context, win);
     var evalMethod = options.noCmdLineAPI ?
-                     dbgGlobal.evalInGlobal :
-                     dbgGlobal.evalInGlobalWithBindings;
+                     (dbgGlobal.executeInGlobal || dbgGlobal.evalInGlobal) :
+                     (dbgGlobal.executeInGlobalWithBindings || dbgGlobal.evalInGlobalWithBindings);
 
     var args = [dbgGlobal, evalMethod, dbgGlobal];
     args.push.apply(args, arguments);
@@ -489,6 +489,8 @@ function handleException(exc, origExpr, context, onError, dbgGlobal)
     {
         Obj.getPropertyNames(exc).forEach(function(prop)
         {
+            if (prop === '__proto__')
+                return;
             result[prop] = exc[prop];
         });
         result.stack = exc.stack;
@@ -526,8 +528,11 @@ function executeInWindowContext(win, func, args, dbgGlobal)
     var code = "(function() { callback(); })";
     var bindings = Object.create(null);
     bindings.callback = dbgGlobal.makeDebuggeeValue(listener);
-    var listenerInWindow = dbgGlobal.evalInGlobalWithBindings(code, bindings)
-        .return.unsafeDereference();
+    var listenerInWindow = (
+            dbgGlobal.executeInGlobalWithBindings ?
+            dbgGlobal.executeInGlobalWithBindings(code, bindings) :
+            dbgGlobal.evalInGlobalWithBindings(code, bindings)
+        ).return.unsafeDereference();
 
     win.document.addEventListener("firebugCommandLine", listenerInWindow);
 
diff --git a/extension/content/firebug/console/commands/commandLineInclude.js b/extension/content/firebug/console/commands/commandLineInclude.js
index 88091c3e4b..3f3683e454 100644
--- a/extension/content/firebug/console/commands/commandLineInclude.js
+++ b/extension/content/firebug/console/commands/commandLineInclude.js
@@ -15,13 +15,14 @@ define([
     "firebug/lib/system",
     "firebug/lib/xpcom",
     "firebug/lib/object",
+    "firebug/lib/devtools",
     "firebug/chrome/tableRep",
     "firebug/console/console",
     "firebug/editor/editor",
     "firebug/editor/inlineEditor",
 ],
 function(Module, Rep, FirebugReps, Domplate, Locale, Dom, Win, Css, Str, Options, Menu, System,
-    Xpcom, Obj, TableRep, Console, Editor, InlineEditor) {
+    Xpcom, Obj, DevTools, TableRep, Console, Editor, InlineEditor) {
 
 // ********************************************************************************************* //
 // Constants
@@ -37,19 +38,7 @@ var Trace = FBTrace.to("DBG_COMMANDLINE");
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-var ScratchpadManager;
-
-try
-{
-    var scope = {};
-    Cu.import("resource:///modules/devtools/scratchpad-manager.jsm", scope);
-    ScratchpadManager = scope.ScratchpadManager;
-}
-catch(ex)
-{
-    // Scratchpad does not exists (when using Seamonkey ...)
-}
-
+var ScratchpadManager = DevTools.ScratchpadManager;
 var storageScope = {}, StorageService;
 Cu.import("resource://firebug/storageService.js", storageScope);
 StorageService = storageScope.StorageService;
@@ -304,7 +293,7 @@ var CommandLineIncludeRep = domplate(TableRep,
             }
         ];
 
-        if (ScratchpadManager)
+        if (typeof ScratchpadManager.openScratchpad == "function")
         {
             items.push({
                 label: "commandline.label.OpenInScratchpad",
diff --git a/extension/content/firebug/console/console.js b/extension/content/firebug/console/console.js
index 264f727c8b..6947ede84c 100644
--- a/extension/content/firebug/console/console.js
+++ b/extension/content/firebug/console/console.js
@@ -10,6 +10,7 @@ define([
     "firebug/lib/wrapper",
     "firebug/lib/xml",
     "firebug/lib/options",
+    "firebug/lib/devtools",
     "firebug/chrome/window",
     "firebug/chrome/firefox",
     "firebug/chrome/panelNotification",
@@ -21,7 +22,7 @@ define([
     "firebug/dom/domBaseTree",
     "firebug/remoting/debuggerClient",
 ],
-function(Firebug, FBTrace, Obj, Events, Locale, Search, Wrapper, Xml, Options, Win, Firefox,
+function(Firebug, FBTrace, Obj, Events, Locale, Search, Wrapper, Xml, Options, DevTools, Win, Firefox,
     PanelNotification, ActivableModule, ConsoleBase, SourceLink, StackFrame, StackTrace,
     DomBaseTree, DebuggerClient) {
 
@@ -30,12 +31,11 @@ function(Firebug, FBTrace, Obj, Events, Locale, Search, Wrapper, Xml, Options, W
 // ********************************************************************************************* //
 // Constants
 
-var Cu = Components.utils;
-var scope = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-var {ConsoleAPIListener} = scope.devtools.require("devtools/toolkit/webconsole/utils");
+var {ConsoleAPIListener} = DevTools.safeRequire(DevTools.devtools,
+  "devtools/shared/webconsole/utils",
+  "devtools/toolkit/webconsole/utils");
 
-// Note: createDefaultReturnValueInstance() is a local helper (see below).
-var defaultReturnValue = createDefaultReturnValueInstance();
+var defaultReturnValue = Object.preventExtensions(Object.create(null));
 
 var Trace = FBTrace.to("DBG_CONSOLE");
 var TraceError = FBTrace.toError();
@@ -493,27 +493,6 @@ Firebug.ConsoleListener =
     }
 };
 
-// ********************************************************************************************* //
-// Local Helpers
-
-function createDefaultReturnValueInstance()
-{
-    var proto =
-    {
-        __exposedProps__:
-        {
-            "toString": "rw"
-        },
-
-        toString: function()
-        {
-            return undefined;
-        }
-    };
-
-    return Object.preventExtensions(Object.create(proto));
-}
-
 // ********************************************************************************************* //
 // Registration
 
diff --git a/extension/content/firebug/console/errorStackTraceObserver.js b/extension/content/firebug/console/errorStackTraceObserver.js
index c1ef6b0532..f42445d22d 100644
--- a/extension/content/firebug/console/errorStackTraceObserver.js
+++ b/extension/content/firebug/console/errorStackTraceObserver.js
@@ -154,9 +154,17 @@ var ErrorStackTraceObserver = Obj.extend(Module,
             if (!sourceFile)
                 sourceFile = {href: script.url};
 
-            var line = script.getOffsetLine(state.offsets[i]);
-            var args = state.argCopies[i];
+            var line;
+
+            // getOffsetLocation has been introduced in Firefox 44 (Fx44)
+            // https://bugzilla.mozilla.org/show_bug.cgi?id=863089
+            // https://github.com/firebug/firebug/issues/7961
+            if (typeof script.getOffsetLocation == "function")
+                line = script.getOffsetLocation(state.offsets[i]).lineNumber;
+            else
+                line = script.getOffsetLine(state.offsets[i]);
 
+            var args = state.argCopies[i];
             var stackFrame = new StackFrame(sourceFile, line, state.frameNames[i],
                 args, null, 0, context);
             trace.frames.push(stackFrame);
diff --git a/extension/content/firebug/console/functionMonitor.js b/extension/content/firebug/console/functionMonitor.js
index 8988356f5f..537ce6155d 100644
--- a/extension/content/firebug/console/functionMonitor.js
+++ b/extension/content/firebug/console/functionMonitor.js
@@ -123,7 +123,11 @@ var FunctionMonitor = Obj.extend(Module,
         Trace.sysout("functionMonitor.monitorScript; " + script.url + ", " +
             script.startLine);
 
-        var location = {line: script.startLine, url: script.url};
+        var url = script.url;
+        var columnOffsets = script.getAllColumnOffsets();
+        if (!columnOffsets || !columnOffsets.length)
+            return false;
+        var location = {line: columnOffsets[0].lineNumber, url: script.url};
 
         // If the first line of the script contains no code, slide down to
         // the next line that has runnable code.
diff --git a/extension/content/firebug/cookies/cookieObserver.js b/extension/content/firebug/cookies/cookieObserver.js
index 9e0f0a92d8..f76442c947 100644
--- a/extension/content/firebug/cookies/cookieObserver.js
+++ b/extension/content/firebug/cookies/cookieObserver.js
@@ -432,7 +432,7 @@ var CookieObserver = Obj.extend(BaseObserver,
 
     logEvent: function(eventObject, context, className)
     {
-        // xxxHonza: if the cookie is changed befor initContext, the log in
+        // xxxHonza: if the cookie is changed before initContext, the log in
         // console is lost.
         Firebug.Console.log(eventObject, context, className, null, true);
     }
diff --git a/extension/content/firebug/cookies/cookiePanel.js b/extension/content/firebug/cookies/cookiePanel.js
index 3bbe9088cc..5f55ca66bc 100644
--- a/extension/content/firebug/cookies/cookiePanel.js
+++ b/extension/content/firebug/cookies/cookiePanel.js
@@ -499,7 +499,7 @@ CookiePanel.prototype = Obj.extend(ActivablePanel,
 // Cookie Breakpoints
 
 /**
- * @class Represents an {@link Debugger} listener. This listener is reponsible for
+ * @class Represents an {@link Debugger} listener. This listener is responsible for
  * providing a list of cookie breakpoints for the Breakpoints side panel.
  */
 CookieModule.DebuggerListener =
diff --git a/extension/content/firebug/cookies/cookieReps.js b/extension/content/firebug/cookies/cookieReps.js
index 38e4d9cb78..4ab8539efe 100644
--- a/extension/content/firebug/cookies/cookieReps.js
+++ b/extension/content/firebug/cookies/cookieReps.js
@@ -215,7 +215,7 @@ CookieReps.CookieRow = domplate(CookieReps.Rep,
             return "";
 
         // The first character is space so, if the table is sorted according
-        // to this column, all "Session" cookies are displayed at the begining.
+        // to this column, all "Session" cookies are displayed at the beginning.
         if (CookieUtils.isSessionCookie(cookie.cookie))
             return " " + Locale.$STR("cookies.Session");
 
diff --git a/extension/content/firebug/css/computedPanel.js b/extension/content/firebug/css/computedPanel.js
index e69abe8733..5568976bd7 100644
--- a/extension/content/firebug/css/computedPanel.js
+++ b/extension/content/firebug/css/computedPanel.js
@@ -14,6 +14,7 @@ define([
     "firebug/lib/string",
     "firebug/lib/url",
     "firebug/lib/xml",
+    "firebug/lib/devtools",
     "firebug/chrome/menu",
     "firebug/chrome/panel",
     "firebug/css/cssModule",
@@ -22,7 +23,7 @@ define([
     "firebug/debugger/script/sourceLink",
 ],
 function(Firebug, Arr, Css, Dom, Domplate, Events, Locale, Obj, Options, Persist, Str, Url, Xml,
-    Menu, Panel, CSSModule, CSSReps, LoadHandler, SourceLink) {
+    DevTools, Menu, Panel, CSSModule, CSSReps, LoadHandler, SourceLink) {
 
 "use strict";
 
@@ -42,9 +43,10 @@ try
 {
     // Firefox 24
     // waiting for: https://bugzilla.mozilla.org/show_bug.cgi?id=867595
-    var scope = {}
-    Cu.import("resource://gre/modules/devtools/Loader.jsm", scope);
-    var {CssLogic} = scope.devtools.require("devtools/styleinspector/css-logic");
+    var {CssLogic} = DevTools.safeRequire(DevTools.devtools,
+      "devtools/shared/inspector/css-logic",
+      "devtools/shared/styleinspector/css-logic",
+      "devtools/styleinspector/css-logic");
 }
 catch (e)
 {
@@ -668,6 +670,14 @@ CSSComputedPanel.prototype = Obj.extend(Panel,
             if (!cssValue)
                 return false;
 
+            if (cssValue.type === "colorKeyword" || cssValue.type === "gradient")
+            {
+                var currentColor = this.getCurrentColor();
+                cssValue.value = cssValue.value.replace(/currentcolor/gi, currentColor);
+                if (cssValue.value === "")
+                    return false;
+            }
+
             if (cssValue.value == this.infoTipValue)
                 return true;
 
@@ -712,6 +722,12 @@ CSSComputedPanel.prototype = Obj.extend(Panel,
         }
     },
 
+    getCurrentColor: function()
+    {
+        var cs = this.selection.ownerDocument.defaultView.getComputedStyle(this.selection);
+        return cs.getPropertyValue("color");
+    },
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
     // Change Listener
 
diff --git a/extension/content/firebug/css/cssEditor.js b/extension/content/firebug/css/cssEditor.js
index 204b5b9f55..0673861528 100644
--- a/extension/content/firebug/css/cssEditor.js
+++ b/extension/content/firebug/css/cssEditor.js
@@ -248,7 +248,7 @@ CSSEditor.prototype = domplate(InlineEditor.prototype,
             var saveSuccess = (rule.conditionText == value);
             this.box.setAttribute("saveSuccess", saveSuccess);
         }
-        else if (rule instanceof window.CSSCharsetRule)
+        else if (window.CSSCharsetRule && rule instanceof window.CSSCharsetRule)
         {
             target.textContent = value;
 
diff --git a/extension/content/firebug/css/cssPanel.js b/extension/content/firebug/css/cssPanel.js
index b6e9023281..801b5abaf1 100644
--- a/extension/content/firebug/css/cssPanel.js
+++ b/extension/content/firebug/css/cssPanel.js
@@ -485,7 +485,7 @@ Firebug.CSSStyleSheetPanel.prototype = Obj.extend(Panel,
                 {
                     rules.push({tag: CSSReps.CSSImportRuleTag.tag, rule: rule});
                 }
-                else if (rule instanceof window.CSSCharsetRule)
+                else if (window.CSSCharsetRule && rule instanceof window.CSSCharsetRule)
                 {
                     rules.push({tag: CSSReps.CSSCharsetRuleTag.tag, rule: rule});
                 }
@@ -1450,9 +1450,10 @@ Firebug.CSSStyleSheetPanel.prototype = Obj.extend(Panel,
             if (!cssValueInfo)
                 return false;
 
-            if (cssValueInfo.value === "currentcolor")
+            if (cssValueInfo.type === "colorKeyword" || cssValueInfo.type === "gradient")
             {
-                cssValueInfo.value = this.getCurrentColor();
+                var currentColor = this.getCurrentColor();
+                cssValueInfo.value = cssValueInfo.value.replace(/currentcolor/gi, currentColor);
                 if (cssValueInfo.value === "")
                     return false;
             }
diff --git a/extension/content/firebug/debugger/actors/breakpointActor.js b/extension/content/firebug/debugger/actors/breakpointActor.js
index 07af36dc5f..fb850842cd 100644
--- a/extension/content/firebug/debugger/actors/breakpointActor.js
+++ b/extension/content/firebug/debugger/actors/breakpointActor.js
@@ -3,10 +3,11 @@
 define([
     "firebug/lib/object",
     "firebug/lib/trace",
+    "firebug/lib/devtools",
     "firebug/debugger/debuggerLib",
     "firebug/debugger/breakpoints/breakpointStore",
 ],
-function(Obj, FBTrace, DebuggerLib, BreakpointStore) {
+function(Obj, FBTrace, DevTools, DebuggerLib, BreakpointStore) {
 
 "use strict";
 
@@ -21,7 +22,7 @@ function(Obj, FBTrace, DebuggerLib, BreakpointStore) {
 
 var Cu = Components.utils;
 
-Cu["import"]("resource://gre/modules/devtools/dbg-server.jsm");
+var DebuggerServer = DevTools.DebuggerServer;
 
 // xxxHonza: Firefox 32 changes the location of BreakpointActor object,
 // but implements support for server side breakpoint condition evaluation
diff --git a/extension/content/firebug/debugger/actors/elementActor.js b/extension/content/firebug/debugger/actors/elementActor.js
index 4a97780a79..6e929f87d2 100644
--- a/extension/content/firebug/debugger/actors/elementActor.js
+++ b/extension/content/firebug/debugger/actors/elementActor.js
@@ -3,8 +3,9 @@
 define([
     "firebug/lib/object",
     "firebug/lib/trace",
+    "firebug/lib/devtools",
 ],
-function(Obj, FBTrace) {
+function(Obj, FBTrace, DevTools) {
 
 // ********************************************************************************************* //
 // Constants
@@ -13,7 +14,7 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-Cu["import"]("resource://gre/modules/devtools/dbg-server.jsm");
+var DebuggerServer = DevTools.DebuggerServer;
 
 // ********************************************************************************************* //
 // Implementation
diff --git a/extension/content/firebug/debugger/actors/objectActor.js b/extension/content/firebug/debugger/actors/objectActor.js
index 13639cd8b4..b2f5970ec7 100644
--- a/extension/content/firebug/debugger/actors/objectActor.js
+++ b/extension/content/firebug/debugger/actors/objectActor.js
@@ -4,8 +4,9 @@ define([
     "firebug/lib/object",
     "firebug/lib/trace",
     "firebug/lib/options",
+    "firebug/lib/devtools",
 ],
-function(Obj, FBTrace, Options) {
+function(Obj, FBTrace, Options, DevTools) {
 
 // ********************************************************************************************* //
 // Constants
@@ -14,8 +15,7 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-Cu["import"]("resource://gre/modules/devtools/dbg-server.jsm");
-
+var DebuggerServer = DevTools.DebuggerServer;
 var ObjectActor = DebuggerServer.ObjectActor;
 var propMax = Options.get("ObjectShortIteratorMax");
 
diff --git a/extension/content/firebug/debugger/actors/threadActor.js b/extension/content/firebug/debugger/actors/threadActor.js
index d2593e03e3..8d42389080 100644
--- a/extension/content/firebug/debugger/actors/threadActor.js
+++ b/extension/content/firebug/debugger/actors/threadActor.js
@@ -4,9 +4,10 @@ define([
     "firebug/lib/object",
     "firebug/lib/trace",
     "firebug/lib/options",
+    "firebug/lib/devtools",
     "firebug/debugger/actors/elementActor",
 ],
-function(Obj, FBTrace, Options, ElementActor) {
+function(Obj, FBTrace, Options, DevTools, ElementActor) {
 
 // ********************************************************************************************* //
 // Constants
@@ -15,8 +16,7 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-Cu["import"]("resource://gre/modules/devtools/dbg-server.jsm");
-
+var DebuggerServer = DevTools.DebuggerServer;
 var ThreadActor = DebuggerServer.ThreadActor;
 
 // ********************************************************************************************* //
diff --git a/extension/content/firebug/debugger/breakpoints/breakpoint.js b/extension/content/firebug/debugger/breakpoints/breakpoint.js
index 0e66f97c68..da31803158 100644
--- a/extension/content/firebug/debugger/breakpoints/breakpoint.js
+++ b/extension/content/firebug/debugger/breakpoints/breakpoint.js
@@ -7,7 +7,7 @@ function(FBTrace) {
 
 // ********************************************************************************************* //
 
-function Breakpoint(href, lineNumber, disabled,type)
+function Breakpoint(href, lineNumber, disabled, type)
 {
     this.href = href;
     this.lineNo = lineNumber;
diff --git a/extension/content/firebug/debugger/breakpoints/breakpointStore.js b/extension/content/firebug/debugger/breakpoints/breakpointStore.js
index ae6a4a2fdb..5c373ee371 100644
--- a/extension/content/firebug/debugger/breakpoints/breakpointStore.js
+++ b/extension/content/firebug/debugger/breakpoints/breakpointStore.js
@@ -221,7 +221,7 @@ var BreakpointStore = Obj.extend(Module,
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    addBreakpoint: function(url, lineNo, condition, type)
+    addBreakpoint: function(url, lineNo, condition, type, disabled = false)
     {
         type = type || BP_NORMAL;
 
@@ -239,7 +239,7 @@ var BreakpointStore = Obj.extend(Module,
         // will be kept otherwise removed.
         if (condition != null)
         {
-            var bp = new Breakpoint(url, lineNo, false, type);
+            var bp = new Breakpoint(url, lineNo, disabled, type);
             bp.condition = condition;
 
             // We just need to find the actual location of a breakpoint.
@@ -270,7 +270,7 @@ var BreakpointStore = Obj.extend(Module,
             if (!this.breakpoints[url])
                 this.breakpoints[url] = [];
 
-            var bp = new Breakpoint(url, lineNo, false, type);
+            var bp = new Breakpoint(url, lineNo, disabled, type);
             this.breakpoints[url].push(bp);
 
             Trace.sysout("breakpointStore.addBreakpoint; NEW BP: " +
diff --git a/extension/content/firebug/debugger/breakpoints/breakpointTool.js b/extension/content/firebug/debugger/breakpoints/breakpointTool.js
index fb93b78ff7..bcaaf7e11b 100644
--- a/extension/content/firebug/debugger/breakpoints/breakpointTool.js
+++ b/extension/content/firebug/debugger/breakpoints/breakpointTool.js
@@ -95,11 +95,25 @@ BreakpointTool.prototype = Obj.extend(new Tool(),
     {
         Trace.sysout("breakpointTool.onAddBreakpoint; (" + bp.lineNo + ")", bp);
 
+        // Do not create server side actors for disabled breakpoints.
+        if (bp.disabled)
+        {
+          this.dispatch("onBreakpointAdded", [this.context, bp]);
+          Firebug.dispatchEvent(this.context.browser, "onBreakpointAdded", [bp]);
+          return;
+        }
+
         var self = this;
         this.setBreakpoint(bp.href, bp.lineNo, function(response, bpClient)
         {
             Trace.sysout("breakpointTool.onAddBreakpoint; callback executed", response);
 
+            // Protocol change, URL is now stored in the source.
+            // Make a copy to the expected location.
+            if (!bpClient.location.url) {
+              bpClient.location.url = bpClient.source._form.href;
+            }
+
             // Do not log error if it's 'noScript'. It's quite common that breakpoints
             // are set before scripts exists (or no longer exists since garbage collected).
             if (response.error && response.error != "noScript")
@@ -142,7 +156,12 @@ BreakpointTool.prototype = Obj.extend(new Tool(),
             // the UI is properly (and asynchronously) updated everywhere.
             self.dispatch("onBreakpointAdded", [self.context, bp]);
 
-            Firebug.dispatchEvent(self.context.browser, "onBreakpointAdded", [bp]);
+            // Adding breakpoints is asynchronous, it might happen that the
+            // context (and browser) is closed soon than the async process
+            // finishes, so avoid exception.
+            // It would be better to avoid such scenarios.
+            if (self.context.browser)
+                Firebug.dispatchEvent(self.context.browser, "onBreakpointAdded", [bp]);
 
             // The info about the original line should not be needed any more.
             delete bp.params.originLineNo;
@@ -373,18 +392,29 @@ BreakpointTool.prototype = Obj.extend(new Tool(),
             // executed as soon as we receive a response.
             if (!isNormalDisabledBreakpoint(bp))
             {
-                self.context.activeThread.setBreakpoint(location,
-                    self.onSetBreakpoint.bind(self, callback));
+                // The protocol changed in Firefox 36. Setting a breakpoint
+                // is now done through source actor not thread actor.
+                // See also:
+                // https://bugzilla.mozilla.org/show_bug.cgi?id=1105493
+                // https://code.google.com/p/fbug/issues/detail?id=7724
+                var setBreakpoint = self.context.activeThread.setBreakpoint;
+                if (typeof setBreakpoint == "function")
+                {
+                    self.context.activeThread.setBreakpoint(location,
+                        self.onSetBreakpoint.bind(self, callback));
+                }
+                else
+                {
+                    var sourceFile = self.context.getSourceFile(url);
+                    if (sourceFile)
+                    {
+                        let sourceClient = sourceFile.getClient();
+                        sourceClient.setBreakpoint(location, self.onSetBreakpoint.bind(self, callback));
+                    }
+                }
             }
         }
 
-        // If the debuggee is paused, just set the breakpoint.
-        if (thread.paused)
-        {
-            doSetBreakpoint(callback);
-            return;
-        }
-
         // If the previous async-process hasn't finished yet, put arguments in a queue.
         if (this.setBreakpointInProgress)
         {
@@ -397,6 +427,22 @@ BreakpointTool.prototype = Obj.extend(new Tool(),
 
         this.setBreakpointInProgress = true;
 
+        // If the debuggee is paused, just set the breakpoint.
+        if (thread.paused)
+        {
+            doSetBreakpoint(function(response, bpClient)
+            {
+                self.setBreakpointInProgress = false;
+
+                callback(response, bpClient);
+
+                // Set breakpoints waiting in the queue.
+                if (self.queue.length > 0)
+                    self.setBreakpoint.apply(self, self.queue.shift());
+            });
+            return;
+        }
+
         // Otherwise, force a pause in order to set the breakpoint.
         // xxxHonza: this sometimes generates 'alreadyPaused' packet, fix me.
         // Or maybe the interrupt call in setBreakpoints. You need a page with two
@@ -501,10 +547,9 @@ BreakpointTool.prototype = Obj.extend(new Tool(),
             Trace.sysout("breakpointTool.doSetBreakpoints; ", arr);
 
             // Iterate all breakpoints in the given array and set them step by step.
-            // The thread is paused at this point. The following loop generates a set of
-            // 'setBreakpoint' packets that are put in an internal queue (in the underlying
-            // RDP framework) and handled step by step, i.e. the next 'setBreakpoint' packet
-            // is sent as soon as a response for the previous one is received.
+            // The following loop resumes/interrupts the thread for every bp set.
+            // This should be optimized by using Promises (callbacks make this
+            // a lot more complicated).
             for (var i = 0; i < arr.length; i++)
                 self.onAddBreakpoint(arr[i]);
 
diff --git a/extension/content/firebug/debugger/commands.js b/extension/content/firebug/debugger/commands.js
index d0b135883d..00258baa13 100644
--- a/extension/content/firebug/debugger/commands.js
+++ b/extension/content/firebug/debugger/commands.js
@@ -7,12 +7,13 @@ define([
     "firebug/lib/trace",
     "firebug/lib/object",
     "firebug/lib/options",
+    "firebug/lib/devtools",
     "firebug/chrome/module",
     "firebug/debugger/rdp",
     "firebug/debugger/debuggerLib",
     "firebug/debugger/breakpoints/breakpointStore"
 ],
-function(Firebug, FBTrace, Obj, Options, Module, RDP, DebuggerLib, BreakpointStore) {
+function(Firebug, FBTrace, Obj, Options, DevTools, Module, RDP, DebuggerLib, BreakpointStore) {
 
 "use strict";
 
@@ -23,7 +24,7 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-Cu["import"]("resource://gre/modules/devtools/dbg-server.jsm");
+var DebuggerServer = DevTools.DebuggerServer;
 
 var Trace = FBTrace.to("DBG_DEBUGGER_COMMANDS");
 var TraceError = FBTrace.toError();
diff --git a/extension/content/firebug/debugger/debuggerLib.js b/extension/content/firebug/debugger/debuggerLib.js
index ad44984793..486e9af217 100644
--- a/extension/content/firebug/debugger/debuggerLib.js
+++ b/extension/content/firebug/debugger/debuggerLib.js
@@ -43,6 +43,10 @@ DebuggerLib.unwrapDebuggeeValue = function(obj)
     if (typeof obj !== "object" || obj === null)
         return obj;
 
+    if (typeof obj.unsafeDereference != "function") {
+      return;
+    }
+
     return Wrapper.unwrapObject(obj.unsafeDereference());
 };
 
@@ -147,6 +151,17 @@ DebuggerLib.getObject = function(context, actorId)
         if (!actor && threadActor._pausePool)
             actor = threadActor._pausePool.get(actorId);
 
+        // Check also the youngest frame that contains objects
+        // living in the scope.
+        // We could also iterate all frames through: threadActor.framePool,
+        // but it could have an impact on performance since this method
+        // is called quite often. It would have to be tested carefully.
+        if (!actor && threadActor.youngestFrame &&
+            threadActor.youngestFrame.actor &&
+            threadActor.youngestFrame.actor.frameLifetimePool) {
+          actor = threadActor.youngestFrame.actor.frameLifetimePool.get(actorId);
+        }
+
         if (!actor)
             return null;
 
@@ -209,6 +224,11 @@ DebuggerLib.getThreadDebugger = function(context)
  */
 DebuggerLib.getThreadDebuggeeGlobalForContext = function(context, global)
 {
+    // Fx27+; this works even with cross-origin frames.
+    var dbg = DebuggerLib.getThreadDebugger(context);
+    if (dbg && dbg.makeGlobalObjectReference)
+        return dbg.makeGlobalObjectReference(global);
+
     var threadActor = DebuggerLib.getThreadActor(context.browser);
     if (!threadActor || !threadActor.globalDebugObject)
         return null;
@@ -369,6 +389,12 @@ DebuggerLib.isExecutableLine = function(context, location)
         return;
     }
 
+    if (!location.url)
+    {
+        TraceError.sysout("debuggerClient.isExecutableLine; ERROR No URL?");
+        return;
+    }
+
     // Set 'innermost' property to false to get any script that is presented
     // on the specified line (see also issue 7176).
     var query = {
@@ -541,7 +567,9 @@ DebuggerLib.breakNow = function(context)
         // but we might want to change what global to use here.
         var global = context.getCurrentGlobal();
         var dbgGlobal = this.getInactiveDebuggeeGlobal(context, global);
-        return dbgGlobal.evalInGlobal("debugger;");
+        return dbgGlobal.executeInGlobal ?
+            dbgGlobal.executeInGlobal("debugger;") :
+            dbgGlobal.evalInGlobal("debugger;");
     }
 };
 
diff --git a/extension/content/firebug/debugger/debuggerTool.js b/extension/content/firebug/debugger/debuggerTool.js
index f15abfda39..5ee2828867 100644
--- a/extension/content/firebug/debugger/debuggerTool.js
+++ b/extension/content/firebug/debugger/debuggerTool.js
@@ -187,6 +187,11 @@ DebuggerTool.prototype = Obj.extend(new Tool(),
             return doResume(this);
         }
 
+        // Backward compatibility with the protocol (URL is now in the source).
+        if (!packet.frame.where.url) {
+          packet.frame.where.url = packet.frame.where.source.url;
+        }
+
         // See: https://bugzilla.mozilla.org/show_bug.cgi?id=829028
         // Avoid double-break at the same line (e.g. breakpoint + step-over)
 
@@ -303,6 +308,14 @@ DebuggerTool.prototype = Obj.extend(new Tool(),
         // which is stored in the context.
         var frames = this.context.activeThread.cachedFrames;
 
+        // Backward compatibility
+        for (var i=0; i<frames.length; i++)
+        {
+            var frame = frames[i];
+            if (!frame.where.url)
+                frame.where.url = frame.where.source.url;
+        }
+
         Trace.sysout("debuggerTool.framesadded; frames: ", frames);
 
         var trace = StackTrace.buildStackTrace(this.context, frames);
diff --git a/extension/content/firebug/debugger/script/breakNotification.js b/extension/content/firebug/debugger/script/breakNotification.js
index 09ebced48e..c4fb0219fd 100644
--- a/extension/content/firebug/debugger/script/breakNotification.js
+++ b/extension/content/firebug/debugger/script/breakNotification.js
@@ -305,6 +305,8 @@ BreakNotification.prototype = domplate(Rep,
         this.listener.onNotificationShow(this);
         return;
 
+        // xxxSebastian: Code is unreachable, therefore commented out
+        /*
         // Animation
         var self = this;
         var delta = Math.max(3, Math.floor(this.box.clientHeight/5));
@@ -326,6 +328,7 @@ BreakNotification.prototype = domplate(Rep,
         }, 15);
 
         return this.box;
+        */
     },
 
     hide: function()
diff --git a/extension/content/firebug/debugger/script/scriptPanel.js b/extension/content/firebug/debugger/script/scriptPanel.js
index 1643cf5e2a..b7faa071c9 100644
--- a/extension/content/firebug/debugger/script/scriptPanel.js
+++ b/extension/content/firebug/debugger/script/scriptPanel.js
@@ -455,6 +455,12 @@ ScriptPanel.prototype = Obj.extend(BasePanel,
 
     showThisCompilationUnit: function(compilationUnit)
     {
+        if (!compilationUnit.getURL())
+        {
+            TraceError.sysout("scriptPanel.showThisCompilationUnit; no URL?");
+            return false;
+        }
+
         if (compilationUnit.getURL().lastIndexOf("chrome://", 0) === 0)
             return false;
 
@@ -1484,10 +1490,14 @@ ScriptPanel.prototype = Obj.extend(BasePanel,
     toggleDisableBreakpoint: function(line)
     {
         var currentUrl = this.getCurrentURL();
-        // create breakpoint if it doesn't exist
+
         var hasBreakpoint = BreakpointStore.hasBreakpoint(currentUrl, line);
         if (!hasBreakpoint)
-            BreakpointStore.addBreakpoint(currentUrl, line);
+        {
+            // Create disabled breakpoint if it doesn't exist yet and bail out.
+            BreakpointStore.addBreakpoint(currentUrl, line, undefined, undefined, true);
+            return;
+        }
 
         var isDisabled = BreakpointStore.isBreakpointDisabled(currentUrl, line);
         if (isDisabled)
@@ -1751,8 +1761,6 @@ ScriptPanel.prototype = Obj.extend(BasePanel,
         // before the ScriptPanel is initialized and adds itself to the DebuggerTool
         // as a listener.
 
-        Trace.sysout("scriptPanel.newSource; " + sourceFile.href, sourceFile);
-
         // New script has been appended, update the default location if necessary.
         // xxxHonza: Do not use this.navigate() method since it would fire "onPanelNavigate"
         // event and cause {@linke NavigationHistory} to be updated (issue 6950).
@@ -1764,7 +1772,7 @@ ScriptPanel.prototype = Obj.extend(BasePanel,
             this.location = this.getDefaultLocation();
 
             Trace.sysout("scriptPanel.newSource; this.location.getURL() = " +
-                this.location.getURL());
+                (this.location ? this.location.getURL() : "no url"));
 
             this.updateLocation(this.location);
             Firebug.chrome.syncLocationList();
@@ -1826,7 +1834,7 @@ ScriptPanel.prototype = Obj.extend(BasePanel,
 
         function failure(result, context)
         {
-            // We are mostly not interested in this evaluation error. It just polutes
+            // We are mostly not interested in this evaluation error. It just pollutes
             // the tracing console.
             // Trace.sysout("scriptPanel.populateInfoTip; ERROR " + result, result);
 
diff --git a/extension/content/firebug/debugger/script/scriptPanelWarning.js b/extension/content/firebug/debugger/script/scriptPanelWarning.js
index f2d4e58806..c48f4c74d8 100644
--- a/extension/content/firebug/debugger/script/scriptPanelWarning.js
+++ b/extension/content/firebug/debugger/script/scriptPanelWarning.js
@@ -222,6 +222,13 @@ var ScriptPanelWarning =
 
     showWarning: function(panel)
     {
+        if (!panel.context.window)
+        {
+            TraceError.sysout("scriptPanelWarning.showWarning; ERROR " +
+                "no window!", panel.context);
+            return;
+        }
+
         var location = panel.getDefaultLocation();
         var jsEnabled = Options.getPref("javascript", "enabled");
         var activitySuspended = this.isActivitySuspended();
diff --git a/extension/content/firebug/debugger/script/sourceFile.js b/extension/content/firebug/debugger/script/sourceFile.js
index 69f0aa2874..dea9d2f416 100644
--- a/extension/content/firebug/debugger/script/sourceFile.js
+++ b/extension/content/firebug/debugger/script/sourceFile.js
@@ -242,6 +242,11 @@ SourceFile.prototype =
     getSourceLink: function()
     {
         return new SourceLink(this.href, null, "js");
+    },
+
+    getClient: function()
+    {
+        return this.context.activeThread.source(this);
     }
 }
 
diff --git a/extension/content/firebug/debugger/script/sourceTool.js b/extension/content/firebug/debugger/script/sourceTool.js
index 6b271e2b9c..813b291d7a 100644
--- a/extension/content/firebug/debugger/script/sourceTool.js
+++ b/extension/content/firebug/debugger/script/sourceTool.js
@@ -77,6 +77,7 @@ var dynamicTypesMap = {
 function SourceTool(context)
 {
     this.context = context;
+    this.ignoreDynamicScripts = Options.get("ignoreDynamicScripts");
 }
 
 /**
@@ -154,13 +155,23 @@ SourceTool.prototype = Obj.extend(new Tool(),
     {
         // Ignore scripts generated from 'clientEvaluate' packets. These scripts are
         // created e.g. as the user is evaluating expressions in the watch window.
-        if (DebuggerLib.isFrameLocationEval(script.url))
+        if (script.introductionType === "debugger eval" ||
+            DebuggerLib.isFrameLocationEval(script.url))
         {
             Trace.sysout("sourceTool.addScript; A script ignored " + script.type +
                 ", " + script.url, script);
             return;
         }
 
+        // Reject dynamic scripts if the option to listen them is turned off.
+        if (this.ignoreDynamicScripts &&
+            dynamicTypesMap[script.introductionType] &&
+            script.introductionType !== "scriptElement") {
+            Trace.sysout("sourceTool.updateScriptFiles; dynamic script introduced and " +
+                "ignored as the user set the preference \"ignoreDynamicScripts\" to true");
+            return;
+        }
+
         // xxxHonza: Ignore inner scripts for now
         if (this.context.getSourceFile(script.url))
         {
@@ -168,6 +179,10 @@ SourceTool.prototype = Obj.extend(new Tool(),
             return;
         }
 
+        // There is no URL for e.g. event handler scripts.
+        if (!script.url)
+          script.url = this.context.getName() + "@" + script.actor;
+
         // Create a source file and append it into the context. This is the only
         // place where an instance of {@link SourceFile} is created.
         var sourceFile = new SourceFile(this.context, script.actor, script.url,
@@ -308,6 +323,9 @@ DynamicSourceCollector.prototype =
 {
     attach: function()
     {
+        if (this.sourceTool.ignoreDynamicScripts)
+            return;
+
         var dbg = DebuggerLib.getThreadDebugger(this.context);
 
         // Monkey patch the current debugger.
@@ -522,8 +540,13 @@ DynamicSourceCollector.prototype =
     restoreBreakpoints: function(script)
     {
         var threadActor = DebuggerLib.getThreadActor(this.context.browser);
-        if (!threadActor._allowSource(script.url))
+        if (!allowSource(threadActor, script)) {
             return false;
+        }
+
+        // Firefox 38 removes the breakpointStore
+        if (!threadActor.breakpointStore)
+          return false;
 
         var endLine = script.startLine + script.lineCount - 1;
         for (var bp of threadActor.breakpointStore.findBreakpoints({url: script.url}))
@@ -792,7 +815,7 @@ function computeDynamicUrl(script, context)
     // Workaround for issue 7521. Make sure dynamic scripts always have
     // unique URL if the source differs.
     // It solves the problem where eval on the same location (i.e. wrapped
-    // within a fucntion) is used to generate different scripts.
+    // within a function) is used to generate different scripts.
     var sourceFile = context.getSourceFile(uniqueUrl);
     if (sourceFile)
     {
@@ -857,6 +880,12 @@ function getElementId(script)
     return Xpath.getElementTreeXPath(element) + " " + attrName;
 }
 
+function allowSource(threadActor, script) {
+    return threadActor._allowSource ?
+        threadActor._allowSource(script.url) :
+        threadActor.sources.allowSource(script.source);
+}
+
 // ********************************************************************************************* //
 // Registration
 
diff --git a/extension/content/firebug/debugger/stack/stackFrame.js b/extension/content/firebug/debugger/stack/stackFrame.js
index dd02163981..0dd7db77a7 100644
--- a/extension/content/firebug/debugger/stack/stackFrame.js
+++ b/extension/content/firebug/debugger/stack/stackFrame.js
@@ -198,9 +198,13 @@ StackFrame.buildStackFrame = function(frame, context)
         return;
     }
 
-    var sourceFile = context.getSourceFile(frame.where.url);
+    // The packet structure changed, make sure to read the URL
+    // from expected location.
+    var url = frame.where.source ? frame.where.source.url : frame.where.url;
+
+    var sourceFile = context.getSourceFile(url);
     if (!sourceFile)
-        sourceFile = {href: frame.where.url};
+        sourceFile = {href: url};
 
     var args = [];
     var bindings = frame.environment.bindings;
@@ -350,7 +354,7 @@ StackFrame.removeChromeFrames = function(trace)
     for (var i = 0; i < frames.length; i++)
     {
         var href = frames[i].href;
-        if (href.startsWith("chrome:") || href.startsWith("resource:"))
+        if (!href || href.startsWith("chrome:") || href.startsWith("resource:"))
             continue;
 
         // xxxFlorent: should be reverted if we integrate
diff --git a/extension/content/firebug/editor/sourceEditor.js b/extension/content/firebug/editor/sourceEditor.js
index f662ba14ed..f8295c2659 100644
--- a/extension/content/firebug/editor/sourceEditor.js
+++ b/extension/content/firebug/editor/sourceEditor.js
@@ -290,6 +290,18 @@ SourceEditor.prototype =
     // Event Listeners
 
     addEventListener: function(type, handler)
+    {
+      try
+      {
+          this.addEventListenerInternal(type, handler);
+      }
+      catch (err)
+      {
+          TraceError.sysout("sourceEditor.addEventListener; ERROR " + err, err);
+      }
+    },
+
+    addEventListenerInternal: function(type, handler)
     {
         Trace.sysout("sourceEditor.addEventListener; " + type);
 
diff --git a/extension/content/firebug/firebugui/codemirror.css b/extension/content/firebug/firebugui/codemirror.css
index 23eaf74d44..3fb2f5653a 100644
--- a/extension/content/firebug/firebugui/codemirror.css
+++ b/extension/content/firebug/firebugui/codemirror.css
@@ -126,7 +126,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 }
 
 /* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actuall scrolling happens, thus preventing shaking and
+   before actual scrolling happens, thus preventing shaking and
    flickering artifacts. */
 .CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
   position: absolute;
diff --git a/extension/content/firebug/firefox/browserMenu.js b/extension/content/firebug/firefox/browserMenu.js
index 23b597dced..53b586b11c 100644
--- a/extension/content/firebug/firefox/browserMenu.js
+++ b/extension/content/firebug/firefox/browserMenu.js
@@ -436,15 +436,17 @@ var BrowserMenu =
     overlayFirefoxMenu: function(doc)
     {
         // Firefox page context menu
-        $menupopupOverlay(doc, $(doc, "contentAreaContextMenu"), [
-            $menuseparator(doc),
-            $menuitem(doc, {
-                id: "menu_firebug_firebugInspect",
-                label: "firebug.InspectElementWithFirebug",
-                command: "cmd_firebug_inspect",
-                "class": "menuitem-iconic"
-            })
-        ]);
+        if (!this.browserOverlay.isMultiprocessEnabled()) {
+            $menupopupOverlay(doc, $(doc, "contentAreaContextMenu"), [
+                $menuseparator(doc),
+                $menuitem(doc, {
+                    id: "menu_firebug_firebugInspect",
+                    label: "firebug.InspectElementWithFirebug",
+                    command: "cmd_firebug_inspect",
+                    "class": "menuitem-iconic"
+                })
+            ]);
+        }
 
         // Firefox view menu
         $menupopupOverlay(doc, $(doc, "menu_viewPopup"),
diff --git a/extension/content/firebug/firefox/browserOverlay.css b/extension/content/firebug/firefox/browserOverlay.css
index 89904ac131..ed67e15991 100644
--- a/extension/content/firebug/firefox/browserOverlay.css
+++ b/extension/content/firebug/firefox/browserOverlay.css
@@ -200,6 +200,10 @@ fbMultiprocessNotificationPanel {
     -moz-binding: url("chrome://firebug/content/firefox/multiprocessNotificationPanel.xml#panel");
 }
 
+fbNewMultiprocessNotificationPanel {
+    -moz-binding: url("chrome://firebug/content/firefox/newMultiprocessNotificationPanel.xml#panel");
+}
+
 fbAuroraNotificationPanel {
     -moz-binding: url("chrome://firebug/content/firefox/auroraNotificationPanel.xml#panel");
 }
@@ -210,12 +214,30 @@ fbUpgradeNotificationPanel {
 
 fbUpgradeNotificationPanel .iconbox,
 fbAuroraNotificationPanel .iconbox,
+fbNewMultiprocessNotificationPanel .iconbox,
 fbMultiprocessNotificationPanel .iconbox {
     padding-right: 10px;
 }
 
+fbNewMultiprocessNotificationPanel .closeButton {
+    background-image: url(chrome://firebug/skin/mac/close.svg);
+    width: 13px;
+    height: 13px;
+    border: none;
+    cursor: pointer;
+}
+
+fbNewMultiprocessNotificationPanel .closeButton:hover {
+    filter: url(resource://firebugui/filters.svg#darken);
+}
+
+fbNewMultiprocessNotificationPanel .closeButton:active {
+    filter: url(resource://firebugui/filters.svg#deepDarken);
+}
+
 fbUpgradeNotificationPanel .desc,
 fbAuroraNotificationPanel .desc,
+fbNewMultiprocessNotificationPanel .desc,
 fbMultiprocessNotificationPanel .desc {
     max-width: 300px;
 }
@@ -225,24 +247,29 @@ fbUpgradeNotificationPanel .title {
     font-size: 16px;
 }
 
+fbNewMultiprocessNotificationPanel .warn,
 fbMultiprocessNotificationPanel .warn {
     max-width: 275px;
 }
 
+fbNewMultiprocessNotificationPanel .warn,
 fbMultiprocessNotificationPanel .warn {
     color: gray;
 }
 
+fbNewMultiprocessNotificationPanel .warningbox,
 fbMultiprocessNotificationPanel .warningbox {
     margin-top: 15px;
 }
 
+fbNewMultiprocessNotificationPanel .warningicon,
 fbMultiprocessNotificationPanel .warningicon {
     margin-right: 4px;
 }
 
 fbUpgradeNotificationPanel .progress,
 fbAuroraNotificationPanel .progress,
+fbNewMultiprocessNotificationPanel .progress,
 fbMultiprocessNotificationPanel .progress {
     margin: 8px;
 }
diff --git a/extension/content/firebug/firefox/browserOverlay.js b/extension/content/firebug/firefox/browserOverlay.js
index b75d514e2d..67e6617a93 100644
--- a/extension/content/firebug/firefox/browserOverlay.js
+++ b/extension/content/firebug/firefox/browserOverlay.js
@@ -13,9 +13,11 @@ define([
     "firebug/firefox/browserMenu",
     "firebug/firefox/browserToolbar",
     "firebug/lib/system",
+    "firebug/lib/devtools",
+    "firebug/lib/channel",
 ],
 function(FBTrace, Options, Locale, Events, Arr, Str, Xpcom, BrowserOverlayLib,
-    BrowserCommands, BrowserMenu, BrowserToolbar, System) {
+    BrowserCommands, BrowserMenu, BrowserToolbar, System, DevTools, Channel) {
 
 // ********************************************************************************************* //
 // Constants
@@ -150,13 +152,18 @@ BrowserOverlay.prototype =
     {
         // Special case for e10s enabled browser.
         if (this.isMultiprocessEnabled()) {
+            this.showNewMultiprocessNotification();
+            return;
+        }
+
+        /*if (this.isMultiprocessEnabled()) {
             this.showMultiprocessNotification();
             return;
         }
         else if (this.isAuroraChannel()) {
             this.showAuroraNotification();
             return;
-        }
+        }*/
 
         if (this.win.Firebug.waitingForFirstLoad)
             return;
@@ -439,9 +446,10 @@ BrowserOverlay.prototype =
     getVersion: function()
     {
         var versionURL = "chrome://firebug/content/branch.properties";
-        var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
 
-        var channel = ioService.newChannel(versionURL, null, null);
+        var loadingPrincipal = servicesScope.Services.scriptSecurityManager.getSystemPrincipal();
+
+        var channel = Channel.new(versionURL);
         var input = channel.open();
         var sis = Cc["@mozilla.org/scriptableinputstream;1"].
             createInstance(Ci.nsIScriptableInputStream);
@@ -580,7 +588,7 @@ BrowserOverlay.prototype =
         var version = this.getVersion();
         var url = firstRunPage + version;
 
-        var browser = win.gBrowser;
+        var browser = win.gBrowser || win.getBrowser();
         if (!browser)
         {
             FBTrace.sysout("browserOverlay.openFirstRunPage; ERROR there is no gBrowser!");
@@ -635,7 +643,8 @@ BrowserOverlay.prototype =
         if (content.mCurrentBrowser.isRemoteBrowser)
           return true;
 
-        if (this.win.gBrowser.isRemoteBrowser)
+        var browser = this.win.gBrowser || this.win.getBrowser();
+        if (browser.isRemoteBrowser)
           return true;
 
         if (servicesScope.Services.appinfo.browserTabsRemoteAutostart)
@@ -747,6 +756,47 @@ BrowserOverlay.prototype =
         panel.open();
     },
 
+    showNewMultiprocessNotification: function()
+    {
+        if (Options.get("noMultiprocessMessage"))
+        {
+          this.toggleDevTools();
+          return;
+        }
+
+        this.oldTheme = Options.getPref("devtools", "theme");
+        this.oldTheme = (this.oldTheme == "firebug") ? "light" : this.oldTheme;
+        this.domPanelWasEnabled = Options.getPref("devtools", "dom.enabled");
+
+        var popupSet = $(this.doc, "mainPopupSet");
+        var panel = this.doc.querySelector("fbNewMultiprocessNotificationPanel");
+        if (!panel)
+        {
+            panel = this.doc.createElement("fbNewMultiprocessNotificationPanel");
+            panel.setAttribute("opendevtoolscommand", "Firebug.browserOverlay.onOpenDevTools(event, 'fbMultiprocessNotificationPanel')");
+            panel.setAttribute("disablecommand", "Firebug.browserOverlay.onDisableE10s(event)");
+            panel.setAttribute("activatefirebugtheme", "Firebug.browserOverlay.onActivateFirebugTheme(event)");
+
+            popupSet.appendChild(panel);
+        }
+
+        let firebugTheme = Options.get("activateFirebugTheme");
+        panel.firebugTheme.checked = firebugTheme;
+
+        //panel.notAgain.checked = false;
+
+        if (firebugTheme)
+        {
+            this.activateFirebugTheme("firebug");
+            this.enableDomPanel(true);
+        }
+
+        panel.internationalize(Locale);
+        panel.open();
+
+        this.toggleDevTools(true);
+    },
+
     onDisableE10s: function(event)
     {
       Events.cancelEvent(event);
@@ -756,9 +806,82 @@ BrowserOverlay.prototype =
       Options.setPref("browser.tabs", "remote.autostart", false);
       Options.setPref("browser.tabs", "remote.autostart.1", false);
 
+      var panel = this.doc.querySelector("fbNewMultiprocessNotificationPanel");
+      //Options.set("noMultiprocessMessage", panel.notAgain.checked);
+      Options.set("noMultiprocessMessage", true);
+
       restartFirefox();
     },
 
+    onOpenDevTools: function(event)
+    {
+      Events.cancelEvent(event);
+
+      var panel = this.doc.querySelector("fbNewMultiprocessNotificationPanel");
+      //Options.set("noMultiprocessMessage", panel.notAgain.checked);
+      Options.set("noMultiprocessMessage", true);
+
+      panel.close();
+    },
+
+    onActivateFirebugTheme: function(event) {
+      var panel = this.doc.querySelector("fbNewMultiprocessNotificationPanel");
+      var newTheme = panel.firebugTheme.checked ? "firebug" : this.oldTheme;
+
+      // Remember state of the checkbox.
+      Options.set("activateFirebugTheme", panel.firebugTheme.checked);
+
+      // Activate/deactivate Firebug theme.
+      this.activateFirebugTheme(newTheme);
+
+      // When Firebug theme is activated show also the DOM panel.
+      this.enableDomPanel(panel.firebugTheme.checked);
+    },
+
+    activateFirebugTheme: function(newTheme) {
+      var oldTheme = Options.getPref("devtools", "theme");
+
+      Options.setPref("devtools", "theme", newTheme);
+
+      let data = {
+        pref: "devtools.theme",
+        newValue: newTheme,
+        oldValue: oldTheme
+      };
+
+      DevTools.gDevTools.emit("pref-changed", data);
+    },
+
+    enableDomPanel: function(enable) {
+      var enableDomPanel = enable ? true : this.domPanelWasEnabled;
+      var currValue = Options.getPref("devtools", "dom.enabled");
+      if (currValue == enableDomPanel) {
+        return;
+      }
+
+      Options.setPref("devtools", "dom.enabled", enableDomPanel);
+
+      if (enableDomPanel) {
+        DevTools.gDevTools.emit("tool-registered", "dom");
+      } else {
+        let toolDefinition = DevTools.gDevTools._tools.get("dom");
+        DevTools.gDevTools.emit("tool-unregistered", toolDefinition);
+      }
+    },
+
+    toggleDevTools: function(forceOpen) {
+      var toolbox = getToolbox(this.win);
+      if (toolbox && forceOpen) {
+        return;
+      }
+
+      if (toolbox) {
+        destroyToolbox(this.win);
+      } else {
+        showToolbox(this.win);
+      }
+    },
+
     onUpgradeFirebug: function(event, panelId)
     {
         Events.cancelEvent(event);
@@ -851,6 +974,8 @@ BrowserOverlay.prototype =
     },
 };
 
+// Helpers
+
 function findFirebugUpdate(callback)
 {
     var xhr = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance();
@@ -891,11 +1016,41 @@ function findFirebugUpdate(callback)
     xhr.send(null);
 }
 
-function restartFirefox() {
+function restartFirefox()
+{
     Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup).
         quit(Ci.nsIAppStartup.eRestart | Ci.nsIAppStartup.eAttemptQuit);
 }
 
+function getCurrentTab(win)
+{
+    let browserDoc = win.top.document;
+    let browser = browserDoc.getElementById("content");
+    return browser.selectedTab;
+}
+
+function showToolbox(win)
+{
+    let tab = getCurrentTab(win);
+    let target = DevTools.devtools.TargetFactory.forTab(tab);
+    return DevTools.gDevTools.showToolbox(target);
+}
+
+function destroyToolbox(win)
+{
+    let toolbox = getToolbox(win);
+    if (toolbox) {
+      return toolbox.destroy();
+    }
+}
+
+function getToolbox(win)
+{
+    let tab = getCurrentTab(win);
+    let target = DevTools.devtools.TargetFactory.forTab(tab);
+    return DevTools.gDevTools.getToolbox(target);
+}
+
 // ********************************************************************************************* //
 // Registration
 
diff --git a/extension/content/firebug/firefox/external-editors/editors.js b/extension/content/firebug/firefox/external-editors/editors.js
index 80c3b992d8..7860ade017 100644
--- a/extension/content/firebug/firefox/external-editors/editors.js
+++ b/extension/content/firebug/firefox/external-editors/editors.js
@@ -211,7 +211,7 @@ EditorManager.prototype =
 
         try
         {
-            var editors = this._data.map(function(x) x.id);
+            var editors = this._data.map(x => x.id);
             prefs.setCharPref(this._prefName, editors.join(","));
         }
         catch (exc)
diff --git a/extension/content/firebug/firefox/newMultiprocessNotificationPanel.xml b/extension/content/firebug/firefox/newMultiprocessNotificationPanel.xml
new file mode 100644
index 0000000000..53b04db771
--- /dev/null
+++ b/extension/content/firebug/firefox/newMultiprocessNotificationPanel.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<!-- See license.txt for terms of usage -->
+
+<bindings xmlns="http://www.mozilla.org/xbl"
+    xmlns:xbl="http://www.mozilla.org/xbl"
+    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    xmlns:html="http://www.w3.org/1999/xhtml">
+
+<binding id="panel">
+    <resources>
+      <stylesheet src="chrome://global/skin/notification.css"/>
+    </resources>
+    <content>
+        <xul:panel anonid="panel" norestorefocus="true" noautofocus="true"
+            ignorekeys="true" role="presentation" type="arrow" class="panel">
+            <xul:hbox>
+               <xul:vbox class="iconbox">
+                   <xul:image src="chrome://firebug/skin/firebug64.png"/>
+               </xul:vbox>
+               <xul:vbox>
+                    <xul:hbox class="warningbox"></xul:hbox>
+
+                    <xul:description anonid="desc" class="desc" />
+
+                    <xul:hbox class="warningbox"></xul:hbox>
+
+                    <xul:label anonid="learnMore"
+                        class="text-link popup-notification-learnmore-link learnMore"
+                        href="https://getfirebug.com/unifying-firebug-and-firefox-devtools"/>
+
+                    <xul:hbox class="warningbox"></xul:hbox>
+
+                    <xul:description anonid="desc3" class="desc" />
+
+                    <xul:hbox class="warningbox">
+                        <xul:vbox>
+                            <xul:checkbox anonid="firebugTheme" checked="true"
+                                xbl:inherits="oncommand=activatefirebugtheme" />
+                        </xul:vbox>
+                    </xul:hbox>
+
+                    <!-- <xul:hbox class="warningbox">
+                        <xul:vbox>
+                            <xul:checkbox anonid="notAgain" checked="false" />
+                        </xul:vbox>
+                    </xul:hbox> -->
+
+                    <xul:hbox class="warningbox" style="height: 10px;"></xul:hbox>
+
+                    <xul:hbox align="right">
+                        <xul:progressmeter anonid="progress" class="progress"
+                            mode="determined" value="0" collapsed="true"/>
+                        <xul:spacer width="20px" />
+                        <xul:button anonid="opendevtools" type="menu-button"
+                            xbl:inherits="oncommand=opendevtoolscommand"
+                            class="popup-notification-menubutton">
+                            <xul:menupopup>
+                                <xul:menuitem anonid="disable"
+                                    xbl:inherits="oncommand=disablecommand"/>
+                            </xul:menupopup>
+                        </xul:button>
+                    </xul:hbox>
+                </xul:vbox>
+                <xul:vbox>
+                    <xul:image class="closeButton" anonid="closeButton"/>
+                </xul:vbox>
+             </xul:hbox>
+        </xul:panel>
+    </content>
+
+    <implementation>
+        <constructor><![CDATA[
+        ]]></constructor>
+
+        <method name="internationalize">
+            <parameter name="Locale" />
+            <body><![CDATA[
+                var desc = document.getAnonymousElementByAttribute(this, "anonid", "desc");
+                desc.textContent = Locale.$STR("multiprocess.description");
+
+                var desc3 = document.getAnonymousElementByAttribute(this, "anonid", "desc3");
+                desc3.textContent = Locale.$STR("multiprocess.description3");
+
+                var learnMore = document.getAnonymousElementByAttribute(this, "anonid", "learnMore");
+                learnMore.textContent = Locale.$STR("multiprocess.learnMore");
+
+                //var notAgain = document.getAnonymousElementByAttribute(this, "anonid", "notAgain");
+                //notAgain.label = Locale.$STR("multiprocess.notAgain");
+
+                var openDevToolsButton = document.getAnonymousElementByAttribute(this, "anonid", "opendevtools");
+                openDevToolsButton.label = Locale.$STR("multiprocess.openDevTools");
+
+                var disableMenu = document.getAnonymousElementByAttribute(this, "anonid", "disable");
+                disableMenu.label = Locale.$STR("multiprocess.disable");
+
+                this.firebugTheme.label = Locale.$STR("multiprocess.activateFirebugTheme");
+
+                var closeButton = document.getAnonymousElementByAttribute(this, "anonid", "closeButton");
+                closeButton.addEventListener('click', this.close.bind(this), false);
+            ]]></body>
+        </method>
+
+        <method name="open">
+            <body><![CDATA[
+                var offsetY = 0;
+                var offsetX = 0;
+                var target = document.getElementById("nav-bar-customization-target");
+
+                var startButton = document.getElementById("firebug-button");
+                if (startButton) {
+                    var style = document.defaultView.getComputedStyle(startButton.button);
+                    offsetY = parseInt(style["padding-bottom"]);
+                    offsetX = parseInt(style["width"])/2;
+                    target = startButton.button;
+                }
+
+                var panel = document.getAnonymousElementByAttribute(this, "anonid", "panel");
+                panel.openPopup(target, "after_end", -offsetX, -offsetY, false, false);
+            ]]></body>
+        </method>
+
+        <method name="close">
+            <body><![CDATA[
+                var panel = document.getAnonymousElementByAttribute(this, "anonid", "panel");
+                panel.hidePopup();
+            ]]></body>
+        </method>
+
+        <property name="openDevToolsButton">
+            <getter><![CDATA[
+                return document.getAnonymousElementByAttribute(this, "anonid", "opendevtools");
+            ]]></getter>
+        </property>
+
+        <property name="notAgain">
+            <getter><![CDATA[
+                return document.getAnonymousElementByAttribute(this, "anonid", "notAgain");
+            ]]></getter>
+        </property>
+
+        <property name="firebugTheme">
+            <getter><![CDATA[
+                return document.getAnonymousElementByAttribute(this, "anonid", "firebugTheme");
+            ]]></getter>
+        </property>
+    </implementation>
+</binding>
+</bindings>
diff --git a/extension/content/firebug/html/eventsPanel.js b/extension/content/firebug/html/eventsPanel.js
index de2ae8231a..966efb9467 100644
--- a/extension/content/firebug/html/eventsPanel.js
+++ b/extension/content/firebug/html/eventsPanel.js
@@ -260,7 +260,7 @@ EventsPanel.prototype = Obj.extend(Firebug.Panel,
             return null;
         try
         {
-            // Pattern match on the occurance of '<minified name>.event.<funcName>.apply'.
+            // Pattern match on the occurrence of '<minified name>.event.<funcName>.apply'.
             var matches = /\b([a-zA-Z_$][a-zA-Z0-9_$]*)\.event\.(dispatch|handle)\.apply/.exec(src);
             var jqName = (matches && matches[1]) || "";
             dbgEnv = dbgEnv.find(jqName);
@@ -406,7 +406,7 @@ EventsPanel.prototype = Obj.extend(Firebug.Panel,
     getListeners: function(target)
     {
         var normal = this.getNormalEventListeners(target);
-        var disabled = this.getDisabledMap(this.context).get(target, []);
+        var disabled = this.getDisabledMap(this.context).get(target) || [];
 
         // Try to insert the disabled listeners at their previous positions. This will be
         // wrong in case listeners have been removed since those positions were recorded,
diff --git a/extension/content/firebug/html/htmlModule.js b/extension/content/firebug/html/htmlModule.js
index dbafb424a5..5a731eacc8 100644
--- a/extension/content/firebug/html/htmlModule.js
+++ b/extension/content/firebug/html/htmlModule.js
@@ -102,7 +102,7 @@ var HTMLModule = Obj.extend(Module,
 // Mutation Breakpoints
 
 /**
- * @class Represents {@link Firebug.Debugger} listener. This listener is reponsible for
+ * @class Represents {@link Firebug.Debugger} listener. This listener is responsible for
  * providing a list of mutation-breakpoints into the Breakpoints side-panel.
  */
 HTMLModule.DebuggerListener =
diff --git a/extension/content/firebug/html/inspector.js b/extension/content/firebug/html/inspector.js
index 5c0a62ce1c..716e298c5b 100644
--- a/extension/content/firebug/html/inspector.js
+++ b/extension/content/firebug/html/inspector.js
@@ -1501,7 +1501,7 @@ function attachStyles(context, doc)
         highlightStyleCache.set(doc, style);
     }
 
-    // Cater for the possiblity that someone might have removed our stylesheet.
+    // Cater for the possibility that someone might have removed our stylesheet.
     if (!style.parentNode)
         Css.addStyleSheet(doc, style);
 }
diff --git a/extension/content/firebug/lib/channel.js b/extension/content/firebug/lib/channel.js
new file mode 100644
index 0000000000..1139e42a0a
--- /dev/null
+++ b/extension/content/firebug/lib/channel.js
@@ -0,0 +1,46 @@
+/* See license.txt for terms of usage */
+
+define([
+],
+function() {
+
+"use strict";
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+var appInfo = Cc["@mozilla.org/xre/app-info;1"]
+    .getService(Ci.nsIXULAppInfo);
+var versionComparator = Cc["@mozilla.org/xpcom/version-comparator;1"]
+    .getService(Ci.nsIVersionComparator);
+var fx47OrEarlier = (versionComparator.compare(appInfo.version, "47a1") < 0);
+
+const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+
+Cu.import("resource://gre/modules/NetUtil.jsm");
+
+// ********************************************************************************************* //
+// Module
+
+var Channel = {};
+
+Channel.new = function(url)
+{
+    if (fx47OrEarlier)
+    {
+        return ioService.newChannel(url, null, null);
+    }
+    else
+    {
+      return NetUtil.newChannel({
+          uri: url,
+          loadUsingSystemPrincipal: true
+      });
+    }
+}
+
+return Channel;
+
+// ********************************************************************************************* //
+});
diff --git a/extension/content/firebug/lib/css.js b/extension/content/firebug/lib/css.js
index c2d4988483..87a30e4c4e 100644
--- a/extension/content/firebug/lib/css.js
+++ b/extension/content/firebug/lib/css.js
@@ -1202,6 +1202,7 @@ Css.unitlessProperties =
     "font-weight": 1,
     "line-height": 1,
     "opacity": 1,
+    "order": 1,
     "orphans": 1,
     "widows": 1,
     "z-index": 1,
@@ -1254,7 +1255,6 @@ Css.cssKeywords =
 
     "boxModels":
     [
-        "padding-box",
         "border-box",
         "content-box"
     ],
@@ -1458,10 +1458,12 @@ Css.cssKeywords =
     [
         "matrix()",
         "matrix3d()",
+        "perspective()",
         "rotate()",
         "rotateX()",
         "rotateY()",
         "rotateZ()",
+        "rotate3d()",
         "scale()",
         "scaleX()",
         "scaleY()",
@@ -1472,7 +1474,8 @@ Css.cssKeywords =
         "translate()",
         "translateX()",
         "translateY()",
-        "translateZ()"
+        "translateZ()",
+        "translate3d()"
     ],
 
     "mozFontFeatureSettings":
diff --git a/extension/content/firebug/lib/devtools.js b/extension/content/firebug/lib/devtools.js
new file mode 100644
index 0000000000..85ad112e97
--- /dev/null
+++ b/extension/content/firebug/lib/devtools.js
@@ -0,0 +1,158 @@
+/* See license.txt for terms of usage */
+/*global define:1, Components:1, Window:1*/
+
+define([
+],
+function() {
+
+"use strict";
+
+var Cu = Components.utils;
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+
+var appInfo = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo);
+var versionComparator = Cc["@mozilla.org/xpcom/version-comparator;1"].getService(Ci.nsIVersionComparator);
+
+var exports = {};
+
+/**
+ * Allows importing a JS module (Firefox platform) and specify alternative locations
+ * to keep backward compatibility in case when the module location changes.
+ * It helps Firebug to support multiple Firefox versions.
+ *
+ * @param {Array} locations List of URLs to try when importing the module.
+ * @returns Scope of the imported module or an empty scope if module wasn't successfully loaded.
+ */
+function safeImport(...args) {
+  for (var i=0; i<args.length; i++) {
+    try {
+      return Cu["import"](args[i], {});
+    }
+    catch (err) {
+    }
+  }
+  return {};
+}
+
+exports.safeImport = safeImport;
+
+/**
+ * Allows requiring a devtools module and specify alternative locations
+ * to keep backward compatibility in case when the module location changes.
+ * It helps Firebug to support multiple Firefox versions.
+ *
+ * @param {Object} devtools Reference to DevTools module.
+ * @param {Array} locations List of URLs to try when importing the module.
+ * @returns Scope of the imported module or an empty scope if module wasn't successfully loaded.
+ */
+function safeRequire(devtools, ...args) {
+  for (var i=0; i<args.length; i++) {
+    try {
+      return devtools["require"](args[i]);
+    }
+    catch (err) {
+    }
+  }
+  return {};
+}
+
+exports.safeRequire = safeRequire;
+
+/**
+ * Allows importing or requiring a devtools module and specify alternative
+ * locations to keep backward compatibility when the module location changes.
+ */
+function safeGet(devtools, ...args) {
+  for (var i=0; i<args.length; i++) {
+    var url = args[i];
+    if (url.startsWith("resource://")) {
+      try {
+        return Cu["import"](url, {});
+      }
+      catch (err) {
+      }
+    } else if (url.startsWith("devtools/")) {
+      try {
+        return devtools["require"](url);
+      }
+      catch (err) {
+      }
+    }
+  }
+  return {};
+}
+
+exports.safeGet = safeGet;
+
+// Support for new devtools modules path.
+// See also:
+// * https://wiki.mozilla.org/DevTools/Hacking
+// * https://github.com/jryans/devtools-migrate/blob/master/README.md
+// * https://developer.mozilla.org/en-US/docs/Tools/Contributing
+// * https://bugzilla.mozilla.org/show_bug.cgi?id=912121
+// * https://bugzilla.mozilla.org/show_bug.cgi?id=1203159
+
+const devtools = exports.devtools = safeImport(
+  "resource://devtools/shared/Loader.jsm",
+  "resource://gre/modules/devtools/shared/Loader.jsm",
+  "resource://gre/modules/devtools/Loader.jsm"
+).devtools;
+
+exports.DevToolsUtils = safeRequire(devtools,
+  "devtools/shared/DevToolsUtils",
+  "devtools/toolkit/DevToolsUtils"
+);
+
+exports.makeInfallible = exports.DevToolsUtils.makeInfallible;
+
+exports.gDevTools = safeGet(devtools,
+  "devtools/client/framework/devtools",
+  "resource:///devtools/client/framework/gDevTools.jsm",
+  "resource:///modules/devtools/client/framework/gDevTools.jsm",
+  "resource:///modules/devtools/gDevTools.jsm"
+).gDevTools;
+
+exports.EventEmitter = safeRequire(devtools,
+  "devtools/shared/event-emitter",
+  "devtools/toolkit/event-emitter"
+);
+
+exports.ToolSidebar = safeRequire(devtools,
+  "devtools/client/framework/sidebar",
+  "devtools/framework/sidebar"
+).ToolSidebar;
+
+exports.DebuggerServer = safeGet(devtools,
+  "devtools/server/main",
+  "resource://gre/modules/devtools/dbg-server.jsm"
+).DebuggerServer;
+
+exports.DebuggerClient = safeGet(devtools,
+  "devtools/shared/client/main",
+  "resource://gre/modules/devtools/dbg-client.jsm"
+).DebuggerClient;
+
+exports.DevToolsWorker = safeGet(devtools,
+  "devtools/shared/worker/worker",
+  "devtools/toolkit/shared/worker"
+).DevToolsWorker;
+
+exports.ScratchpadManager = safeImport(
+  "resource://devtools/client/scratchpad/scratchpad-manager.jsm",
+  "resource:///modules/devtools/client/scratchpad/scratchpad-manager.jsm",
+  "resource:///modules/devtools/scratchpad-manager.jsm"
+).ScratchpadManager;
+
+exports.require = exports.devtools["require"];
+
+// Pretty print worker
+var fx43OrEarlier = (versionComparator.compare(appInfo.version, "44a1") < 0);
+exports.prettyPrintWorkerUrl = fx43OrEarlier ?
+  "resource://gre/modules/devtools/server/actors/pretty-print-worker.js" :
+  "resource://devtools/server/actors/pretty-print-worker.js";
+
+return exports;
+
+// ********************************************************************************************* //
+});
diff --git a/extension/content/firebug/lib/domplate.js b/extension/content/firebug/lib/domplate.js
index fc6537127c..9a8ed9bbfc 100644
--- a/extension/content/firebug/lib/domplate.js
+++ b/extension/content/firebug/lib/domplate.js
@@ -91,7 +91,7 @@ DomplateTag.prototype =
      * Initializer for DOM templates. Called to create new Functions objects like TR, TD,
      * OBJLINK, etc. See defineTag
      *
-     * @param args keyword argments for the template, the {} brace stuff after the tag name,
+     * @param args keyword arguments for the template, the {} brace stuff after the tag name,
      *      eg TR({...}, TD(...
      * @param oldTag a nested tag, eg the TD tag in TR({...}, TD(...
      */
@@ -750,7 +750,7 @@ DomplateLoop.prototype = copyObject(DomplateTag.prototype,
         var iterName;
         if (this.iter instanceof Parts)
         {
-            // We have a function with optional aruments or just one variable
+            // We have a function with optional arguments or just one variable
             var part = this.iter.parts[0];
 
             // Join our function arguments or variables
@@ -868,7 +868,7 @@ function parseParts(str)
     if (!index)
     {
         // Double quotes in strings need to be escaped (see issue 6710)
-        return str.replace("\\", "\\\\", "g").replace('"', '\\"', "g");
+        return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
     }
 
     // If we have data after our last matched index we append it here as the final step
@@ -1313,12 +1313,29 @@ function defineTags()
     }
 }
 
+// APIs for associating elements with data, future compatible with Firebug.next.
+// The data is currently stored as expandos on the elements, or in the case of
+// elements from unprivileged content, expandos on the elements' unwaived xray
+// wrappers. Note that the latter expandos are local to the current
+// compartment, and thus to Firebug when compartment_per_addon is set.
+Domplate.getElementData = function(elem, name)
+{
+    return elem[name];
+};
+
+Domplate.setElementData = function(elem, name, value)
+{
+    elem[name] = value;
+};
+
 // xxxHonza: Domplate is injected into FBL namespace only for backward
 // compatibility with extensions.
 // We need to mark this as deprecated.
 FBL.TAG = Domplate.TAG;
 FBL.FOR = Domplate.FOR;
 FBL.DomplateTag = Domplate.DomplateTag;
+FBL.getElementData = Domplate.getElementData;
+FBL.setElementData = Domplate.setElementData;
 
 defineTags(
     "a", "button", "br", "canvas", "col", "colgroup", "div", "fieldset", "form", "h1", "h2",
diff --git a/extension/content/firebug/lib/http.js b/extension/content/firebug/lib/http.js
index 24f8a0f135..80bf39b86c 100644
--- a/extension/content/firebug/lib/http.js
+++ b/extension/content/firebug/lib/http.js
@@ -5,9 +5,10 @@ define([
     "firebug/lib/trace",
     "firebug/lib/deprecated",
     "firebug/debugger/stack/stackFrame",
-    "firebug/lib/string"
+    "firebug/lib/string",
+    "firebug/lib/channel",
 ],
-function(Xpcom, FBTrace, Deprecated, StackFrame, Str) {
+function(Xpcom, FBTrace, Deprecated, StackFrame, Str, Channel) {
 
 "use strict";
 
@@ -17,9 +18,9 @@ function(Xpcom, FBTrace, Deprecated, StackFrame, Str) {
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
+const Cu = Components.utils;
 
 const NS_SEEK_SET = Ci.nsISeekableStream.NS_SEEK_SET;
-const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
 
 var Http = {};
 
@@ -96,7 +97,7 @@ Http.getResource = function(aURL, ignoreMissing)
 {
     try
     {
-        var channel = ioService.newChannel(aURL, null, null);
+        var channel = Channel.new(aURL);
         var input = channel.open();
 
         return Http.readFromStream(input);
@@ -351,7 +352,7 @@ Http.safeGetXHRResponseText = function(xhr)
 };
 
 // ********************************************************************************************* //
-// IP Adress and port number (Requires Gecko 5).
+// IP Address and port number (Requires Gecko 5).
 
 Http.safeGetLocalAddress = function(request)
 {
diff --git a/extension/content/firebug/lib/json.js b/extension/content/firebug/lib/json.js
index c81ad32a37..9015bd63a9 100644
--- a/extension/content/firebug/lib/json.js
+++ b/extension/content/firebug/lib/json.js
@@ -70,9 +70,10 @@ Json.parseJSONString = function(jsonString, originURL)
     }
     catch (exc) {}
 
-    // Give up if we don't have valid start, to avoid some unnecessary overhead.
+    // Give up if we don't have valid start, to avoid some unnecessary overhead,
+    // and if we don't start with comments (pseudoJsonToJson is meant to strip them).
     first = firstNonWs(jsonString);
-    if (first !== "[" && first !== "{" && isNaN(first) && first !== '"')
+    if (first !== "[" && first !== "{" && isNaN(first) && first !== '"' && first !== "/")
         return null;
 
     // Remove JavaScript comments, quote non-quoted identifiers, and merge
diff --git a/extension/content/firebug/lib/object.js b/extension/content/firebug/lib/object.js
index c227e83cc5..391acd095b 100644
--- a/extension/content/firebug/lib/object.js
+++ b/extension/content/firebug/lib/object.js
@@ -4,9 +4,10 @@ define([
     "firebug/lib/trace",
     "firebug/lib/xpcom",
     "firebug/lib/array",
-    "firebug/lib/string"
+    "firebug/lib/string",
+    "firebug/lib/devtools",
 ],
-function(FBTrace, Xpcom, Arr, Str) {
+function(FBTrace, Xpcom, Arr, Str, DevTools) {
 
 "use strict";
 
@@ -219,14 +220,15 @@ Obj.isNonNativeGetter = function(obj, propName)
 {
     try
     {
-        var scope = {};
-        Cu.import("resource://gre/modules/devtools/WebConsoleUtils.jsm", scope);
+        var {Utils} = DevTools.safeRequire(DevTools.devtools,
+          "devtools/shared/webconsole/utils",
+          "devtools/toolkit/webconsole/utils");
 
-        if (scope.WebConsoleUtils.isNonNativeGetter)
+        if (Utils.isNonNativeGetter)
         {
             Obj.isNonNativeGetter = function(obj, propName)
             {
-                return scope.WebConsoleUtils.isNonNativeGetter(obj, propName);
+                return Utils.isNonNativeGetter.isNonNativeGetter(obj, propName);
             };
 
             return Obj.isNonNativeGetter(obj, propName);
diff --git a/extension/content/firebug/lib/search.js b/extension/content/firebug/lib/search.js
index c127c3a478..fb3286b5bd 100644
--- a/extension/content/firebug/lib/search.js
+++ b/extension/content/firebug/lib/search.js
@@ -174,7 +174,7 @@ Search.ReversibleIterator = function(length, start, reverse)
  *
  * @constructor
  * @param {String} literal Text to search for
- * @param {Boolean} reverse Truthy to preform a reverse search, falsy to perform a forward seach
+ * @param {Boolean} reverse Truthy to preform a reverse search, falsy to perform a forward search
  * @param {Boolean} caseSensitive Truthy to perform a case sensitive search, falsy to perform
  * a case insensitive search.
  */
diff --git a/extension/content/firebug/lib/string.js b/extension/content/firebug/lib/string.js
index b89091987a..eb520d34c8 100644
--- a/extension/content/firebug/lib/string.js
+++ b/extension/content/firebug/lib/string.js
@@ -406,8 +406,8 @@ Str.stripNewLines = function(value)
 
 Str.escapeSingleQuoteJS = function(value)
 {
-    return value.replace("\\", "\\\\", "g").replace(/\r/gm, "\\r")
-                .replace(/\n/gm, "\\n").replace("'", "\\'", "g");
+    return value.replace(/\\/g, "\\\\").replace(/\r/gm, "\\r")
+                .replace(/\n/gm, "\\n").replace(/'/g, "\\'");
 };
 
 Str.reverseString = function(value)
@@ -417,8 +417,8 @@ Str.reverseString = function(value)
 
 Str.escapeJS = function(value)
 {
-    return value.replace("\\", "\\\\", "g").replace(/\r/gm, "\\r")
-        .replace(/\n/gm, "\\n").replace('"', '\\"', "g");
+    return value.replace(/\\/g, "\\\\").replace(/\r/gm, "\\r")
+        .replace(/\n/gm, "\\n").replace(/"/g, '\\"');
 };
 
 Str.cropString = function(text, limit, alternativeText)
diff --git a/extension/content/firebug/lib/url.js b/extension/content/firebug/lib/url.js
index 0fbb6ee9ec..7c29760dff 100644
--- a/extension/content/firebug/lib/url.js
+++ b/extension/content/firebug/lib/url.js
@@ -343,9 +343,7 @@ Url.isAbsoluteUrl = function(url)
 
 Url.absoluteURL = function(url, baseURL)
 {
-    // Replace "/./" with "/" using regular expressions (don't use string since /./
-    // can be treated as regular expressoin too, see 3551).
-    return Url.absoluteURLWithDots(url, baseURL).replace(/\/\.\//, "/", "g");
+    return Url.absoluteURLWithDots(url, baseURL).replace(/\/\.\//g, "/");
 };
 
 Url.absoluteURLWithDots = function(url, baseURL)
@@ -419,7 +417,7 @@ Url.normalizeURL = function(url)
 
     // Normalize path traversals (a/b/../c -> a/c).
     while (url.indexOf("/../") !== -1 && url[0] != "/")
-        url = url.replace(/[^\/]+\/\.\.\//g, "");
+        url = url.replace(/[^\/]+\/+\.\.\//g, "");
 
     // Issue 1496, avoid #
     url = url.replace(/#.*/, "");
diff --git a/extension/content/firebug/net/netCacheReader.js b/extension/content/firebug/net/netCacheReader.js
index b87be2a985..f0549ec07e 100644
--- a/extension/content/firebug/net/netCacheReader.js
+++ b/extension/content/firebug/net/netCacheReader.js
@@ -279,8 +279,16 @@ function onDescriptorAvailable(netProgress, file, descriptor)
 {
     Trace.sysout("netCacheReader.onDescriptorAvailable; file.href: " + file.href, descriptor);
 
+    // Avoid error message in the Console panel.
+    // See also: https://github.com/firebug/firebug/issues/8003
+    let descriptorDataSize = 0;
+    try {
+        descriptorDataSize = descriptor.dataSize;
+    } catch (err) {
+    }
+
     if (file.size <= 0)
-        file.size = descriptor.dataSize;
+        file.size = descriptorDataSize;
 
     if (descriptor.lastModified && descriptor.lastFetched &&
         descriptor.lastModified < Math.floor(file.startTime/1000))
@@ -304,7 +312,7 @@ function onDescriptorAvailable(netProgress, file, descriptor)
         },
         {
             name: "Data Size",
-            value: descriptor.dataSize
+            value: descriptorDataSize
         },
         {
             name: "Fetch Count",
diff --git a/extension/content/firebug/net/netPanel.js b/extension/content/firebug/net/netPanel.js
index a2106f0e3f..db03d0318e 100644
--- a/extension/content/firebug/net/netPanel.js
+++ b/extension/content/firebug/net/netPanel.js
@@ -888,7 +888,7 @@ NetPanel.prototype = Obj.extend(ActivablePanel,
             var tbody = this.table.querySelector(".netTableBody");
 
             // xxxHonza: Fake first row (shold be renamed, but it's a hack anyway).
-            // There is no way to insert a row befor the current first row in a table.
+            // There is no way to insert a row before the current first row in a table.
             // See Domplate.insertRows() comment for more details.
             NetRequestEntry.footerTag.insertRows({}, tbody);
 
@@ -1059,7 +1059,7 @@ NetPanel.prototype = Obj.extend(ActivablePanel,
     {
         var tbody = this.table.querySelector(".netTableBody");
 
-        // XXXjoe Don't update rows whose phase is done and layed out already
+        // XXXjoe Don't update rows whose phase is done and laid out already
         var phase;
         for (var row = tbody.firstChild; row; row = row.nextSibling)
         {
diff --git a/extension/content/firebug/net/netProgress.js b/extension/content/firebug/net/netProgress.js
index 0f7950183e..189b3a539f 100644
--- a/extension/content/firebug/net/netProgress.js
+++ b/extension/content/firebug/net/netProgress.js
@@ -956,6 +956,7 @@ NetProgress.prototype =
 function logTime(file, title, time)
 {
     // xxxHonza: just for debugging purposes.
+    /*
     return;
 
     if (!file._timings)
@@ -969,6 +970,7 @@ function logTime(file, title, time)
         index: ++file._timings.counter,
         time: time
     });
+    */
 }
 
 // ********************************************************************************************* //
diff --git a/extension/content/firebug/net/netReps.js b/extension/content/firebug/net/netReps.js
index 75048c1ed1..befb420626 100644
--- a/extension/content/firebug/net/netReps.js
+++ b/extension/content/firebug/net/netReps.js
@@ -1063,7 +1063,7 @@ Firebug.NetMonitor.NetInfoBody = domplate(Rep, new EventSource(),
                 Firebug.NetMonitor.NetInfoHeaders.renderHeaders(headersText,
                     file.responseHeaders, "ResponseHeaders");
 
-                // If the request comes from the BFCache do not display reponse headers.
+                // If the request comes from the BFCache do not display response headers.
                 // There is not real response from the server and all headers come from
                 // the cache. So, the user should see the 'Response Headers From Cache'
                 // section (see issue 5573).
@@ -1706,6 +1706,11 @@ Firebug.NetMonitor.NetInfoHeaders = domplate(Rep, new EventSource(),
         var netInfoBox = Dom.getAncestorByClass(target, "netInfoBody");
         var file = netInfoBox.repObject;
 
+        // Use the original file object (workaround for issue #7928)
+        if (file.context) {
+          file = file.context.netProgress.getRequestFile(file.request) || file;
+        }
+
         if (target.sourceDisplayed)
         {
             var headers = requestHeaders ? file.requestHeaders : file.responseHeaders;
diff --git a/extension/content/firebug/net/netUtils.js b/extension/content/firebug/net/netUtils.js
index eba7eb172d..0a932244db 100644
--- a/extension/content/firebug/net/netUtils.js
+++ b/extension/content/firebug/net/netUtils.js
@@ -240,7 +240,7 @@ var NetUtils =
 
     getResponseText: function(file, context)
     {
-        // The response can be also empty string so, check agains "undefined".
+        // The response can be also empty string so, check against "undefined".
         return (typeof(file.responseText) != "undefined") ?
             file.responseText :
             context.sourceCache.loadText(file.href, file.method, file);
@@ -371,7 +371,7 @@ var NetUtils =
      * The logic is as follows:
      * 1) If the request is an XHR, return 'xhr' as category
      * 2) Otherwise use the file extension to guess the MIME type.
-     *    This is prefered since MIME types in HTTP requests are often wrong.
+     *    This is preferred since MIME types in HTTP requests are often wrong.
      *    This part is based on the 'mimeExtensionMap' map.
      * 3) If the file extension is missing or unknown, try to get the MIME type
      *    from the HTTP request object.
@@ -389,7 +389,7 @@ var NetUtils =
      * The logic is as follows:
      * 1) If the request is an XHR, add 'xhr' as category
      * 2) Use the file extension to guess the MIME type.
-     *    This is prefered since MIME types in HTTP requests are often wrong.
+     *    This is preferred since MIME types in HTTP requests are often wrong.
      *    This part is based on the 'mimeExtensionMap' map.
      * 3) If the file extension is missing or unknown, try to get the MIME type
      *    from the HTTP request object.
@@ -408,7 +408,7 @@ var NetUtils =
             categories.push("xhr");
 
         // Guess mime-type according to the file extension. Using file extension
-        // is prefered way since mime-types in HTTP requests are often wrong.
+        // is preferred way since mime-types in HTTP requests are often wrong.
         var mimeType = this.getMimeType(null, file.href);
 
         // If no luck with file extension, let's try to get the mime-type from
diff --git a/extension/content/firebug/net/sourceCache.js b/extension/content/firebug/net/sourceCache.js
index 67a1c898c2..4704da81e8 100644
--- a/extension/content/firebug/net/sourceCache.js
+++ b/extension/content/firebug/net/sourceCache.js
@@ -8,24 +8,24 @@ define([
     "firebug/lib/url",
     "firebug/lib/http",
     "firebug/lib/options",
-    "firebug/lib/string"
+    "firebug/lib/string",
+    "firebug/lib/channel"
 ],
-function(EventSource, Obj, Firebug, Xpcom, Url, Http, Options, Str) {
+function(EventSource, Obj, Firebug, Xpcom, Url, Http, Options, Str, Channel) {
 
 // ********************************************************************************************* //
 // Constants
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const nsIIOService = Ci.nsIIOService;
+const Cu = Components.utils;
+
 const nsIRequest = Ci.nsIRequest;
 const nsICachingChannel = Ci.nsICachingChannel;
 const nsIScriptableInputStream = Ci.nsIScriptableInputStream;
 const nsIUploadChannel = Ci.nsIUploadChannel;
 const nsIHttpChannel = Ci.nsIHttpChannel;
 
-const IOService = Cc["@mozilla.org/network/io-service;1"];
-const ioService = IOService.getService(nsIIOService);
 const ScriptableInputStream = Cc["@mozilla.org/scriptableinputstream;1"];
 const chromeReg = Xpcom.CCSV("@mozilla.org/chrome/chrome-registry;1", "nsIToolkitChromeRegistry");
 
@@ -214,7 +214,7 @@ Firebug.SourceCache.prototype = Obj.extend(new EventSource(),
         var channel;
         try
         {
-            channel = ioService.newChannel(url, null, null);
+            channel = Channel.new(url);
             channel.loadFlags |= LOAD_FROM_CACHE | LOAD_BYPASS_LOCAL_CACHE_IF_BUSY;
 
             if (method && (channel instanceof nsIHttpChannel))
diff --git a/extension/content/firebug/net/spy.js b/extension/content/firebug/net/spy.js
index 65cab8ab4b..283bce1339 100644
--- a/extension/content/firebug/net/spy.js
+++ b/extension/content/firebug/net/spy.js
@@ -908,7 +908,7 @@ function onHTTPSpyAbort(spy)
 
     updateLogRow(spy);
 
-    // Notify Net pane about a request beeing aborted.
+    // Notify Net pane about a request being aborted.
     // xxxHonza: the net panel shoud find out this itself.
     var netProgress = spy.context.netProgress;
     if (netProgress)
diff --git a/extension/content/firebug/net/tabCache.js b/extension/content/firebug/net/tabCache.js
index f7578e68b7..ceac59771e 100644
--- a/extension/content/firebug/net/tabCache.js
+++ b/extension/content/firebug/net/tabCache.js
@@ -18,17 +18,18 @@ define([
     "firebug/trace/traceListener",
     "firebug/net/sourceCache",
     "firebug/lib/options",
+    "firebug/lib/channel",
 ],
 function(ActivableModule, Obj, Firebug, Xpcom, HttpRequestObserver, HttpResponseObserver, Locale,
-    Events, Url, Http, Str, Win, JSONViewerModel, TraceModule, TraceListener, SourceCache, Options) {
+    Events, Url, Http, Str, Win, JSONViewerModel, TraceModule, TraceListener, SourceCache,
+    Options, Channel) {
 
 // ********************************************************************************************* //
 // Constants
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-
-const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+const Cu = Components.utils;
 
 // List of text content types. These content-types are cached.
 var contentTypes =
@@ -440,7 +441,7 @@ Firebug.TabCache.prototype = Obj.extend(SourceCache.prototype,
             if (url === "<unknown>")
                 return [Locale.$STR("message.sourceNotAvailableFor") + ": " + url];
 
-            var channel = ioService.newChannel(url, null, null);
+            var channel = Channel.new(url);
 
             // These flag combination doesn't repost the request.
             channel.loadFlags = Ci.nsIRequest.LOAD_FROM_CACHE |
diff --git a/extension/content/firebug/remoting/debuggerClient.js b/extension/content/firebug/remoting/debuggerClient.js
index c8ecb1d7d7..9a8209c8b6 100644
--- a/extension/content/firebug/remoting/debuggerClient.js
+++ b/extension/content/firebug/remoting/debuggerClient.js
@@ -6,12 +6,13 @@ define([
     "firebug/lib/object",
     "firebug/lib/options",
     "firebug/lib/events",
+    "firebug/lib/devtools",
     "firebug/chrome/tabWatcher",
     "firebug/chrome/firefox",
     "firebug/chrome/window",
     "firebug/remoting/tabClient",
 ],
-function(Firebug, FBTrace, Obj, Options, Events, TabWatcher, Firefox, Win, TabClient) {
+function(Firebug, FBTrace, Obj, Options, Events, DevTools, TabWatcher, Firefox, Win, TabClient) {
 
 "use strict";
 
@@ -24,11 +25,12 @@ var Trace = FBTrace.to("DBG_DEBUGGERCLIENT");
 var TraceConn = FBTrace.to("DBG_CONNECTION");
 var TraceError = FBTrace.toError();
 
-var dbgClientScope = {};
-var dbgServerScope = {};
-
-Cu["import"]("resource://gre/modules/devtools/dbg-client.jsm", dbgClientScope);
-Cu["import"]("resource://gre/modules/devtools/dbg-server.jsm", dbgServerScope);
+var dbgClientScope = {
+  DebuggerClient: DevTools.DebuggerClient
+};
+var dbgServerScope = {
+  DebuggerServer: DevTools.DebuggerServer
+};
 
 // ********************************************************************************************* //
 // Module Implementation
@@ -109,10 +111,10 @@ var DebuggerClient = Obj.extend(Firebug.Module,
             {
                 // The debugger server might be already initialized either by Firebug
                 // in another browser window or by built-in devtools.
-                if (!DebuggerServer.initialized)
+                if (!dbgServerScope.DebuggerServer.initialized)
                 {
-                    DebuggerServer.init(function () { return true; });
-                    DebuggerServer.addBrowserActors();
+                    dbgServerScope.DebuggerServer.init(function () { return true; });
+                    dbgServerScope.DebuggerServer.addBrowserActors();
                 }
             }
             catch (e)
@@ -123,7 +125,7 @@ var DebuggerClient = Obj.extend(Firebug.Module,
 
         this.transport = (this.isRemoteDebugger) ?
             debuggerSocketConnect(Options.get("remoteHost"), Options.get("remotePort")) :
-            DebuggerServer.connectPipe();
+            dbgServerScope.DebuggerServer.connectPipe();
 
         // Load Firebug actors. If Firebug is running server side these actors
         // should also be loaded.
@@ -405,6 +407,12 @@ var DebuggerClient = Obj.extend(Firebug.Module,
 
     onThreadAttached: function(context)
     {
+        // "newSource" events are emitted by thread-actor now.
+        // https://hg.mozilla.org/integration/mozilla-inbound/rev/152f968b6b13
+        // https://github.com/firebug/firebug/issues/7918
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=1171967
+        context.activeThread.addListener("newSource", this.newSource);
+
         this.dispatch("onThreadAttached", [context, false]);
 
         Firebug.dispatchEvent(context.browser, "onThreadAttached");
@@ -412,6 +420,8 @@ var DebuggerClient = Obj.extend(Firebug.Module,
 
     onThreadDetached: function(context)
     {
+        context.activeThread.removeListener("newSource");
+
         this.dispatch("onThreadDetached", [context]);
 
         Firebug.dispatchEvent(context.browser, "onThreadDetached");
diff --git a/extension/content/firebug/remoting/tabClient.js b/extension/content/firebug/remoting/tabClient.js
index 44c395950c..c9a7ca1ee3 100644
--- a/extension/content/firebug/remoting/tabClient.js
+++ b/extension/content/firebug/remoting/tabClient.js
@@ -305,9 +305,9 @@ TabClient.prototype = Obj.extend(new EventSource(),
         var threadActorObj = DebuggerLib.getThreadActor(this.browser);
         threadActorObj.global = this.window.wrappedJSObject;
 
-        // xxxHonza: The useSourceMaps options might be used by issue 5765 
+        // Enable pretty printing. See also: https://github.com/firebug/firebug/issues/7906
         var options = {
-            //useSourceMaps: true
+            useSourceMaps: true
         };
 
         this.tabClient.attachThread(options, this.onThreadAttached.bind(this));
diff --git a/extension/content/firebug/server/server.js b/extension/content/firebug/server/server.js
index 5e8504a206..736e3ad0a3 100644
--- a/extension/content/firebug/server/server.js
+++ b/extension/content/firebug/server/server.js
@@ -2,8 +2,9 @@
 
 define([
     "firebug/lib/trace",
+    "firebug/lib/devtools",
 ],
-function(FBTrace) {
+function(FBTrace, DevTools) {
 
 // xxxHonza: FBTrace isn't available when loading from within bootstrap.js
 // The default FBTrace implementation should buffer all logs that are fired
@@ -16,6 +17,8 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
+var DebuggerServer = DevTools.DebuggerServer;
+
 // ********************************************************************************************* //
 // Module
 
@@ -28,8 +31,6 @@ var Server =
     {
         try
         {
-            Cu.import("resource:///modules/devtools/dbg-server.jsm");
-
             DebuggerServer.init(function() { return true; });
 
             // Add built-in actors (like e.g. debugger actors)
diff --git a/extension/defaults/preferences/firebug.js b/extension/defaults/preferences/firebug.js
index e612c1716c..a1f9b08944 100644
--- a/extension/defaults/preferences/firebug.js
+++ b/extension/defaults/preferences/firebug.js
@@ -28,6 +28,10 @@ pref("extensions.firebug.hideDefaultInspector", false);
 pref("extensions.firebug.delayLoad", true);
 pref("extensions.firebug.clearAnnotationsConfirmation", true);
 
+// Multiprocess Notification
+pref("extensions.firebug.noMultiprocessMessage", false);
+pref("extensions.firebug.activateFirebugTheme", true);
+
 // Remoting
 pref("extensions.firebug.serverHost", "localhost");
 pref("extensions.firebug.serverPort", 5999);
@@ -109,7 +113,8 @@ pref("extensions.firebug.maxScriptLineLength", 10000);
 pref("extensions.firebug.breakOnExceptions", false);
 pref("extensions.firebug.ignoreCaughtExceptions", false);
 pref("extensions.firebug.enableSyntaxHighlighting", true);
-pref("extensions.firebug.maxNumberOfDynamicScripts", 300);
+pref("extensions.firebug.maxNumberOfDynamicScripts", 150);
+pref("extensions.firebug.ignoreDynamicScripts", false);
 
 // Stack
 pref("extensions.firebug.omitObjectPathStack", false);
diff --git a/extension/install.rdf b/extension/install.rdf
index 69bb34bc9c..69ed7fdce7 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -5,16 +5,17 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>firebug@software.joehewitt.com</em:id>
-    <em:version>2.0.7</em:version>
+    <em:version>2.0.19</em:version>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
+    <em:multiprocessCompatible>true</em:multiprocessCompatible>
 
     <!-- Any suitably modern toolkit application -->
     <em:targetApplication>
       <Description>
         <em:id>toolkit@mozilla.org</em:id>
         <em:minVersion>30.0a1</em:minVersion>
-        <em:maxVersion>37.0</em:maxVersion>
+        <em:maxVersion>54.0</em:maxVersion>
       </Description>
     </em:targetApplication>
 
@@ -23,7 +24,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>30.0a1</em:minVersion>
-        <em:maxVersion>37.0</em:maxVersion>
+        <em:maxVersion>54.0</em:maxVersion>
       </Description>
     </em:targetApplication>
 
diff --git a/extension/install.rdf.tpl.xml b/extension/install.rdf.tpl.xml
index 3873521a6a..e0bf39e51f 100644
--- a/extension/install.rdf.tpl.xml
+++ b/extension/install.rdf.tpl.xml
@@ -8,13 +8,14 @@
     <em:version>@VERSION@@RELEASE@</em:version>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
+    <em:multiprocessCompatible>true</em:multiprocessCompatible>
 
     <!-- Any suitably modern toolkit application -->
     <em:targetApplication>
       <Description>
         <em:id>toolkit@mozilla.org</em:id>
         <em:minVersion>30.0a1</em:minVersion>
-        <em:maxVersion>37.0</em:maxVersion>
+        <em:maxVersion>54.0</em:maxVersion>
       </Description>
     </em:targetApplication>
 
@@ -23,7 +24,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>30.0a1</em:minVersion>
-        <em:maxVersion>37.0</em:maxVersion>
+        <em:maxVersion>54.0</em:maxVersion>
       </Description>
     </em:targetApplication>
 
diff --git a/extension/locale/en-US/multiprocess-notification.properties b/extension/locale/en-US/multiprocess-notification.properties
index d62e42b98d..ec4708d232 100644
--- a/extension/locale/en-US/multiprocess-notification.properties
+++ b/extension/locale/en-US/multiprocess-notification.properties
@@ -1,14 +1,24 @@
-# LOCALIZATION NOTE (multiprocess.description, multiprocess.learnMore, multiprocess.warning,
+# LOCALIZATION NOTE (multiprocess.description, multiprocess.description3, multiprocess.learnMore, multiprocess.warning,
 # multiprocess.upgrade, multiprocess.disable, multiprocess.cancel):
 # Label used in a notification panel that is displayed when the user clicks on Firebug start
 # button in multiprocess Firefox browser (e10s enabled browser).
-multiprocess.description=Firebug 2 doesn't work with multiprocess Firefox (e10s). So you need to either disable e10s or upgrade to Firebug 3 alpha.
-multiprocess.learnMore=Learn more...
+multiprocess.description=The next version of Firebug has been integrated directly into the Firefox Developer Tools for increased performance and stability.
+multiprocess.description3=This change includes an updated Inspector and new Performance, Storage, and Memory tools, all using the Firebug theme you’re familiar with.
+multiprocess.learnMore=Learn more about the changes...
 multiprocess.warning=Firebug 3 alpha is based on the built-in Firefox developer tools so Firebug 2 addons don't work just yet, however turning off e10s should only be a temporary measure since it brings performance, stability and security advantages.
 multiprocess.upgrade=Upgrade and Restart
-multiprocess.disable=Disable e10s and Restart
+multiprocess.disable=Enable old Firebug and disable e10s (requires restart)
 multiprocess.cancel=Cancel
 
+# LOCALIZATION NOTE (multiprocess.notAgain, multiprocess.description2,
+# multiprocess.openDevTools, multiprocess.warning2): Label used in a new notification panel
+# that is displayed when the user clicks on Firebug start button in multiprocess
+# Firefox browser (e10s enabled browser).
+multiprocess.description2=We've ported many Firebug features into built-in tools in order to support existing Firebug users so, go ahead and check it out!
+multiprocess.openDevTools=Don’t show this message again
+multiprocess.warning2=Turning off e10s should only be a temporary measure since it brings performance, stability and security advantages.
+multiprocess.notAgain=Do not display this message again
+
 # LOCALIZATION NOTE (aurora.description, aurora.description2, aurora.notnow, aurora.nothanks):
 # Label used in a notification panel that is displayed when the user clicks on Firebug start
 # button in Aurora (Firefox) channel.
@@ -26,3 +36,8 @@ upgrade.tip.upgradeFirebug=Upgrade to Firebug 3 (for testers)
 # Label used in a notification panel that is displayed when the user wants to explicitly upgrade Firebug.
 upgrade.description=Firebug 3 alpha is available for testing
 upgrade.description2=Firebug 3 is based on the built-in Firefox developer tools so it works with the performance, stability and security advantages coming with multiprocess Firefox (also known as e10s), however Firebug 2 addons don't work with Firebug 3 yet.
+
+# LOCALIZATION NOTE (multiprocess.activateFirebugTheme):
+# Label used in a notification panel that is displayed when the user wants to explicitly upgrade Firebug.
+# The label belongs to a checkbox allowing to activate/deactivate Firebug theme for built-in DevTools
+multiprocess.activateFirebugTheme=Activate the Firebug theme
diff --git a/extension/locale/fr/firebug-amo.properties b/extension/locale/fr/firebug-amo.properties
index 738eef3353..e657a71bdc 100644
--- a/extension/locale/fr/firebug-amo.properties
+++ b/extension/locale/fr/firebug-amo.properties
@@ -1,3 +1,3 @@
-firebug.amo.summary1.6=Firebug s'intègre à Firefox pour mettre à disposition des outils de développement prêts à être utilisés pendant la navigation. Vous pouvez modifier, déboguer et contrôler les CSS, le code HTML et Javascript sur n'importe quelle page Web…\n\nFirebug 1.6 nécessite Firefox 3.6 à minima.
-firebug.amo.description=Firebug ajoute à Firefox une mine d'outils de développement à portée de main durant votre navigation. Vous pouvez éditer, déboguer et contrôler les CSS, le code HTML et JavaScript de n'importe quelle page Web en direct…\n\nSur le site de Firebug vous trouverez de la documentation, des captures d'écran et des forums de discussion : http://getfirebug.com
+firebug.amo.summary1.6=Firebug met à disposition des outils de développement prêts à être utilisés pendant la navigation. Vous pouvez modifier, déboguer et contrôler les CSS, HTML et Javascript sur n'importe quelle page Web…\n\nFirebug 1.6 nécessite Firefox 3.6 à minima.
+firebug.amo.description=Firebug ajoute à Firefox une mine d'outils de développement à portée de main durant votre navigation. Vous pouvez éditer, déboguer et contrôler les CSS, le code HTML et JavaScript de n'importe quelle page Web en direct…\n\nSur le site de Firebug vous trouverez de la documentation, des captures d'écran et des forums de discussion : https://getfirebug.com
 firebug.amo.developer.comments=Si vous rencontrez des problèmes, veuillez lire la FAQ Firebug.\n\nhttps://getfirebug.com/faq.html
diff --git a/extension/locale/fr/firebug.properties b/extension/locale/fr/firebug.properties
index bea634989a..d33758c0cd 100755
--- a/extension/locale/fr/firebug.properties
+++ b/extension/locale/fr/firebug.properties
@@ -1491,7 +1491,7 @@ script.suggestion.no_system_source_debugging2=Firebug ne peut actuellement être
 # Message displayed in the Script panel, if the page doesn't include any JavaScript.
 # The suggestion message represents an advice how to solve the problem.
 script.warning.no_javascript=Pas de JavaScript sur cette page
-script.suggestion.no_javascript2=Si les balises <script>ont un attibut "type", il devrait ressembler à "text/javascript" ou "application/javascript". De plus, les scripts doivent être analysables (syntaxiquement corrects).
+script.suggestion.no_javascript2=Si les balises <script> ont un attribut "type", il devrait ressembler à "text/javascript" ou "application/javascript". De plus, les scripts doivent être analysables (syntaxiquement corrects).
 # LOCALIZATION NOTE (script.warning.debugger_active, script.suggestion.debugger_active):
 # Message displayed in the Script panel, if the page is opened in different tabs/windows and
 # the debugger is already halted at a breakpoint inside another tab/window.
diff --git a/extension/locale/sl-SI/cookies.properties b/extension/locale/sl-SI/cookies.properties
index 66695d4535..35212e3f84 100644
--- a/extension/locale/sl-SI/cookies.properties
+++ b/extension/locale/sl-SI/cookies.properties
@@ -1,134 +1,129 @@
 # LOCALIZATION NOTE (cookies.Panel): Title of the panel in Firebug's UI.
-cookies.Panel=Cookies
-panel.tip.cookies=Allows inspecting and manipulating the cookies
+cookies.Panel=Piškotki
+panel.tip.cookies=Omogoči pregledovanje in upravljanje s piškotki
 # LOCALIZATION NOTE (cookies.Session): Label used to mark session cookies.
-cookies.Session=Session
+cookies.Session=Seja
 # LOCALIZATION NOTE (cookies.AllowGlobally, cookies.tip.AllowGlobally):
 # Label used for cookies permission.
-cookies.AllowGlobally=Accept Cookies From Sites
-cookies.tip.AllowGlobally=Accept all cookies by default or block all cookies by default
+cookies.AllowGlobally=Sprejmi piškotke iz spletnih strani
+cookies.tip.AllowGlobally2=Privzeto sprejme ali zavrne vse piškotke
 # LOCALIZATION NOTE (cookies.showCookieEvents, cookies.tip.showCookieEvents):
 # Label used in Cookies panel options menu (the small arrow next to the Cookies panel label).
 # If checked, various cookies events are displayed in Firebug's Console panel.
-cookies.showCookieEvents=Show Cookie Events
-cookies.tip.showCookieEvents=Log cookie events (changed, deleted) into the console
+cookies.showCookieEvents=Prikaži dogodke piškotkov
+cookies.tip.showCookieEvents2=Beleži dogodke piškotkov v konzolo
 # LOCALIZATION NOTE (cookies.clearWhenDeny): Label used in Cookies panel options menu (the
 # small arrow next to the Cookies panel label). If checked, cookies are automatically removed
 # if the permission is changed to deny.
 # xxxHonza: currently not displayed in the UI
-cookies.clearWhenDeny=Clear cookies when denying
+cookies.clearWhenDeny=Počisti piškotke ob zavrnitvi
 # LOCALIZATION NOTE (cookies.Cut, cookies.Copy, cookies.CopyAll, cookies.Paste,
 # cookies.Delete): Support for clipboard actions. Used in a cookie context menu
 # (right click on a cookie in the Cookies panel).
-cookies.Cut=Cut
-cookies.Copy=Copy
-cookies.CopyAll=Copy All
-cookies.Paste=Paste
-cookies.Delete=Delete
+cookies.Cut=Izreži
+cookies.Copy=Kopiraj
+cookies.CopyAll=Kopiraj vse
+cookies.Paste=Prilepi
+cookies.Delete=Izbriši
 # LOCALIZATION NOTE (cookies.Clear Value): Label for an item in the cookie context menu.
 # Clears cookie value, but not removes the cookie itself.
-cookies.Clear_Value=Clear Value
+cookies.Clear_Value=Počisti vrednost
 # LOCALIZATION NOTE (cookies.Edit): Label for an item in the cookie context menu. Displays
 # a dialog for editing clicked cookie.
-cookies.Edit=Edit
-cookies.Accept=Accept
+cookies.Edit=Uredi
+cookies.Accept=Sprejmi
 # LOCALIZATION NOTE (cookies.header.Reset_Header): Used in cookie header context menu (right
 # click on a header in the Cookies panel). This action restores default state of the header
 # (visibility and size of all columns)
-cookies.header.Reset_Header=Reset Header
+cookies.header.Reset_Header=Ponastavi glavo
 # LOCALIZATION NOTE (cookies.Intro, cookies.ExceptionsTitle): Used for managing Cookie panel
 # enablement. Used only if Firebug 1.2 and 1.3 is installed
-cookies.Intro=You can specify which web sites are always or never allowed to use cookies.\nType the exact address of the site you want to manage and then click Block,\nAllow for Session, or Allow.
-cookies.ExceptionsTitle=Exceptions - Cookies
+cookies.Intro=Določite lahko, katere spletne strani lahko vedno in katere nikoli ne smejo uporabljati piškotkov.\nVtipkajte točen naslov spletne strani, s katero želite upravljati in kliknite Blokiraj,\nDovoli za sejo ali Dovoli.
+cookies.ExceptionsTitle=Izjeme - piškotki
 # LOCALIZATION NOTE (cookies.modulemanager.description, cookies.HostEnable, cookies.HostDisable,
 # cookies.Permissions, cookies.PermissionsIntro): Various labels used for mangaing Cookies panel
 # enablement. Used only if Firebug 1.2 and 1.3 is installed.
 # examples: Enable Cookies panel for www.softwareishard.com
-cookies.modulemanager.description=Support for Cookie Monitoring
-cookies.HostEnable=Enable Cookies panel for %S
-cookies.HostDisable=Disable Cookies panel for %S
-cookies.Permissions=Enable or Disable Cookies panel
-cookies.PermissionsIntro=Choose web sites where Cookies panel will be enabled or disabled.
+cookies.modulemanager.description=Podpora za nadzor piškotkov
+cookies.HostEnable=Omogoči podokno piškotkov za %S
+cookies.HostDisable=Onemogoči podokno piškotkov za %S
+cookies.Permissions=Omogoči ali onemogoči podokno piškotkov
+cookies.PermissionsIntro=Izberite spletne strani, kjer bo podokno piškotkov omogočeno ali onemogočeno.
 # LOCALIZATION NOTE (cookies.SystemPages, cookies.LocalFiles): Labels used in the Cookies
 # panel if it's disabled (only for Firebug 1.2 and 1.3).
-cookies.SystemPages=System Pages
-cookies.LocalFiles=Local Files
+cookies.SystemPages=Sistemske strani
+cookies.LocalFiles=Lokalne datoteke
 # LOCALIZATION NOTE (cookies.confirm.removeall): Used in a confirmation dialog when all cookies
 # of a website are going to be deleted (or permission is set do deny and cookies should be deleted).
-cookies.confirm.removeall=Do you want to remove all cookies in the list?
+cookies.confirm.removeall=Ali želite odstraniti vse piškotke iz seznama?
 # LOCALIZATION NOTE (cookies.confirm.removeallsession): Used in a confirmation dialog when
 # all session cookies are going to be deleted
-cookies.confirm.removeallsession=Do you want to remove all session cookies in the list?
+cookies.confirm.removeallsession=Ali želite odstraniti vse piškotke seje iz seznama?
 # LOCALIZATION NOTE (cookies.confirm.Remove_All_From_Host): Used in a confirmation dialog when cookies
 # from a specific host are going to be deleted (or permission is set do deny and cookies should be deleted).
-cookies.confirm.Remove_All_From_Host=Do you want to remove all cookies from %S?
-# LOCALIZATION NOTE (cookies.msg.Do_not_show_this_message_again): 
-# Message within a confirmation dialog that is displayed when deleting cookies.
-# This message is displayed next to a check-box that can be used to disabled this
-# confirmation.
-cookies.msg.Do_not_show_this_message_again=Do not show this message again
+cookies.confirm.Remove_All_From_Host=Ali želite odstraniti vse piškotke iz %S?
 # LOCALIZATION NOTE (cookies.Confirm_cookie_removal): A label used for option (mini tab menu)
 # that says whether a confirmation dialog is displayed when removing cookies. 
-cookies.Confirm_cookie_removal=Confirm Cookie Removal
-cookies.tip.Confirm_cookie_removal=If checked, there is a confirmation dialog displayed before deleting all cookies in the list.
+cookies.Confirm_cookie_removal=Potrdi odstranitev piškotkov.
+cookies.tip.Confirm_cookie_removal2=Vpraša za potrditev pred odstranitvijo vseh piškotkov s seznama
 # LOCALIZATION NOTE (cookies.removeall.tooltip): A tooltip for Cookies->Remove Cookies menu
-cookies.removeall.tooltip=Remove all cookies in the list.
+cookies.removeall.tooltip=Odstrani vse piškotke iz seznama.
 # LOCALIZATION NOTE (cookies.Remove_Session_Cookies): A label used for
 # Cookies->Remove Session Cookies menu
-cookies.Remove_Session_Cookies=Remove Session Cookies
+cookies.Remove_Session_Cookies=Odstrani vse piškotke seje
 # LOCALIZATION NOTE (cookies.removeall.tooltip): A tooltip for Cookies->Remove Session Cookies menu
-cookies.removeallsession.tooltip=Remove all session cookies in the list.
+cookies.removeallsession.tooltip=Odstrani vse piškotke seje iz seznama.
 # LOCALIZATION NOTE (cookies.createcookie.tooltip): A tooltip for Cookies->Create Cookie menu
 # examples: Create new cookie for www.softwareishard.com
-cookies.createcookie.tooltip=Create a new cookie for %S
+cookies.createcookie.tooltip=Ustavri nov piškotek za %S
 # LOCALIZATION NOTE (cookies.createcookie.defaultvalue): Default value for newly created cookie.
-cookies.createcookie.defaultvalue=Value
+cookies.createcookie.defaultvalue=Vrednost
 # LOCALIZATION NOTE (cookies.perm.manage.tooltip): A tooltip for permissions button that
 # is located on a Cookis panel toolbar.
 # examples: Manage cookie permissions for www.softwareishard.com
-cookies.perm.manage.tooltip=Manage cookie permissions for %S
+cookies.perm.manage.tooltip=Upravljaj dovoljenja piškotkov za %S
 # LOCALIZATION NOTE (cookies.console.cookiescleared): A label for a cookie event that is
 # displayed in Firebug's Console panel when all cookie in Firefox are removed
 # To remove all cookies use menu on Cookis panel toolbar: Tools->Show All Cookies and click
 # Remove All Cookies in the dialog.
-cookies.console.cookiescleared=All cookies have been removed.
+cookies.console.cookiescleared=Vsi piškotki so bili odstranjeni.
 # LOCALIZATION NOTE (cookies.console.cookiescleared): A label for a cookie event that is
 # displayed in Firebug's Console panel when all cookie in Firefox are removed
 # To remove all cookies use menu on Cookis panel toolbar: Tools->Show All Cookies and click
 # Remove All Cookies in the dialog.
-cookies.console.sessioncookiescleared=All session cookies have been removed.
+cookies.console.sessioncookiescleared=Vsi piškotki seje so bili odstranjeni..
 # LOCALIZATION NOTE (cookies.console.cookiesrejected, cookies.console.nocookiesreceived):
 # A label for a cookie event that is displayed in Firebug's Console panel when cookies are
 # rejected by the current site.
-cookies.console.cookiesrejected=Cookies rejected:
-cookies.console.nocookiesreceived=No cookies received
+cookies.console.cookiesrejected=Zavrnjeni piškotki:
+cookies.console.nocookiesreceived=Prejetih ni bilo nobenih piškotkov
 # LOCALIZATION NOTE (cookies.console.cookie, cookies.console.deleted, cookies.console.added,
 # cookies.console.changed, cookies.console.cleared): Various labels that are used for cookie
 # events displayed in Firebug's Console panel.
-cookies.console.cookie=Cookie
-cookies.console.deleted=deleted
-cookies.console.added=added
-cookies.console.changed=changed
-cookies.console.cleared=cleared
+cookies.console.cookie=Piškotek
+cookies.console.deleted=izbrisan
+cookies.console.added=dodan
+cookies.console.changed=spremenjen
+cookies.console.cleared=počiščen
 # LOCALIZATION NOTE (cookies.domain.label): Label used for marking domain cookie.
 # Displayed in the Cookies panel for domain cookies.
 # xxxHonza: not used in the UI now.
-cookies.domain.label=Domain
+cookies.domain.label=Domena
 # LOCALIZATION NOTE (cookies.secure.label): Label used for marking secure cookie.
 # Displayed in the Cookies panel for secure cookies.
-cookies.secure.label=Secure
+cookies.secure.label=Varen
 # LOCALIZATION NOTE (cookies.status.accepted, cookies.status.downgraded,
 # cookies.status.flagged, cookies.status.rejected): Various statuses of a cookie
 # displayed in Status column.
-cookies.status.accepted=Accepted
-cookies.status.downgraded=Downgraded
-cookies.status.flagged=Flagged
-cookies.status.rejected=Rejected
+cookies.status.accepted=Sprejet
+cookies.status.downgraded=Podgrajen
+cookies.status.flagged=Označen
+cookies.status.rejected=Zavrnjen
 # LOCALIZATION NOTE (cookies.info.valuetab.label, cookies.info.rawdatatab.Raw_Data,
 # cookies.info.jsontab.JSON, cookies.info.xmltab.XML): A label for tabs displayed
 # if a cookie entry is expanded. Tab are only available in the UI, if necessary.
-cookies.info.valuetab.label=Value
-cookies.info.rawdatatab.Raw_Data=Raw Data
+cookies.info.valuetab.label=Vrednost
+cookies.info.rawdatatab.Raw_Data=Surovi podatki
 cookies.info.jsontab.JSON=JSON
 cookies.info.xmltab.XML=XML
 # LOCALIZATION NOTE (cookies.default.session, cookies.default.thirdPartySession,
@@ -136,137 +131,151 @@ cookies.info.xmltab.XML=XML
 # cookies.default.warn, cookies.host.session, cookies.host.accept,
 # cookies.host.reject): Various labels for cookie permissions.
 # examples: Accept cookies from www.softwareishard.com
-cookies.default.session=Default (Accept session cookies)
-cookies.default.thirdPartySession=Default (Accept session cookies)
-cookies.default.thirdParty=Default (Accept cookies)
-cookies.default.allow=Default (Accept cookies)
-cookies.default.deny=Default (Deny cookies)
-cookies.default.warn=Default (Warn before accepting cookie)
-cookies.host.session=Accept session cookies from %S 
-cookies.host.accept=Accept cookies from %S 
-cookies.host.reject=Deny cookies from %S
+cookies.default.session=Privzeto (sprejmi piškotke seje)
+cookies.default.thirdPartySession=Privzeto (sprejmi piškotke seje)
+cookies.default.thirdParty=Privzeto (sprejmi piškotke)
+cookies.default.allow=Privzeto (sprejmi piškotke)
+cookies.default.deny=Privzeto (zavrni piškotke)
+cookies.default.warn=Privzeto (opozori me pred sprejemanjem piškotka)
+cookies.default.limitThirdParty=Privzeto (omeji piškotke tretjih oseb)
+cookies.host.session=Sprejmi piškotke seje iz %S 
+cookies.host.accept=Sprejmi piškotke iz %S 
+cookies.host.reject=Zavrni piškotke iz %S
+cookies.host.limitThirdParty=Omeji piškotke tretjih oseb za %S
 # LOCALIZATION NOTE (cookies.edit.invalidname, cookies.edit.invalidhost,
 # cookies.edit.invalidpath): Various error messages used when a new cookie is created
 # using a cookie dialog. Use Cookies->Create Cookie menu to show the dialog.
-cookies.edit.invalidname=Cookie name is not valid.
-cookies.edit.invalidhost=Cookie host is not valid.
-cookies.edit.invalidpath=Cookie path is not valid.
+cookies.edit.invalidname=Ime piškotka ni veljavno.
+cookies.edit.invalidhost=Gostitelj piškotka ni veljaven.
+cookies.edit.invalidpath=Pot piškotka ni veljavna.
 # LOCALIZATION NOTE (cookies.header.name, cookies.header.value, cookies.header.rawValue,
 # cookies.header.domain, cookies.header.size, cookies.header.path, cookies.header.expires,
-# cookies.header.security, cookies.header.status, cookies.header.httponly):
+# cookies.header.security, cookies.header.status, cookies.header.httponly,
+# cookies.header.maxAge):
 # Column labels used in the cookie header.
-cookies.header.name=Name
-cookies.header.value=Value
-cookies.header.rawValue=Raw Value
-cookies.header.domain=Domain
-cookies.header.size=Size
-cookies.header.path=Path
-cookies.header.expires=Expires
-cookies.header.security=Security
-cookies.header.httponly=HttpOnly
+cookies.header.name=Ime
+cookies.header.value=Vrednost
+cookies.header.rawValue=Surova vrednost
+cookies.header.domain=Domena
+cookies.header.size=Velikost
+cookies.header.rawSize= Surova velikost
+cookies.header.path=Pot
+cookies.header.expires=Poteče
+cookies.header.security=Varnost
+cookies.header.httponly=Samo HTTP
+cookies.header.maxAge=Največja starost
 # LOCALIZATION NOTE (cookies.header.name.tooltip, cookies.header.value.tooltip,
 # cookies.header.rawValue.tooltip, cookies.header.domain.tooltip, cookies.header.size.tooltip,
 # cookies.header.path.tooltip, cookies.header.expires.tooltip, cookies.header.security.tooltip,
-# cookies.header.httponly.tooltip):
+# cookies.header.httponly.tooltip, cookies.header.maxAge.tooltip):
 # Column tooltips used in the cookie header.
-cookies.header.name.tooltip=Name of the cookie
-cookies.header.value.tooltip=Value stored for the cookie
-cookies.header.rawValue.tooltip=Raw value stored for the cookie
-cookies.header.domain.tooltip=Domain that has stored the cookie
-cookies.header.size.tooltip=Size of the stored cookie
-cookies.header.path.tooltip=Directory where the cookie is active
-cookies.header.expires.tooltip=Expiration date for the cookie
-cookies.header.security.tooltip=Shows whether it is a secure cookie or not
-cookies.header.httponly.tooltip=Shows if the cookie is an HTTP only cookie
-# LOCALIZATION NOTE (cookies.netinfo.Received_Cookies, cookies.netinfo.Sent_Cookies):
+cookies.header.name.tooltip=Ime piškotka
+cookies.header.value.tooltip=Shranjena vrednost za piškotek
+cookies.header.rawValue.tooltip=Surova shranjena vrednost za piškotek
+cookies.header.domain.tooltip2=Domena shranjenega piškotka
+cookies.header.rawSize.tooltip=Surova velikost shranjenega piškotka
+cookies.header.size.tooltip=Velikost shranjenega piškotka
+cookies.header.path.tooltip=Pot aktivnega piškotka
+cookies.header.expires.tooltip=Datum poteka piškotka
+cookies.header.security.tooltip=Prikažei ali je piškotek varen ali ne.
+cookies.header.httponly.tooltip=Prikaži ali je piškotek samo za strani HTTP
+cookies.header.maxAge.tooltip=Najdaljši čas za shranjevanje piškotka
+# LOCALIZATION NOTE (cookies.netinfo.Received_Cookies, cookies.netinfo.Sent_Cookies,
+# cookies.netinfo.deleted.tooltip):
 # Labels used in the Firebug's net panel. If there are any cookies associated with a network
 # request, there is an additional Cookies tab displayed when the user expands the request.
 # These labels are used within this tab.
-cookies.netinfo.Received_Cookies=Received Cookies
-cookies.netinfo.Sent_Cookies=Sent Cookies
+cookies.netinfo.Received_Cookies=Prejeti piškotki
+cookies.netinfo.Sent_Cookies=Poslani piškotki
+cookies.netinfo.deleted.tooltip=Zahteva je povzročila potek piškotka
 # LOCALIZATION NOTE (cookies.Path_Filter): Label for a Filter->Path Filter
 # xxxHonza: Not implemented yet.
-cookies.Path_Filter=Path Filter
+cookies.Path_Filter=Filter poti
 # LOCALIZATION NOTE (cookies.menu.Cookies): Label for menu Cookies, dislayed on the toolbar.
-cookies.menu.Cookies=Cookies
+cookies.menu.Cookies=Piškotki
 # LOCALIZATION NOTE (cookies.export.Export_All_Cookies, cookies.export.Export_All_Cookies_Tooltip,
 # cookies.export.Export_For_Site, cookies.export.Export_For_Site_Tooltip): Labels and 
 # tooltips for exporting menus available under Cookies menus.
-cookies.export.Export_All_Cookies=Export All Cookies
-cookies.export.Export_All_Cookies_Tooltip=Export all browser cookies to cookies.txt file
-cookies.export.Export_For_Site=Export Cookies For This Site
-cookies.export.Export_For_Site_Tooltip=Export cookies for %S into cookies.txt file
+cookies.export.Export_All_Cookies=Izvozi vse piškotke
+cookies.export.Export_All_Cookies_Tooltip2=Izvozi vse brskalnikove piškotke v datoteko .txt
+cookies.export.Export_For_Site=Izvozi piškotke za to stran
+cookies.export.Export_For_Site_Tooltip2=Izvozi piškotke za %S v datoteko .txt
 # LOCALIZATION NOTE (cookies.message.There_is_no_active_page): An error message displayed
 # when the user is trying to create a cookie and there is no active page (site). This should
 # never happen.
-cookies.message.There_is_no_active_page=There is no active page.
 # LOCALIZATION NOTE (cookies.Break_On_Cookie, cookies.Disable_Break_On_Cookie):
 # Tooltips for resume button that are used when the Cookies panel is currently selected.
+cookies.export.Export_JSON_to_Clipboard=Izvozi v obliki JSON na odložišče
+cookies.export.Export_Json_For_Clipboard_Tooltip=Izvozi piškotke za %S v obliki JSON na odložišče
 # The button allows stopping JS execution when a cookie on the current page is modified
 # added or removed.
-cookies.Break_On_Cookie=Break On Cookie Change
-cookies.Disable_Break_On_Cookie=Disable Break On Cookie Change
 # LOCALIZATION NOTE (cookies.Cookie_Breakpoints): Name of Cookie breakpoint group
+cookies.message.There_is_no_active_page=Aktivna stran ne obstaja.
 # displayed in Breakpoints panel (in the Script panel)
-cookies.Cookie_Breakpoints=Cookie Breakpoints
 # LOCALIZATION NOTE (cookies.Break_On_Cookie, cookies.menu.tooltip.Break_On_Cookie):
 # Label and tooltip for a context menu item used when the user right clicks on a cookie. 
 # examples: Break on 'MyCookie' cookie
+cookies.Break_On_Cookie=Prekini ob spremembi piškotka
+cookies.Disable_Break_On_Cookie=Onemogoči prekinitev ob spremembi piškotka
 # examples: Break on 'MyCookie' when removed or changed.
-cookies.menu.Break_On_Cookie=Break On '%S' cookie
-cookies.menu.tooltip.Break_On_Cookie=Break on '%S' when removed or changed.
 # LOCALIZATION NOTE (cookies.menu.Edit_Breakpoint_Condition): Label for context menu item
+cookies.Cookie_Breakpoints=Točke prekinitev piškotka
 # used when user right clicks on a cookie with existing breakpoint.
-cookies.menu.Edit_Breakpoint_Condition=Edit Breakpoint Condition
 # LOCALIZATION NOTE (cookies.Breakpoint_condition_evaluation_fails): Message displayed
 # within the Firebug Console panel if a cookie breakpoint condition fails when evaluated. 
-cookies.Breakpoint_condition_evaluation_fails=Breakpoint condition evaluation fails
 # DTD strings converted (main Firecokie UI, see cookiePanel.xul)
-cookies.RemoveAll=Remove Cookies
-cookies.Create=Create Cookie
+cookies.menu.Break_On_Cookie=Prekini ob piškotku '%S'
+cookies.menu.tooltip.Break_On_Cookie=Prekini ob piškotku '%S', kadar je bil odstranjen ali spremenjen.
 # LOCALIZATION NOTE (cookies.Tools, cookies.ToolsTooltip) Label and tooltip for Tools
 # menu on Cookies toolbar.
-cookies.Tools=Tools
-cookies.ToolsTooltip=Tools
+cookies.menu.Edit_Breakpoint_Condition=Uredi pogoj prekinitvenih točk
 # LOCALIZATION NOTE (cookies.ViewAll, cookies.ViewAllTooltip) Label and tooltip for
 # view all cookies menu item (Tools menu). This action opens Firefox built-in cookie manager window.
-cookies.ViewAll=Show All Cookies
-cookies.ViewAllTooltip=Open the built-in Cookie Manager
+cookies.Breakpoint_condition_evaluation_fails=Ovrednotenje pogoja prekinitvenih točk je spodletelo
 # LOCALIZATION NOTE (cookies.ViewExceptions, cookies.ViewExceptionsTooltip) Label and
+cookies.RemoveAll=Odstrani piškotke
+cookies.Create=Ustvari piškotek
 # tooltip for Site Permissions menu item (Tools menu). This action opens Firefox built-in
 # dialog for setting web site cookie permissions.
-cookies.ViewExceptions=Web Sites Permissions
-cookies.ViewExceptionsTooltip=View list of allowed or prohibited web sites
+cookies.Tools=Orodja
+cookies.ToolsTooltip=Orodja
 # LOCALIZATION NOTE (cookies.Filter, cookies.FilterTooltip, cookies.filter.byPath,
 # cookies.filter.byPathTooltip, cookies.filter.showRejectedCookies,
+cookies.ViewAll=Prikaži vse piškotke
+cookies.ViewAllTooltip=Odpri vgrajeni upravitelj piškotkov
 # cookies.filter.showRejectedCookiesTooltip): Labels and tooltips for cookie Filter menu
 # presented on the Cookie toolbar.
-cookies.Filter=Filter
-cookies.FilterTooltip=Use given options to filter the cookie list.
-cookies.filter.byPath=Filter Cookies By Current Path
-cookies.filter.byPathTooltip=Show only cookies that match the current path.
-cookies.filter.showRejectedCookies=Show Rejected Cookies
-cookies.filter.showRejectedCookiesTooltip=Display even rejected cookies in the list.
 # LOCALIZATION NOTE (cookies.edit.title, cookies.edit.name.label,
+cookies.ViewExceptions=Dovoljenja spletnih strani
+cookies.ViewExceptionsTooltip=Pokaži seznam dovoljenih ali prepovedanih strani
 # cookies.edit.domain.label, cookies.edit.path.label, cookies.edit.expire.label,
 # cookies.edit.value.label, cookies.edit.secure.label, cookies.edit.httponly.label,
 # cookies.edit.session.label, cookies.edit.urlEncode.label): Edit Cookie dialog UI
-cookies.edit.title=Edit Cookie
-cookies.edit.name.label=Name:
-cookies.edit.domain.label=Host:
-cookies.edit.path.label=Path:
-cookies.edit.expire.label=Expires:
-cookies.edit.value.label=Value:
-cookies.edit.secure.label=Secure Cookie
-cookies.edit.httponly.label=HTTP Only
-cookies.edit.session.label=Session
-cookies.edit.urlEncode.label=URL encode value
 # LOCALIZATION NOTE (cookies.console.Cookies, cookies.console.Filter_By_Cookies)
+cookies.Filter=Filter
+cookies.FilterTooltip=Uporabi dane možnosti za filtriranje seznama piškotkov.
+cookies.filter.byPath=Filtriraj piškotke po trenutni poti
+cookies.filter.byPathTooltip=Prikaži samo piškotke, ki se ujemajo s trenutno potjo.
+cookies.filter.showRejectedCookies=Prikaži zavrnjene piškotke
+cookies.filter.showRejectedCookiesTooltip=Prikaži tudi zavrnjene piškotke na seznamu.
 # Label and tooltip for a toolbar button displayed on the Console panel. Used for filtering.
-cookies.console.Cookies=Cookies
-cookies.console.Filter_By_Cookies=Filter By Cookies
 # LOCALIZATION NOTE (firebug.shortcut.removeAllCookies.label) Label used by the
 # Customize Shortcuts dialog (Firebug menu)
-firebug.shortcut.removeAllCookies.label=Remove All Cookies
-cookie.sizeinfo.Size=Size
-cookie.sizeinfo.Raw_Size=Raw Size
+# LOCALIZATION NOTE (firebug.shortcut.removeAllCookies.label) Label used by the
+cookies.edit.title=Uredi piškotek
+cookies.edit.name.label=Ime:
+cookies.edit.domain.label=Gostitlelj:
+cookies.edit.path.label=Pot:
+cookies.edit.expire.label=Poteče:
+cookies.edit.value.label=Vrednost:
+cookies.edit.secure.label=Varen piškotek
+cookies.edit.httponly.label=Samo HTTP
+cookies.edit.session.label=Seja
+cookies.edit.urlEncode.label=Kodirna vrednost URL
+# Customize Shortcuts dialog (Firebug menu)
+cookies.console.Cookies=Piškotki
+cookies.console.Filter_By_Cookies=Filtriraj po piškotkih
+firebug.shortcut.removeAllCookies.label=Odstrani vse piškotke
+firebug.shortcut.tip.removeAllCookies=Odstrani vse navedene piškotke
+cookie.sizeinfo.Size=Velikost
+cookie.sizeinfo.Raw_Size=Surova velikost
diff --git a/extension/locale/sl-SI/firebug-amo.properties b/extension/locale/sl-SI/firebug-amo.properties
index 3f1d81d66e..97ff3d1f57 100644
--- a/extension/locale/sl-SI/firebug-amo.properties
+++ b/extension/locale/sl-SI/firebug-amo.properties
@@ -1,7 +1,7 @@
-# LOCALIZATION NOTE (firebug.amo.summary, firebug.amo.description, firebug.amo.developer.comments):n\n
-# These texts are used on Mozilla Add-on site: https://addons.mozilla.org/en-US/firefox/addon/1843n\n
-# They are not direct part of Firebug extension and so, you can't see them in Firebug's UI.n\n
-# Note that firebug.amo.summary must not exceed 250 characters (limitation by AMO site)n\n
-firebug.amo.summary1.6=Firebug je integriral v Firefox kopico razvojnih orodij. V živo lahko urejaš, razhroščuješ in nadziraš izvajanje CSS, HTML in JavaScript kode na katerikoli strani...\n\nFirebug 1.6 potrebuje Firefox verzije 3.6 ali novejši.
-firebug.amo.description=Firebug se vgradi v Firefox in s tem imaš na razpolago ogromno razvijalskih orodij, medtem ko brskaš po internetu. Lahko urejaš, razhroščuješ in nadziraš izvajanje CSS, HTML in Javascript kode v živo na strani...\n\nObiščite Firebug spletno stran za dokumentacijo, informacije o programu in obisk foruma: https://getfirebug.com
-firebug.amo.developer.comments=Če naletite na kakršnekoli težave, prosimo preberite Firebug pogosta vprašanja.\n\nhttps://getfirebug.com/faq
+# LOCALIZATION NOTE (firebug.amo.summary, firebug.amo.description, firebug.amo.developer.comments):
+# These texts are used on Mozilla Add-on site: https://addons.mozilla.org/en-US/firefox/addon/1843
+# They are not direct part of Firebug extension and so, you can't see them in Firebug's UI.
+# Note that firebug.amo.summary must not exceed 250 characters (limitation by AMO site)
+firebug.amo.summary1.6=Firebug je vgradil v Firefox kopico razvojnih orodij. V živo lahko urejate, razhroščujete in nadzirate izvajanje kode CSS, HTML in JavaScript na katerikoli strani...\\\n\\\nFirebug 1.6 potrebuje Firefox različice 3.6 ali novejše.
+firebug.amo.description=Firebug se vgradi v Firefox in da na razpolago ogromno razvojnih orodij, medtem ko brskate po internetu. Lahko urejate, razhroščujte in nadzirate izvajanje kode CSS, HTML in Javascript v živo na strani...\\\n\\\nObiščite spletno stran Firebug za dokumentacijo, zaslonske posnetke in razprave foruma: http://getfirebug.com
+firebug.amo.developer.comments=Če naletite na kakršnekoli težave, prosimo preberite Firebug pogosta vprašanja.\\\n\\\nhttp://getfirebug.com/faq.html
diff --git a/extension/locale/sl-SI/firebug.properties b/extension/locale/sl-SI/firebug.properties
index 7d025cc424..d4bdcc167e 100644
--- a/extension/locale/sl-SI/firebug.properties
+++ b/extension/locale/sl-SI/firebug.properties
@@ -1,1070 +1,1323 @@
 Firebug=Firebug
-# LOCALIZATION NOTE (WindowTitle): Title of detached Firebug window.n\n
-# %S Title of the associated web page.n\n
-# examples: Firebug - Googlen\n
-WindowTitle=Firebug -%S
-# Panel titlesn\n
+# LOCALIZATION NOTE (WindowTitle): Title of detached Firebug window.
+# %S = Title of the associated web page.
+# examples: Firebug - Google
+WindowTitle=Firebug - %S
+# Panel titles
 Panel-console=Konzola
-panel.tip.console=Allows observing console messages and executing JavaScript commands
+panel.tip.console=Omogoča opazovanje sporočil konzole in izvedbo ukazov Javascript
 Panel-net=Mreža
-panel.tip.net=Allows analyzing the network traffic
+panel.tip.net=Omogoča analiziranje omrežnega prometa
 Panel-html=HTML
-panel.tip.html=Allows inspecting and manipulating the DOM nodes
+panel.tip.html=Omogoča pregledovanje in upravljanje z vozlišči DOM
 Panel-stylesheet=CSS
-panel.tip.stylesheet=Allows inspecting and manipulating the CSS stylesheets
+panel.tip.stylesheet=Omogoča pregledovanje in upravljanje s slogovnimi predlogami CSS
 Panel-script=Skript
-panel.tip.script=Allows debugging of JavaScript
+panel.tip.script=Omogoča razhroščevanje JavaScripta
 Panel-dom=DOM
-panel.tip.dom=Allows inspecting and manipulating the DOM properties
+panel.tip.dom=Omogoča pregledovanje in upravljanje z lastnostmi DOM
 Panel-css=Slog
-panel.tip.css=Allows inspecting and manipulating the CSS rules of the selected DOM node
+panel.tip.css=Omogoča pregledovanje in upravljanje s pravili CSS izbranega vozlišča DOM
 Panel-computed=Izračunano
-panel.tip.computed=Allows inspecting the computed CSS values of the selected DOM node
-Panel-layout=Postavitev
-panel.tip.layout=Allows inspecting and manipulating the layout data of the selected DOM node
+panel.tip.computed=Omogoča pregledovanje izračunanih vrednosti CSS izbranega vozlišča DOM
+Panel-layout=Razporeditev
+panel.tip.layout=Omogoča pregledovanje in upravljanje s podatki postavitve izbranega vozlišča DOM
 Panel-domSide=DOM
-panel.tip.domSide=Allows inspecting and manipulating the DOM properties of the selected DOM node
-Panel-watches=Sledilnik
-panel.tip.watches=Allows inspecting the JavaScript variables available in the current stack frame and defining watch expressions
+panel.tip.domSide=Omogoča pregledovanje in upravljanje z lastnostmi DOM izbranega vozlišča DOM
+Panel-watches=Spremljaj
+panel.tip.watches=Omogoča pregledovanje spremenljivk Javascript, ki so na voljo v trenutnem okvirju skladov, in določanje spremljalnih izrazov
 Panel-breakpoints=Prekinitvene točke
-panel.tip.breakpoints=Allows manipulating the set breakpoints
+panel.tip.breakpoints=Omogoča upravljanje s prekinitvenimi točkami
 Panel-callstack=Sklad
-panel.tip.callstack=Allows observing the current JavaScript call stack
-Panel-scopes=Obseg
+panel.tip.callstack=Omogoča opazovanje trenutnega sklada klicev Javascript
+Panel-html-events=Dogodki
+panel.tip.html-events=Omogoča pregledovanje poslušalnikov dogodkov, ki so vpisani za izbrano vozlišče DOM
+Panel-scopes=Obsegi
 firebug.DetachFirebug=Odpri Firebug v novem oknu
 firebug.AttachFirebug=Pripni Firebug k oknu brskalnika
-# LOCALIZATION NOTE (Total_Firebugs): Used in a tooltip that is displayed for Firebugn\n
-# icon located within Firefox status bar. Displayes number of pages with activated Firebug.n\n
-# xxxHonza: this construct should be replaced by PluralFormn\n
-# See: https://developer.mozilla.org/en/Localization_and_Pluralsn\n
-pluralRule=1
-# Console panel options.n\n
-# LOCALIZATION NOTE (Line): Used at many places in the UI. Displays location of an error,n\n
-# message, etc. within a source of a web page.n\n
-# #1 File name, #2 Line numbern\n
-# examples: somePage.htm (line 64)n\n
-# LOCALIZATION NOTE (InspectInTab): Menu item label used in a various context menus.n\n
-plural.Total_Firebugs2=%1$S Firebug Skupaj;%1$S Skupaj Firebugov
-# For example, right clicking on an element in the HTML panel offers an action to inspectn\n
-# clicked element in the DOM panel (tab).n\n
-# #1 Target panel titlen\n
-startbutton.tip.deactivated=Deactivated
-# examples: Inspect in DOM Tabn\n
-# LOCALIZATION NOTE (jsdIScript): an internal Firefox object used for debugging Firebugn\n
-# do not translate.n\n
-# #1 jsdIScript.tagn\n
-# HTML panel context menu items.n\n
+# LOCALIZATION NOTE (pluralRuleFirebugs): Custom plural rule for this locale.
+# If there is no Firebug translation for the current browser locale, this value
+# will be used instead of the one in chrome://global/locale/intl.properties
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+pluralRule=10
+# LOCALIZATION NOTE (plural.Total_Firebugs2): Semicolon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# Used in a tooltip that is displayed for the Firebug icon located within Firefox toolbar.
+# Displays the number of pages with Firebug activated.
+# %1 = number of Firebug instances activated
+# example: 2 Total Firebugs
+plural.Total_Firebugs2=Skupaj %1$S Firebug;Skupaj %1$S Firebuga;Skupaj %1$S Firebugi;Skupaj %1$S Firebugov
+# LOCALIZATION NOTE (startbutton.tip.deactivated):
+# Used in a tooltip that is displayed for the Firebug icon located within Firefox toolbar.
+# Displays the deactivated status of Firebug
+startbutton.tip.deactivated=Onemogočeno
+# LOCALIZATION NOTE (panel.status): Label showing the status of an activable panel
+# inside a tooltip when hovering the Start Button. Will be shown for each panel.
+# first %S = panel name
+# second %S = panel activation status
+# example: Console: On
+plural.startbutton.tip.errors=Na tej strani se je pojavila %1$S napaka;Na tej strani sta se pojavili %1$S napaki;Na tej strani so se pojavile %1$S napake;Na tej strani se je pojavilo %1$S napak
+# LOCALIZATION NOTE (annotations.confirm.clear):
+# Used in a confirmation dialog when all Firebug annotations are going to be deleted
+# LOCALIZATION NOTE (firebug_options): Tooltip text used for Firebug icon menu (them left
+# most button on Firebug main toolbar)
+# LOCALIZATION NOTE (firebug.Show_All_Panels): Menu item label used in 'list of all panels'
 panel.status=%S: %S
-inBrowser=V brskalniku
-minimized=Pomanjšan
+inBrowser=v brskalniku
+minimized=skrčen
 enablement.for_all_pages=za vse strani
-enablement.on=Vklop
-enablement.off=Izklop
-enablement.Panel_activation_status=Panel activation status:
+enablement.on=Vklopljeno
+enablement.off=Izklopljeno
+enablement.Panel_activation_status=Stanje omogočanja podokna:
 none=Zaprto
-Firebug_-_inactive_for_current_website=Firebug - neaktiven za obstoječo spletno stran
-Activate_Firebug_for_the_current_website=Aktiviraj Firebug za trenutno spletno stran
-Minimized=Pomanjšano
-Minimize_Firebug=Pomanjšaj Firebug
-On_for_all_web_pages=Vključi za vse strani
-firebug.menu.tip.On_for_all_Web_Sites=Activate Firebug by default for all websites
-firebug.menu.Clear_Activation_List=Izbriši aktivacijski seznam
-firebug.menu.tip.Clear_Activation_List=Clear the list of websites Firebug is activated for
-firebug.menu.Detached=Detached
-firebug.menu.tip.Detached=Detach Firebug into its own window
-firebug.menu.Top=Top
-firebug.menu.tip.Top=Align Firebug to the top of the user agent window
-firebug.menu.Bottom=Bottom
-firebug.menu.tip.Bottom=Align Firebug to the bottom of the user agent window
-firebug.menu.Left=Left
-firebug.menu.tip.Left=Align Firebug to the left of the user agent window
-firebug.menu.Right=Right
-firebug.menu.tip.Right=Align Firebug to the right of the user agent window
-firebug.uiLocation=Firebug UI lokacija
-firebug.menu.tip.UI_Location=Position of the Firebug user interface
-# Quick Info Boxn\n
-# LOCALIZATION NOTE (html.Break_On_Mutate, html.Disable_Break_On_Mutate): Tooltips for resumen\n
-firebug_options=Firebug Možnosti
-# button that are used when the HTML panel is currently selected. The button allows stoppingn\n
-# JS execution when DOM of the current page is modified.n\n
-firebug.Show_All_Panels=Prikaži vse panele
-console.option.Show_Command_Line=Show Command Line
-console.option.tip.Show_Command_Line=Focus the Command Line / Show the Command Line Popup
-# LOCALIZATION NOTE (EditAttribute): Menu Item label used in HTML panel context menu. Allowsn\n
-ShowJavaScriptErrors=Prikaži napake JavaScript-a
-console.option.tip.Show_JavaScript_Errors=Log JavaScript error messages into the console
-ShowJavaScriptWarnings=Prikaži opozorila JavaScript-a
-console.option.tip.Show_JavaScript_Warnings=Log JavaScript warning messages into the console
+Firebug_-_inactive_for_current_website=Firebug - neaktiven za trenutno spletno stran
+Activate_Firebug_for_the_current_website=Omogoči Firebug za trenutno spletno stran
+Minimize_Firebug=Skrči Firebug
+On_for_all_web_pages=Vključi za vse spletne strani
+firebug.menu.tip.On_for_all_Web_Sites=Privzeto omogoči Firebug za vse spletne strani
+firebug.menu.Clear_Activation_List=Izbriši seznam omogočanja
+firebug.menu.tip.Clear_Activation_List=Počisti seznam spletnih strani, za katere je omogočen Firebug
+firebug.menu.Detached=Odpeto
+firebug.menu.tip.Detached=Odpni Firebug v svoje okno
+firebug.menu.Top=Vrh
+firebug.menu.tip.Top=Poravnaj Firebug na vrh okna uporabniškega posrednika
+firebug.menu.Bottom=Dno
+firebug.menu.tip.Bottom=Poravnaj Firebug na dno okna uporabniškega posrednika
+firebug.menu.Left=Levo
+firebug.menu.tip.Left=Poravnaj Firebug na levo stran okna uporabniškega posrednika
+firebug.menu.Right=Desno
+firebug.menu.tip.Right=Poravnaj Firebug na desno stran okna uporabniškega posrednika
+firebug.uiLocation=Mesto UI-ja Firebug
+firebug.menu.tip.UI_Location=Položaj uporabniškega vmesnika Firebug
+# menu (available on Firebug's tab bar).
+# Console panel options (located in tab's option menu)
+annotations.confirm.clear=Ali želite počistiti vse pripombe Firebug za vse spletne strani?
+# LOCALIZATION NOTE (Line, LineAndCol): Used at many places in the UI. Displays the location
+# of an error, message, etc. within a source of a web page.
+firebug_options=Možnosti Firebug
+console.option.Show_Command_Line=Prikaži ukazno vrstico
+console.option.tip.Show_Command_Line=Osredotoči se na ukazno vrstico / Prikaži pojavno okno ukazne vrstice
+# first %S = File name, second %S = Line number
+ShowJavaScriptErrors=Prikaži napake JavaScript
+console.option.tip.Show_JavaScript_Errors=Beleži sporočila napak JavaScript v konzolo
+ShowJavaScriptWarnings=Prikaži opozorila JavaScript
+console.option.tip.Show_JavaScript_Warnings=Beleži opozorilna sporočila JavaScript v konzolo
 ShowCSSErrors=Prikaži napake CSS
-console.option.tip.Show_CSS_Errors=Log CSS error messages into the console
-ShowXMLHTMLErrors=Show XML/HTML Errors
-console.option.tip.Show_XML_HTML_Errors=Log XML and HTML error messages into the console
-ShowStackTrace=Prikaži sklad napake
-console.option.tip.Show_Stack_Trace=Show stack trace information for error messages
+console.option.tip.Show_CSS_Errors=Beleži sporočila napak CSS v konzolo
+ShowXMLHTMLErrors=Prikaži XML/Napake HTML
+console.option.tip.Show_XML_HTML_Errors=Beleži sporočila napak XML in HTML v konzolo
+ShowStackTrace=Prikaži sled sklada z napakami
+console.option.tip.Show_Stack_Trace=Prikaži podatke o sledi sklada za sporočila napak
 ShowXMLHttpRequests=Prikaži XMLHttpRequests
-console.option.tip.Show_XMLHttpRequests=Log XMLHttpRequests into the console
-ShowChromeErrors=Prikaži chrome napake
-console.option.tip.Show_System_Errors=Log program and add-on internal error messages into the console
-ShowChromeMessages=Prikaži chrome sporočila
-console.option.tip.Show_System_Messages=Log program and add-on internal messages into the console
-ShowExternalErrors=Prikaži zunanje napake
-console.option.tip.Show_External_Errors=Log error messages coming from external sources into the console
+console.option.tip.Show_XMLHttpRequests=Beleži sXMLHttpRequests na konzolo
+ShowChromeErrors=Prikaži napake chrome
+console.option.tip.Show_System_Errors=Beleži sporočila notranjih napak programa in dodatkov v konzolo
+ShowChromeMessages=Prikaži sporočila chrome
+console.option.tip.Show_System_Messages=Beleži notranja sporočila programa in dodatkov v konzolo
 ShowNetworkErrors=Prikaži omrežne napake
-console.option.tip.Show_Network_Errors=Log network error messages into the console
+console.option.tip.Show_Network_Errors=Beleži sporočila omrežnih napak v konzolo
 JavascriptOptionsStrict=Stroga opozorila (počasnejše delovanje)
-console.option.tip.Show_Strict_Warnings=Log also strict warnings into the console
+console.option.tip.Show_Strict_Warnings=Beleži tudi stroga opozorila v konzolo
+console.option.Group_Log_Messages=Združi sporočila dnevnika
+console.option.tip.Group_Log_Messages=Združi enaka sporočila dnevnika v konzolo
 Command_History=Zgodovina ukazov
-console.option.Show_Command_Editor=Show Command Editor
-console.option.tip.Show_Command_Editor=Switch to the Command Editor
-commandLineShowCompleterPopup=Prikaži pojavno okno seznama nedokončanih opravil
-console.option.tip.Show_Completion_List_Popup=Show the popup for command auto-completion
-Assertion=Assert napaka
-# editing an existing HTML element attribute.n\n
-# #1 Name of the clicked attribute.n\n
-# examples: Edit Attribute "onclick"...n\n
-# LOCALIZATION NOTE (DeleteAttribute): Menu Item label used in HTML panel context menu. Allowsn\n
-# deleting an existing HTML element attribute.n\n
+console.option.Show_Command_Editor=Prikaži urejevalnik ukazov
+console.option.tip.Show_Command_Editor=Preklopi na urejevalnik ukazov
+commandLineShowCompleterPopup=Prikaži pojavno okno seznama dokončanih opravil
+console.option.tip.Show_Completion_List_Popup=Prikaži pojavno okno za samodokončanje ukazov
+Assertion=Spodletela trditev
+# examples: somePage.htm (line 64)
+# examples: somePage.htm (line 64, column 53)
+# LOCALIZATION NOTE (InspectInPanel): Menu item label used in a various context menus.
+# For example, right clicking on an element in the HTML panel offers an action to inspect
+# clicked element in the DOM panel.
 Line=%S (vrstica %S)
 LineAndCol=%S (vrstica %S, stolpec %S)
 InstanceLine=%S #%S (vrstica %S)
 StackItem=%S (%S vrstica %S)
 SystemItem=<Sistem>
-# #1 Name of the clicked attribute.n\n
-# examples: Delete Attribute "onclick"...n\n
-# LOCALIZATION NOTE (InheritedFrom): Displaying a HTML element name + an applied CSS rule.n\n
-# that has been inherited. Used in the Style side panel (under HTML panel).n\n
-# examples: Inherited from table.tabViewn\n
-panel.Inspect_In_Panel=Inspect in %S Panel
-panel.tip.Inspect_In_Panel=Switch to the %S panel to examine the object there
+# %S = Target panel title
+# examples: Inspect in DOM Panel
+# LOCALIZATION NOTE (jsdIScript): an internal Firefox object used for debugging Firebug
+# do not translate.
+# %S = jsdIScript.tag
+panel.Inspect_In_Panel=Preglej v podoknu %S
+panel.tip.Inspect_In_Panel=Preklopi na podokno %S za pregled tamkajšnjega predmeta
 NoName=(brez imena)
-# LOCALIZATION NOTE (EditProp): Menu item label used in the CSS panel context menu.n\n
-# Allows to edit an existing CSS rule property.n\n
-# %S Name of the clicked propertyn\n
-jsdIScript=jsdl skripta %S
-# examples: Edit "background-color"...n\n
-# LOCALIZATION NOTE (DisableProp): Menu item label used in the CSS panel context menu.n\n
-# Allows to disable an existing CSS rule property.n\n
-ShowFullText=Prikaži polni tekst
-html.option.tip.Show_Full_Text=Don't crop element contents
-# %S Name of the clicked propertyn\n
-# examples: Disable "background-color"n\n
-# LOCALIZATION NOTE (DeleteProp): Menu item label used in the CSS panel context menu.n\n
+# LOCALIZATION NOTE (html.option.Show_Full_Text, html.option.tip.Show_Full_Text):
+# HTML panel option (located in tab's option menu). If set to true, contents
+# of an element will not be cropped
+ShowFullText=Prikaži polno besedilo
+html.option.tip.Show_Full_Text=Ne obreži vsebine elementa
+# LOCALIZATION NOTE (html.option.Show_Whitespace, html.option.tip.Show_Whitespace):
+# HTML panel option (located in tab's option menu). If set to true, whitepace inside of
+# nodes will be shown
 ShowWhitespace=Prikaži prazna mesta
-html.option.tip.Show_Whitespace=Show Whitespace inside of nodes
-# Allows to delete an existing CSS rule property.n\n
-# %S Name of the clicked propertyn\n
-ShowComments=Prikaži opombe
-html.option.tip.Show_Comments=Show comment nodes
-# examples: Delete "background-color"n\n
-# Console context menu labels.n\n
-# LOCALIZATION NOTE do not translate, no longer used(?)n\n
-html.option.Show_Entities_As_Symbols=Show Entities As Symbols
-html.option.tip.Show_Entities_As_Symbols=Show all XML entities using their symbolic representation
-html.option.Show_Entities_As_Names=Show Entities As Names
-html.option.tip.Show_Entities_As_Names=Show all XML entities using their names
-html.option.Show_Entities_As_Unicode=Show Entities As Unicode
-html.option.tip.Show_Entities_As_Unicode=Show all XML entities in their Unicode representation
-# Breakpoints side paneln\n
-# Script paneln\n
-# LOCALIZATION NOTE (LayoutPadding, LayoutBorder, LayoutMargin, LayoutOffset, LayoutAdjacent):n\n
-HighlightMutations=Poudari spremembe
-html.option.tip.Highlight_Mutations=Highlight changes inside nodes
-# Labels used to describe layout properties a the selected HTML element.n\n
-# Used in the Layout side panel under HMTL panel.n\n
-# LOCALIZATION NOTE (ShowRulers): Label for context menu item. Used in the Layout side paneln\n
+html.option.tip.Show_Whitespace=Prikaži prazna mesta znotraj vozlišč
+# LOCALIZATION NOTE (html.option.Show_Comments, html.option.tip.Show_Comments):
+# HTML panel option (located in tab's option menu). If set to true, comment nodes are displayed
+ShowComments=Prikaži pripombe
+html.option.tip.Show_Comments=Prikaži vozlišča pripomb
+# LOCALIZATION NOTE (html.option.Show_Text_Nodes_With_Entities, html.option.tip.Show_Text_Nodes_With_Entities):
+# HTML panel option (located in tab's option menu). If set to true, special characters will be
+# shown in their entity representation, e.g. " => &quot;, & => &amp;
+html.option.Show_Entities_As_Symbols=Prikaži predmete kot simbole
+html.option.tip.Show_Entities_As_Symbols=Prikaži vse predmete XML z uporabo svojih simboličnih prikazov
+html.option.Show_Entities_As_Names=Prikaži predmete kot imena
+html.option.tip.Show_Entities_As_Names=Prikaži vse predmete XML z uporabo svojih imen
+html.option.Show_Entities_As_Unicode=Prikaži predmete kot Unicode
+html.option.tip.Show_Entities_As_Unicode=Prikaži vse predmete XML v svojem prikazu Unicode
+# LOCALIZATION NOTE (html.option.Highlight_Mutations, html.option.tip.Highlight_Mutations):
+# HTML panel option (located in tab's option menu). If set to true, changes to the nodes
+# will be highlighted
+HighlightMutations=Označi spremembe
+html.option.tip.Highlight_Mutations=Označi spremembe v vozliščih
+# LOCALIZATION NOTE (html.option.Expand_Mutations, html.option.tip.Expand_Mutations):
+# HTML panel option (located in tab's option menu). If set to true, the tree view
+# will be expanded to display changed nodes
 ExpandMutations=Razširi spremembe
-html.option.tip.Expand_Mutations=Expand the tree view to display changed nodes
-# under HTML panel.n\n
-# LOCALIZATION NOTE http://www.w3.org/TR/cssom-view/#the-getclientrects-and-getboundingclientn\n
-# This is the default and may become the only choice.n\n
-ScrollToMutations=Zvrsti spremembe v vpogled
-html.option.tip.Scroll_To_Mutations=Scroll the tree view to bring changed nodes into view
-# LOCALIZATION NOTE (ShowAdjacentLayout): this is disabled, no translationn\n
-# Net paneln\n
-# LOCALIZATION NOTE (net.header.Reset_Header) Label for header context menu (within the net panel)n\n
-ShowQuickInfoBox=Prikaži hitre informacije
-inspect.option.tip.Show_Quick_Info_Box=Show information about the currently inspected element inside a panel overlaying the page
-# LOCALIZATION NOTE (net.header.URL, net.header.URL_Tooltip, net.header.Status,n\n
-# net.header.Status_Tooltip, net.header.Domain, net.header.Domain_Tooltip,n\n
-# net.header.Size, net.header.Size_Tooltip, net.header.Timeline, net.header.Timeline_Tooltip):n\n
-ShadeBoxModel=Model zasenčenega okvirja
-inspect.option.tip.Shade_Box_Model=Shade the different parts of the box model
-ScrollIntoView=Zvrsti v vpogled
-html.tip.Scroll_Into_View=Scroll the page to make the element visible
-NewAttribute=Nov atribut...
-html.tip.New_Attribute=Add a new attribute to this element
-html.Edit_Node=Edit %S...
-html.Node=Node
-html.tip.Edit_Node=Edit the %S using the full text editor
-DeleteElement=Odstrani element
-html.Delete_Element=Delete the element from the tree
-DeleteNode=Odstrani node
-html.Delete_Node=Delete the node from the tree
-# Labels and tooltips for a headers displayed on top of the Net panel.n\n
-quickInfo=Hitre informacije
-computedStyle=Izračunan stil
-# LOCALIZATION NOTE (net.label.Network_Breakpoints): Label for network breakpoints group.n\n
-# LOCALIZATION NOTE (net.label.Break_On_Request): Label used in the Net panel's contextn\n
-# menu for breaking on a XHR.n\n
+html.option.tip.Expand_Mutations=Razširi pogled drevesa za prikaz spremenjenih vozlišč
+# LOCALIZATION NOTE (html.option.Scroll_To_Mutations, html.option.tip.Scroll_To_Mutations):
+# HTML panel option (located in tab's option menu). If set to true, the tree view
+# will be scrolled to display changed nodes
+ScrollToMutations=Pomakni spremembe v pogled
+html.option.tip.Scroll_To_Mutations=Pomakni pogled drevesa za pomik spremenjenih vozlišč v pogled
+# LOCALIZATION NOTE (html.option.Scroll_To_Mutations, html.option.tip.Scroll_To_Mutations):
+# Inspector option (located in HTML tab's option menu and Firebug menu). If set to true,
+# a panel will be shown including information about the currently inspected element
+ShowQuickInfoBox=Prikaži polje hitrih podatkov
+inspect.option.tip.Show_Quick_Info_Box=Prikaži podatke o trenutno pregledanem elementu v podoknu, ki prekriva stran
+# LOCALIZATION NOTE (html.option.Scroll_To_Mutations, html.option.tip.Scroll_To_Mutations):
+# Inspector option (located in HTML tab's option menu and Firebug menu). If set to true, the tree view
+# will be scrolled to display changed nodes
+ShadeBoxModel=Zasenči model okvirja
+inspect.option.tip.Shade_Box_Model=Zasenči različne dele modela okvirja
+ScrollIntoView=Pomakni v pogled
+html.tip.Scroll_Into_View=Pomakni stran, da naredite element viden
+NewAttribute=Nov atribut ...
+html.tip.New_Attribute=Dodaj nov atribut temu elementu
+html.Edit_Node=Uredi %S ...
+html.Node=Vozlišče
+html.tip.Edit_Node=Uredi %S z uporabo polnega urejevalnika besedila
+DeleteElement=Izbriši element
+html.Delete_Element=Izbriši element iz drevesa
+DeleteNode=Izbriši vozlišče
+html.Delete_Node=Izbriši vozlišče iz drevesa
+# Quick Info Box
+quickInfo=Hitri podatki
+computedStyle=Izračunan slog
+# LOCALIZATION NOTE (html.Break_On_Mutate, html.Disable_Break_On_Mutate): Tooltips for resume
+# button that are used when the HTML panel is currently selected. The button allows stopping
+# JS execution when DOM of the current page is modified.
 html.Break_On_Mutate=Prekini ob mutaciji
 html.Disable_Break_On_Mutate=Onemogoči prekinitev ob mutaciji
-html.label.Break_On_Text_Change=Prekini ob spremembi teksta
-html.label.HTML_Breakpoints=HTML prelomna točka
+html.label.Break_On_Text_Change=Prekini ob spremembi besedila
+html.label.HTML_Breakpoints=Prekinitvene točke HTML 
 html.label.Break_On_Attribute_Change=Prekini ob spremembi atributa
-html.tip.Break_On_Attribute_Change=Stop JavaScript execution when an attribute of this element changes
-html.label.Break_On_Child_Addition_or_Removal=Prekini ob dodajanju/odvzemanju dedovanega razreda
-html.tip.Break_On_Child_Addition_or_Removal=Stop JavaScript execution when a child node is added to or removed from this element
+html.tip.Break_On_Attribute_Change=Ustavi izvajanje JavaScripta, kadar se spremeni atribut tega elementa
+html.label.Break_On_Child_Addition_or_Removal=Prekini ob dodajanju/odstranitvi podrejenega predmeta
+html.tip.Break_On_Child_Addition_or_Removal=Ustavi izvajanje JavaScripta, kadar je temu elementu odstranjeno ali dodano podrejeno vozlišče
 html.label.Break_On_Element_Removal=Prekini ob odstranitvi elementa
-html.tip.Break_On_Element_Removal=Stop JavaScript execution when the element is removed
-# LOCALIZATION NOTE (Post, Put): Label (verb) used in the Net panel for detailed info aboutn\n
-# a network request (displayed when a net panel entry is expanded). The content ofn\n
-# this tab displays sent data (related to a HTTP send method).n\n
-# LOCALIZATION NOTE (Response, URLParameters, Cache, HTML, jsonviewer.tab.JSON, xmlviewer.tab.XML):n\n
+html.tip.Break_On_Element_Removal=Ustavi izvajanje JavaScripta, kadar je ta element odstranjen
+# LOCALIZATION NOTE (html.label.Expand/Contract_All, html.tip.Expand/Contract_All):
+# Used within the HTML for a context menu item. The user can expand/contract
+# the element and all its children to quickly see the entire hierarchical structure
+# or collapse it.
 html.label.Expand/Contract_All=Razširi/Skrči vse
-html.tip.Expand/Contract_All=Expand/collapse all the children recursively
-# Label used in the Net panel for detailed info about a network request (displayedn\n
-# when a net panel entry is expanded)n\n
-# LOCALIZATION NOTE (RequestHeaders, ResponseHeaders): Label (noun) used in the Net paneln\n
+html.tip.Expand/Contract_All=Ponavljajoče razširi/strni vse podrejene predmete
+# LOCALIZATION NOTE (dom.scopeName): Used within the DOM panel to name the fake property that
+# contains the innermost closure scope of a function.
+dom.scopeName=(zaključek)
+# LOCALIZATION NOTE (dom.scopeParentName): Used within the DOM panel to name the fake property
+# that contains the parent of a closure scope.
+dom.scopeParentName=(nadrejeni obseg)
+# LOCALIZATION NOTE (dom.tip.scopeName): Used within the DOM panel as a tooltip when hovering
+# "(closure)".
+dom.tip.scopeName=Uporabite <func>.%closureVariable za dostop do ukazne vrstice
+# LOCALIZATION NOTE (dom.tip.scopeMemberName): Used within the DOM panel as a tooltip when
+# hovering a variable in a closure.
+# %S: the variable name - starts with "%"
+dom.tip.scopeMemberName=Uporabite <func>.%S za dostop do ukazne vrstice
+# LOCALIZATION NOTE (firebug.reps.declarativeScope, firebug.reps.objectScope, firebug.reps.withScope):
+# Labels shown to describe different types of closure scopes.
+firebug.reps.declarativeScope=[obseg navajanja]
+firebug.reps.objectScope=[predmetni obseg]
+firebug.reps.withScope=[z obsegom]
+# LOCALIZATION NOTE (firebug.reps.optimizedAway): Label shown to denote a closure variable that has
+# been optimized away.
+firebug.reps.optimizedAway=(odoptimizirana)
+# LOCALIZATION NOTE (firebug.reps.element.attribute_value, firebug.reps.element.property_value):
+# Used in the Console panel for elements. If an input element has two different values, one set
+# as "value" attribute and one set as 'value' property, these labels are used to distinguish it.
+firebug.reps.element.attribute_value=vrednost atributa
+firebug.reps.element.property_value=vrednost lastnosti
+# LOCALIZATION NOTE (dom.label.breakOnPropertyChange, dom.tip.Break_On_Property_Change):
+# Used within the DOM panel to create a 'property breakpoint'. Right-click on an property of an object.
+# The label is also used for the 'Break On Property Change' button (available on the toolbar).
 dom.label.breakOnPropertyChange=Prekinitev ob spremembi lastnosti
-dom.tip.Break_On_Property_Change=Stop the JavaScript execution when this property changes
-# (expand an entry in the panel and select Headers tab).n\n
-# LOCALIZATION NOTE (LimitExceeded): A message displayed in the Net panel when some entriesn\n
+dom.tip.Break_On_Property_Change=Ustavi izvajanje JavaScripta ob spremembi te lastnosti
+# LOCALIZATION NOTE (dom.disableBreakOnPropertyChange): Used within the DOM panel for the
+# 'break on next button' in the case the option is activated
 dom.disableBreakOnPropertyChange=Onemogoči prekinitev ob spremembi lastnosti
-dom.label.DOM_Breakpoints=DOM prelomne točke
-# must be removed since maximum number of entries has been reached.n\n
-# %S Is the number of entries removed.n\n
-# examples: Firebug's log limit has been reached. 150 entries not shown.n\n
-# xxxHonza: this construct should be replaced by PluralFormn\n
-EditAttribute=Uredi atribut "%S"
-html.tip.Edit_Attribute=Edit the value of the attribute "%S" of this element
-# See: https://developer.mozilla.org/en/Localization_and_Pluralsn\n
-# LOCALIZATION NOTE (LimitPrefsTitle): A message displayed in the Net panel when log limitn\n
-# has been reached. Informing the user what preferencee should be changed to modify the limit.n\n
-# %S Name of a preference.n\n
-DeleteAttribute=Odstrani atribute "%S"
-html.tip.Delete_Attribute=Delete the attribute "%S" from this element
-# examples: In order to change the limit modify: firebug.extensions.console.logLimitn\n
-# LOCALIZATION NOTE (Profile): Used as a caption for reported profile info.n\n
-# (result of javascript profiler tool). Reprsents a verb.n\n
+dom.label.DOM_Breakpoints=Prekinitvene točke DOM
+# LOCALIZATION NOTE (EditAttribute, html.tip.Edit_Attribute): Menu item label used in HTML panel context menu. Allows
+# editing an existing HTML element attribute.
+# %S = Name of the clicked attribute
+# examples: Edit Attribute "onclick"...
+EditAttribute=Uredi atribut "%S" ...
+html.tip.Edit_Attribute=Uredi vrednost atributa "%S" tega elementa
+# LOCALIZATION NOTE (DeleteAttribute, html.tip.Delete_Attribute): Menu item label used in HTML panel context menu. Allows
+# deleting an existing HTML element attribute.
+# %S = Name of the clicked attribute
+# examples: Delete Attribute "onclick"...
+DeleteAttribute=Izbriši atribut "%S"
+html.tip.Delete_Attribute=Izbriši atribut "%S" iz tega elementa
+# LOCALIZATION NOTE (InheritedFrom): Displaying an HTML element name + an applied CSS rule,
+# that has been inherited. Used in the Style side panel (under HTML panel).
+# examples: Inherited from table.tabView
 InheritedFrom=Podedovano od
-SothinkWarning=Razširitev Sothink SWF Catcher onemogoča pravilno dlovanje Firebug-a.<br><br>Prosim preberite <a href="http://www.getfirebug.com/faq.html#Sothink" target="_new">podrobno razlago na Firebug FAQ</a> za pomoč.
-# LOCALIZATION NOTE (Calls, OwnTime, Time, Avg, Min, Max, File): Used in profiler report headern\n
-# (name of a report column). In order to see this, select the Console panel start profilingn\n
+SothinkWarning=Razširitev Sothink SWF Catcher preprečuje pravilno delovanje Firebuga.<br><br> Za pomoč preberite <a href=\\"http://www.getfirebug.com/faq.html#Sothink\\" target=\\"_new\\">ta predmet v Pogostih vprašanjih Firebuga</a>.
+# LOCALIZATION NOTE (css.fontFamilyPreview): Part of a tooltip in the CSS panel
+# and Style side panel (within HTML panel) when the mouse hovers a font name
+# LOCALIZATION NOTE (css.EmptyStyleSheet): Displayed in the CSS panel
+# in case there are no stylesheets attached to the current page.
+# The text between <a> and </a> is displayed as a link.
+# LOCALIZATION NOTE (css.EmptyElementCSS2): Displayed in the Style side panel
 css.fontFamilyPreview=V kožuščku hudobnega fanta stopiclja mizar. 0123456789
-# by clicking the Profile button and stop it by clicking again. The report is logged into then\n
-# console panel. Make sure Script panel is enabled.n\n
-# Support for clipboard actions.n\n
-css.EmptyStyleSheet=Ni pravil. Lahko <a>ustvariš pravilo</a>.
-# LOCALIZATION NOTE (ShowCallsInConsole): Label for context menu item. Used in the Scriptn\n
-# panel when clicking a function object.n\n
-# %S Name of the functionn\n
-css.EmptyElementCSS=Ta element nima pravil sloga. Lahko <a>ustvarite pravilo</a> za to.
-EditStyle=Uredi slog elementa...
-style.tip.Edit_Style=Edit the element's inline style
-AddRule=Add Rule...
-css.tip.AddRule=Add a general rule for this element
-NewRule=Novo pravilo
-css.tip.New_Rule=Add a new rule
-# Log Calls to "getData"n\n
-# LOCALIZATION NOTE (console.MethodNotSupported): A message displayed in the Console paneln\n
-# if specific method is not supported.n\n
-# %S Name of a not supported method.n\n
-css.Delete_Rule=Delete "%S"
-css.tip.Delete_Rule=Delete the rule "%S" and all its properties
-# LOCALIZATION NOTE (commandline.MethodNotSupported): A message displayed in the Console paneln\n
-# when a not supported method is used on the command line.n\n
-# %S Name of a not supported method.n\n
-css.menu.Edit_Media_Query=Edit Media Query...
-css.menu.tip.Edit_Media_Query=Edit the media query assigned to this rule
-NewProp=Nova lastnost...
-css.tip.New_Prop=Add a new property to the current rule
-# LOCALIZATION NOTE (console.Disable_Break_On_All_Errors, console.Break_On_All_Errors):n\n
-# Tooltip for the "Break on... " button used when the Console panel is selected.n\n
-# Console strings used when JavaScript is not availablen\n
-# LOCALIZATION NOTE (net.file.SizeInfotip): A tool-tip text used for precise size of a networkn\n
-EditProp=Uredi "%S"
-css.tip.Edit_Prop=Edit the value of the property "%S"
-# response in the Net panel.n\n
-# #1 is rounded size, #2 precise sizen\n
-# examples: Size: 2KB (2,362 bytes)n\n
-# LOCALIZATION NOTE (net.option.Disable_Browser_Cache): A label for Net panel's option.n\n
+# (available within the HTML panel) in case there are no CSS rules for the selected element.
+# The text between <a> and </a> is displayed as a link.
+# LOCALIZATION NOTE (css.Delete_Rule, css.tip.Delete_Rule): Menu item label used in the CSS panel context menu.
+css.EmptyStyleSheet=Ni pravil. Lahko pa <a>eno ustvarite</a>.
+# Allows to delete an existing CSS rule
+# %S = Selector of the clicked rule
+# examples: Delete "div > p"
+css.EmptyElementCSS=Ta element nima slogovnih pravil. Lahko pa za njega <a>eno pravilo ustvarite</a>.
+EditStyle=Uredi slog elementa ...
+style.tip.Edit_Style=Uredi slog v besedilu za element
+AddRule=Dodaj pravilo ...
+css.tip.AddRule=Dodaj splošno pravilo za ta element
+NewRule=Novo pravilo ...
+css.tip.New_Rule=Dodaj novo pravilo
+# LOCALIZATION NOTE (css.menu.Edit_Media_Query, css.menu.tip.Edit_Media_Query):
+# Menu item label used in the CSS panel context menu.
+# Allows to add or edit the CSS media query of an import rule
+# LOCALIZATION NOTE (EditProp, css.tip.Edit_Prop): Menu item label used in the CSS panel context menu.
+css.Delete_Rule=Izbriši "%S"
+css.tip.Delete_Rule=Izbriši pravilo "%S" in vse njegove lastnosti
+# Allows to edit an existing CSS rule property.
+# %S = Name of the clicked property
+# examples: Edit "background-color"...
+css.menu.Edit_Media_Query=Uredi poizvedbo predstavnosti ...
+css.menu.tip.Edit_Media_Query=Uredi poizvedbo predstavnosti, ki je dodeljena temu pravilu
+NewProp=Nova lastnost ...
+css.tip.New_Prop=Dodaj novo lastnost trenutnemu pravilu
+# LOCALIZATION NOTE (DisableProp): Menu item label used in the CSS panel context menu.
+# Allows to disable an existing CSS rule property.
+# %S = Name of the clicked property
+# examples: Disable "background-color"
+EditProp=Uredi "%S" ...
+css.tip.Edit_Prop=Uredi vrednost lastnosti "%S"
+# LOCALIZATION NOTE (DeleteProp, css.tip.Delete_Prop): Menu item label used in the CSS panel context menu.
+# Allows to delete an existing CSS rule property.
+# %S = Name of the clicked property
+# examples: Delete "background-color"
 DisableProp=Onemogoči "%S"
-css.tip.Disable_Prop=Disable the property "%S"
-# LOCALIZATION NOTE names of kinds of scopes. Probably best left in English.n\n
-# With: the scope inside of the with(obj) {} statementn\n
-# Call: the scope inside of a function eg function foo() { XXX here XXX var f = function() {} };n\n
-# Window: the scope inside of a Javascript window object.n\n
-DeleteProp=Odstrani "%S"
-css.tip.Delete_Prop=Delete the property "%S"
-# Net panel timing info labelsn\n
-BreakOnThisError=Prekinitev ob tej napaki
-console.menu.tip.Break_On_This_Error=Stop the JavaScript execution as soon as this error occurs
-BreakOnAllErrors=Prekinitev pri vseh napakah
-console.menu.tip.Break_On_All_Errors=Stop the JavaScript execution as soon as an error occurs
-#A11y Chrome Labels (not visible, spoken by screen readers)n\n
-#A11y panelNode labels (not visible, spoken by screen readers)n\n
-#A11y Domplate labels  (not visible, spoken by screen readers)n\n
-TrackThrowCatch=Sledi Throw/Catch
-script.option.tip.Track_Throw_Catch=Track exceptions even when they are caught by try/catch blocks
-UseLastLineForEvalName=Uporabi zadnjo izvorno vrstico za eval() imena
-UseMD5ForEvalName=Uporabi MD5 za eval() imena
-# LOCALIZATION NOTEn\n
+css.tip.Disable_Prop=Onemogoči lastnost "%S"
+# Console context menu labels.
+# LOCALIZATION NOTE (script.option.Track_Throw_Catch):
+# Script panel option (located in tab's option menu). If set to true, tracking of
+# throw/catch blocks is enabled.
+DeleteProp=Izbriši \\"%S\\"
+css.tip.Delete_Prop=Izbriši lastnost "%S"
+# Breakpoints side panel
+BreakOnThisError=Prekini ob tej napaki
+console.menu.tip.Break_On_This_Error=Ustavi izvajanje Javascripta takoj, ko se pojavi ta napaka
+BreakOnAllErrors=Prekini ob vseh napakah
+console.menu.tip.Break_On_All_Errors=Ustavi izvajanje Javascripta takoj, ko se pojavi napaka
+# LOCALIZATION NOTE (breakpoints.Remove_Breakpoint, breakpoints.tip.Remove_Breakpoint, breakpoints.Disable_Breakpoint,
+# breakpoints.tip.Disable_Breakpoint, breakpoints.Enable_Breakpoint, breakpoints.tip.Enable_Breakpoint):
+# Context menu items in the Script panel and Breakpoints side panel.
+TrackThrowCatch=Sledi ukazoma Throw/Catch
+script.option.tip.Track_Throw_Catch=Sledi izjemam, kadar jih ujamejo bloki try/catch
+# LOCALIZATION NOTE (script.balloon.Continue, script.balloon.Disable): Labels used for buttons
 Breakpoints=Prekinitvene točke
-ErrorBreakpoints=prekinitvene točke ob napaki
-LoggedFunctions=zabeležene funkcije
+ErrorBreakpoints=Prekinitvene točke ob napaki
+LoggedFunctions=Zabeležene funkcije
 EnableAllBreakpoints=Omogoči vse prekinitvene točke
-breakpoints.option.tip.Enable_All_Breakpoints=Enable all listed breakpoints
+breakpoints.option.tip.Enable_All_Breakpoints=Omogoči vse navedene prekinitvene točke
 DisableAllBreakpoints=Onemogoči vse prekinitvene točke
-breakpoints.option.tip.Disable_All_Breakpoints=Disable all listed breakpoints
+breakpoints.option.tip.Disable_All_Breakpoints=Onemogoči vse navedene prekinitvene točke
 ClearAllBreakpoints=Odstrani vse prekinitvene točke
-breakpoints.option.tip.Clear_All_Breakpoints=Remove all listed breakpoints
-ConditionInput=Ta prekinitvena točka bo zaustavila izvajanje, če je ta izraz resničen:
-# Used by a11y. Not directly visible in the UI, intended for screen readers.n\n
-# Describe contents of inline editor fieldsn\n
-# LOCALIZATION NOTE (a11y.labels.overridden):n\n
-breakpoints.Remove_Breakpoint=Odstrani točko preloma
-breakpoints.tip.Remove_Breakpoint=Remove the breakpoint
-breakpoints.Disable_Breakpoint=Onemogoči točko preloma
-breakpoints.tip.Disable_Breakpoint=Disable the breakpoint
-breakpoints.Enable_Breakpoint=Omogoči točko preloma
-breakpoints.tip.Enable_Breakpoint=Enable the breakpoint
-# Used by a11y. Not directly visible in the UI, intended for screen readers.n\n
-# indicates style property is overridden by selector with higher specificityn\n
-# LOCALIZATION NOTE (a11y.hasConditionalBreakpoint, a11y.hasDisabledBreakpoint):n\n
-# Used by a11y. Not directly visible in the UI, intended for screen readers.n\n
-# Existence and state of a breakpointn\n
+breakpoints.option.tip.Clear_All_Breakpoints=Odstrani vse navedene prekinitvene točke
+ConditionInput=Ta prekinitvena točka bo zaustavila izvajanje samo, če je ta izraz resničen:
+# within balloon popup dialog. This dialog appears when the debugger halts at a breakpoint or at
+# a 'debugger;' keyword.
+# Continue: allows to resume the debugger
+breakpoints.Remove_Breakpoint=Odstrani prekinitveno točko
+breakpoints.tip.Remove_Breakpoint=Odstrani prekinitveno točko
+breakpoints.Disable_Breakpoint=Onemogoči prekinitveno točko
+breakpoints.tip.Disable_Breakpoint=Onemogoči prekinitveno točko
+breakpoints.Enable_Breakpoint=Omogoči prekinitveno točko
+breakpoints.tip.Enable_Breakpoint=Omogoči prekinitveno točko
+# Disable: allows to disable the current 'debugger;' keyword used in the Javascript source
+# LOCALIZATION NOTE (callstack.Expand_All, callstack.tip.Expand_All,
+# callstack.Collapse_All, callstack.tip.Collapse_All):
+# Context menu item labels used in Stack side panel (within Script panel)
+# Firebug needs to be halted at a breakpoint to see these items.
 script.balloon.Continue=Nadaljuj
 script.balloon.Disable=Onemogoči
 ScriptsFilterStatic=Prikaži statične skripte
-ScriptsFilterEval=Prikaži statične in eval skripte
-ScriptsFilterEvent=Prikaži statične in event skripte
-ScriptsFilterAll=Prikaži statične, eval in event skripte
+ScriptsFilterEval=Prikaži statične in skripte eval
+ScriptsFilterEvent=Prikaži statične in skripte dogodkov
+ScriptsFilterAll=Prikaži statične skripte, skripte dogodkov in eval
 ScriptsFilterStaticShort=statične
 ScriptsFilterEvalShort=evals
-ScriptsFilterEventShort=events
+ScriptsFilterEventShort=dogodki
 ScriptsFilterAllShort=vse
-# LOCALIZATION NOTE (a11y.updates.script_suspended_on_line_in_file): Used by a11y. Not directlyn\n
-# visible in the UI, intended for screen readers.n\n
-# #1 Line number, #2 Function name, #3 File namen\n
-# LOCALIZATION NOTE (a11y.updates.match_found_in_logrows): Used by a11y. Not directlyn\n
+# LOCALIZATION NOTE (callstack.Execution_not_stopped):
+# Message displayed in the Stack side panel if the script execution is not stopped.
+# LOCALIZATION NOTE (ShowUserProps, ShowUserFuncs, ShowDOMProps, ShowDOMFuncs, ShowDOMConstants,
+# ShowOwnProperties, ShowOwnPropertiesTooltip, ShowEnumerableProperties, ShowEnumerablePropertiesTooltip,
 callstack.Expand_All=Razširi vse
-callstack.tip.Expand_All=Expand all stack frame functions
-callstack.Collapse_All=Zapri vse
-callstack.tip.Collapse_All=Collapse all stack frame functions
-# visible in the UI, intended for screen readers.n\n
-# Describes the match found when performing a console panel search n\n
-callstack.Execution_not_stopped=Stack frames are just shown when the script execution is stopped.
-# #1 %S String key the use is looking for. #2 number of rows that contain the matched textn\n
-# examples: "Match found for test in 17 log rows"n\n
-# LOCALIZATION NOTE (a11y.updates.match_found_for_on_line): Used by a11y. Not directlyn\n
-# visible in the UI, intended for screen readers.n\n
-ShowUserProps=Prikaži uporabniško opredeljene lastnosti
-dom.option.tip.Show_User_Props=Show user-defined object properties
-ShowUserFuncs=Prikaži uporabniško opredeljene funkcije
-dom.option.tip.Show_User_Funcs=Show user-defined object methods
-ShowDOMProps=Prikaži DOM lastnosti
-dom.option.tip.Show_DOM_Props=Show properties specified inside the DOM
-ShowDOMFuncs=Prikaži DOM funkcije
-dom.option.tip.Show_DOM_Funcs=Show functions specified inside the DOM
-ShowDOMConstants=Prikaži DOM konstante
-dom.option.tip.Show_DOM_Constants=Show constants specified inside the DOM
-ShowInlineEventHandlers=Prikaži linijske Event handlerje
-ShowInlineEventHandlersTooltip=Prikaži inline event handlerje, ki so na voljo in niso povezani z nobeno funkcijo.
-ShowOwnProperties=Prikaži samo lastne lastnosti
-ShowOwnPropertiesTooltip=Ne prikaži verige lastnosti
+callstack.tip.Expand_All=Razširi vse funkcije okvirja sklada
+callstack.Collapse_All=Strni vse
+callstack.tip.Collapse_All=Strni vse funkcije okvirja sklada
+# ShowInlineEventHandlers):
+# Labels for DOM panel options (located in tab's option menu)
+callstack.Execution_not_stopped=Okvirji sklada so prikazani samo ob ustavitvi izvajanja skripta.
+# LOCALIZATION NOTE (AddWatch, watch.tip.Add_Watch): Context menu item in the DOM panel, Script panel and Watch side panel.
+# Adds the selection or object to the Watch side panel to observe it
+# LOCALIZATION NOTE (CopySourceCode, script.tip.Copy_Source_Code): Context menu item of the Script panel.
+# Copies the selected source code to the clipboard.
+ShowUserProps=Prikaži uporabniško določene lastnosti
+dom.option.tip.Show_User_Props=Prikaži uporabniško določene lastnosti predmetov
+ShowUserFuncs=Prikaži uporabniško določene funkcije
+dom.option.tip.Show_User_Funcs=Prikaži uporabniško določene metode predmetov
+ShowDOMProps=Prikaži lastnosti DOM
+dom.option.tip.Show_DOM_Props=Prikaži lastnosti določene znotraj DOM
+ShowDOMFuncs=Prikaži funkcije DOM
+dom.option.tip.Show_DOM_Funcs=Prikaži funkcije določene znotraj DOM
+ShowDOMConstants=Prikaži stalnice DOM
+dom.option.tip.Show_DOM_Constants=Prikaži stalnice določene znotraj DOM
+ShowClosures=Prikaži zaključke
+dom.option.tip.Show_Closures=Prikaži zaključke, ki se nanašajo na različne funkcije (omogoči razhroščevalnik)
+dom.option.tip.Show_Closures2=Prikaži zaključke, ki so povezani z različnim funkcijami
+ShowInlineEventHandlers=Prikaži krmilnike dogodkov v besedilu
+ShowInlineEventHandlersTooltip=Prikaži razpoložljive krmilnike dogodkov, ki niso povezani z nobeno funkcijo.
+ShowOwnProperties=Prikaži samo svoje lastnosti
+ShowOwnPropertiesTooltip=Ne prikaži verige prototipa
 ShowEnumerableProperties=Prikaži samo števne lastnosti
 ShowEnumerablePropertiesTooltip=Ne prikaži ne-števnih lastnosti
-NoMembersWarning=Ta objekt nima lastnosti za prikaz.
-NewWatch=Nov sledilni izraz...
-# Describes the match found when performing a script panel search n\n
-# #1 %S String key the use is looking for. #2 line number the match was found on. #3 file name the match was found inn\n
-AddWatch=Dodaj sledenje
-watch.tip.Add_Watch=Add the selection/object to the Watch side panel for observation
-# examples: "Match found for window.alert on line 322 in utilities.js"n\n
-# LOCALIZATION NOTE (a11y.updates.match_found_in_element): Used by a11y. Not directlyn\n
+NoMembersWarning=Ta predmet nima lastnosti za prikaz.
+NewWatch=Nov spremljevalni izraz ...
+# LOCALIZATION NOTE (SetBreakpoint, script.tip.Set_Breakpoint): Context menu item of the Script panel.
+# Toggles setting of a breakpoint at the current line of a script inside the Script panel.
+AddWatch=Dodaj spremljanje
+watch.tip.Add_Watch=Dodaj izbiro/predmet stranskemu podoknu spremljanja za opazovanje
+# LOCALIZATION NOTE (EditBreakpointCondition, breakpoints.tip.Edit_Breakpoint_Condition):
+# Context menu item of the Script panel.
 CopySourceCode=Kopiraj izvorno kodo
-script.tip.Copy_Source_Code=Copy the selected source code to the clipboard
-Use_hash_plus_number_to_go_to_line=Uporabi #<number> za preskok v vrstico
+script.tip.Copy_Source_Code=Kopiraj izbrano izvorno kodo na odložišče
+Use_hash_plus_number_to_go_to_line=Uporabi #<število> za preskok na vrstico
 CopyValue=Kopiraj vrednost
-dom.tip.Copy_Value=Copy the property's value to the clipboard
+dom.tip.Copy_Value=Kopiraj vrednost lastnosti na odložišče
 Copy_Name=Kopiraj ime
-dom.tip.Copy_Name=Copy the property's name to the clipboard
+dom.tip.Copy_Name=Kopiraj ime lastnosti na odložišče
 Copy_Path=Kopiraj pot
-dom.tip.Copy_Path=Copy the property path
-NewProperty=Nova lastnost...
-EditProperty=Uredi lastnost...
-dom.tip.Edit_Property=Edit the property's value
-EditVariable=Uredi spremenljivko...
-stack.tip.Edit_Variable=Edit the variable's value
-EditWatch=Uredi sledenje...
-watch.tip.Edit_Watch=Edit the watch expression's value
-DeleteProperty=Odstrani lastnost
-dom.tip.Delete_Property=Delete the property
-DeleteWatch=Odstrani sledenje
-DeleteAllWatches=Delete All Watches
-watch.tip.Delete_Watch=Delete the watch expression
-watch.tip.Delete_All_Watches=Delete all the watch expressions
-# visible in the UI, intended for screen readers.n\n
-# Describes the match found when performing an HTML panel search (if it is found in an element node) n\n
+dom.tip.Copy_Path=Kopiraj pot lastnosti
+NewProperty=Nova lastnost ...
+EditProperty=Uredi lastnost ...
+dom.tip.Edit_Property=Uredi vrednost lastnosti
+EditVariable=Uredi spremenljivko ...
+stack.tip.Edit_Variable=Uredi vednost spremenljivke
+EditWatch=Uredi spremljanje ...
+watch.tip.Edit_Watch=Uredi vednost spremljalnega izraza
+DeleteProperty=Izbriši lastnost
+dom.tip.Delete_Property=Izbriši lastnost
+DeleteWatch=Izbriši spremljanje
+DeleteAllWatches=Izbriši vsa spremljanja
+watch.tip.Delete_Watch=Izbriši spremljalni izraz
+watch.tip.Delete_All_Watches=Izbriši vse spremljalne izraze
+# Allows to edit the condition, under which a breakpoint stops the JavaScript execution
+# LOCALIZATION NOTE (style.option.Only_Show_Applied_Styles, style.option.tip.Only_Show_Applied_Styles):
+# Style side panel option (located in tab's option menu). If set to true,
+watch.frameResultType.return=<vrnjena vrednost>
+watch.frameResultType.exception=<izjema>
+# just styles applied to an element will be displayed and overwritten ones will be hidden.
+# LOCALIZATION NOTE (style.option.Show_User_Agent_CSS, style.option.tip.Show_User_Agent_CSS):
 SetBreakpoint=Nastavi prekinitveno točko
-script.tip.Set_Breakpoint=Toggles setting of a breakpoint at the current line
-# #1 Search string that was matched. #2 the HTML element name containing the matched string. #3 XPATH string specifying  the matched elementn\n
-# examples: "Match found for obj in object element at /html/body/object[2]"n\n
-# LOCALIZATION NOTE (a11y.updates.match_found_in_attribute): Used by a11y. Not directlyn\n
-EditBreakpointCondition=Uredi pogoje prekinitvene točke
-breakpoints.tip.Edit_Breakpoint_Condition=Edit the condition, under which this breakpoint stops the JavaScript execution
-NoBreakpointsWarning=Na tej strani ni postavljenih prekinitvenih točk.
-# visible in the UI, intended for screen readers.n\n
-# Describes the match found when performing an HTML  panel search (if it is found in an attribute node) n\n
-# #1 Search string that was matched. #2 Attribute name #3 attribute value n\n
-Only_Show_Applied_Styles=Prikaži samo uporabljene stile
-style.option.tip.Only_Show_Applied_Styles=Just show styles applied to the element
-# #4 the HTML element name containing. #5 XPATH string specifying  the matched elementn\n
-# examples: "Match found for abindex in tabindex="0" in span element at /html/body/span[2]"n\n
-# LOCALIZATION NOTE (a11y.updates.match_found_in_text_content): Used by a11y. Not directlyn\n
-Show_User_Agent_CSS=Prikaži CSS
-style.option.tip.Show_User_Agent_CSS=Also show the CSS defined by the user agent
-# visible in the UI, intended for screen readers.n\n
-# Describes the match found when performing an HTML panel search (if it is found in a text element's contents) n\n
-# #1 Search string that was matched. #2 element's text content  n\n
-# #3 the HTML element name containing. #4 XPATH string specifying  the matched elementn\n
-# examples: "Match found for Firebug Rocks! in h2 element at /html/body/h2[2]"n\n
-computed.option.label.Colors_As_Hex=Colors As Hex
-computed.option.tip.Colors_As_Hex=Show colors in hexadecimal format
-computed.option.label.Colors_As_RGB=Colors As RGB
-computed.option.tip.Colors_As_RGB=Show colors in RGB format
-computed.option.label.Colors_As_HSL=Colors As HSL
-computed.option.tip.Colors_As_HSL=Show colors in HSL format
-# LOCALIZATION NOTE (a11y.updates.match_found_in_selector): Used by a11y. Not directlyn\n
-# visible in the UI, intended for screen readers.n\n
-# Describes the match found when performing a CSS panel search (if it is found in a selector) n\n
-# #1 Search string that was matched. #2 selector in which the match was found  n\n
-style.option.label.active=:active
-style.option.tip.active=Display :active pseudo-class styles
-# examples: "Match found for main in #mainContent h2 {"n\n
-# LOCALIZATION NOTE (a11y.updates.match_found_in_style_property): Used by a11y. Not directlyn\n
-# visible in the UI, intended for screen readers.n\n
-# Describes the match found when performing a CSS panel search (if it is found in a style property) n\n
+script.tip.Set_Breakpoint=Preklopi nastavitev prekinitvene točke na trenutni vrstici
+# Style side panel option (located in tab's option menu). If set to true, the Style side panel will
+# also display styles defined by the user agent.
+# LOCALIZATION NOTE (computed.option.label.Colors_As_Hex, computed.option.tip.Colors_As_Hex,
+EditBreakpointCondition=Uredi pogoje prekinitvene točke ...
+breakpoints.tip.Edit_Breakpoint_Condition=Uredi pogoj, pod katerim ta prekinitvena točka ustavi izvajanje Javascripta
+NoBreakpointsWarning=Na tej strani ni nastavljenih prekinitvenih točk.
+#   computed.option.label.Colors_As_RGB, computed.option.tip.Colors_As_RGB,
+#   computed.option.label.Colors_As_HSL, computed.option.tip.Colors_As_HSL):
+# CSS panel, Style side panel and Computed side panel option (located in tab's option menu).
+Only_Show_Applied_Styles=Prikaži samo uporabljene sloge
+style.option.tip.Only_Show_Applied_Styles=Prikaži samo sloge, ki so uporabljeni za ta element
+# Allows switching the display of CSS colors between hex, rgb(a) and hsl(a) format
+# LOCALIZATION NOTE (style.option.label.active, style.option.tip.active):
+# Style side panel option tooltip (located in tab's option menu). If the option is set to true,
+Show_User_Agent_CSS=Prikaži CSS uporabniškega posrednika
+style.option.tip.Show_User_Agent_CSS=Prikaži tudi CSS, ki ga je določil uporabniški posrednik
+# the Style side panel will simulate the element being activated and therefore display
+# :active pseudo-class styles
+# LOCALIZATION NOTE (style.option.label.hover, style.option.tip.hover):
+# Style side panel option tooltip (located in tab's option menu). If the option is set to true,
+# the Style side panel will simulate the element being hovered and therefore display
+# :hover pseudo-class styles
+# LOCALIZATION NOTE (style.option.label.focus, style.option.tip.focus):
+computed.option.label.Colors_As_Authored=Overjene barve
+computed.option.tip.Colors_As_Authored=Prikaže barve kot so bile določene
+computed.option.label.Colors_As_Hex=Brave kot šestnajstiška števila
+computed.option.tip.Colors_As_Hex=Prikaži barve v šestnajstiški obliki
+computed.option.label.Colors_As_RGB=Barve kot RGB
+computed.option.tip.Colors_As_RGB=Prikaži barve v obliki RGB
+computed.option.label.Colors_As_HSL=Barve kot HSL
+computed.option.tip.Colors_As_HSL=Prikaži barve v obliki HSL
+# Style side panel option tooltip (located in tab's option menu). If the option is set to true,
+# the Style side panel will simulate the element being focused and therefore display
+# :focus pseudo-class styles
+# LOCALIZATION NOTE (css.label.Inspect_Declaration, css.tip.Inspect_Declaration):
+style.option.label.active=:aktiven
+style.option.tip.active=Prikaži sloge psevdo razreda :active
+# CSS panel/Style side panel context menu option. Allows inspecting a font face of a web font
+# declaration inside the CSS panel
+# LOCALIZATION NOTE (css.option.Expand_Shorthand_Properties, css.option.tip.Expand_Shorthand_Properties):
+# CSS panel/Style side panel option (located in tab's option menu). If set to true,
 style.option.label.hover=:hover
-style.option.tip.hover=Display :hover pseudo-class styles
-# #1 Search string that was matched. #2 style property in which the match was found #3 selector the style property applies to  n\n
-# examples: "Match found for background in style property background-repeat: "repeat-x"; in selector #mainContent {"n\n
-# LOCALIZATION NOTE (a11y.updates.match_found_in_dom_property): Used by a11y. Not directlyn\n
-# visible in the UI, intended for screen readers.n\n
+style.option.tip.hover=Prikaži sloge psevdo razreda :hover
+# CSS shorthand properties like 'margin' will be split into their components, e.g. 'margin-top',
+# 'margin-left', 'margin-bottom', 'margin-right'
+# LOCALIZATION NOTE (computed.option.Sort_Alphabetically, computed.option.tip.Sort_Alphabetically):
+# Computed side panel option (located in tab's option menu). If set to 'alphabetical',
 style.option.label.focus=:focus
-style.option.tip.focus=Display :focus pseudo-class styles
-# Describes the match found when performing a DOM panel search  n\n
-# #1 Search string that was matched. #2 DOM property in which the match was found   n\n
-# examples: "Match found for time in _starttime : 1257324992232 (Number)"n\n
-css.label.Inspect_Declaration=Inspect Declaration
-css.tip.Inspect_Declaration= Inspect the declaration of this font
-# LOCALIZATION NOTE (a11y.updates.match_found_in_net_row): Used by a11y. Not directlyn\n
-# visible in the UI, intended for screen readers.n\n
-# Describes the match found when performing a Net panel search  n\n
-# #1 Search string that was matched. #2 File name associated to the row in which the match was found. n\n
-Expand_Shorthand_Properties=Razširi kratkoročne lastnosti
-css.option.tip.Expand_Shorthand_Properties=Expand CSS shorthand properties into their components
-# #3 Column in which the match was found #4. Column value   n\n
-# examples: "Match found for 792 in GET loading_animation.gif, timeline: 792 ms"n\n
-# LOCALIZATION NOTE (a11y.updates.match_found_in_net_summary_row): Used by a11y. Not directlyn\n
-# visible in the UI, intended for screen readers.n\n
+style.option.tip.focus=Prikaži sloge psevdo razreda :focus
+# the computed styles will be listed alphabetically by their name, otherwise they will be grouped
+# into categories
+# LOCALIZATION NOTE (computed.option.Show_Mozilla_Specific_Styles, computed.option.tip.Show_Mozilla_Specific_Styles):
+css.label.Inspect_Declaration=Preveri najavo
+css.tip.Inspect_Declaration= Preveri najavo te pisave
+# Computed side panel option (located in tab's option menu). If set to true,
+# also styles prefixed with -moz will be displayed
+# LOCALIZATION NOTE (computed.No_User-Defined_Styles):
+# Displayed in the Computed side panel (available within the HTML panel) in case there are no
+Expand_Shorthand_Properties=Razširi okrajšane lastnosti
+css.option.tip.Expand_Shorthand_Properties=Razširi okrajšane lastnosti CSS v njihove komponente
+# user-defined CSS rules applying to the selected element.
+# LOCALIZATION NOTE (location.inline):
+# Label used within the Location Menu for inline styles or scripts
+# LOCALIZATION NOTE (location.no_domain):
 Sort_alphabetically=Razvrsti po abecedi
-computed.option.tip.Sort_Alphabetically=Sort the styles by their name/group the styles into categories
-# Describes the match found when performing a Net panel search (if it is found in the Net summary row)n\n
-# #1 Search string that was matched. #2 Column value in which the match was found n\n
-# examples: "Match found for 05 in net summary row: 4.05sn\n
-Show_Mozilla_specific_styles=Prikaži Mozilla specifične stile
-computed.option.tip.Show_Mozilla_Specific_Styles=Also show styles prefixed with -moz
-# LOCALIZATION NOTE (a11y.updates.no_matches_found): Used by a11y. Not directlyn\n
-# visible in the UI, intended for screen readers.n\n
-# Indicates that the searched string was not matched  n\n
-computed.No_User-Defined_Styles=This element has no user-defined style rules.
+computed.option.tip.Sort_Alphabetically=Razvrsti sloge po njihovem imenu/združi sloge v kategorije
+# Label used within the Location Menu for the group of scripts,
+# which don't have a domain specified like e.g. eval()'ed scripts
+# LOCALIZATION NOTE (LayoutPadding, LayoutBorder, LayoutMargin, LayoutPosition, LayoutAdjacent):
+Show_Mozilla_specific_styles=Prikaži sloge, ki so značilni za Mozillo
+computed.option.tip.Show_Mozilla_Specific_Styles=Prikaži tudi sloge predpete z -moz
+# Labels used to describe layout properties a the selected HTML element.
+# Used in the Layout side panel (within HTML panel).
+# LOCALIZATION NOTE (layout.option.Show_Rulers, layout.option.tip.Show_Rulers):
+computed.No_User-Defined_Styles=Ta element nima uporabniško določenih slogovnih pravil.
 script.Type_any_key_to_filter_list=Vnesite katerokoli tipko za filtriranje seznama
-# %S Search string that was matched.   n\n
-# examples: "No matched found for wefkhwefkgwekhjgjh"n\n
-# Console messages.n\n
-LayoutPadding=padding
-LayoutBorder=border
-LayoutMargin=margin
-LayoutPosition=pozicija
-LayoutAdjacent=adjacent
+# Layout side panel option (located in tab's option menu). If set to true,
+# rulers and guides will be displayed for the element on the page
+location.inline=V  besedilu
+# when hovering parts of the layout box
+# Net panel
+# LOCALIZATION NOTE (net.tip.Clear)
+location.no_domain=Bred domene
+# Tooltip for the button inside the Net panel to clear the request list
+# LOCALIZATION NOTE (net.header.Reset_Header, net.header.tip.Reset_Header)
+# Label for header context menu within the Net panel
+LayoutPadding=odmik
+LayoutBorder=obroba
+LayoutMargin=rob
+LayoutPosition=položaj
 position=položaj
-# LOCALIZATION NOTE (label.Activate_Firebug_for_the_selected_Firefox_tab):n\n
-# If Firebug is displayed in an external window (detached), but not active for then\n
-# currently selected Firefox tab, the following button label is used for ann\n
-# activation button.n\n
-ShowRulers=Prikaži merilo in vodila
-layout.option.tip.Show_Rulers=Show rulers and guides on the page when hovering parts of the layout box
-# LOCALIZATION NOTE (message.Failed_to_load_source_for, message.The_resource_from_this_URL_is_not_text):n\n
-Loading=Nalagam...
-Headers=Glave
-# An error message displayed in the Script panel when a source can't be displayedn\n
-# for specific URL.n\n
-net.tip.Clear=Clear the request list
-# examples: Failed to load source for: http://www.example.com/script.jsn\n
-# examples: The resource from this URL is not text: http://www.example.com/script.jsn\n
-net.header.Reset_Header=Ponastavi glavo
-net.header.tip.Reset_Header=Reset the header display
 # LOCALIZATION NOTE (net.header.URL, net.header.URL_Tooltip, net.header.Status,
 # net.header.Status_Tooltip, net.header.Domain, net.header.Domain_Tooltip,
 # net.header.Size, net.header.Size_Tooltip, net.header.Timeline, net.header.Timeline_Tooltip,
 # net.header.Local_IP, net.header.Local_IP_Tooltip, net.header.Remote_IP,
+ShowRulers=Prikaži merila in vodila
+layout.option.tip.Show_Rulers=Prikaži merila in vodila na strani, kadar se miška nahaja nad deli razporeditvenega polja
 # net.header.Remote_IP_Tooltip, net.header.Protocol, net.header.Protocol_Tooltip):
 # Labels and tooltips for headers displayed on top of the Net panel.
-net.header.URL=URL
-net.header.URL_Tooltip=Zahtevaj URL in uporabljeno HTTP metodo
-net.header.Status=Status
-net.header.Status_Tooltip=Status prejetega odgovora
-net.header.Domain=Domena
-net.header.Domain_Tooltip=Domena izvršene zahteve
-net.header.Size=Velikost
-net.header.Size_Tooltip=Velikost prejetega odgovora.
-net.header.Timeline=Časovni potek
-net.header.Timeline_Tooltip=Podroben časovni potek zahtev in odgovorov.
-net.header.Local_IP=Lokalni IP
-net.header.Local_IP_Tooltip=Lokalni IP naslov in vrata na katera se veže zahtevek.
-net.header.Remote_IP=Oddaljeni IP
-net.header.Remote_IP_Tooltip=Oddaljeni IP naslov in vrata na katera se veže zahtevek.
-net.header.Protocol=Protokol
-net.header.Protocol_Tooltip=URL protokol za lociranje vira na Internetu.
+events.noEventListeners=Na tem elementu neposredno ni poslušalnikov dogodkov.
 # LOCALIZATION NOTE (net.label.Network_Breakpoints): Label for network breakpoints group.
-net.label.XHR_Breakpoints=XHR prelomne točke
 # LOCALIZATION NOTE (net.label.Break_On_XHR, net.tip.Break_On_XHR):
 # Net panel context menu item for stopping the JavaScript execution on an XHR
-net.label.Break_On_XHR=Prekini ob XHR
-net.tip.Break_On_XHR=Stop the JavaScript execution as soon as an XMLHttpRequest is made
+events.listenersFrom=Poslušalniki iz
+events.otherListeners=Drugi poslušalniki iz
 # LOCALIZATION NOTE (net.headers.view_source, net.headers.pretty_print): Labels used in the
+events.capturing=(zajem)
 # Net panel's Headers tab (displayed if you expand a network request). The label is used
 # for a link, that switches the view between raw source code and formated header values.
-net.headers.view_source=ogled izvorne kode
-net.headers.pretty_print=lepi tisk
-# LOCALIZATION NOTE (net.filter.Media): Label for Net panel filter (used on the Net panel toolbar)
-net.filter.Media=Mediji
+events.tip.jQuerySelectorFilter=Filter izbirnika jQuery
+# LOCALIZATION NOTE (net.filter.label.All, net.filter.tooltip.All, net.filter.label.HTML,
+# net.filter.tooltip.HTML, net.filter.label.CSS, net.filter.tooltip.CSS, net.filter.label.JS,
+# net.filter.tooltip.JS, net.filter.label.XHR, net.filter.tooltip.XHR, net.filter.label.Images,
+events.tip.wrappedFunction=Poslušalnik dogodkov kliče to ovijalno funkcijo
+# net.filter.tooltip.Images, net.filter.label.Plugins, net.filter.tooltip.Plugins,
+# net.filter.label.Media, net.filter.tooltip.Media):
+events.option.showWrappedListeners=Prikaži ovijalne poslušalnike
+events.option.tip.showWrappedListeners=Za poslušalnike dogodkov, ki delujejo kot ovijalniki okoli drugih funkcij, prikaže ovijalne funkcije na seznamu. To je lahko uporabno za delo s knjižnicami JavaScript.
+# Labels and tooltips for Net panel filter (used on the Net panel toolbar)
+Loading=Nalaganje ...
+Headers=Glave
 # LOCALIZATION NOTE (Post, Put): Label (verb) used in the Net panel for detailed info about
 # a network request (displayed when a Net panel entry is expanded). The content of
+net.tip.Clear=Počisti seznam zahtev
 # this tab displays sent data (related to an HTTP send method).
-Post=Poslano
-Put=Vtakni
 # LOCALIZATION NOTE (Response, URLParameters, Cache, HTML, jsonviewer.tab.JSON, xmlviewer.tab.XML):
+net.header.Reset_Header=Ponastavi glavo
+net.header.tip.Reset_Header=Ponastavi prikaz glave
 # Labels used in the Net panel for detailed info about a network request (displayed
 # when a Net panel entry is expanded)
-Response=Odgovor
-URLParameters=Param.
-Cache=Pomnilnik
-HTML=HTML
-jsonviewer.tab.JSON=JSON
-xmlviewer.tab.XML=XML
-svgviewer.tab.SVG=SVG
-fontviewer.General_Info=Splošne informacije
-fontviewer.Meta_Data=Meta podatki
-fontviewer.view_source=ogled izvorne kode
-fontviewer.Preview=Predogled
-fontviewer.view_characters=ogled znakov
-fontviewer.pretty_print=lepši tisk
-fontviewer.view_sample=ogled vzorca
-fontviewer.uniqueid=Unikaten ID
-fontviewer.vendor=Prodajalec
-fontviewer.license=Licenca
-fontviewer.description=Opis
-fontviewer.copyright=Avtorske pravice
-fontviewer.credits=Avtorji
-fontviewer.trademark=Blagovna znamka
-fontviewer.licensee=Pridobitelj licence
-fontviewer.extension=Vtičnik
-fontviewer.pangram=V kožuščku hudobnega fanta stopiclja mizar
 # LOCALIZATION NOTE (jsonviewer.sort, jsonviewer.do_not_sort): Label (verb) used in the
 # Net panel for JSON responses. Allows to sort alphabetically.
-jsonviewer.sort=Razvrščaj po ključu
-jsonviewer.do_not_sort=Ne razvrščaj
 # LOCALIZATION NOTE (net.jsonviewer.Copy_JSON): Label (verb) displayed in the JSON tab of a network request
 # in the Net & Console panel when copying JSON replies.
+net.header.URL=URL
+net.header.URL_Tooltip=Zahtevan URL in uporabljena metoda HTTP
+net.header.Status=Stanje
+net.header.Status_Tooltip=Stanje prejetega odgovora
+net.header.Domain=Domena
+net.header.Domain_Tooltip=Domena izvršene zahteve
+net.header.Size=Velikost
+net.header.Size_Tooltip=Velikost prejetega odgovora (stisnjena velikost v primeru stisnjenih odgovorov).
+net.header.Timeline=Časovnica
+net.header.Timeline_Tooltip=Podroben časovni potek zahtev in odgovorov.
+net.header.Local_IP=Lokalni IP
+net.header.Local_IP_Tooltip=Lokalni naslov IP in število vrat, na katera se veže zahteva
+net.header.Remote_IP=Oddaljeni IP
+net.header.Remote_IP_Tooltip=Oddaljeni naslov IP in vrata, na katera se veže zahteva
+net.header.Protocol=Protokol
+net.header.Protocol_Tooltip=Protokol URL, ki se uporablja za iskanje vira na spletu.
 # %S = Part of the JSON, that was clicked
+net.label.XHR_Breakpoints=Prekinitvene točke XHR
 # example: Copy "person" as JSON
-net.jsonviewer.Copy_JSON=Kopiraj "%S" kot JSON
 # LOCALIZATION NOTE (RequestHeaders, ResponseHeaders, CachedResponseHeaders, PostRequestHeaders):
+net.label.Break_On_XHR=Prekini ob XHR
+net.tip.Break_On_XHR=Ustavi izvajanje JavaScripta takoj, ko je narejen XMLHttpRequest
 # Label (noun) used in the Net panel (displayed inside the Headers tab of a request).
-RequestHeaders=Glave zahtevka
-ResponseHeaders=Glave odgovora
-CachedResponseHeaders=Glave odgovora iz pomnilnika
-PostRequestHeaders=Request Headers From Upload Stream
 # LOCALIZATION NOTE (net.label.ResponseHeadersFromBFCache):
 # Label (noun) used in the Net panel and displayed instead of Response Headers
+net.headers.view_source=pokaži izvorno kodo
+net.headers.pretty_print=lepi tisk
 # if the response comes directly from the cache (BFCache).
-net.label.ResponseHeadersFromBFCache=The request was resolved directly from the cache, so we have no response from the server. See below for the cached response.
 # LOCALIZATION NOTE (plural.Limit_Exceeded2): Semicolon list of plural forms.
 # A message displayed in the Net panel when some entries must be removed in the case the maximum number
 # of entries has been reached.
 # %1 = the number of entries removed
 # example: Firebug's log limit has been reached. 150 entries not shown.
-plural.Limit_Exceeded2=Omejitev Firebug log dnevnika je bila dosežena. %1$S vnos ni prikazan.;Omejitev Firebug log dnevnika je bila dosežena. %1$S vnosov ni prikazanih.
-LimitPrefs=Nastavitve
+net.filter.label.All=Vsi
+net.filter.tooltip.All=Prikaži vse vrste MIME
+net.filter.label.HTML=HTML
+net.filter.tooltip.HTML=Prikaži samo datoteke z oznakami
+net.filter.label.CSS=CSS
+net.filter.tooltip.CSS=Prikaži samo datoteke CSS
+net.filter.label.JS=JavaScript
+net.filter.tooltip.JS=Prikaži samo datoteke Javascript
+net.filter.label.XHR=XHR
+net.filter.tooltip.XHR=Prikaži samo XMLHttpRequests
+net.filter.label.Images=Slike
+net.filter.tooltip.Images=Prikaži samo slike
+net.filter.label.Plugins=Vtičniki
+net.filter.tooltip.Plugins=Prikaži samo datoteke Flash in Silverlight
+net.filter.label.Media=Predstavnost
+net.filter.tooltip.Media=Prikaži samo zvok in sliko 
+net.filter.label.Fonts=Pisave
+net.filter.tooltip.Fonts=Prikaži samo pisave 
+Name=Ime
+Description=Opis
 # LOCALIZATION NOTE (LimitPrefsTitle): A message displayed in the Net panel when log limit
 # has been reached. Informing the user what preference should be changed to modify the limit.
 # %S = Name of a preference
+Post=Objavi
+Put=Vstavi
 # examples: In order to change the limit modify 'firebug.extensions.console.logLimit'
-LimitPrefsTitle=Za spremembo omejitve spremenite: %S
-Refresh=Osveži
-panel.tip.Refresh=Refresh the panel display
 # LOCALIZATION NOTE (OpenInTab, firebug.tip.Open_In_Tab): Context menu option of source links,
 # stylesheets and net requests to open the underlying URL in a new browser tab
-OpenInTab=Odpri v novem zavihku
-firebug.tip.Open_In_Tab=Open the URL in a new browser tab
-Open_Response_In_New_Tab=Odpri odgovor v novem zavihku
-net.tip.Open_Response_In_New_Tab=Open the response in a new browser tab
+Response=Odgovor
+URLParameters=Param.
+Cache=Predpomnilnik
+HTML=HTML
+jsonviewer.tab.JSON=JSON
+xmlviewer.tab.XML=XML
+svgviewer.tab.SVG=SVG
+fontviewer.tab.Font=Pisava
+fontviewer.General_Info=Splošni podatki
+fontviewer.Meta_Data=Metapodatki
+fontviewer.view_source=pokaži izvorno kodo
+fontviewer.Preview=Predogled
+fontviewer.view_characters=pokaži znake
+fontviewer.pretty_print=lepi tisk
+fontviewer.view_sample=pokaži vzorec
+fontviewer.uniqueid=Edinstven ID
+fontviewer.vendor=Dobavitelj
+fontviewer.license=Licenca
+fontviewer.description=Opis
+fontviewer.copyright=Avtorske pravice
+fontviewer.credits=Zasluge
+fontviewer.trademark=Blagovna znamka
+fontviewer.licensee=Imetnik licence
+fontviewer.extension=Razširitev
+fontviewer.pangram=V kožuščku hudobnega fanta stopiclja mizar
 # LOCALIZATION NOTE (Profile): Caption (verb) for reported profile info.
 # (result of JavaScript profiler tool).
-Profile=Profil
-ProfilerStarted=Profiler je zagnan. Klikni 'Profil' ponovno za poročilo
+jsonviewer.sort=Razvršča po ključu
+jsonviewer.do_not_sort=Ne razvrsti
 # LOCALIZATION NOTE (plural.Profile_Time2): Semicolon list of plural forms.
 # Caption for reported profile info (result of JavaScript profiler tool).
 # %1 = Number of milliseconds
 # %2 = Number of calls (plural)
+net.jsonviewer.Copy_JSON=Kopiraj \\\"%S\\\" kot JSON
 # example: (56ms, 15 calls)
-plural.Profile_Time2=(%1$Sms, %2$S klic);(%1$Sms, %2$S klici)
-NothingToProfile=Ni aktivnosti za profil.
-PercentTooltip=Procent časa porabljenega za to funkcijo.
-CallsHeaderTooltip=Število klicev te funkcije.
-OwnTimeHeaderTooltip=Časa porabljen za to funkcijo, brez ugnezdenih klicev.
-TimeHeaderTooltip=Časa porabljen za to funkcijo, vključno z ugnezdenimi klici.
-AvgHeaderTooltip=Povprečen čas, vključno z klici funkcij.
-MinHeaderTooltip=Minimalen čas, vključno z klici funkcij.
-MaxHeaderTooltip=Maksimalen čas, vključno z klici funkcij.
-ProfileButton.Enabled.Tooltip=Profil JavaScript čas izvrševanja.
-ProfileButton.Disabled.Tooltip=Profil JavaScript čas izvrševanja (skriptni panel mora biti omogočen).
-Function=Funkcija
-Percent=Procent
 # LOCALIZATION NOTE (Calls, OwnTime, Time, Avg, Min, Max, File): Used in profiler report header
+RequestHeaders=Glave zahtev
+ResponseHeaders=Glave odgovora
+CachedResponseHeaders=Glave odgovora iz predpomnilnika
+PostRequestHeaders=Glave zahtev iz pretoka prenosa
 # (name of a report column). In order to see this, select the Console panel, start profiling
 # by clicking the Profile button and stop it by clicking it again. The report is logged into the
 # Console panel. Make sure Script panel is enabled.
-Calls=Klici
-OwnTime=Lasten čas
-Time=Čas
-Avg=Povp.
-Min=Min
-Max=Maks
-File=Datoteka
+net.label.ResponseHeadersFromBFCache=Zahteva je bila razrešena neposredno iz predpomnilnika, tako da ni odgovora od strežnika. Glejte spodaj za predpomnjen odgovor.
 # Support for standard actions.
-Copy=Kopiraj
-Cut=Izreži
-Remove=Odstrani
-Delete=Delete
-Paste=Prilepi
-SelectAll=Select All
-html.Copy_Node=Copy %S
-html.tip.Copy_Node=Copy the %S node and all its contents to the clipboard
-CopyInnerHTML=Kopiraj innerHTML
-html.tip.Copy_innerHTML=Copy the contents of the element to the clipboard
-CopyXPath=Kopiraj XPath
-html.tip.Copy_XPath=Copy the element's XPath to the clipboard
-Copy_CSS_Path=Kopiraj CSS pot
-html.tip.Copy_CSS_Path=Copy the element's CSS path to the clipboard
+# LOCALIZATION NOTE (html.menu.Paste, html.tip.Paste): Context menu item (with subitems).
+# Used in the HTML Panel to paste HTML/SVG/XML/XUL/MathML contents
+# %S = the type of the content to paste (HTML, SVG, XML, XUL or MathML)
+# LOCALIZATION NODE (html.menu.Paste_*, html.tip.Paste_*): Context menu items.
+plural.Limit_Exceeded2=Omejitev dnevnika Firebug je bila dosežena. %1$S vnos ni prikazan.;Omejitev dnevnika Firebug je bila dosežena. %1$S vnosa nista prikazana.;Omejitev dnevnika Firebug je bila dosežena. %1$S vnosi niso prikazani.;Omejitev dnevnika Firebug je bila dosežena. %1$S vnosov ni prikazanih.
+LimitPrefs=Nastavitve
+# These items are paste options, and appears as subitems of html.menu.Paste in the context menu.
+# LOCALIZATION NOTE (html.menu.Reload_Frame, html.menu.tip.Reload_Frame):
+# Context menu item of HTML frames
 # LOCALIZATION NOTE (CopyError, console.menu.tip.Copy_Error): Context menu item. Used in the Console
+LimitPrefsTitle=Za spremembo omejitve spremenite: %S
+Refresh=Osveži
+panel.tip.Refresh=Osveži prikaz podokna
 # panel when clicking an error object.
-CopyLocation=Kopiraj mesto
-clipboard.tip.Copy_Location=Copy the URL of the object's location to the clipboard
-CopyURLParameters=Copy URL Parameters
-net.tip.Copy_URL_Parameters=Copy URL parameters to the clipboard
-CopyPOSTParameters=Copy POST Parameters
-net.tip.Copy_POST_Parameters=Copy POST parameters to the clipboard
-CopyLocationParameters=Kopiraj mesto z parametri
-net.tip.Copy_Location_Parameters=Copy the URL incl. the parameters to the clipboard
-CopyRequestHeaders=Kopiraj glave zahtevka
-net.tip.Copy_Request_Headers=Copy the request headers to the clipboard
-CopyResponseHeaders=Kopiraj glave odgovora
-net.tip.Copy_Response_Headers=Copy the response headers to the clipboard
-CopyResponse=Kopiraj telo odgovora
-net.tip.Copy_Response=Copy the response body to the clipboard
 # LOCALIZATION NOTE (CopyError, console.menu.tip.Copy_Error): Context menu item. Used in the Console
+OpenInTab=Odpri v novem zavihku
+firebug.tip.Open_In_Tab=Odpri URL v novem brskalnikovem zavihku
+Open_Response_In_New_Tab=Odpri odgovor v novem zavihku
+net.tip.Open_Response_In_New_Tab=Odpri odgovor v novem brskalnikovem zavihku
 # panel when clicking an error object.
-CopyError=Kopiraj napako
-console.menu.tip.Copy_Error=Copy the error information to the clipboard
 # LOCALIZATION NOTE (CopySource, dom.tip.Copy_Source): Context menu item of. Used in the Console
+Profile=Profil
+ProfilerStarted=Spremljanje delovanja se izvaja. Ponovno kliknite 'Profil' za ogled poročila.
+ProfilerRequiresTheScriptPanel=Podokno skriptov mora biti omogočeno za delovanje profiliranja.
 # panel when clicking an error object.
-CopySource=Kopiraj funkcijo
-dom.tip.Copy_Source=Copy the function's source code to the clipboard
 # LOCALIZATION NOTE (ShowCallsInConsole): Context menu item of a function object inside the
 # DOM panel and Watch side panel.
 # %S = Name of the function
 # example: Log Calls to "getData"
+plural.Profile_Time2=(%1$Sms, %2$S klic);(%1$Sms, %2$S klica);(%1$Sms, %2$S klici);(%1$Sms, %2$S klicev)
+NothingToProfile=Ni aktivnosti za profil.
+PercentTooltip=Odstotek časa porabljenega za to funkcijo.
+CallsHeaderTooltip=Število klicev te funkcije.
+OwnTimeHeaderTooltip=Čas porabljen za to funkcijo, brez ugnezdenih klicev.
+TimeHeaderTooltip=Čas porabljen za to funkcijo, vključno z ugnezdenimi klici.
+AvgHeaderTooltip=Povprečen čas, vključno z klici funkcij.
+MinHeaderTooltip=Minimalen čas, vključno z klici funkcij.
+MaxHeaderTooltip=Maksimalen čas, vključno z klici funkcij.
+ProfileButton.Tooltip=Čas izvedbe profila JavaScript
+Function=Funkcija
+Percent=Odstotek
 # example: Log calls to the function "getData" inside the Console panel
-ShowCallsInConsole=Zabeleži klice v "%S"
-dom.tip.Log_Calls_To_Function=Log calls to the function "%S" inside the Console panel
 # LOCALIZATION NOTE (ShowEventsInConsole, html.tip.Show_Events_In_Console):
 # Menu item label used in HTML elements context menu. Allows logging of event information
 # to the console.
-ShowEventsInConsole=Zabeleži dogodek
-html.tip.Show_Events_In_Console=Log event information to the console
+Calls=Klici
+OwnTime=Lasten čas
+Time=Čas
+Avg=Povp.
+Min=Min
+Max=Maks
+File=Datoteka
 # LOCALIZATION NOTE (panel.Enabled, panel.tip.Enabled):
+Copy=Kopiraj
+Cut=Izreži
+Remove=Odstrani
+Delete=izbriši
+Paste=Prilepi
+SelectAll=Izberi vse
+html.Copy_Node=Kopiraj %S
+html.tip.Copy_Node=Kopiraj vozlišče %S in vso njegovo vsebino na odložišče
+CopyInnerHTML=Kopiraj innerHTML
+html.tip.Copy_innerHTML=Kopiraj vsebino elementa na odložišče
+CopyXPath=Kopiraj XPath
+CopyMinimalXPath=Kopiraj najmanjšo XPath
+html.tip.Copy_XPath=Kopiraj vsebino elementov XPath na odložišče
+html.tip.Copy_Minimal_XPath=Kopiraj najmanjšo XPath elementa na odložišče
+Copy_CSS_Path=Kopiraj pot CSS
+html.tip.Copy_CSS_Path=Kopiraj pot elementa CSS na odložišče
 # Option inside the options menu of activatable panels. Enables/Disables the panel.
-panel.Enabled=Omogočen
-panel.tip.Enabled=Toggle the panel activation
 # LOCALIZATION NOTE (panel.tooltip.Show_Command_Line_Popup): Tooltip used for a button on main
 # Firebug toolbar. This button allows to open the Command Line within other panels
+html.menu.Paste=Prilepi %S
+html.tip.Paste=Prilepi kot vsebino %S
 # than the Console panel.
-panel.tooltip.Show_Command_Line_Popup=Show Command Line Popup
 # LOCALIZATION NOTE (console.MethodNotSupported): Message displayed in the Console panel,
+html.menu.Paste_Replace_Content=Nadomesti vsebino
+html.tip.Paste_Replace_Content=Nadomesti vsebino vozlišča
+html.menu.Paste_Replace_Node=Nadomesti vozlišče
+html.tip.Paste_Replace_Node=Nadomesti HTML vozlišča
+html.menu.Paste_AsFirstChild=Kot prvi podrejeni predmet
+html.tip.Paste_AsFirstChild=Prilepi kot prvi podrejeni predmet vozlišča
+html.menu.Paste_AsLastChild=Kot zadnji podrejeni predmet
+html.tip.Paste_AsLastChild=Prilepi kot zadnji podrejeni predmet vozlišča
+html.menu.Paste_Before=Pred
+html.tip.Paste_Before=Prilepi pred vozliščem
+html.menu.Paste_After=Za
+html.tip.Paste_After=Prilepi za vozliščem
 # if a specific method is not supported.
 # %S = Name of the unsupported method
+html.menu.Reload_Frame=Ponovno naloži okvir
+html.menu.tip.Reload_Frame=Ponovno naloži vsebino okvirja
 # example: Firebug console does not support 'bind'
-console.MethodNotSupported=Firebug konzola ne podpira '%S'
+# LOCALIZATION NOTE (commandline.errorSourceHeader): Message displayed in the header of the
+CopyLocation=Kopiraj mesto
+clipboard.tip.Copy_Location=Kopiraj URL mesta predmeta na odložišče
+CopyURLParameters=Kopiraj parametre URL
+net.tip.Copy_URL_Parameters=Kopiraj parametre URL na odložišče
+CopyPOSTParameters=Kopiraj parametre POST
+net.tip.Copy_POST_Parameters=Kopiraj parametre POST na odložišče
+CopyLocationParameters=Kopiraj mesto s parametri
+net.tip.Copy_Location_Parameters=Kopiraj URL vključno s parametri na odložišče
+CopyRequestHeaders=Kopiraj glave zahtev
+net.tip.Copy_Request_Headers=Kopiraj glave zahtev na odložišče
+CopyResponseHeaders=Kopiraj glave odgovora
+net.tip.Copy_Response_Headers=Kopiraj glave odgovora na odložišče
+CopyAsCurl=Kopiraj kot URL
+net.tip.Copy_as_cURL=Kopiraj zahtevek kot ukazni niz URL na odložišče
+CopyResponse=Kopiraj telo odgovora
+net.tip.Copy_Response=Kopiraj telo odgovora na odložišče
+# source code where an exception has occured.
+# LOCALIZATION NOTE (commandline.MethodDisabled): Message displayed in the Console panel,
+CopyError=Kopiraj napako
+console.menu.tip.Copy_Error=Kopiraj podatke o napaki na odložišče
+# if a disabled method is entered via the Command Line.
 # LOCALIZATION NOTE (commandline.MethodNotSupported): Message displayed in the Console panel,
+CopySource=Kopiraj funkcijo
+dom.tip.Copy_Source=Kopiraj izvorno kodo funkcije na odložišče
 # if an unsupported method is entered via the Command Line.
 # %S = Name of the unsupported method
-commandline.MethodNotSupported=Firebuk ukazna vrstica ne podpira '%S'
 # LOCALIZATION NOTE (commandline.CurrentWindow): Message displayed in the Console panel when
 # cd(someWindow) is run. A space and a representation of the window object is appended
 # internally by Firebug.
-commandline.CurrentWindow=Current window:
+ShowCallsInConsole=Beleži klice v "%S"
+dom.tip.Log_Calls_To_Function=Beleži klice funkcije "%S" v podoknu konzole
 # LOCALIZATION NOTE (console.Disable_Break_On_All_Errors, console.Break_On_All_Errors):
 # Tooltip for the "Break on... " button used when the Console panel is selected.
-console.Disable_Break_On_All_Errors=Onemogoči prekinitev ob vseh napakah
-console.Break_On_All_Errors=Prekini ob vseh napakah
+dom.tip.setBreakpoint=Nastavi prekinitveno točko kot prvo vrstico za "%S"
 # LOCALIZATION NOTE (console.Break_On_This_Error): Tooltip for the breakpoint besides an error message
 # in the Console panel
-console.Break_On_This_Error=Prekini ob tej napaki
 # LOCALIZATION NOTE (console.Use_Arrow_keys,_Tab_or_Enter): Hint at the top of the Completion List Popup
+ShowEventsInConsole=Beleži dogodke
+html.tip.Show_Events_In_Console=Beleži podatke o dogodkih v konzolo
 # in the Command Line
-console.Use_Arrow_keys,_Tab_or_Enter=Use Arrow keys, Tab or Enter
 # LOCALIZATION NOTE (console.JSDisabledInFirefoxPrefs): Hint shown inside the Console panel in the case
+html.logAllEvents=Beleži vse dogodke
+html.logAllEvents.tip=Nadira vse razpoložljive dogodke
 # JavaScript is not available
-console.JSDisabledInFirefoxPrefs=Izvajanje JavaScript kode je onemogočeno v Firefox nastavitvah. Če želite uporabljati konzolno okno, omogočite nastavitev pod  'Orodja' -> 'Možnosti' -> 'Vsebina' -> 'Omogoči JavaScript'
+# LOCALIZATION NOTE (console.tip.ScriptPanelMustBeEnabledForTraces): Message shown inside the Console
+panel.Enabled=Omogočen
+panel.tip.Enabled=Preklopi omogočanje podokna
+# panel instead of a stack trace when it is missing because the script panel is disabled. The text
+# enclosed in <a></a> is a link which enables the Script panel.
+# LOCALIZATION NOTE (tooltip.multipleFiltersHint):
+panel.tooltip.Show_Command_Line_Popup=Prikaži pojavno okno ukazne vrstice
+# Hint used for Console and Net panel filter button tooltips describing the shortcut for selecting
+# multiple filters
+commandline.errorSourceHeader=IZRAZ, OVREDNOTEN Z UPORABO UKAZNE VRSTICE FIREBUG:
 # LOCALIZATION NOTE (console.multiHighlightLimitExceeded):
 # Used by the Console panel for arrays. If the user moves the mouse over an array bracket,
+commandline.MethodDisabled=Ta metoda ukazne vrstice je začasno onemogočena.
 # all elements in the array are highlighted on the page. If there are too many elements
 # in the array, this tooltip is displayed instead.
 # %S = Maximal number of elements to highlight
+commandline.CurrentWindow=Trenutno okno:
 # example: There are too many elements in the array to highlight on the page (current limit is 100).
 #          See 'extensions.firebug.multiHighlightLimit' preference.
-console.multiHighlightLimitExceeded=Obstaja preveč elementov v matriki da bi jih označili na strani (trenutna omejitev je %S).\nPoglejte 'extensions.firebug.multiHighlightLimit' nastavitve.
+console.Disable_Break_On_All_Errors=Onemogoči prekinitev ob vseh napakah
+console.Break_On_All_Errors=Prekini ob vseh napakah
 # LOCALIZATION NOTE (commandline.disabledForXMLDocs): This message is displayed in the Console panel
 # in cases when the current page is an XML document. The text between <a> and </a> is a link,
+console.Break_On_This_Error=Prekini ob tej napaki
 # that causes to switch to HTML rendering of the document.
-commandline.disabledForXMLDocs=Firebug ukazna vrstica je onemogočena za XML strani. Lahko <a>preklopite v HTML</a> za jo omogočit.
+# LOCALIZATION NOTE (commandline.Use_in_Command_Line): Right-click option for copying a JS value into the variable
+console.Use_Arrow_keys,_Tab_or_Enter=Uporabi smerne tipke, Tab ali Enter
+# $p and opening the Command Line.
+# LOCALIZATION NOTE (commandline.include.includeSuccess): For the include() function. This message is displayed
+console.Firebug_Command_Line_API=API ukazne vrstice Firebug
+# in the Console panel when a remote script evaluation succeeded
+# %S = the filename
+# LOCALIZATION NOTE (commandline.include.aliasNotFound): For the include() function. This message is displayed
+console.ScriptPanelMustBeEnabledForTraces=Podokno skripta mora biti omogočeno za pridobitev sledi sklada. <a>Omogoči podokno skripta.</a>
+# in the Console panel when a requested alias is not found
+# %S = the alias name
+# LOCALIZATION NOTE (commandline.include.loadFail): For the include() function. This message is displayed
+console.DebuggerWasDisabledForError=Sled sklada ne obstaja, ker je bila napaka zabeležena preden je bil omogočeno podokno skriptov. Stran lahko <a>ponovno naložite</a>.
+# in the Console panel when the remote script download failed
+# %S = the filename
+# LOCALIZATION NOTE (commandline.include.invalidRequestProtocol): For the include() function. This message is displayed
+tooltip.multipleFiltersHint=Uporabite Ctrl-klik za izbiro več filtrov
+# in the Console panel when the user tries to download a script with another scheme than HTTP(S)
+# %S = the filename
+# LOCALIZATION NOTE (commandline.include.invalidSyntax): For the include() function. This message is displayed
+# in the Console panel when the user tries to execute a non-Javascript file 
+# or when the script contains syntax errors
+# LOCALIZATION NOTE (commandline.include.aliasCreated): For the include() function. This message is displayed
+# in the Console panel when a new alias is created successfully
+console.multiHighlightLimitExceeded=Obstaja preveč elementov v polju za označitev na strani (trenutna omejitev je %S).\nGlejte nastavitev 'extensions.firebug.multiHighlightLimit'.
+# %S = the alias name
+# LOCALIZATION NOTE (commandline.include.aliasRemoved): For the include() function. This message is displayed
+# in the Console panel when a new alias is removed successfully
+commandline.disabledForXMLDocs=Ukazna vrstica Firebug je onemogočena za strani XML. Za omogočanje jo lahko <a>preklopite na HTML</a>.
+# %S = the alias name
+# LOCALIZATION NOTE (commandline.include.invalidAliasName): For the include() function. This message is displayed
+commandline.Use_in_Command_Line=Uporabi ukazno vrstico
+commandline.tip.Use_in_Command_Line=Osredotoči se na ukazno vrstico in naredi to vrednost na voljo kot "$p"
+# in the Console panel if an invalid alias name (which contains "/" or ".") is provided.
+# %S = the invalid alias name
+commandline.include.Alias=Vzdevek
+# LOCALIZATION NOTE (commandline.include.tooLongAliasName): For the include() function. This message is displayed
+# in the Console panel if the provided alias name is too long (i.e. more than 30 characters)
+commandline.include.URL=URL
+# %S = the invalid alias name
+# LOCALIZATION NOTE (commandline.include.wrongAliasArgument): For the include() function. This message is displayed
+# in the Console panel if the type of the alias name is invalid (a string is expected)
+commandline.include.includeSuccess=Lastnost %S je vključena.
+# LOCALIZATION NOTE (commandline.include.wrongUrlArgument): For the include() function. This message is displayed
+# in the Console panel if the type of the url arguement is invalid (a string or null are expected)
+# LOCALIZATION NOTE (commandline.include.confirmDelete): For the include() function. This message is displayed
+commandline.include.aliasNotFound=Vzdevek "%S ni bil najden.
+# in a confirmation dialog when the user wants to delete an alias
+# %S = the name of the alias to delete
+# LOCALIZATION NOTE (commandline.include.noDefinedAlias): For the include() function. This message is displayed
+commandline.include.loadFail=Naslednjega skripta ni bilo mogoče naložiti: %S
+# when the user wants to display the aliases table but there no alias is defined.
+# LOCALIZATION NOTE (Do_not_show_this_message_again): 
+# Message within a confirmation dialog that is displayed when deleting things.
+commandline.include.invalidRequestProtocol=Podprti so samo protokoli HTTP/HTTPS.
+# This message is displayed next to a check-box that can be used to disabled this
+# confirmation.
+commandline.include.invalidSyntax=Vključitev je spodletela zaradi skladnostne napake. Ali datoteka res vsebuje JavaScript?
+# NOTE to translators: this message was originally taken from cookies.msg.Do_not_show_this_message_again
+# LOCALIZATION NOTE (scratchpad.loading, scratchpad.failLoading)
+# Used when Firebug downloads a remote script and wants to display it in Scratchpad
+commandline.include.aliasCreated=Vzdevek "%S" je bil ustvarjen.
+# The messages appears as Javascript Comments in Scratchpad
 # LOCALIZATION NOTE (net.sizeinfo.Response_Body, net.sizeinfo.Post_Body, net.sizeinfo.Total_Sent,
 # net.sizeinfo.Total_Received, net.sizeinfo.Including_Headers):
+commandline.include.aliasRemoved=Vzdevek "%S" je bil odstranjen.
 # Labels used for a detailed size info tooltip. The tooltip is displayed, if the mouse hovers over
 # a request size displayed within the Net panel. 'Total Sent' and 'Total Received' info includes
 # sent and received headers size.
-net.sizeinfo.Response_Body=Vsebina odgovora
-net.sizeinfo.Post_Body=Post vsebina
-net.sizeinfo.Total_Sent=Skupaj poslano
-net.sizeinfo.Total_Received=Skupaj prejeto
-net.sizeinfo.Including_HTTP_Headers=Vključuje HTTP glave
-net.ActivationMessage=Omrežni panel aktiviran. Zahtevki poslani med neaktivnostjo panela niso prikazani.
-net.responseSizeLimitMessage=Firebug je dosegel omejitev za odgovore. Kliknite <a>tukaj</a>, če želite odpreti
+commandline.include.invalidAliasName=Imena vzdevkov ne smejo vsebovati "." ali "/"; neveljavno ime vzdevka: "%S".
 # LOCALIZATION NOTE (net.postDataSizeLimitMessage): A warning message displayed within the Net
 # panel (inside the Post tab of an expanded request entry). The message informs the user that
 # posted data reached Firebug's size limit and only part of it is displayed in the UI.
-net.postDataSizeLimitMessage=Post omejitev velikosti presežena - odstranjeno s strani Firebuga.
-net.Break_On_XHR=Prekinitev ob XHR
-net.label.Parameters=Parametri
-net.label.Parts=Deli
-net.label.Source=Izvor
+commandline.include.tooLongAliasName=Imena vzdevkov ne smejo vsebovati več kot 30 znakov; neveljavno ime vzdevka: %S.
 # LOCALIZATION NOTE (net.label.Resend): Label for context menu item. Used when clicking
 # on a HTTP request (in the Console or Net panel) to re-send it with the same arguments.
-net.label.Resend=Ponovno pošlji
-net.tip.Resend=Send the request again
+commandline.include.invalidAliasArgumentType=Neveljaven drugi element; pričakovano je ime vzdevka.
 # LOCALIZATION NOTE (net.option.Disable_Browser_Cache, net.option.tip.Disable_Browser_Cache):
 # Net panel option (located in tab's option menu). If set to true, the browser's HTTP cache is disabled
-net.option.Disable_Browser_Cache=Onemogoči predpomnenje v brskalniku
-net.option.tip.Disable_Browser_Cache=Disable the browser's HTTP cache
+commandline.include.invalidUrlArgumentType=Neveljaven argument url.
 # LOCALIZATION NOTE (net.option.Show_Paint_Events, net.option.tip.Show_Paint_Events):
 # Net panel option (located in tab's option menu). If set to true, the Net panel displays
 # MozAfterPaint events.
+commandline.include.confirmDelete=Ali res želite izbrisati ta vzdevek: "%S"?
 # See also: http://www.softwareishard.com/blog/firebug/watching-mozafterpaint-in-firebug/
-net.option.Show_Paint_Events=Prikaži paint dogodke
-net.option.tip.Show_Paint_Events=Show MozAfterPaint events as green lines inside the timeline
 # LOCALIZATION NOTE (net.option.Show_BFCache_Responses, net.option.tip.Show_BFCache_Responses):
+commandline.include.noDefinedAlias=(določen še ni bil noben vzdevek)
+commandline.tip.Delete_Alias=Izbriši vzdevek
+commandline.tip.Edit_Alias_Name=Uredi ime vzdevka
+commandline.tip.Edit_Alias_URL=Uredi URL vzdevka
+commandline.tip.Open_In_Scratchpad=Odpri vsebino skripta v beležnici
+commandline.tip.Include_Script=Prenesi in izvedi skript
+commandline.label.DeleteAlias=Izbriši vzdevek
+commandline.label.EditAliasName=Uredi ime vzdevka
+commandline.label.EditAliasURL=Uredi URL vzdevka
+commandline.label.OpenInScratchpad=Odpri v beležnici
+commandline.label.IncludeScript=Vključi "%S"
 # Net panel option (located in tab's option menu). If set to true, the Net panel also displays responses coming from
 # BFCache (back-forward cache). See also: https://developer.mozilla.org/En/Working_with_BFCache
-net.option.Show_BFCache_Responses=Prikaži BFCache odgovore
-net.option.tip.Show_BFCache_Responses=Prikazani bodo tudi odgovori iz nazaj-naprej medpomnilnika
 # LOCALIZATION NOTE (script.Break_On_Next, script.Disable_Break_On_Next):
 # Tooltip used for the Break On Next button inside panel toolbar of the Script panel.
 # (breaking on next executed JavaScript statement)
-script.Break_On_Next=Prekini ob naslednji
-script.Disable_Break_On_Next=Onemogoči prelom ob naslednjem
-ShowHttpHeaders=Prikaži glave HTTP
 # LOCALIZATION NOTE (plural.Request_Count2): Semicolon list of plural forms.
+Do_not_show_this_message_again=Ne prikaži tega več
 # A label used in the Net panel. Displays the number of HTTP requests executed by the current page.
 # %1 = Number of requests
 # example: 21 requests
-plural.Request_Count2=%1$S zahteva;%1$S zahteve
-FromCache=iz predpomnilnika
-StopLoading=Prekini nalaganje
-net.tip.Stop_Loading=Stop loading the request
-LargeData=(zelo veliko podatkov)
-ShowComputedStyle=Prikaži izračunan slog
-StyleGroup-text=Tekst
-StyleGroup-background=Ozadje
-StyleGroup-box=Box model
-StyleGroup-layout=ureditev
-StyleGroup-other=Drugo
-Dimensions=%S x %S
+scratchpad.loading=Nalaganje, počakajte ...
+scratchpad.failLoading=Napaka pri nalaganju skripta
+# LOCALIZATION NOTE (net.summary.from_cache):
+# Label used in the Net panel's request summary. Displays the summarized response size coming from cache for all HTTP requests.
+# LOCALIZATION NOTE (net.summary.tip.request_count, net.summary.tip.total_size,
+# net.summary.tip.total_cached_size, net.summary.tip.total_request_time):
+# Labels used for the tooltips in the Net panel's request summary
+net.sizeinfo.Response_Body=Vsebina odgovora
+net.sizeinfo.Post_Body=Vsebina objave
+net.sizeinfo.Total_Sent=Skupaj poslano
+net.sizeinfo.Total_Received=Skupaj prejeto
+net.sizeinfo.Including_HTTP_Headers=Vključuje glave HTTP
+net.ActivationMessage=Mrežno podokno je omogočeno. Zahteve poslane med neaktivnostjo podokna niso prikazane.
+net.responseSizeLimitMessage=Firebug je dosegel omejitev velikosti za odgovore. Kliknite <a>tukaj</a>, če želite odpreti celoten odgovor v novem Firefoxovem zavihku.
 # LOCALIZATION NOTE (CopyColor, css.tip.Copy_Color):
 # Context menu item for color values inside the CSS panel.
 # Copies the color value to the clipboard.
-CopyColor=Kopiraj barvo
-css.tip.Copy_Color=Copy the color to the clipboard
+net.postDataSizeLimitMessage=Omejitev velikosti zahteve Firebug je bila dosežena.
+net.Break_On_XHR=Prekinitev ob XHR
+net.label.Parameters=Parametri
+net.label.Parts=Deli
+net.label.Source=Izvorna koda
+net.label.Patch=Popravek
 # LOCALIZATION NOTE (CopyImageLocation, css.tip.Copy_Image_Location,
 # OpenImageInNewTab, css.tip.Open_Image_In_New_Tab):
+net.label.Resend=Ponovno pošlji
+net.tip.Resend=Ponovno pošlji zahtevo
 # Context menu items for images inside the CSS panel.
 # Allow copying the URL of an image to the clipboard and opening it in a new browser tab
-CopyImageLocation=Kopiraj mesto slike
-css.tip.Copy_Image_Location=Copy the URL of the image to the clipboard
-OpenImageInNewTab=Odpri sliko v novem zavihku
-css.tip.Open_Image_In_New_Tab=Open the image in a new browser tab
-# LOCALIZATION NOTE (callstack.option.Omit_Object_Path_Stack, callstack.option.tip.Omit_Object_Path_Stack):
+net.option.Disable_Browser_Cache=Onemogoči predpomnilnik brskalnika
+net.option.tip.Disable_Browser_Cache=Onemogoči predpomnilnik brskalnika HTTP
+# LOCALIZATION NOTE (OmitObjectPathStack, callstack.option.tip.Omit_Object_Path_Stack):
 # Stack side panel option (located in tab's option menu). If set to true,
 # the object path stack won't be displayed.
-OmitObjectPathStack=Prezri sklad orodne vrstice
-callstack.option.tip.Omit_Object_Path_Stack=Do not display the object path stack
-Load_Original_Source=Naloži originalno izvorno kodo
-css.tip.Load_Original_Source=Discard the changes and load the original CSS
+# LOCALIZATION NOTE (callstack.option.Show_Arguments, callstack.option.tip.Show_Arguments):
+net.option.Show_Paint_Events=Prikaži dogodke paint
+net.option.tip.Show_Paint_Events=Prikaži dogodke MozAfterPaint kot zelene črte v časovnem poteku
+# Stack side panel option (located in tab's option menu). If set to true,
+# function arguments are displayed
 # LOCALIZATION NOTE (Copy_Rule_Declaration, css.tip.Copy_Rule_Declaration):
+net.option.Show_BFCache_Responses=Prikaži odgovor BFCachee
+net.option.tip.Show_BFCache_Responses=Prikaži tudi odgovore iz predpomnilnika nazaj naprej
 # Menu item label and tooltip used in CSS panel/Style side panel context menu.
 # Allows copying the current CSS rule including all its properties to the clipboard.
-Copy_Rule_Declaration=Kopiraj deklaracijo pravil
-css.tip.Copy_Rule_Declaration=Copy the rule including all its properties to the clipboard
 # LOCALIZATION NOTE (Copy_Style_Declaration, css.tip.Copy_Style_Declaration):
+script.Break_On_Next=Prekini ob naslednji
+script.Disable_Break_On_Next=Onemogoči prekinitev ob naslednjem
+ShowHttpHeaders=Prikaži glave HTTP
 # Menu item label and tooltip used in CSS panel/Style side panel context menu.
 # Allows copying the current CSS rule's properties to the clipboard.
-Copy_Style_Declaration=Kopiraj deklaracijo stila
-css.tip.Copy_Style_Declaration=Copy the rule's properties to the clipboard
+# LOCALIZATION NOTE (css.label.Copy_Property_Declaration, css.tip.Copy_Property_Declaration,
+# css.label.Copy_Property_Name, css.tip.Copy_Property_Name, css.label.Copy_Property_Value,
+plural.Request_Count2=%1$S zahteva;%1$S zahtevi,%1$S zahteve;%1$S zahtev
+# css.tip.Copy_Property_Value):
+# Menu item labels and tooltips used in CSS panel/Style side panel context menu.
+net.summary.from_cache=%S iz predpomnilnika
+# Allow copying the current CSS property's declaration/name/value to the clipboard.
 # LOCALIZATION NOTE (plural.Error_Count2): Semicolon list of plural forms.
 # A label used in for Firebug Start Button. Displays the number of JavaScript errors found by Firebug.
+net.summary.tip.request_count=Število zahtev
+net.summary.tip.total_size=Skupna velikost zahtev
+net.summary.tip.total_cached_size=Skupna predpomnjena velikost vseh zahtev
+net.summary.tip.total_request_time=Skupni čas, ki je potreben z nalaganje vseh zahtev in čas pojavitve dogodka 'onload'
+netParametersSortAlphabetically=Razvrsti po abecedi
+netParametersDoNotSort=Ne razvrsti
+StopLoading=Ustavi nalaganje
+net.tip.Stop_Loading=Ustavi nalaganje zahteve
+LargeData=(zelo veliko podatkov)
+ShowComputedStyle=Prikaži izračunan slog
+StyleGroup-text=Besedilo
+StyleGroup-background=Ozadje
+StyleGroup-box=Model okvirja
+StyleGroup-layout=Razporeditev
+StyleGroup-other=Drugo
+Dimensions=%S x %S
 # %1 = Number of errors
 # example: 111 Errors
-plural.Error_Count2=%1$S Napaka;%1$S Napake
-moduleManager.title=%S panel je onemogočen
-moduleManager.desc3=Uporabi kontekstni menu Firebug ikone v statusni vrstici za o(ne)mogočanje vseh panelov. Nadzor posameznih panelov pa opravi v zavihkih panela:
-moduleManager.Enable=Omogoči
-Suspend_Firebug=Začasno prekini Firebug
-Resume_Firebug=Ponovno zaženi Firebug
-Reset_Panels_To_Disabled=Onemogoči panele
-Open_Console=Odpri konzolo
-Open_Console_Tooltip=Odpri sledilno konzolo za Firebug.
-Scope_Chain=Veriga obsega
 # LOCALIZATION NOTE (With_Scope, Call_Scope, Window_Scope):
+CopyColor=Kopiraj barvo
+css.tip.Copy_Color=Kopiraj barvo na odložišče
 # Names of kinds of scopes. Probably best left in English.
 # With: the scope inside of the with(obj) {} statement
-With_Scope=Z
 # Call: the scope inside of a function eg function foo() { XXX here XXX var f = function() {} };
-Call_Scope=Kliči
 # Window: the scope inside of a Javascript window object.
-Window_Scope=Okno
-Logs=Log datoteke
-Options=Možnosti
-Copy_Stack=Kopiraj sklad
-Copy Exception=Kopiraj izjemo
+CopyImageLocation=Kopiraj mesto slike
+css.tip.Copy_Image_Location=Kopiraj URL slike na odložišče
+OpenImageInNewTab=Odpri sliko v novem zavihku
+css.tip.Open_Image_In_New_Tab=Odpri sliko v novem brskalnikovem zavihku
 # LOCALIZATION NOTE (requestinfo.Blocking, requestinfo.Resolving, requestinfo.Connecting,
 # requestinfo.Sending, requestinfo.Waiting, requestinfo.Receiving, requestinfo.ContentLoad,
 # requestinfo.WindowLoad):
+OmitObjectPathStack=Preskoči sklad orodne vrstice
+callstack.option.tip.Omit_Object_Path_Stack=Ne prikaži sklada poti predmeta
+Load_Original_Source=Naloži izvirno izvorno kodo
+css.tip.Load_Original_Source=Opusti spremembe in naloži izvirni CSS
 # Net panel timing info labels. Displayed in a tooltip (aka time-info-tip) when hovering the
 # waterfall graph in the Net panel.
-requestinfo.Blocking=Blokirano
-requestinfo.Resolving=DNS poizvedba
-requestinfo.Connecting=Povezujem
-requestinfo.Sending=Pošiljam
-requestinfo.Waiting=Čakam
-requestinfo.Receiving=Prejemam
-requestinfo.ContentLoad='DOMContentLoaded' (dogodek)
-requestinfo.WindowLoad='load' (dogodek)
 # LOCALIZATION NOTE (requestinfo.started.label, requestinfo.phases.label, requestinfo.timings.label):
+callstack.option.Show_Arguments=Prikaži argumente
+callstack.option.tip.Show_Arguments=Prikaži tudi argumente funkcije
 # Labels used within a tooltip (aka time-info-tip) for waterfall graph in the Net panel.
-requestinfo.started.label=Začetni čas zahtevka od začetka
-requestinfo.phases.label=Začetni in pretečeni čas faze zahtev, glede na začetek zahteve:
-requestinfo.timings.label=Časovnik dogodka glede na začetek zahteve:
-search.Firebug_Search=Firebug iskanje
 # LOCALIZATION NOTE (search.Next, search.Previous, search.Case_Sensitive, search.Case_Insensitive,
 # search.Multiple_Files, search.Use_Regular_Expression):
+Copy_Rule_Declaration=Kopiraj najavo pravil
+css.tip.Copy_Rule_Declaration=Kopiraj pravilo vključno s vsemi njegovimi lastnostmi na odložišče
 # Labels used within an options menu for the search box. This menu is displayed if the search box is focused.
-search.Next=Naslednji
-search.tip.Next=Search for the next match
-search.Previous=Prejšnji
-search.tip.Previous=Search for the previous match
-search.Case_Sensitive=Razlikuj velike/male črke
-search.tip.Case_Sensitive=Consider the case when searching
-search.Case_Insensitive=Velike/male črke nepomembne
-search.tip.Case_Insensitive=Ignore the case when searching
-search.Multiple_Files=Več datotek
-search.tip.Multiple_Files=Search inside all files related to this panel
-search.Use_Regular_Expression=Uporabi splošno deklaracijo
-search.tip.Use_Regular_Expression=Interpret the entered string as a regular expression when searching
 # LOCALIZATION NOTE (search.html.CSS_Selector, search.net.Headers, search.net.Parameters, search.net.Response_Bodies,
 # search.script.Multiple_Files):
+Copy_Style_Declaration=Kopiraj najavo sloga
+css.tip.Copy_Style_Declaration=Kopiraj lastnosti pravila na odložišče
 # Labels used within an options menu for the search box. This menu is displayed if the search box is focused.
 # These labels are specific to a certain panel.
-search.html.CSS_Selector=CSS selektor
+# LOCALIZATION NOTE (firebug.tip.Toggle_Side_Panels): A tooltip used for side panels visibility
+# toggle button. The button is available on the right side of panel's toolbar (only for panels
+# that have a side panel).
+css.label.Copy_Property_Declaration=Kopiraj najavo lastnosti
+css.tip.Copy_Property_Declaration=Kopiraj najavo lastnosti na odložišče
+css.label.Copy_Property_Name=Kopiraj ime lastnosti
+css.tip.Copy_Property_Name=Kopiraj ime lastnosti na odložišče
+css.label.Copy_Property_Value=Kopiraj vrednost lastnosti
+css.tip.Copy_Property_Value=Kopiraj vrednost lastnosti na odložišče
+moduleManager.title=Podokno %S je onemogočeno
+moduleManager.desc3=Uporabi Firebugov gumb orodne vrstice za omogočanje/onemogočanje vseh podoken hkrati. Za nadzor posameznih podoken uporabi meni zavihkov vsakega podokna.
+moduleManager.Enable=Omogoči
+Reset_Panels_To_Disabled=Ponastavi podokna na onemogočeno
+Open_Console=Odpri konzolo
+Open_Console_Tooltip=Odpri sledilno konzolo za Firebug.
+Scope_Chain=Veriga obsega
+# Firebug shortcuts
+# A11y Chrome Labels (not visible, spoken by screen readers)
+# A11y panelNode labels (not visible, spoken by screen readers)
+With_Scope=Z
+# A11y Domplate labels (not visible, spoken by screen readers)
+Call_Scope=Klic
+# LOCALIZATION NOTE:
+Window_Scope=Okno
+# Used by a11y. Not directly visible in the UI, intended for screen readers.
+# Describe contents of inline editor fields
+scopes.Global_Scope=Splošni obseg
+# LOCALIZATION NOTE (a11y.labels.overridden):
+# Used by a11y. Not directly visible in the UI, intended for screen readers.
+# Indicates, that a style property is overridden by selector with higher specificity
+# LOCALIZATION NOTE (a11y.hasConditionalBreakpoint, a11y.hasDisabledBreakpoint):
+# Used by a11y. Not directly visible in the UI, intended for screen readers.
+requestinfo.Blocking=Blokiranje
+requestinfo.Resolving=Iskanje DNS-a
+requestinfo.Connecting=Povezovanje
+requestinfo.Sending=Pošiljanje
+requestinfo.Waiting=Čakanje
+requestinfo.Receiving=Prejemanje
+requestinfo.ContentLoad=\\'DOMContentLoaded\\' (dogodek)
+requestinfo.WindowLoad='load' (dogodek)
+# Existence and state of a breakpoint
+# LOCALIZATION NOTE (a11y.updates.script_suspended_on_line_in_file): Used by a11y. Not directly
+requestinfo.started.label=Začetni čas zahteve od začetka
+requestinfo.phases.label=Začetni in pretečeni čas faze zahtev, glede na začetek zahteve:
+requestinfo.timings.label=Časovnik dogodka glede na začetek zahteve:
+search.Firebug_Search= Iskanje Firebug
+# visible in the UI, intended for screen readers.
+# first %S = Line number, second %S = Function name, third %S = File name
+# LOCALIZATION NOTE (a11y.updates.match_found_in_logrows): Used by a11y. Not directly
+search.Next=Naslednje
+search.tip.Next=Išči naslednje ujemanje
+search.Previous=Prejšnjie
+search.tip.Previous=Išči prejšnje ujemanje
+search.Case_Sensitive=Razlikuj velike/male črke
+search.tip.Case_Sensitive=Upoštevaj velikost črk med iskanjem
+search.Case_Insensitive=Neobčutljivo na velikost črk
+search.tip.Case_Insensitive=Prezri velikost črk med iskanjem
+search.Multiple_Files=Več datotek
+search.tip.Multiple_Files=Išči v vseh datotekah, ki so povezane s tem podoknom
+search.Use_Regular_Expression=Uporabi običajni izraz
+search.tip.Use_Regular_Expression=Razloži vneseni niz kot običajni izraz med iskanjem
+search.Placeholder=Išči v podoknu %S
+# visible in the UI, intended for screen readers.
+# Describes the match found when performing a console panel search
+# first %S = String key the user is looking for, second %S = Number of rows that contain the matched text
+# examples: Match found for "test" in 17 log rows
+search.html.CSS_Selector=Izbirnik CSS
+search.html.Search_by_text_or_CSS_selector=Išči z besedilom ali izbirnikom CSS
 search.net.Headers=Glave
 search.net.Parameters=Parametri
 search.net.Response_Bodies=Vsebina odgovorov
-search.net.tip.Response_Bodies=Search also in response bodies
+search.net.tip.Response_Bodies=Išči tudi v vsebini odgovorov
 firebug.console.Persist=Vztrajaj
-firebug.console.Do_Not_Clear_On_Reload2=Do not clear the panel on page reload
+firebug.console.Do_Not_Clear_On_Reload2=Ne počisti podokna ob ponovnem nalaganju strani
+firebug.console.All=Vse
 firebug.console.Show_All_Log_Entries=Prikaži vse zapise v dnevniku
 firebug.console.Errors=Napake
 firebug.console.Filter_by_Errors=Filtriraj po napakah
 firebug.console.Warnings=Opozorila
 firebug.console.Filter_by_Warnings=Filtriraj po opozorilih
-firebug.console.Info=Podrobnosti
-firebug.console.Filter_by_Info=Filtriraj po podrobnostih
-firebug.console.Debug_Info=Info. razhroščevalnika
-firebug.console.Filter_by_Debug_Info=Filtriraj po info. razhroščevalnika
-firebug.Deactivate_Firebug=Deactivate Firebug
-firebug.tip.Deactivate_Firebug=Deactivate Firebug for the current website
+firebug.console.Info=Podatki
+firebug.console.Filter_by_Info=Filtriraj po podatkih
+firebug.console.Debug_Info=Podatki o razhroščevanju
+firebug.console.Filter_by_Debug_Info=Filtriraj po podatkih razhroščevanja
+firebug.Deactivate_Firebug=Onemogoči Firebug
+firebug.tip.Deactivate_Firebug=Onemogoči Firebug za trenutno spletno stran
+# LOCALIZATION NOTE (a11y.updates.match_found_for_on_line): Used by a11y. Not directly
+# visible in the UI, intended for screen readers.
+# Describes the match found when performing a script panel search
+firebug.tip.Toggle_Side_Panels=Preklopi vidnost stranskih podoken
 firebug.ShowFirebug=Odpri Firebug
-firebug.menu.tip.Open_Firebug=Show the Firebug UI
+firebug.menu.tip.Open_Firebug=Prikaži UI Firebug
 firebug.HideFirebug=Skrij Firebug
-firebug.menu.tip.Minimize_Firebug=Minimize Firebug, but keep it active
-firebug.FocusFirebug=Focus Firebug Window
-firebug.menu.tip.Focus_Firebug=Focus Detached Firebug Window
-firebug.menu.Enable_All_Panels=Omogoči vse panele
-firebug.menu.tip.Enable_All_Panels=Enable all activable panels
-firebug.menu.Disable_All_Panels=Onemogoči vse panele
-firebug.menu.tip.Disable_All_Panels=Disable all activable panels
-firebug.menu.Customize_shortcuts=Uredi bližnjice
-firebug.menu.tip.Customize_Shortcuts=Customize Firebug's internal key bindings
+firebug.menu.tip.Minimize_Firebug=Skrči Firebug, toda ohrani ga aktivnega
+firebug.FocusFirebug=Osredotči se na okno Firebug
+firebug.menu.tip.Focus_Firebug=Osredotoči se na odpeto okno Firebug
+firebug.menu.Enable_All_Panels=Omogoči vsa podokna
+firebug.menu.tip.Enable_All_Panels=Omogoči vsa omogočljiva okna
+firebug.menu.Disable_All_Panels=Onemogoči vsa podokna
+firebug.menu.tip.Disable_All_Panels=Onemogoči vsa omogočljiva okna
+firebug.menu.Customize_shortcuts=Prilagodi bližnjice
+firebug.menu.tip.Customize_Shortcuts=Prilagodi Firebugove notranje tipkovne bližnjice
 firebug.Options=Možnosti
-firebug.menu.tip.Options=Global Firebug preferences
-firebug.menu.Enable_Accessibility_Enhancements=Omogoči izboljšave za slabovidne
-firebug.menu.tip.Enable_Accessibility_Enhancements=Enable full control via keyboard and other accessibility enhancements
-firebug.menu.Activate_Same_Origin_URLs2=Activate For Same Origin URLs
-firebug.menu.tip.Activate_Same_Origin_URLs=Activate Firebug for URLs matching the same origin policy
-firebug.menu.Reset_All_Firebug_Options=Ponastavi vse Firebug nastavitve
-firebug.menu.tip.Reset_All_Firebug_Options=Reset all Firebug preferences to their default values
+firebug.menu.tip.Options=Splošne Firebugove nastavitve
+firebug.menu.Enable_Accessibility_Enhancements=Omogoči izboljšave za dostopnost
+firebug.menu.tip.Enable_Accessibility_Enhancements=Omogoči poln nadzor preko tipkovnice in druge izboljšave za dostopnost
+firebug.menu.Activate_Same_Origin_URLs2=Omogoči za iste izvirne URL-je
+firebug.menu.tip.Activate_Same_Origin_URLs=Omogoči Firebug za URL-je, ki se ujemajo z isto izvirno politiko
+firebug.menu.Reset_All_Firebug_Options=Ponastavi vse Firebugove nastavitve
+firebug.menu.tip.Reset_All_Firebug_Options=Ponastavi vse Firebugove nastavitve na njihove privzete vrednosti
 firebug.menu.Firebug_Online=Firebug na spletu
-firebug.menu.tip.Firebug_Online=Websites related to Firebug
-firebug.menu.Extensions=Firebug Extensions...
-firebug.menu.tip.Extensions=Download and Install Firebug Extensions
-firebug.menu.Vertical_Panels=Vertical Panels
-firebug.menu.tip.Vertical_Panels=Toggle the layout of the Firebug main and side panels
-firebug.menu.Show_Info_Tips=Show Info Tips
-firebug.menu.tip.Show_Info_Tips=Show popups with information about the hovered element
+firebug.menu.tip.Firebug_Online=Spletne strani, ki so povezane s Firebugom
+firebug.menu.Extensions=Razširitve Firebug ...
+firebug.menu.tip.Extensions=Prenesi in namesti razširitve Firebug
+firebug.menu.Vertical_Panels=Navpična podokna
+firebug.menu.tip.Vertical_Panels=Preklopi razporeditev Firebugovega glavnega in stranskega podokna
+firebug.menu.Show_Info_Tips=Prikaži podatkovne namige
+firebug.menu.tip.Show_Info_Tips=Prikaži pojavna okna s podatki o elementu, nad katerim je kazalec miške
 firebug.Show_Error_Count=Prikaži števec napak
-firebug.menu.tip.Show_Error_Count=Show the number of errors logged inside the console
-firebug.TextSize=Velikost pisave
-firebug.menu.tip.Text_Size=Change the text size used in Firebug
-firebug.IncreaseTextSize=Povečaj pisavo
-firebug.menu.tip.Increase_Text_Size=Increase the text sizes used in Firebug
-firebug.DecreaseTextSize=Pomanjšaj pisavo
-firebug.menu.tip.Decrease_Text_Size=Decrease the text sizes used in Firebug
-firebug.NormalTextSize=Normalna pisava
-firebug.menu.tip.Normal_Text_Size=Reset the text size used in Firebug to the default
-firebug.Website=Firebugova spletna stran...
-firebug.menu.tip.Website=Open the official Firebug website
-firebug.help=Help...
-firebug.menu.tip.help=Open the page with links to pages explaining Firebug
-firebug.Documentation=Dokumentacija...
-firebug.menu.tip.Documentation=Open the documentation about Firebug
-firebug.KeyShortcuts=Bližnice s tipkovnico...
-firebug.menu.tip.Key_Shortcuts=Open the list of mouse and keyboard shortcuts available in Firebug
-firebug.Forums=Pogovorna skupina...
-firebug.menu.tip.Forums=Open the discussion group site
-firebug.Issues=Sledilnik napak...
-firebug.menu.tip.Issues=Open the issue tracker site
-firebug.Donate=Prispevki...
-firebug.menu.tip.Donate=Open the contribution site
-firebug.About=O razširitvi...
-firebug.menu.tip.About=Information about Firebug
-ProfileJavaScript=Profile JavaScript
-firebug.menu.tip.Profile_JavaScript=Profile JavaScript execution time
+firebug.menu.tip.Show_Error_Count=Prikaži števec napak zabeleženih v konzoli
+firebug.TextSize=Velikost besedila
+firebug.menu.tip.Text_Size=Spremeni velikost besedila v Firebugu
+firebug.IncreaseTextSize=Povečaj velikost besedila
+firebug.menu.tip.Increase_Text_Size=Povečaj velikosti besedila v Firebugu
+firebug.DecreaseTextSize=Pomanjšaj velikost besedila
+firebug.menu.tip.Decrease_Text_Size=Pomanjšaj velikosti besedila v Firebugu
+firebug.NormalTextSize=Običajna velikost besedila
+firebug.menu.tip.Normal_Text_Size=Ponastavi velikost besedila v Firebugu na privzeto
+firebug.Website=Firebugova spletna stran ...
+firebug.menu.tip.Website=Odpri Firebugovo uradno spletno stran
+firebug.help=Pomoč ...
+firebug.menu.tip.help=Odpri stran s povezavami na strani, ki razlagajo Firebug
+firebug.Documentation=Dokumentacija ...
+firebug.menu.tip.Documentation=Odpri dokumentacijo o Firebugu
+firebug.KeyShortcuts=Tipkovne bližnjice ...
+firebug.menu.tip.Key_Shortcuts=Odpri seznam bližnjic za miško in tipkovnico, ki so na voljo v Firebugu
+firebug.Forums=Skupina za razprave  ...
+firebug.menu.tip.Forums=Odpri stran skupine za razprave
+firebug.Issues=Sledilnik vprašanj ...
+firebug.menu.tip.Issues=Odpri stran sledilnika vprašanj
+firebug.Donate=Prispevaj ...
+firebug.menu.tip.Donate=Odpri stran za prispevke
+firebug.About=O razširitvi ...
+firebug.menu.tip.About=Podatki o Firebugu
+ProfileJavaScript=Profil JavaScript
+firebug.menu.tip.Profile_JavaScript=Čas izvajanja profila JavaScript
 firebug.Search=Išči
-firebug.menu.tip.Search=Set focus to the search field
-# Firebug shortcuts
+firebug.menu.tip.Search=Osredotoči se na iskalno polje
+# first %S = String key the user is looking for, second $S = Line number the match was found on, third %S = File name the match was found in
 firebug.shortcut.reenterCommand.label=Ponovno vnesi ukaz
-firebug.shortcut.tip.reenterCommand=Re-enter the last command into the Command Line
-firebug.shortcut.toggleInspecting.label=Preklopi preiskovanje
-firebug.shortcut.tip.toggleInspecting=Enable/disable the Inspector
-firebug.shortcut.toggleQuickInfoBox.label=Preklopi okno s hitrimi informacijami
-firebug.shortcut.tip.toggleQuickInfoBox=Enable/disable the display of a panel with information about the currently inspected element
+firebug.shortcut.tip.reenterCommand=Ponovno vnesi zadnji ukaz na ukazno vrstico
+firebug.shortcut.toggleInspecting.label=Preklopi pregledovanje
+firebug.shortcut.tip.toggleInspecting=Omogoči/Onemogoči pregledovalnik
+firebug.shortcut.toggleQuickInfoBox.label=Preklopi polje s hitrimi podatki
+firebug.shortcut.tip.toggleQuickInfoBox=Omogoči/Onemogoči prikaz podokna s podatki o trenutno pregledanem elementu
 firebug.shortcut.toggleProfiling.label=Preklopi profiliranje
-firebug.shortcut.tip.toggleProfiling=Enable/disable the JavaScript Profiler
-firebug.shortcut.focusCommandLine.label=Fokusiraj ukazno vrstico
-firebug.shortcut.tip.focusCommandLine=Open Firebug and set the focus to the Command Line / toggle the Command Line Popup
-firebug.shortcut.focusFirebugSearch.label=Fokusiraj Firebug iskanje
-firebug.shortcut.tip.focusFirebugSearch=Set the focus to the search field
-firebug.shortcut.focusWatchEditor.label=Fokusiraj nadzorni urejevalnik
-firebug.shortcut.tip.focusWatchEditor=Switch to the Script panel and set the focus to the field for entering a new watch expression
-firebug.shortcut.focusLocation.label=Fokusiraj lokacijo
-firebug.shortcut.tip.focusLocation=Open the Location Menu
-firebug.shortcut.nextObject.label=Naslednji objekt
-firebug.shortcut.tip.nextObject=Select the next object in the element path of a panel
-firebug.shortcut.previousObject.label=Prejšnji objekt
-firebug.shortcut.tip.previousObject=Select the previous object in the element path of a panel
-firebug.shortcut.customizeFBKeys.label=Prilagodi Firebug bližnjice
-firebug.shortcut.tip.customizeFBKeys=Open the Firebug Shortcut Bindings dialog
+firebug.shortcut.tip.toggleProfiling=Omogoči/Onemogoči profilirnik JavaScript
+firebug.shortcut.focusCommandLine.label=Osredotoči se na ukazno vrstico
+firebug.shortcut.tip.focusCommandLine=Odpre Firebug in se osredotoči na ukazno vrstico / preklopi pojavno okno ukazne vrstice
+firebug.shortcut.focusFirebugSearch.label=Osredotoči se na iskanje Firebug
+firebug.shortcut.tip.focusFirebugSearch=Osredotoči se na iskalno polje
+firebug.shortcut.focusWatchEditor.label=Osredotoči se na urejevalnik spremljanja
+firebug.shortcut.tip.focusWatchEditor=Preklopi na podokno skriptov in se osredotoči na polje za vnos novega izraza za spremljanje
+firebug.shortcut.focusLocation.label=Osredotoči se na mesto
+firebug.shortcut.tip.focusLocation=Odpri meni mesta
+firebug.shortcut.nextObject.label=Naslednji predmet
+firebug.shortcut.tip.nextObject=Izberi naslednji predmet v poti elementa podokna
+firebug.shortcut.previousObject.label=Prejšnji predmet
+firebug.shortcut.tip.previousObject=Izberi prejšnji predmet v poti elementa podokna
+firebug.shortcut.customizeFBKeys.label=Prilagodi bližnjice Firebug
+firebug.shortcut.tip.customizeFBKeys=Odpri pogovorno okno tipkovnih bližnjic Firebug
 firebug.shortcut.detachFirebug.label=Odpri Firebug v novem oknu
-firebug.shortcut.tip.detachFirebug=Detach Firebug into its own window
-firebug.shortcut.leftFirebugTab.label=Preklopi na levi Firebug panel
-firebug.shortcut.tip.leftFirebugTab=Switch to the Firebug panel to the left
-firebug.shortcut.rightFirebugTab.label=Preklopi na desni Firebug panel
-firebug.shortcut.tip.rightFirebugTab=Switch to the Firebug panel to the right
+firebug.shortcut.tip.detachFirebug=Odpni Firebug v svoje okno
+firebug.shortcut.leftFirebugTab.label=Preklopi na levo Firebugovo podokno
+firebug.shortcut.tip.leftFirebugTab=Preklopi na Firebugovo podokno na levi strani
+firebug.shortcut.rightFirebugTab.label=Preklopi na desno Firebugovo podokno
+firebug.shortcut.tip.rightFirebugTab=Preklopi na Firebugovo podokno na desni strani
 firebug.shortcut.toggleFirebug.label=Odpri Firebug
-firebug.shortcut.tip.toggleFirebug=Open/Minimize Firebug UI
-firebug.shortcut.closeFirebug.label=Deactivate Firebug
-firebug.shortcut.tip.closeFirebug=Deactivate Firebug for the current website
-firebug.shortcut.previousFirebugTab.label=Prejšnji Firebug zavihek
-firebug.shortcut.tip.previousFirebugTab=Switch to the previously selected Firebug panel
+firebug.shortcut.tip.toggleFirebug=Odpri/Skrči UI Firebug
+firebug.shortcut.closeFirebug.label=Onemogoči Firebug
+firebug.shortcut.tip.closeFirebug=Onemogoči Firebug za trenutno spletno stran
+firebug.shortcut.previousFirebugTab.label=Prejšnji Firebugov zavihek
+firebug.shortcut.tip.previousFirebugTab=Preklopi na prej izbrani Firebugov zavihek
 firebug.shortcut.clearConsole.label=Počisti konzolo
-firebug.shortcut.tip.clearConsole=Remove all logs from the console
+firebug.shortcut.tip.clearConsole=Odstrani vse dnevnike iz konzole
 firebug.shortcut.openTraceConsole.label=Odpri sledilno konzolo
-firebug.shortcut.tip.openTraceConsole=Open the FBTrace Console
+firebug.shortcut.tip.openTraceConsole=Odpri konzolo FBTrace
 firebug.shortcut.navBack.label=Nazaj
-firebug.shortcut.tip.navBack=Switch to the previous panel or location list item of the navigation history
+firebug.shortcut.tip.navBack=Preklopi na prejšnje podokno ali predmet seznama mest zgodovine krmarjenja
 firebug.shortcut.navForward.label=Naprej
-firebug.shortcut.tip.navForward=Switch to the next panel or location list item of the navigation history
+firebug.shortcut.tip.navForward=Preklopi na naslednje podokno ali predmet seznama mest zgodovine krmarjenja
 firebug.shortcut.increaseTextSize.label=Povečaj velikost pisave
-firebug.shortcut.tip.increaseTextSize=Increase the text sizes used in Firebug
+firebug.shortcut.tip.increaseTextSize=Povečaj velikosti besedila, ki se uporabljajo v Firebugu
 firebug.shortcut.decreaseTextSize.label=Pomanjšaj velikost pisave
-firebug.shortcut.tip.decreaseTextSize=Decrease the text sizes used in Firebug
-firebug.shortcut.normalTextSize.label=Normalna velikost pisave
-firebug.shortcut.tip.normalTextSize=Reset the text sizes used in Firebug to the default
-firebug.shortcut.help.label=Open help
-firebug.shortcut.tip.help=Open the page answering the frequently asked questions
-firebug.shortcut.toggleBreakOn.label=Toggle Break On ...
-firebug.shortcut.tip.toggleBreakOn=Enable/disable stopping the script execution on specific events occurring inside a panel
-firebug.panel_selector=Izbira panela
-customizeShortcuts=Tipke bližnjic
-# A11y Chrome Labels (not visible, spoken by screen readers)
-a11y.labels.panel_tools=panelna orodja
-a11y.labels.firebug_panels=Firebug paneli
-a11y.labels.firebug_side_panels=Firebug drsni paneli
-a11y.labels.firebug_window=firebug okno
-a11y.labels.firebug_status=firebug status
+firebug.shortcut.tip.decreaseTextSize=Pomanjšaj velikosti besedila, ki se uporabljajo v Firebugu
+firebug.shortcut.normalTextSize.label=Običajna velikost pisave
+firebug.shortcut.tip.normalTextSize=Ponastavi velikosti besedila, ki se uporabljajo v Firebugu, na običajne
+firebug.shortcut.help.label=Odpri pomoč
+firebug.shortcut.tip.help=Odpri stran z odgovori na pogosta vprašanja
+firebug.shortcut.toggleBreakOn.label=Preklopi prekinitev na ...
+firebug.shortcut.tip.toggleBreakOn=Omogoči/Onemogoči ustavljanje izvajanja skripta v določenih dogodkih, ki se pojavijo v podoknu
+# examples: Match found for "window.alert" on line 322 in utilities.js
+# LOCALIZATION NOTE (a11y.updates.match_found_in_element): Used by a11y. Not directly
+# visible in the UI, intended for screen readers.
+firebug.panel_selector2=Vidna podokna
+firebug.panel_selector2.tip=Prikaže/skrije posamezna podokna Firebug
+# Describes the match found when performing an HTML panel search (if it is found in an element node)
+firebug.Show_All_Panels=Prikaži vsa podokna
+customizeShortcuts=Tipkovne bližnjice
+a11y.labels.file_selector=izbirnik datotek
+# first %S = Matched search string, second %S = HTML element name containing the matched string, third %S = XPATH string specifying the matched element
+a11y.labels.panel_tools=orodja podoken
+a11y.labels.firebug_tools=Orodja Firebug
+a11y.labels.firebug_panels=Firebugova podokna
+a11y.labels.firebug_side_panels=Firebugova stranska podokna
+a11y.labels.firebug_window=firebugovo okno
+a11y.labels.firebug_status=firebugovo stanje
 a11y.labels.reset=ponastavi
 a11y.labels.reset_shortcut=ponastavi bližnjico %S
-aria.labels.inactive_panel=neaktiven panel
-# A11y panelNode labels (not visible, spoken by screen readers)
-a11y.labels.log_rows=zapiši vrstice v dnevnik
-a11y.labels.call_stack=prikliči sklad
-a11y.labels.document_structure=struktura dokumenta
-a11y.labels.title_panel=panel %S
-a11y.labels.title_side_panel=stranski panel %S
+aria.labels.inactive_panel=neaktivno podokno
+# example: Match found for "obj" in object element at /html/body/object[2]
+a11y.labels.log_rows=zabeleži vrstice
+a11y.labels.call_stack=kliči sklad
+a11y.labels.document_structure=zgradba dokumenta
+a11y.labels.title_panel= podokno %S
+a11y.labels.title_side_panel= stransko podokno %S
 a11y.labels.cached=predpomnjeno
 aria.labels.stack_trace=sledi skladu
-# A11y Domplate labels (not visible, spoken by screen readers)
-a11y.layout.padding=padding
-a11y.layout.border=rob
-a11y.layout.margin=razmik
+# LOCALIZATION NOTE (a11y.updates.match_found_in_attribute): Used by a11y. Not directly
+a11y.layout.padding=odmik
+a11y.layout.border=obroba
+a11y.layout.margin=rob
 a11y.layout.position=položaj
 a11y.layout.position_top=zgornji položaj
 a11y.layout.position_right=desni položaj
 a11y.layout.position_bottom=spodnji položaj
 a11y.layout.position_left=levi položaj
-a11y.layout.margin_top=razmik zgoraj
-a11y.layout.margin_right=razmik desno
-a11y.layout.margin_bottom=razmik spodaj
-a11y.layout.margin_left=razmik levo
-a11y.layout.border_top=rob zgoraj
-a11y.layout.border_right=rob desno
-a11y.layout.border_bottom=rob spodaj
-a11y.layout.border_left=rob levo
-a11y.layout.padding_top=odmik zgoraj
-a11y.layout.padding_right=odmik desno
-a11y.layout.padding_bottom=odmik spodaj
-a11y.layout.padding_left=odmik levo
+a11y.layout.margin_top=zgornji rob
+a11y.layout.margin_right=desni rob
+a11y.layout.margin_bottom=spodnji rob
+a11y.layout.margin_left=levi rob
+a11y.layout.border_top=zgornja obroba
+a11y.layout.border_right=desna obroba
+a11y.layout.border_bottom=spodnja obroba
+a11y.layout.border_left=leva obroba
+a11y.layout.padding_top=zgornji odmik
+a11y.layout.padding_right=desni odmik
+a11y.layout.padding_bottom=spodnji odmik
+a11y.layout.padding_left=levi odmik
 a11y.layout.top=zgoraj
 a11y.layout.right=desno
 a11y.layout.bottom=spodaj
@@ -1072,435 +1325,434 @@ a11y.layout.left=levo
 a11y.layout.width=širina
 a11y.layout.height=višina
 a11y.layout.size=velikost
-a11y.layout.z-index=z-index
-a11y.layout.box-sizing=mere-okna
-a11y.layout.clientBoundingRect=objemajoči okvir
-a11y.descriptions.press_enter_to_edit_values=pritisnite enter, ki mu sledi tabulator, za urejanje posametnih vrednosti
-a11y.labels.style_rules=stilska pravila
-aria.labels.inherited_style_rules=dedovana stilska pravila
-a11y.labels.computed_styles=izračunani stili
-a11y.labels.dom_properties=DOM lastnosti
-# LOCALIZATION NOTE:
-# Used by a11y. Not directly visible in the UI, intended for screen readers.
-# Describe contents of inline editor fields
-a11y.labels.inline_editor=linijski urejevalnik
-a11y.labels.value_for_attribute_in_element=vrednost %S atributa v %S elementu
-a11y.labels.attribute_for_element=atribut za element %S
-a11y.labels.text_contents_for_element=tekstovna vsebina za element %S
-a11y.labels.defined_in_file=določeno v %S
-a11y.labels.declarations_for_selector=stilska deklaracija za "%S" selektor
-a11y.labels.property_for_selector=CSS lastnost za selektor: %S
-a11y.labels.value_property_in_selector=%S vrednost za selektor %S
-a11y.labels.css_selector=CSS selektor
-a11y.labels.source_code_for_file=izvorna koda za datoteko %S
-a11y.labels.press_enter_to_add_new_watch_expression=pritisnite enter za dodajanje novega watch izraza
-# LOCALIZATION NOTE (a11y.labels.overridden):
-# Used by a11y. Not directly visible in the UI, intended for screen readers.
-# Indicates, that a style property is overridden by selector with higher specificity
-a11y.labels.overridden=prepisano
-# LOCALIZATION NOTE (a11y.hasConditionalBreakpoint, a11y.hasDisabledBreakpoint):
-# Used by a11y. Not directly visible in the UI, intended for screen readers.
-# Existence and state of a breakpoint
-a11y.updates.has_conditional_break_point=vsebuje pogojno točko preloma
-a11y.updates.has_disabled_break_point=je onemogočil prelomne točke
-# LOCALIZATION NOTE (a11y.updates.script_suspended_on_line_in_file): Used by a11y. Not directly
-# visible in the UI, intended for screen readers.
-# first %S = Line number, second %S = Function name, third %S = File name
-a11y.updates.script_suspended_on_line_in_file=Skripta prekinjana v vrstici %S v %S, datoteka %S
-# LOCALIZATION NOTE (a11y.updates.match_found_in_logrows): Used by a11y. Not directly
-# visible in the UI, intended for screen readers.
-# Describes the match found when performing a console panel search
-# first %S = String key the user is looking for, second %S = Number of rows that contain the matched text
-# examples: Match found for "test" in 17 log rows
-a11y.updates.match_found_in_logrows=našel sem ujemanje za %S v %S vrsticah dnevnika
-# LOCALIZATION NOTE (a11y.updates.match_found_for_on_line): Used by a11y. Not directly
-# visible in the UI, intended for screen readers.
-# Describes the match found when performing a script panel search
-# first %S = String key the user is looking for, second $S = Line number the match was found on, third %S = File name the match was found in
-# examples: Match found for "window.alert" on line 322 in utilities.js
-a11y.updates.match_found_for_on_line=našel sem ujemanje za %S v vrstici %S datoteke %S
-# LOCALIZATION NOTE (a11y.updates.match_found_in_element): Used by a11y. Not directly
-# visible in the UI, intended for screen readers.
-# Describes the match found when performing an HTML panel search (if it is found in an element node)
-# first %S = Matched search string, second %S = HTML element name containing the matched string, third %S = XPATH string specifying the matched element
-# example: Match found for "obj" in object element at /html/body/object[2]
-a11y.updates.match_found_in_element=našel sem ujemanje za %S v elementu %S pri poti %S
-# LOCALIZATION NOTE (a11y.updates.match_found_in_attribute): Used by a11y. Not directly
+a11y.layout.z-index=kazalo z
+a11y.layout.box-sizing=velikosti okvirja
+a11y.layout.clientBoundingRect=mejni okvir odjemalca
+a11y.descriptions.press_enter_to_edit_values=Pritisnite Enter, ki mu sledi tabulator za urejanje posameznih vrednosti
+a11y.labels.style_rules=slogovna pravila
+aria.labels.inherited_style_rules=dedovana slogovna pravila
+a11y.labels.event_listeners=poslušalniki dogodkov
+a11y.labels.inherited_event_listeners=podedovani poslušalniki dogodkov
+a11y.labels.computed_styles=izračunani slogi
+a11y.labels.dom_properties=lastnosti DOM
 # visible in the UI, intended for screen readers.
 # Describes the match found when performing an HTML  panel search (if it is found in an attribute node)
 # first %S = Search string that was matched, second %S = Attribute name, third %S = Attribute value,
+a11y.labels.inline_editor=urejevalnik sloga v besedilu
+a11y.labels.value_for_attribute_in_element=vrednost atributa %S v elementu %S
+a11y.labels.attribute_for_element=atribut za element %S
+a11y.labels.text_contents_for_element=vsebina besedila za element %S
+a11y.labels.defined_in_file=določeno v %S
+a11y.labels.declarations_for_selector=slogovne najave za izbirnik "%S"
+a11y.labels.property_for_selector=lastnost CSS za izbirnik: %S
+a11y.labels.value_property_in_selector=vrednost %S za izbirnik %S
+a11y.labels.css_selector=izbirnik CSS
+a11y.labels.source_code_for_file=izvorna koda za datoteko %S
+a11y.labels.press_enter_to_add_new_watch_expression=pritisnite enter za dodajanje novega izraza za spremljanje
+a11y.labels.search_options=iskalne možnosti
+a11y.labels.Press_up_or_down=Pritisnite tipko gor ali dol za iskalne možnosti
 # fourth %S = HTML element name containing, fifth %S = XPATH string specifying  the matched element
 # example: Match found for "abindex" in tabindex="0" in span element at /html/body/span[2]
-a11y.updates.match_found_in_attribute=našel sem ujemanje za %S v atributu %S=%S elementa %S pri poti %S
 # LOCALIZATION NOTE (a11y.updates.match_found_in_text_content): Used by a11y. Not directly
+a11y.labels.overridden=preglašeno
 # visible in the UI, intended for screen readers.
 # Describes the match found when performing an HTML panel search (if it is found in a text element's contents)
 # first %S = Matched search string, second %S = Element's text content,
+a11y.updates.has_conditional_break_point=ima pogojno prekinitveno točko
+a11y.updates.has_disabled_break_point=ima onemogočene prekinitvene točke
 # third %S = HTML element name containing, fourth %S = XPATH string specifying  the matched element
 # example: Match found for "Firebug Rocks!" in h2 element at /html/body/h2[2]
-a11y.updates.match_found_in_text_content=našel sem ujemanje za %S v vsebini: %S elementa %S pri poti %S
 # LOCALIZATION NOTE (a11y.updates.match_found_in_selector): Used by a11y. Not directly
+a11y.updates.script_suspended_on_line_in_file=Skript je bil začasno ustavljen v vrstici %S funkcije %S, datoteka %S
 # visible in the UI, intended for screen readers.
 # Describes the match found when performing a CSS panel search (if it is found in a selector)
 # first %S = Matched search string, second %S = Selector, in which the match was found
 # example: Match found for "main" in #mainContent h2 {
-a11y.updates.match_found_in_selector=našel sem ujemanje za %S v selektorju %S
 # LOCALIZATION NOTE (a11y.updates.match_found_in_style_property): Used by a11y. Not directly
+a11y.updates.match_found_in_logrows=ujemanje za "%S" je bilo najdeno v %S vrsticah dnevnika
 # visible in the UI, intended for screen readers.
 # Describes the match found when performing a CSS panel search (if it is found in a style declaration)
 # first %S = Matched search string, second %S = Style property, in which the match was found
 # third %S = Selector the style declaration applies to
 # example: Match found for background in style declaration background-repeat: "repeat-x"; in selector #mainContent {
-a11y.updates.match_found_in_style_declaration=najdeno ujemanje za "%S" v deklaraciji stila %S v selektorju %S
+a11y.updates.match_found_for_on_line=ujemanje za "%S" je bilo najdeno v vrstici %S datoteke %S
 # LOCALIZATION NOTE (a11y.updates.match_found_in_dom_property): Used by a11y. Not directly
 # visible in the UI, intended for screen readers.
 # Describes the match found when performing a DOM panel search
 # first %S = Matched search string, second %S = DOM property, in which the match was found
 # examples: Match found for "time" in DOM property _starttime
-a11y.updates.match_found_in_dom_property=našel sem ujemanje za %S v DOM lastnosti %S
+a11y.updates.match_found_in_element=ujemanje za "%S" je bilo najdeno v elementu %S v poti %S
 # LOCALIZATION NOTE (a11y.updates.match_found_in_net_row): Used by a11y. Not directly
 # visible in the UI, intended for screen readers.
 # Describes the match found when performing a Net panel search
 # first %S = Matched search string, second %S = File name associated to the row, in which the match was found,
 # third %S = Column, in which the match was found, fourth %S = Column value
 # examples: Match found for "792" in GET loading_animation.gif, timeline: 792 ms
-a11y.updates.match_found_in_net_row=našel sem ujemanje za "%S" v %S, %S:%S;
+a11y.updates.match_found_in_attribute=ujemanje za "%S" je bilo najdeno v atributu %S=%S elementa %S v poti %S
 # LOCALIZATION NOTE (a11y.updates.match_found_in_net_summary_row): Used by a11y. Not directly
 # visible in the UI, intended for screen readers.
 # Describes the match found when performing a Net panel search (if it is found in the Net summary row)
 # first %S = Matched search string, second %S = Column value, in which the match was found
 # examples: Match found for "05" in net summary row: 4.05s
-a11y.updates.match_found_in_net_summary_row=našel sem ujemanje za %S v vrstici povzetka omrežja: %S
 # LOCALIZATION NOTE (a11y.updates.no_matches_found): Used by a11y. Not directly
+a11y.updates.match_found_in_text_content=ujemanje za "%S" je bilo najdeno v vsebini: %S elementa %S v poti %S
 # visible in the UI, intended for screen readers.
 # Indicates that the searched string was not matched
 # %S = Search string
 # examples: No matched found for "wefkhwefkgwekhjgjh"
-a11y.updates.no_matches_found=nisem našel ujemanj za "%S"
 # LOCALIZATION NOTE (confirmation.Reset_All_Firebug_Options):
+a11y.updates.match_found_in_selector=ujemanje za "%S" je bilo najdeno v izbirniku %S
 # Text in the confirmation dialog shown when the options should be reset
-confirmation.Reset_All_Firebug_Options=Ste prepričani, da želite ponastaviti vse nastavitve na privzete?
 # LOCALIZATION NOTE (confirmation.Edit_CSS_Source):
 # If the user has changed the CSS and clicks on the Source Edit button, a confirmation dialog is
 # displayed containing the following message
-confirmation.Edit_CSS_Source=Obstoječi CSS popravki bodo zavrženi.\nSte prepričani, da želite urediti izvorno kodo?
 # Console messages
-warning.Console_must_be_enabled=Konzola mora biti omogočena
-warning.Command_line_blocked?=Ukazna vrstica blokirana?
-warning.dollar_change=The console command line function $() has changed meaning from $=getElementById(id) to $=querySelector(selector). You might try $("#%S") instead.
-message.Reload_to_activate_window_console=Ponovno naloži za aktiviranje konzolnega okna
 # LOCALIZATION NOTE (message.sourceNotAvailableFor, message.The_resource_from_this_URL_is_not_text):
+a11y.updates.match_found_in_style_declaration=ujemanje za "%S" je bilo najdeno v slogovni najavi %S v izbirniku %S
 # An error message displayed in the Script panel when a source can't be displayed
 # for specific URL.
 # examples: Reload the page to get source for: http://www.example.com/script.js
 # examples: The resource from this URL is not text: http://www.example.com/script.js
-message.sourceNotAvailableFor=Ponovno naloži stran za pridobitev izvorne kode za
-message.The_resource_from_this_URL_is_not_text=Vir na tem URL naslovu ni tekst
 # LOCALIZATION NOTE (firebug.history.Go_back_to_this_script, firebug.history.Go_forward_to_this_script,
+a11y.updates.match_found_in_dom_property=ujemanje za "%S" je bilo najdeno v lastnosti DOM %S
 # firebug.history.Stay_on_this_page): Tooltips for menu items in the history popup menu.
-firebug.history.Go_back_to_this_panel=Pojdi nazaj na ta panel
-firebug.history.Stay_on_this_panel=Ostani na tem panelu
-firebug.history.Go_forward_to_this_panel=Pojdi naprej na ta panel
 # LOCALIZATION NOTE (firebug.history.Go_back_one_script, firebug.history.Go_forward_one_script):
 # Tooltips for back/forward buttons on the Script panel toolbar.
-firebug.history.Go_back=Nazaj
-firebug.history.Go_forward=Naprej
 # LOCALIZATION NOTE (script.warning.inactive_during_page_load, script.suggestion.inactive_during_page_load):
 # Message displayed in the Script panel, if the debugger is inactive during page load.
 # The suggestion message represents an advice how to solve the problem. It contains a link enclosed in <a> and </a>
+a11y.updates.match_found_in_net_row=ujemanje za "%S" je bilo najdeno v %S, %S:%S;
 # to reload the sources
-script.warning.inactive_during_page_load=Skriptni panel ni bil aktiven med nalaganjem strani
-script.suggestion.inactive_during_page_load2=<a>Ponovno naloži</a> za ogled vseh virov
 # LOCALIZATION NOTE (script.warning.javascript_not_enabled, script.suggestion.javascript_not_enabled):
 # This message is displayed within the Script panel if javascript is not enabled.
 # The suggestion message represents an advice how to solve the problem.
-script.warning.javascript_not_enabled=Javascript je onemogočen
-script.suggestion.javascript_not_enabled=Poglej Firefox > Orodja > Možnosti > Vsebina > Omogoči Javascript
 # LOCALIZATION NOTE (script.button.enable_javascript): Title for a link, that is displayed on
+a11y.updates.match_found_in_net_summary_row=ujemanje za "%S" je bilo najdeno v vrstici povzetka mreže: %S
 # the Script panel, if Javascript is disabled. This link allows to enable it.
-script.button.enable_javascript=Omogoči Javascript in osveži
 # LOCALIZATION NOTE (script.warning.all_scripts_filtered, script.suggestion.all_scripts_filtered):
 # Message displayed in the Script panel, if no JavaScripts are available for the current page.
 # The suggestion message represents an advice how to solve the problem.
-script.warning.all_scripts_filtered=Vse skripte so bile filtrirane
-script.suggestion.all_scripts_filtered=Poglej nastavitve filtriranja skript orodni vrstici ali "Prikaži možnosti chrome izvorov"
 # LOCALIZATION NOTE (script.warning.no_system_source_debugging, script.suggestion.no_system_source_debugging):
+a11y.updates.no_matches_found=ujemanje za "%S" ni bilo najdeno
 # Message displayed in the Script panel, if the page opened is accessed via a chrome URL.
 # The suggestion message represents an advice how to solve the problem.
-script.warning.no_system_source_debugging=System sources can't be debugged
-script.suggestion.no_system_source_debugging=Firebug currently can't be used to debug user agent internal files. See <a>issue 5110</a> for the reason.
+confirmation.Reset_All_Firebug_Options=Ali ste prepričani, da želite ponastaviti vse Firebugove možnosti na privzeto stanje?
 # LOCALIZATION NOTE (script.warning.debugger_active, script.suggestion.debugger_active):
 # Message displayed in the Script panel, if the page doesn't include any JavaScript.
 # The suggestion message represents an advice how to solve the problem.
-script.warning.no_javascript=Ni Javascript kode na tej strani
-script.suggestion.no_javascript2=If <script> tags have a "type" attribute, it should equal "text/javascript" or "application/javascript". Also scripts must be parsable (syntactically correct).
+confirmation.Edit_CSS_Source=Obstoječe urejanje kode CSS bo zavrženo.\nAli ste prepričani, da želite urediti izvorno kodo?
 # LOCALIZATION NOTE (script.warning.debugger_active, script.suggestion.debugger_active):
+warning.Console_must_be_enabled=Konzola mora biti omogočena
+warning.Command_line_blocked?=Ukazna vrstica blokirana?
+warning.dollar_change=Funkcija ukazne vrstice konzole $() je spremenila pomen iz $=getElementById(id) v $=querySelector(izbirnik). Namesto tega lahko poskusite s/z $("#%S").
+message.Reload_to_activate_window_console=Ponovno naloži za omogočanje konzolnega okna
 # Message displayed in the Script panel, if the page is opened in different tabs/windows and
 # the debugger is already halted at a breakpoint inside another tab/window.
 # The suggestion message represents an advice how to solve the problem.
-script.warning.debugger_active=Razhroščevalnik je že aktiven
-script.suggestion.debugger_active=Razhroščevalnik je trenutno ustavljen na prelomni točki na drugi strani.
-script.button.Go_to_that_page=Pojdi na to stran
-script.warning.debugger_not_activated=Razhroščevalnik ni aktiviran
-script.suggestion.debugger_not_activated=Razhroščevalnik ni aktiviran
+# LOCALIZATION NOTE (script.Script_panel_must_be_enabled): Adds a parenthetical note to a tooltip
+# about the Script panel having to be enabled.
+message.sourceNotAvailableFor=Ponovno naloži stran za pridobitev izvorne kode za
+message.The_resource_from_this_URL_is_not_text=Vir na tem naslovu URL ni besedilo
+# %S = original message
+# example: "Profile JavaScript execution time (Script panel must be enabled)"
+firebug.history.Go_back_to_this_panel=Pojdi nazaj na to podokno
+firebug.history.Stay_on_this_panel=Ostani na tem podoknu
+firebug.history.Go_forward_to_this_panel=Pojdi naprej na to podokno
 # firebug.dtd
-firebug.Firebug=Firebug
-firebug.Close=Zapri
-firebug.View=Pogled
-firebug.Help=Pomoč
-firebug.Run=Zaženi
-firebug.Copy=Kopiraj
-firebug.History=Zgodovina
-firebug.Run_the_entered_command=Izvedi vnesen ukaz
-firebug.Clear_the_Command_Editor=Počisti urejevalec ukazov
-firebug.Copy_the_script_as_a_bookmarklet=Kopiraj skripto kot zaznamek
-firebug.Insert_a_previously_entered_command=Vstavi predhodno vnešen ukaz
-firebug.AlwaysOpenInWindow=Vedno odpri v novem oknu
-firebug.OpenWith=Odpri z urejevalnikom
-firebug.menu.tip.Open_With=Open the content in an external editor
-firebug.Permissions=Strani...
-firebug.Configure_Editors=Nastavi urejevalnike
-script.tip.Script_Type=Filter on script type
-script.tip.Script_Filter_Static=Just display scripts loaded together with the page
-script.tip.Script_Filter_Evals=Display scripts loaded together with the page and scripts created via eval()
-script.tip.Script_Filter_Events=Display scripts loaded together with the page, scripts created via eval() and event listeners
-script.tip.Script_Filter_All=Display all kinds of scripts
 # LOCALIZATION NOTE (firebug.labelWithShortcut):
+firebug.history.Go_back=Nazaj
+firebug.history.Go_forward=Naprej
 # Label for an item incl. assigned keyboard shortcut
 # example: Continue (F8)
 # example: Step Out (Shift+F11)
-firebug.labelWithShortcut=%S (%S)
 # LOCALIZATION NOTE (firebug.Rerun, script.tip.Rerun, firebug.Continue, script.tip.Continue,
+script.warning.inactive_during_page_load=Podokno skriptov je bilo neaktivno med nalaganjem strani
+script.suggestion.inactive_during_page_load2=<a>Ponovno naloži</a> za ogled vseh virov
 # firebug.StepOver, script.tip.Step_Over, firebug.StepInto, script.tip.Step_Into,
 # firebug.StepOut, script.tip.Step_Out, firebug.RunUntil, script.tip.Run_Until):
 # Labels used for debugger options available in the Script panel.
-script.Rerun=Rerun
-script.tip.Rerun=Rerun the current function call stack
-script.Continue=Continue
-script.tip.Continue=Continue the JavaScript execution
-script.Step_Over=Step Over
-script.tip.Step_Over=Execute the next command
-script.Step_Into=Step Into
-script.tip.Step_Into=Execute the next command and jump into functions
-script.Step_Out=Step Out
-script.tip.Step_Out=Execute the rest of the function's body and returns to its caller
-firebug.RunUntil=Zaženi do te vrstice
-script.tip.Run_Until=Execute the JavaScript until the specified line
+script.warning.javascript_not_enabled=Javascript je onemogočen
+script.suggestion.javascript_not_enabled=Glejte Firefox > Orodja > Možnosti > Vsebina > Omogoči Javascript
 # LOCALIZATION NOTE (firebug.Inspect, firebug.InspectElement, firebug.InspectElementWithFirebug)
 # Labels for Firebug Inspector. Used by a button (available in Firefox Customize Toolbar dialog)
+script.button.enable_javascript=Omogoči Javascript in osveži
 # and also page context menu. As soon as built-in inspector is having its own "Inspect Element"
 # Firebug should start using "Inspect Element with Firebug" to distinguish itself.
-firebug.Inspect=Preglej
-firebug.InspectElement=Preglej Element
-firebug.InspectElementWithFirebug=Preglej element z Firebugom
-firebug.BreakOnErrors=Prekini ob napaki
-firebug.InspectTooltip=Klikni element na strani za pregled
-firebug.EditHTMLTooltip=Uredi to HTML kodo
-firebug.Profile=Profil
-firebug.Clear=Počisti
-firebug.ClearConsole=Počisti konzolo
-firebug.ClearTooltip=Počisti konzolo
-firebug.All=Vse
-firebug.Images=Slike
-firebug.Flash=Flash
 # editors.dtd
-editors.Configured_Firebug_Editors=Nastavljeni Firebug urejevalniki
-editors.Editor=Urejevalnik
-editors.Executable=Izvršna datoteka
-editors.Launch_Arguments=Zaganjalna stikala
-editors.Add=Dodaj
-editors.Remove=Odstrani
-editors.Change=Spremeni
-editors.Move_Up=Premakni gor
-editors.Close=Zapri
-editors.Browse=Prebrskaj...
-changeEditor.Editor_Configuration=Nastavitve urejevalnika
-changeEditor.Name=Ime:
-changeEditor.Executable=Izvršilna datoteka:
-changeEditor.CmdLine=Argumenti:
-changeEditor.Supplied_arguments=Argumenti, ki jih je posredoval Firebug:
-changeEditor.URL_of_file=URL datoteke (če %url ni prisoten, bo datoteka %file privzeto dodana)
-changeEditor.Path_to_local_file=Pot do krajevne datoteke (ali začasne kopije)
-changeEditor.Line_number=Številka vrstice (če je na voljo)
-changeEditor.Invalid_Application_Path=Neveljavna pot do aplikacije
-changeEditor.Application_does_not_exist=Izbrana aplikacija ne obstaja!
+script.warning.all_scripts_filtered=Vsi skripti so bili filtrirani
+script.suggestion.all_scripts_filtered=Glejte nastavitve filtriranja skriptov v orodni vrstici podokna
 # LOCALIZATION NOTE (firebug.Edit, firebug.css.sourceEdit, firebug.css.liveEdit,
 # firebug.EditCSSTooltip, firebug.css.sourceEdit.tooltip, firebug.css.liveEdit.tooltip)
 # Used in the CSS panel for the Edit button.
-firebug.Edit=Uredi
-firebug.css.sourceEdit=Uredi izvorno kodo
-firebug.css.sourceEdit.tooltip=Urejanje izvorne kode stilske datoteke, kot jo naloži brskalnik
-firebug.css.liveEdit=Urejanje v živo
-firebug.css.liveEdit.tooltip=Tekstovno polje za urejanje CSS pridobljeno iz brskalnika
-firebug.EditCSSTooltip=Uredi to slogovno predlogo
+script.warning.no_system_source_debugging=Sistemskih virov ni mogoče razhroščevati
+script.suggestion.no_system_source_debugging2=Firebug trenutno ne morete uporabljati za razhroščevanje notranjih datotek uporabniškega posrednika. Za vzrok glejte <a>vprašanje 5110</a>. Namesto tega lahko uporabite <a>DevTools Browser Toolbox</a>.
 # LOCALIZATION NOTE (firebug.activation.privateBrowsingMode):
 # Message displayed in the Console panel when the private browsing mode is on.
 # (in Firefox 4+ it's 'Start Private Browsing')
-firebug.activation.privateBrowsingMode=Spletna mesta niso pomnjena v načinu Zasebno brskanje
+script.warning.no_javascript=Ni kode Javascript na tej strani
+script.suggestion.no_javascript2=Če imajo oznake <script> atribut "type", bi moral biti enak "text/javascript" ali "application/javascript". Skripti morajo biti tudi razčlenljivi (skladnostno pravilni).
 # LOCALIZATION NOTE (firebug.breakpoint.showBreakNotifications):
 # Label used within Script panel's options menu. Represents an option, that can be used
 # to switch of the break notifications.
-firebug.breakpoint.showBreakNotifications=Prikaži opozorila ob prekinitvah
-firebug.breakpoint.tip.Show_Break_Notifications=Show a notification box, when a Break On ... feature or the debugger; keyword stopped the JavaScript execution
 # LOCALIZATION NOTE (firebug.activation.privateBrowsingMode):
+script.warning.debugger_active=Razhroščevalnik je že aktiven
+script.suggestion.debugger_active=Razhroščevalnik je trenutno ustavljen na prekinitveni točki druge strani.
+script.button.Go_to_that_page=Pojdi na to stran
+script.warning.debugger_not_activated=Razhroščevalnik ni aktiven
+script.suggestion.debugger_not_activated=Razhroščevalnik ni omogočen
 # Message displayed in a break notification popup next to a checkbox.
 # Includes a link enclosed in <a> and </a> to open the panel's options menu.
-firebug.breakpoint.doNotShowBreakNotification2=Omogoči/onemogoči opozorila o prelomu v <a>zavihku panelnega menuja</a>.
 # LOCALIZATION NOTE (firebug.bon.cause.disableDebuggerKeyword2, firebug.bon.tooltip.disableDebuggerKeyword2):
+script.warning.loading=Nalaganje ...
+script.suggestion.loading=Ne obstaja noben skript, toda stran se še vedno nalaga.
 # Message displayed in a break notification popup when break on debugger; keyword happens.
 # The keyword can be disabled by creating a disabled breakpoint on the same line.
 # The other label is used for a tooltip on the action button.
-firebug.bon.cause.disableDebuggerKeyword2=S klikom na gumb "Onemogoči" boste povozili nastavitve 'razhroščevalca' z onemogočeno točko preloma.
-firebug.bon.tooltip.disableDebuggerKeyword2=Ustvari onemogočeno točko preloma
 # LOCALIZATION NOTE (firebug.bon.scriptPanelNeeded): A label used by 'Break On Next' button
+script.Script_panel_must_be_enabled=%S (podokno skripta mora biti omogočeno)
 # This feature needs the Script panel enabled in order to work.
-firebug.bon.scriptPanelNeeded=(za uporabo sledeče možnosti mora biti omogočen skriptni panel)
 # LOCALIZATION NOTE (firebug.dom.noChildren):
 # Message displayed in the DOM panel in cases, in which there are no children objects
+script.SourceLimited=Omejitev predpomnilnika Firebug je bila dosežena. Deli skripta niso prikazani.
 # and so nothing to display.
-firebug.dom.noChildren2=Ni podrejenih objektov
+firebug.Firebug=Firebug
+firebug.Close=Zapri
+firebug.View=Pogled
+firebug.Help=Pomoč
+firebug.Run=Zaženi
+firebug.Copy=Kopiraj
+firebug.History=Zgodovina
+firebug.Run_the_entered_command=Izvedi vneseni ukaz
+firebug.Clear_the_Command_Editor=Počisti urejevalnik ukazov
+firebug.Copy_the_script_as_a_bookmarklet=Kopiraj skript kot živi zaznamek
+firebug.Insert_a_previously_entered_command=Vstavi prej vneseni ukaz
+firebug.AlwaysOpenInWindow=Vedno odpri v novem oknu
+firebug.OpenWith=Odpri z urejevalnikom
+firebug.menu.tip.Open_With=Odpri vsebino v zunanjem urejevalniku
+firebug.Permissions=Strani ...
+firebug.Configure_Editors=Nastavi urejevalnike
+script.tip.Script_Type=Filtriraj po vrsti skripta
+script.tip.Script_Filter_Static=Prikaži samo skripte, ki so bili naloženi skupaj s stranjo
+script.tip.Script_Filter_Evals=Prikaži skripte, ki so bili naloženi skupaj s stranjo in skripte, ki so bili ustvarjeni preko eval()
+script.tip.Script_Filter_Events=Prikaži skripte, ki so bili naloženi skupaj s stranjo, skripte, ki so bili ustvarjeni preko eval() in poslušalnike dogodkov
+script.tip.Script_Filter_All=Prikaži vse vrste skriptov
 # LOCALIZATION NOTE (firebug.reps.more): Label shown when the displayed array/list has
 # more elements then displayed on the screen. "..." is automatically appended.
-firebug.reps.more=več
 # LOCALIZATION NOTE (firebug.reps.reference): Label shown when the displayed array/list has
 # a reference to itself (a cycle).
-firebug.reps.reference=Circular reference
+firebug.labelWithShortcut=%S (%S)
 # LOCALIZATION NOTE (firebug.storage.totalItems): Semicolon list of plural forms.
 # Label used in the DOM panel for local/session/global storage.
 # It's informing the user about the number of items in the storage.
 # %1 = Number of storage items
+script.Rerun=Ponovno zaženi
+script.tip.Rerun=Ponovno zaženi klicni sklad trenutne funkcije
+script.Continue=Nadaljuj
+script.tip.Continue=Nadaljuj z izvajanjem JavaScripta
+script.Step_Over=Preskoči
+script.tip.Step_Over=Izvedi naslednji ukaz
+script.Step_Into=Pomakni se na
+script.tip.Step_Into=Izvedi naslednji ukaz in preskoči na funkcijo
+script.Step_Out=Izstopi
+script.tip.Step_Out=Izvedi preostanek telesa funkcije in vrne klicatelju
+firebug.RunUntil=Zaženi do te vrstice
+script.tip.Run_Until=Izvedi JavaScript do določene vrstice
 # example: 1 item in Storage
 # example: 2 items in Storage
-firebug.storage.totalItems=%1$S objekt v Shrambi;%1$S objektov v Shrambi
+script.PrettyPrint=Lepi tisk
+script.tip.PrettyPrint=Oblikuj trenutni skript
+# LOCALIZATION NOTE (firebug.reps.historyEntries): Semicolon list of plural forms.
+# Displayed when evaluating "history" - informs the user about the number of entries in history.
+# %1 = Number of history entries
 # LOCALIZATION NOTE (firebug.reps.table.ObjectProperties):
+firebug.Inspect=Preglej
+firebug.InspectElement=Preglej Element
+firebug.InspectElementWithFirebug=Preglej element z Firebugom
+firebug.BreakOnErrors=Prekini ob napaki
+firebug.InspectTooltip=Kliknite na element strani, da ga pregledate
+firebug.EditHTMLTooltip=Uredi to kodo HTML
+firebug.Profile=Profil
+firebug.Clear=Počisti
+firebug.ClearConsole=Počisti konzolo
+firebug.ClearTooltip=Počisti konzolo
 # Label used in the header of the output of the console.table() method inside the Console panel,
+editors.Configured_Firebug_Editors=Nastavljeni urejevalniki Firebug
+editors.Editor=Urejevalnik
+editors.Executable=Izvršljiva datoteka
+editors.Launch_Arguments=Zaženi argumente
+editors.Add=Dodaj
+editors.Remove=Odstrani
+editors.Change=Spremeni
+editors.Move_Up=Premakni gor
+editors.Close=Zapri
+editors.Browse=Brskaj ...
+changeEditor.Editor_Configuration=Nastavitve urejevalnika
+changeEditor.Name=Ime:
+changeEditor.Executable=Izvršljiva datoteka:
+changeEditor.CmdLine=Argumenti:
+changeEditor.Supplied_arguments=Argumenti, ki jih je posredoval Firebug:
+changeEditor.URL_of_file2=URL datoteke (če %url ni prisoten, bo privzeto dodana %file)
+changeEditor.Path_to_local_file2=Pot do lokalne datoteke (ali do začasne kopije)
+changeEditor.Line_number2=Številka vrstice (če je na voljo)
+changeEditor.Invalid_Application_Path=Neveljavna pot do programa
+changeEditor.Application_does_not_exist=Izbrani program ne obstaja!
 # if an object is passed into it.
-firebug.reps.table.ObjectProperties=Lastnosti objekta
 # LOCALIZATION NOTE (firebug.completion.empty):
 # Label used in the command line by the auto-complete function.
+firebug.Edit=Uredi
+firebug.css.sourceEdit=Urejanje izvorne kode
+firebug.css.sourceEdit.tooltip=Uredi izvorno kodo slogovne predloge, kot jo naloži brskalnik
+firebug.css.liveEdit=Urejanje v živo
+firebug.css.liveEdit.tooltip=Uredi CSS, ki je bila pridobljena iz brskalnika
+firebug.EditCSSTooltip=Uredi to slogovno predlogo
 # Displayed, if there are no possible completions.
-firebug.completion.empty=(brez zaključkov)
 # LOCALIZATION NOTE (firebug.failedToPreviewObjectURL, firebug.failedToPreviewImageURL):
 # Label used in an image preview infotip in the HTML panel when hovering over an <img> element
+firebug.activation.privateBrowsingMode=Spletna mesta niso pomnjena v načinu za Zasebno brskanje
 # when loading of the given URL fails. The firebug.failedToPreviewObjectURL is specifically used
 # for moz-filedata (HTML5),
 # see: https://developer.mozilla.org/en/Using_files_from_web_applications#Example.3a_Using_object_URLs_to_display_images
-firebug.failedToPreviewObjectURL=URL je bil najverjetneje preklican z uporabo metode revokeObjectURL.
-firebug.failedToPreviewImageURL=Napaka pri nalaganju danega URLja.
+firebug.debugger.breakOnExceptions=Prekini ob vseh izjemah
+firebug.debugger.tip.breakOnExceptions=Ustavi izvajanje JavaScripta, kadar se pojavi izjema
 # LOCALIZATION NOTE (firebug.Memory_Profiler_Started):
 # Message logged into the Console panel when memory profiler session starts.
-firebug.Memory_Profiler_Started=Spominski profiler zagnan
 # LOCALIZATION NOTE (firebug.Objects_Added_While_Profiling):
+firebug.debugger.ignoreCaughtExceptions=Prezri ujete izjeme
+firebug.debugger.tip.ignoreCaughtExceptions=Ustavi izvajanje JavaScripta samo, kadar se pojavi neujeta izjema
 # Title for a group (logged into the Console panel), that contains a list of new objects
 # allocated within memory profiler session.
-firebug.Objects_Added_While_Profiling=Objekti dodani med profiliranjem
 # LOCALIZATION NOTE (firebug.Memory_Profiler_Results):
+firebug.breakpoint.showBreakNotifications=Prikaži opozorila ob prekinitvah
+firebug.breakpoint.tip.Show_Break_Notifications=Prikaži obvestilno polje, kadar je možnost Prekini ob ... ali kjučna beseda debugger; ustavila izvajanje Javascripta
 # Message used within the Console panel when the memory profiler session is finished.
-firebug.Memory_Profiler_Results=Rezultati spominskega profilerja
 # LOCALIZATION NOTE (firebug.Entire_Session):
 # Label used within memory profiler results to mark summary information for entire session.
-firebug.Entire_Session=Celotna seja
+firebug.breakpoint.doNotShowBreakNotification2=Opozorila o prekinitvah lahko omogočite/onemogočite  v <a>meniju zavihkov podokna</a>.
 # LOCALIZATION NOTE (console.msg.nothing_to_output):
 # Used by the console panel if a Console API is used without any argument.
-console.msg.nothing_to_output=(nothing to output)
 # LOCALIZATION NOTE (console.msg.nothing_to_output):
 # Used by the console panel if an empty string is passed into a Console API.
-console.msg.an_empty_string=(an empty string)
+firebug.bon.cause.disableDebuggerKeyword2=S klikom na gumb "Onemogoči" boste preglasili 'razhroščevalec' z onemogočeno prekinitveno točko.
+firebug.bon.tooltip.disableDebuggerKeyword2=Ustvari onemogočeno prekinitveno točko
 # LOCALIZATION NOTE (cookies.legacy.firecookie_detected, cookies.legacy.uninstall, cookies.legacy.uninstall_and_restart):
 # A message and labels used when Firecookie is detected. This extension has been integrated with
+firebug.bon.scriptPanelNeeded=(za uporabo te možnosti mora biti omogočeno podokno skriptov)
 # Firebu and should not be installed together with Firebug 1.10+
-cookies.legacy.firecookie_detected=Firecookie add-on is detected. This add-on has been integrated with Firebug 1.10 by default. To avoid a collision you need to uninstall Firecookie. \n\nYou must restart to finish uninstalling the add-on.
-cookies.legacy.uninstall=Uninstall
-cookies.legacy.uninstall_and_restart=Uninstall && Restart
-# LOCALIZATION NOTE (firebug.cmd.help.values, console.cmd.help_title_desc):
-console.cmd.help_title=Command Line API
-console.cmd.help_title_desc=Press F1 to open online Firebug help
+# LOCALIZATION NOTE (console.cmd.help_title, console.cmd.help_title_desc):
+firebug.bon.title.debugger_keyword=ključna beseda razhroščevalnika
+# LOCALIZATION NOTE (console.cmd.tip_title, console.cmd.tip_title_desc):
+# LOCALIZATION NOTE (console.cmd.tip.javascript, console.cmd.tip.closures):
+# Description for Command Line tips that is logged
+firebug.dom.noChildren2=Ni podrejenih predmetov
+# in the the Console panel if the user types "help" into the command line.
 # LOCALIZATION NOTE (console.cmd.help.$): Description for Command Line API that is logged
+firebug.reps.more=več
 # in the the Console panel if the user types "help" into the command line.
-console.cmd.help.$=Returns a single element with the given id.
-console.cmd.help.$$=Returns an array of elements that match the given CSS selector.
-console.cmd.help.$x=Returns an array of elements that match the given XPath expression.
-console.cmd.help.dir=Prints an interactive listing of all properties of the object. This looks identical to the view inside the DOM panel.
-console.cmd.help.dirxml=Prints the XML source tree of an HTML or XML element. This looks identical to the view inside the HTML panel. You can click on any node to inspect it in the HTML panel.
-console.cmd.help.cd=By default, command line expressions are relative to the top-level window of the page. cd() allows you to use the window of a frame in the page instead.
-console.cmd.help.clear=Clears the console.
-console.cmd.help.copy=Copies the given parameter to the clipboard. This can be a return value of a function or an object.
-console.cmd.help.inspect=Inspects an object in the most suitable panel, or the panel identified by the optional second argument. The available panel names are "html", "stylesheet", "script", and "dom".
-console.cmd.help.keys=Returns an array containing the names of all properties of the object.
-console.cmd.help.values=Returns an array containing the values of all properties of the object.
-console.cmd.help.debug=Adds a breakpoint on the first line of a function.
-console.cmd.help.undebug=Removes the breakpoint on the first line of a function.
-console.cmd.help.monitor=Turns on logging for all calls to a function.
-console.cmd.help.unmonitor=Turns off logging for all calls to a function.
-console.cmd.help.monitorEvents=Turns on logging for all events dispatched to an object. The optional second argument may define specific events or event types to log. The available event types are "composition", "contextmenu", "drag", "focus", "form", "key", "load", "mouse", "mutation", "paint", "scroll", "text", "ui", "xul", and "clipboard".
-console.cmd.help.unmonitorEvents=Turns off logging for all events dispatched to an object. The optional second argument may define specific events or event families, for which to turn logging off.
-console.cmd.help.profile=Turns on the JavaScript profiler. The optional second argument contains the text to be printed in the header of the profile report.
-console.cmd.help.profileEnd=Turns off the JavaScript profiler and prints its report.
-console.cmd.help.table=Allows to log provided data using tabular layout. The method takes one required parameter that represents table-like data (array of arrays or list of objects). The optional second parameter can be used to specify columns and/or properties to be logged.
-console.cmd.help.$0=Represents the last element selected via the Inspector.
-console.cmd.help.$1=Represents the second last element selected via the Inspector.
-console.cmd.help.$n=Returns one of the 5 last elements selected via the Inspector. This method takes one required parameter, which represents the index of the element (starting at 0).
-console.cmd.help.help=Displays help for all available commands.
 # LOCALIZATION NOTE (console.cmd.helpUrlNotAvailable): A message used displayed to the user
+firebug.reps.reference=Krožni sklic
 # if registered command doesn't have help URL associated and the user clicks on the command name.
 # List of command names is displayed if you type "help" (without quotes) into the command line.
-console.cmd.helpUrlNotAvailable=Help page for this command is not available.
-# LOCALIZATION NOTE (css.selector.noSelection): A help description used in empty
-# Selection side panel.
-css.selector.noSelection=Type custom selector or right click CSS rule and pick <b>Get Matching Elements</b>.
-css.selector.noSelectionResults=No matching elements
-css.selector.selectorError=Selection failed:
-# LOCALIZATION NOTE (css.selector.Selection): Title for Selector side panel displayed
-# in the CSS panel.
-css.selector.Selection=Elements
-# LOCALIZATION NOTE (panel.tip.selector): Tooltip text for the Selection side panel
-# Shown when hovering the Selection panel tab
-panel.tip.selector=Displays elements matching a CSS selector
-css.selector.TryASelector=Try a selector...
-# LOCALIZATION NOTE (css.selector.cmd.getMatchingElements): A label for context menu item.
-# The menu-item is used in the CSS panel's context menu and allows to get matched elements
-# for the clicked rule selector. Elements are displayed in the side panel.
-css.selector.cmd.getMatchingElements=Get Matching Elements
-# LOCALIZATION NOTE (css.selector.unknownErrorMessage): An error message displayed
-# to the user if querySelectorAll (used by the Selector side panel) fails and there is no
-# explanantion coming from the platform.
-css.selector.unknownErrorMessage=Failed to execute specified selector string
 # LOCALIZATION NOTE (perftiming.bars.label, perftiming.events.label): A label used in a tooltip
 # for performance.timing graph.
 # The graph is displayed in the Console when the user executes "performance.timing" expression.
-perftiming.bars.label=Document phases start and elapsed time relative to the document load:
-perftiming.events.label=Event timing relative to the document load:
 # LOCALIZATION NOTE (perftiming.details_title, perftiming.details_title_desc): A label used
+firebug.storage.totalItems=%1$S predmet v Shrambi;%1$S predmeta v Shrambi;%1$S predmeti v Shrambi;%1$S predmetov v Shrambi
 # for detailed performance timing info table.
-perftiming.details_title=Perfomance Timing
-perftiming.details_title_desc=Detailed timing
 # LOCALIZATION NOTE (perftiming.connectEnd, perftiming.connectStart,
 # perftiming.domContentLoadedEventEnd, perftiming.domContentLoadedEventStart,
+firebug.reps.historyEntries=%1$S vnos zgodovine;več vnosov zgodovine (%1$S)
 # perftiming.domInteractive, perftiming.domLoading, perftiming.domainLookupEnd,
 # perftiming.domainLookupStart, perftiming.fetchStart, perftiming.loadEventEnd,
 # perftiming.loadEventStart, perftiming.avigationStart, perftiming.redirectCount,
+firebug.reps.table.ObjectProperties=Lastnosti predmeta
+firebug.reps.table.ObjectValues=Vrednosti
 # perftiming.redirectEnd, perftiming.redirectStart, perftiming.requestStart,
 # perftiming.responseEnd, perftiming.responseStart, perftiming.timing, perftiming.unloadEventEnd,
 # perftiming.unloadEventStart): Description for performance timing field. Displayed when
+firebug.completion.empty=(brez zaključkov)
 # the user executes 'performance.timing' in the command line.
-perftiming.connectEnd=Time when server connection is finished.
-perftiming.connectStart=Time just before server connection begins.
-perftiming.domComplete=Time just before document readiness completes.
-perftiming.domContentLoadedEventEnd=Time after DOMContentLoaded event completes.
-perftiming.domContentLoadedEventStart=Time just before DOMContentLoaded starts.
-perftiming.domInteractive=Time just before readiness set to interactive.
-perftiming.domLoading=Time just before readiness set to loading.
-perftiming.domainLookupEnd=Time after domain name lookup.
-perftiming.domainLookupStart=Time just before domain name lookup.
-perftiming.fetchStart=Time when the resource starts being fetched.
-perftiming.loadEventEnd=Time when the load event is complete.
-perftiming.loadEventStart=Time just before the load event is fired.
-perftiming.navigationStart=Time after the previous document begins unload.
-perftiming.redirectCount=Number of redirects since the last non-redirect.
-perftiming.redirectEnd=Time after last redirect response ends.
-perftiming.redirectStart=Time of fetch that initiated a redirect.
-perftiming.requestStart=Time just before a server request.
-perftiming.responseEnd=Time after the end of a response or connection.
-perftiming.responseStart=Time just before the start of a response.
-perftiming.unloadEventEnd=Time after the previous document is unloaded.
-perftiming.unloadEventStart=Time just before the unload event is fired.
+firebug.failedToPreviewObjectURL=Predmet URL je bil najverjetneje preklican z uporabo metode revokeObjectURL.
+firebug.failedToPreviewImageURL=Napaka pri nalaganju danega URLja.
+firebug.Memory_Profiler_Started=Spominski profilirnik je bil zagnan
+firebug.Objects_Added_While_Profiling=Predmeti dodani med profiliranjem
+firebug.Memory_Profiler_Results=Rezultati profilirnika pomnilnika 
+firebug.Entire_Session=Celotna seja
+console.msg.nothing_to_output=(brez izpisa)
+console.msg.an_empty_string=(prazen niz)
+cookies.legacy.firecookie_detected=Zaznan je bil dodatek Firecookie. Ta dodatek je bil privzeto vgrajen s Firebugom 1.10. Za preprečitev spora morate odstraniti Firecookie. \n\nZa dokončanje odstranitve tega dodatka morate ponovno zagnati.
+cookies.legacy.uninstall=Odstrani
+cookies.legacy.uninstall_and_restart=Odstrani in ponovno zaženi
+console.cmd.help_title= API ukazne vrstice
+console.cmd.help_title_desc=Pritisnite F1 za odpiranje spletne pomoči Firebug
+console.cmd.tip_title=Namigi ukazne vrstice
+console.cmd.tip_title_desc=Naučite se namige in trike ukazne vrstice
+console.cmd.tip.javascript=Katerikoli izraz JavaScript lahko izvršite na ukazni vrstici. Primer:
+console.cmd.tip.closures=Za dostop do spremenljivk v zaključkih uporabi skladnost '.%' (pokaži <a>več</a>). Primer:
+console.cmd.help.$=Vrne posamezen element z danim id-jem.
+console.cmd.help.$$=Vrne polje elementov, ki se ujema z danim izbirnikom CSS.
+console.cmd.help.$x=Vrne polje elementov, ki se ujema z danim izrazom XPath.
+console.cmd.help.dir=Tiskanja so sodejna navajanja vseh lastnosti predmeta. To je videti identično pogledu v podoknu DOM.
+console.cmd.help.dirxml=Natisne drevo izvorne kode XML elementa HTML ali XML. To je videti identično pogledu v podoknu HTML.  Lahko kliknete na katerokoli vozlišče, da ga pregledate v podoknu HTML.
+console.cmd.help.cd=Privzeto so izrazi ukazne vrstice relativni glede na najvišje uvrščeno okno strani. Namesto tega vam cd() omogoča uporabo okna okvirja v strani.
+console.cmd.help.clear=Počisti konzolo.
+console.cmd.help.copy=Kopira dani parameter na odložišče. To je lahko vrnjena vrednost funkcija ali predmeta.
+console.cmd.help.inspect=Pregleda predmet v najbolj ustreznem podoknu ali podoknu, ki ga prepozna izbirni drugi argument. Razpoložljiva imena podoken so "html", "slogovna predloga", "skript" in "dom".
+console.cmd.help.keys=Vrne polje, ki vsebuje imena vseh lastnosti predmeta.
+console.cmd.help.values=Vrne polje, ki vsebuje vrednosti vseh lastnosti predmeta.
+console.cmd.help.debug=Doda prekinitveno točko v prvo vrstico funkcije.
+console.cmd.help.undebug=Odstrani prekinitveno točko v prvi vrstici funkcije.
+console.cmd.help.monitor=Vklopi beleženje vseh klicev funkcije.
+console.cmd.help.unmonitor=Izklopi beleženje vseh klicev funkcije.
+console.cmd.help.monitorEvents=Vklopi beleženje vseh dogodkov, ki so bili poslani predmetu. Izbirni drugi argument lahko opredeli določene dogodke ali vrste dogodkov v dnevnik. Razpoložljive vrste dogodkov so "composition", "contextmenu", "drag", "focus", "form", "key", "load", "mouse", "mutation", "paint", "scroll", "text", "ui", "xul" in "clipboard".
+console.cmd.help.unmonitorEvents=Izklopi beleženje vseh dogodkov, ki so bili poslani predmetu. Izbirni drugi argument lahko opredeli določene dogodke ali družine dogodkov, za katere naj se beleženje izključi.
+console.cmd.help.profile=Vključi profilirnik Javascript. Izbirni drugi argument vsebuje besedilo za tiskanje v glavi poročila profila.
+console.cmd.help.profileEnd=Izključi profilirnik Javascript in natisne njegovo poročilo.
+console.cmd.help.table=Omogoča beleženje posredovanih podatkov z uporabo zamaknjene razporeditve. Ta metoda sprejme en zahtevan argument, ki predstavlja podatke podobne preglednici (polje polj ali seznam predmetov). Izbirni drugi argument se lahko uporabi za določene stolpce in/ali lastnosti za beleženje.
+console.cmd.help.$0=Prestavlja zadnji element, ki je bil izbran preko Pregledovalnika.
+console.cmd.help.$1=Prestavlja predzadnji element, ki je bil izbran preko Pregledovalnika.
+console.cmd.help.$2=Predstavlja tretji izbrani element pred koncem preko Pregledovalnika.
+console.cmd.help.$3=Predstavlja četrti izbrani element pred koncem preko Pregledovalnika.
+console.cmd.help.$4=Predstavlja peti izbrani element pred koncem preko Pregledovalnika.
+console.cmd.help.$n=Vrne enega od zadnjih petih elementov, ki so bili izbrani preko Pregledovalnika. Ta metoda sprejme en zahtevan argument, ki predstavlja kazalo elementa (z začetkom pri 0).
+console.cmd.help.$_=Predstavlja rezultat nazadnje ovrednotenega izraza v ukazni vrstici.
+console.cmd.help.help=Prikaži pomoč za vse razpoložljive ukaze.
+console.cmd.help.include=Vključuje oddaljeni skript.
+console.cmd.help.$p=Po desnemu kliku na predmet/vrednost Javascript in klikom na "Uporabi v ukazni vrstici" bo ta spremenljivka ukazne vrstice nastavljena na to vrednost.
+console.cmd.help.getEventListeners=Vrne predmet z vsemi poslušalniki dogodkov, ki so bili neposredno vpisani na element (ali drugi cilj dogodka).
+functionMonitor.Monitor_created=Nadzornik je bil ustvarjen.
+functionMonitor.Monitor_removed=Nadzornik je bil odstranjen.
+functionMonitor.Breakpoint_created=Prekinitvena točka je bila ustvarjena.
+functionMonitor.Breakpoint_removed=Prekinitvena točka je bila odstranjena.
+functionMonitor.No_monitor_to_remove=Ni nadzornika za odstranitev.
+functionMonitor.No_breakpoint_to_remove=Ni prekinitvene točke za odstranitev.
+functionMonitor.api_call_requires_a_function="%1$S" zahteva funkcijo kot argument.
+functionMonitor.unable_to_locate_source=Vira za funkcijo ni mogoče najti.
+functionMonitor.script_panel_must_be_enabled=Za delovanje "%1$S" mora biti omogočeno podokono skriptov.
+console.cmd.helpUrlNotAvailable=Stran pomoči za ta ukaz ni na voljo.
+perftiming.bars.label=Začetek faz dokumenta in pretekli čas glede na nalaganje dokumenta:
+perftiming.events.label=Časovnik dogodkov glede na nalaganje dokumenta:
+perftiming.details_title=Časovnik zmogljivosti
+perftiming.details_title_desc=Podroben časovnik
+perftiming.connectEnd=Čas ob prekinitvi povezave s strežnikom.
+perftiming.connectStart=Čas trenutka pred začetkom povezave s strežnikom.
+perftiming.domComplete=Čas trenutka pred zaključkom pripravljenosti dokumenta.
+perftiming.domContentLoadedEventEnd=Čas po zaključku dogodka DOMContentLoaded.
+perftiming.domContentLoadedEventStart=Čas pred začetkom dogodka DOMContentLoaded.
+perftiming.domInteractive=Čas trenutka pred nastavitvijo pripravljenosti na sodejavno.
+perftiming.domLoading=Čas trenutka pred nastavitvijo pripravljenosti na nalaganje.
+perftiming.domainLookupEnd=Čas po iskanju imena domene.
+perftiming.domainLookupStart=Čas trenutka pred iskanjem imena domene.
+perftiming.fetchStart=Čas začetka pridobitve vira.
+perftiming.loadEventEnd=Čas zaključka dogodka nalaganja.
+perftiming.loadEventStart=Čas trenutka pred sprožitvijo dogodka nalaganja.
+perftiming.navigationStart=Čas po odstranitvi prejšnjega dokumenta.
+perftiming.redirectCount=Število preusmerjanj od zadnjega nepreusmerjanja.
+perftiming.redirectEnd=Čas po zaključku zadnjega preusmerjanja.
+perftiming.redirectStart=Čas pridobitve, ki je začela preusmerjanje.
+perftiming.requestStart=Čas trenutka pred zahtevo strežnika.
+perftiming.responseEnd=Čas po zaključku odgovora ali povezave.
+perftiming.responseStart=Čas trenutka pred začetkom odgovora.
+perftiming.unloadEventEnd=Čas po prejšnji odstranitvi dokumenta.
+perftiming.unloadEventStart=Čas trenutka pred sprožitvijo dogodka odstranitve.
+eventListeners.group_title=Poslušalniki dogodkov
+mutationObservers.group_title=Opazovalniki mutacij
diff --git a/extension/locale/sl-SI/selectors.properties b/extension/locale/sl-SI/selectors.properties
new file mode 100644
index 0000000000..b6a8798dc4
--- /dev/null
+++ b/extension/locale/sl-SI/selectors.properties
@@ -0,0 +1,27 @@
+# LOCALIZATION NOTE (Panel-selectors): Title for Selectors side panel displayed
+# in the CSS panel
+Panel-selectors=Izbirniki
+# LOCALIZATION NOTE (panel.tip.selector): Tooltip text for the Selection side panel
+# Shown when hovering the Selection panel tab
+panel.tip.selectors=Prikaži elemente, ki se ujemajo z izbirnikom CSS
+# LOCALIZATION NOTE (css.selector.noSelection): A help description used in empty
+# Selectors side panel.
+css.selector.tip.Selector=Izbirnik
+# LOCALIZATION NOTE (css.selector.noSelectionResults, css.selector.invalidSelector):
+# Info messages for selector trials in Selectors side panel
+css.selector.noSelection=Vtipkajte izbirnik po meri ali desno kliknite na pravilo CSS in izberite <b>Dobi ujemajoče se elemente</b>.
+# LOCALIZATION NOTE (css.selector.readMore):
+# Helper text with a link to getfirebug.com/wiki for the Selectors panel.
+css.selector.noSelectionResults=Ni ujemajočih se elementov
+# LOCALIZATION NOTE (css.selector.invalidSelector):
+# LOCALIZATION NOTE (css.selector.TryASelector):
+css.selector.readMore=<a>Preberite si lahko več</a> o uporabi tega podokna.
+# Placeholder label for the Selectors side panel's input field for creating new selector trials
+css.selector.invalidSelector=Vnesen je bil neveljaven izbirnik
+# LOCALIZATION NOTE (css.selector.cmd.getMatchingElements): A label for context menu item.
+# The menu-item is used in the CSS panel's context menu and allows to get matched elements
+css.selector.TryASelector=Poskusi izbrinik ...
+# for the clicked rule selector. Elements are displayed in the side panel.
+css.selector.cmd.getMatchingElements=Dobi ujemajoče se elemente
+aria.labels.Selectors=Stransko podokno izirnikov
+a11y.labels.press_enter_to_add_new_selector=Pritisnite Enter za dodajanje novega izbirnika
diff --git a/extension/modules/firebug-trace-service.js b/extension/modules/firebug-trace-service.js
index 489c6f9b17..40ffc082a5 100644
--- a/extension/modules/firebug-trace-service.js
+++ b/extension/modules/firebug-trace-service.js
@@ -138,7 +138,7 @@ TracerWrapper.prototype =
 
         // Create FBTrace proxy. As soon as FBTrace console is available it'll forward
         // all calls to it.
-        return Proxy.create(
+        return new Proxy({},
         {
             get: function(target, name)
             {
diff --git a/extension/modules/gcli.js b/extension/modules/gcli.js
index 35a45ebd91..58d2d3339c 100644
--- a/extension/modules/gcli.js
+++ b/extension/modules/gcli.js
@@ -25,7 +25,7 @@ try
 catch (err)
 {
     if (FBTrace.DBG_ERRORS)
-        FBTrace.sysout("ERROR GCLI not available");
+        FBTrace.sysout("ERROR GCLI not available " + err, err);
 }
 
 // Load the Locale module and make sure Firebug string bundle is registered
@@ -123,10 +123,23 @@ var commands = [];
 
 function addCommand(command)
 {
+    // API for registering GCLI commands has changed in Firefox 42
+    // The new API are not supported at the moment.
+    // Some pointers:
+    // All modules in
+    // https://dxr.mozilla.org/mozilla-central/source/toolkit/devtools/gcli/commands
+    // export their items, for example:
+    // https://dxr.mozilla.org/mozilla-central/source/toolkit/devtools/gcli/commands/cookie.js#54
+    // And the code that does most of the loading for built-in commands is:
+    // https://dxr.mozilla.org/mozilla-central/source/toolkit/devtools/gcli/commands/index.js
+    // Test with a helper API:
+    // https://dxr.mozilla.org/mozilla-central/source/browser/devtools/commandline/test/helpers.js#469
+
     if (scope.gcli.addCommand)
         scope.gcli.addCommand(command);
-    else
+    else if (scope.gcli.addItems)
         scope.gcli.addItems([command]);
+
     commands.push(command);
 }
 
diff --git a/extension/modules/locale.js b/extension/modules/locale.js
index 9734714bce..4a16117258 100644
--- a/extension/modules/locale.js
+++ b/extension/modules/locale.js
@@ -42,7 +42,7 @@ var Locale = {};
  * $STR("Label"); - search for key "Label" within the firebug.properties file
  *                 and returns its value. If the key doesn't exist returns "Label".
  *
- * $STR("Button Label"); - search for key "Button_Label" withing the firebug.properties
+ * $STR("Button Label"); - search for key "Button_Label" within the firebug.properties
  *                        file. If the key doesn't exist returns "Button Label".
  *
  * $STR("net.Response Header"); - search for key "net.Response_Header". If the key doesn't
@@ -65,7 +65,7 @@ Locale.$STR = function(name, bundle)
     if (!name)
         return "";
 
-    var strKey = name.replace(" ", "_", "g");
+    var strKey = name.replace(/ /g, "_");
 
     if (!PrefLoader.getPref("useDefaultLocale"))
     {
@@ -100,14 +100,14 @@ Locale.$STR = function(name, bundle)
     var index = name.lastIndexOf(".");
     if (index > 0 && name.charAt(index-1) != "\\")
         name = name.substr(index + 1);
-    name = name.replace("_", " ", "g");
+    name = name.replace(/_/g, " ");
 
     return name;
 };
 
 Locale.$STRF = function(name, args, bundle)
 {
-    var strKey = name.replace(" ", "_", "g");
+    var strKey = name.replace(/ /g, "_");
 
     if (!PrefLoader.getPref("useDefaultLocale"))
     {
diff --git a/extension/modules/require-debug.js b/extension/modules/require-debug.js
index eecaab708e..1074614c42 100644
--- a/extension/modules/require-debug.js
+++ b/extension/modules/require-debug.js
@@ -67,8 +67,7 @@ require.execCbOFF = function (name)
                             (typeof value == "function"/* || typeof value == "object"*/))
                         {
                                 var funcName = name + "_" + prop;
-                                funcName = funcName.replace("/", "_", "g");
-                                funcName = funcName.replace("-", "_", "g");
+                                funcName = funcName.replace(/[\/\-]/g, "_");
                                 var namedFunction = eval("(function(){ return function " + funcName +
                                     "(){return true;} })()");
                                 value.displayName = namedFunction;
@@ -183,4 +182,4 @@ require.onError = function(exc)
 {
     require.onDebug.apply(require, arguments);
     throw exc;
-};
\ No newline at end of file
+};
diff --git a/extension/skin/classic/console.css b/extension/skin/classic/console.css
index 5e29a0dd84..b980ea03f3 100644
--- a/extension/skin/classic/console.css
+++ b/extension/skin/classic/console.css
@@ -804,7 +804,7 @@ of an error log is affected (higher than other logs). */
 .spyTitle {
     color: #000000;
     font-weight: bold;
-    -moz-box-sizing: padding-box;
+    box-sizing: border-box;
     overflow: hidden;
     z-index: 100;
     padding-left: 18px;
diff --git a/extension/skin/classic/cookies/cookies.css b/extension/skin/classic/cookies/cookies.css
index 593fea0aa4..335a8cba65 100644
--- a/extension/skin/classic/cookies/cookies.css
+++ b/extension/skin/classic/cookies/cookies.css
@@ -294,7 +294,7 @@
 /************************************************************************************************/
 
 .cookieNameLabel {
-    -moz-box-sizing: padding-box;
+    box-sizing: border-box;
     overflow: hidden;
     padding-top: 1px;
     font-weight: bold;
diff --git a/extension/skin/classic/html.css b/extension/skin/classic/html.css
index b4e6de1179..ef494cb3ee 100644
--- a/extension/skin/classic/html.css
+++ b/extension/skin/classic/html.css
@@ -1,7 +1,7 @@
 /* See license.txt for terms of usage */
 
 .panelNode-html {
-    -moz-box-sizing: padding-box;
+    box-sizing: border-box;
     padding: 4px 0 0 2px;
     word-wrap: break-word;
 }
@@ -218,4 +218,4 @@
 
 .useA11y .nodeLabelBox:focus {
     outline: none;
-}
\ No newline at end of file
+}
diff --git a/extension/skin/classic/net.css b/extension/skin/classic/net.css
index ce260eb5ae..66b73cce21 100644
--- a/extension/skin/classic/net.css
+++ b/extension/skin/classic/net.css
@@ -233,7 +233,7 @@
 }
 
 .netHrefLabel {
-    -moz-box-sizing: padding-box;
+    box-sizing: border-box;
     overflow: hidden;
     z-index: 10;
     position: absolute;
@@ -248,7 +248,7 @@
     display: none;
     -moz-user-select: none;
     padding-right: 10px;
-    padding-bottom: 2px;
+    padding-bottom: 3px;
     max-width: calc(100% - 38px);
     background: #FFFFFF;
     z-index: 200;
@@ -402,7 +402,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 .netTimeLabel {
-    -moz-box-sizing: padding-box;
+    box-sizing: border-box;
     position: absolute;
     top: 1px;
     left: 100%;
diff --git a/extension/skin/classic/performanceTiming.css b/extension/skin/classic/performanceTiming.css
index 37eb3f99db..218ed22bf0 100644
--- a/extension/skin/classic/performanceTiming.css
+++ b/extension/skin/classic/performanceTiming.css
@@ -23,7 +23,7 @@
 }
 
 .perfTimingBarLabel {
-    -moz-box-sizing: padding-box;
+    box-sizing: border-box;
     position: absolute;
     top: 1px;
     left: 100%;
diff --git a/extension/update.rdf.tpl.xml b/extension/update.rdf.tpl.xml
index f70e4b0942..f8b4bf16df 100644
--- a/extension/update.rdf.tpl.xml
+++ b/extension/update.rdf.tpl.xml
@@ -12,7 +12,7 @@
             <r:Description>
               <id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>
               <minVersion>30.0a1</minVersion>
-              <maxVersion>37.0</maxVersion>
+              <maxVersion>54.0</maxVersion>
               <updateLink>https://getfirebug.com/releases/firebug/@VERSION@/@LEAF@</updateLink>
               <updateInfoURL>https://getfirebug.com/updateInfo/firebug2.0.xml</updateInfoURL>
             </r:Description>
diff --git a/tests/FBTest/content/testResultTabView.js b/tests/FBTest/content/testResultTabView.js
index 8a18927667..ed1e94c4fb 100644
--- a/tests/FBTest/content/testResultTabView.js
+++ b/tests/FBTest/content/testResultTabView.js
@@ -372,8 +372,8 @@ var TestResultTabView = domplate(
 // ********************************************************************************************* //
 
 /**
- * This template displays a parse-erros that can occurs when parsing
- * expected and acuall results (see compare method).
+ * This template displays a parse-errors that can occurs when parsing
+ * expected and actuall results (see compare method).
  *
  * @domplate
  */
diff --git a/tests/content/commandLine/4391/jquery-latest.js b/tests/content/commandLine/4391/jquery-latest.js
index 9a13ab960e..01dcd52833 100644
--- a/tests/content/commandLine/4391/jquery-latest.js
+++ b/tests/content/commandLine/4391/jquery-latest.js
@@ -1997,7 +1997,7 @@ jQuery.fn.extend({
 					classNames = value.split( rspace );
 
 				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space seperated list
+					// check each className given, space separated list
 					state = isBool ? state : !self.hasClass( className );
 					self[ state ? "addClass" : "removeClass" ]( className );
 				}
@@ -3652,7 +3652,7 @@ var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[
 	rNonWord = /\W/;
 
 // Here we check if the JavaScript engine is using some sort of
-// optimization where it does not always call our comparision
+// optimization where it does not always call our comparison
 // function. If that is the case, discard the hasDuplicate value.
 //   Thus far that includes Google Chrome.
 [0, 0].sort(function() {
@@ -4630,7 +4630,7 @@ if ( document.documentElement.compareDocumentPosition ) {
 	};
 }
 
-// Utility function for retreiving the text value of an array of DOM nodes
+// Utility function for retrieving the text value of an array of DOM nodes
 Sizzle.getText = function( elems ) {
 	var ret = "", elem;
 
@@ -7769,7 +7769,7 @@ if ( jQuery.support.ajax ) {
 							xml;
 
 						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occured
+						// of an xhr when a network error occurred
 						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
 						try {
 
diff --git a/tests/content/commandLine/api/dirxml.html b/tests/content/commandLine/api/dirxml.html
index b91f8de20b..870c5351af 100644
--- a/tests/content/commandLine/api/dirxml.html
+++ b/tests/content/commandLine/api/dirxml.html
@@ -15,7 +15,7 @@ <h1>Command Line API: dirxml</h1>
 
 <ol>
 <li>Open Firebug and enable the Console panel.</li>
-<li>Execute teh following expression in the command line:<br/>
+<li>Execute the following expression in the command line:<br/>
 <code style="color:green">dirxml(document.getElementById("content"));</code></li>
 <li>The console panel should display a following XML log:</li>
 </ol>
diff --git a/tests/content/console/1693/issue1693.js b/tests/content/console/1693/issue1693.js
index a1e331ad70..220559d6d9 100644
--- a/tests/content/console/1693/issue1693.js
+++ b/tests/content/console/1693/issue1693.js
@@ -54,7 +54,7 @@ function onDataComplete(e)
                 for (var i = 0; i < 80000; i++)
                     responseText += i + " ";
 
-                // Compare expected and actuall (displayed) response text.
+                // Compare expected and actual (displayed) response text.
                 var text1 = responseText.substr(0, limit);
                 var text2 = responseBody.textContent.substr(0, limit);
                 FBTest.compare(text1, text2, "The response text must be properly displayed");
diff --git a/tests/content/console/6356/jquery-1.9.1.js b/tests/content/console/6356/jquery-1.9.1.js
index e2c203fe97..2d8494017e 100644
--- a/tests/content/console/6356/jquery-1.9.1.js
+++ b/tests/content/console/6356/jquery-1.9.1.js
@@ -4186,7 +4186,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 		// Regex strategy adopted from Diego Perini
 		assert(function( div ) {
 			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explictly
+			// This is to test IE's treatment of not explicitly
 			// setting a boolean content attribute,
 			// since its presence should be enough
 			// http://bugs.jquery.com/ticket/12359
diff --git a/tests/content/console/spy/2462/issue2462.js b/tests/content/console/spy/2462/issue2462.js
index 97b088d4c1..228a63eb67 100644
--- a/tests/content/console/spy/2462/issue2462.js
+++ b/tests/content/console/spy/2462/issue2462.js
@@ -9,7 +9,7 @@ function runTest()
                 classes: "logRow logRow-spy error loaded"
             };
 
-            // Asynchronously wait for the request beeing displayed.
+            // Asynchronously wait for the request being displayed.
             FBTest.waitForDisplayedElement("console", options, function(logRow)
             {
                 FBTest.testDone();
diff --git a/tests/content/dom/sidePanel/sidePanel.html b/tests/content/dom/sidePanel/sidePanel.html
index 39bb4f37e4..5819b58bfc 100644
--- a/tests/content/dom/sidePanel/sidePanel.html
+++ b/tests/content/dom/sidePanel/sidePanel.html
@@ -14,7 +14,7 @@ <h1>Existence of the DOM side panel</h1>
                 <h3>Steps to reproduce</h3>
                 <ol>
                     <li>Open Firebug</li>
-                    <li>Switch to the <em>HTML</em> panel and checkt DOM side panel is availble</li>
+                    <li>Switch to the <em>HTML</em> panel and checkt DOM side panel is available</li>
                     <li>Selecte the DOM side panel and check it displayes some properties</li>
                 </ol>
             </section>
diff --git a/tests/content/examples/exampleNet1.js b/tests/content/examples/exampleNet1.js
index abc4e1a032..489107f199 100644
--- a/tests/content/examples/exampleNet1.js
+++ b/tests/content/examples/exampleNet1.js
@@ -9,7 +9,7 @@ function runTest()
                 classes: "netRow category-xhr hasHeaders loaded"
             };
 
-            // Asynchronously wait for the request beeing displayed.
+            // Asynchronously wait for the request being displayed.
             FBTest.waitForDisplayedElement("net", options, function(netRow)
             {
                 var options = {
diff --git a/tests/content/firebug.html b/tests/content/firebug.html
index 0c3d78c36e..6ba805e285 100644
--- a/tests/content/firebug.html
+++ b/tests/content/firebug.html
@@ -348,7 +348,7 @@
     {group: "script",             uri: "script/4213/issue4213.js",                desc: "Script panel's location button is not updated", testPage: "script/4213/issue4213.html"},
     {group: "script",             uri: "script/4724/issue4724.js",                desc: "&quot;Disable Breakpoint&quot; is not checked on disabled breakpoints", testPage: "script/4724/issue4724.html"},
     {group: "script",             uri: "script/4816/issue4816.js",                desc: "Script panel claims No JavaScript when it means you're stopped on a breakpoint on some other tab", testPage: "script/4816/issue4816.html"},
-    {group: "script",             uri: "script/4818/issue4818.js",                desc: "frame.eval fails for everthing but the newest frame of the stack", testPage: "script/4818/issue4818.html"},
+    {group: "script",             uri: "script/4818/issue4818.js",                desc: "frame.eval fails for everything but the newest frame of the stack", testPage: "script/4818/issue4818.html"},
     {group: "script",             uri: "script/4932/issue4932.js",                desc: "The Script panel shows No Javascript on this page even if they are scripts within an iframe", testPage: "script/4932/issue4932.html"},
     {group: "script",             uri: "script/5044/issue5044.js",                desc: "Shortcut for Break On Next", testPage: "script/5044/issue5044.html"},
     {group: "script",             uri: "script/6476/issue6476.js",                desc: "Change directive for sourceURL", testPage: "script/6476/issue6476.html"},
diff --git a/tests/content/html/events/5440/jquery-1.5.js b/tests/content/html/events/5440/jquery-1.5.js
index 5c99a8d4a8..219c7c23f2 100644
--- a/tests/content/html/events/5440/jquery-1.5.js
+++ b/tests/content/html/events/5440/jquery-1.5.js
@@ -1815,7 +1815,7 @@ jQuery.fn.extend({
 					classNames = value.split( rspaces );
 
 				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space seperated list
+					// check each className given, space separated list
 					state = isBool ? state : !self.hasClass( className );
 					self[ state ? "addClass" : "removeClass" ]( className );
 				}
@@ -3272,7 +3272,7 @@ var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[
 	baseHasDuplicate = true;
 
 // Here we check if the JavaScript engine is using some sort of
-// optimization where it does not always call our comparision
+// optimization where it does not always call our comparison
 // function. If that is the case, discard the hasDuplicate value.
 //   Thus far that includes Google Chrome.
 [0, 0].sort(function() {
@@ -4234,7 +4234,7 @@ if ( document.documentElement.compareDocumentPosition ) {
 	};
 }
 
-// Utility function for retreiving the text value of an array of DOM nodes
+// Utility function for retrieving the text value of an array of DOM nodes
 Sizzle.getText = function( elems ) {
 	var ret = "", elem;
 
diff --git a/tests/content/html/events/5440/jquery-1.9.js b/tests/content/html/events/5440/jquery-1.9.js
index e2c203fe97..2d8494017e 100644
--- a/tests/content/html/events/5440/jquery-1.9.js
+++ b/tests/content/html/events/5440/jquery-1.9.js
@@ -4186,7 +4186,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 		// Regex strategy adopted from Diego Perini
 		assert(function( div ) {
 			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explictly
+			// This is to test IE's treatment of not explicitly
 			// setting a boolean content attribute,
 			// since its presence should be enough
 			// http://bugs.jquery.com/ticket/12359
diff --git a/tests/content/net/1308/issue1308-1.6.js b/tests/content/net/1308/issue1308-1.6.js
index e0ba664516..4348e48a84 100644
--- a/tests/content/net/1308/issue1308-1.6.js
+++ b/tests/content/net/1308/issue1308-1.6.js
@@ -12,7 +12,7 @@ function runTest()
                 classes: "netRow category-xhr hasHeaders loaded"
             };
 
-            // Asynchronously wait for the request beeing displayed.
+            // Asynchronously wait for the request being displayed.
             FBTest.waitForDisplayedElement("net", options, function(netRow)
             {
                 var panel = FBTest.getPanel("net");
diff --git a/tests/content/net/2221/issue2221-1.5.js b/tests/content/net/2221/issue2221-1.5.js
index 1ebec9f643..8abf379169 100644
--- a/tests/content/net/2221/issue2221-1.5.js
+++ b/tests/content/net/2221/issue2221-1.5.js
@@ -1,7 +1,7 @@
 // 1) Load Test case page.
 // 2) Enable Net panel
 // 3) Add "load" listener to the target iframe so, the test knows when
-//    the reponse for submitted form is received.
+//    the response for submitted form is received.
 // 4) Check the Post info UI.
 
 var panel = null;
diff --git a/tests/content/net/2221/issue2221.js b/tests/content/net/2221/issue2221.js
index 1b201efb35..bc9908ba4b 100644
--- a/tests/content/net/2221/issue2221.js
+++ b/tests/content/net/2221/issue2221.js
@@ -1,7 +1,7 @@
 // 1) Load Test case page.
 // 2) Enable Net panel
 // 3) Add "load" listener to the target iframe so, the test knows when
-//    the reponse for submitted form is received.
+//    the response for submitted form is received.
 // 4) Check the Post info UI.
 
 var panel = null;
diff --git a/tests/content/net/2696/issue2696.js b/tests/content/net/2696/issue2696.js
index 43c87c9110..458829512d 100644
--- a/tests/content/net/2696/issue2696.js
+++ b/tests/content/net/2696/issue2696.js
@@ -13,7 +13,7 @@ function runTest()
             // 3) Select Net panel
             FBTest.enableNetPanel(() =>
             {
-                // Asynchronously wait for the request beeing displayed.
+                // Asynchronously wait for the request being displayed.
                 FBTest.waitForDisplayedElement("net", null, (netRow) =>
                 {
                     FBTest.ok(netRow, "There must be just one xhr request.");
diff --git a/tests/content/net/369/issue369.htm b/tests/content/net/369/issue369.htm
index 9417e2beb6..e0719beb3d 100644
--- a/tests/content/net/369/issue369.htm
+++ b/tests/content/net/369/issue369.htm
@@ -25,7 +25,7 @@ <h1>Issue #369</h1>
 <button onclick="makeRequest3();">Secure JSON</button>
 <button onclick="makeRequest4();">JSON in a loop</button>
 <button onclick="makeRequest5();">Break in Script</button>
-<button onclick="makeRequest6();">JSON in a funtion 2</button>
+<button onclick="makeRequest6();">JSON in a function 2</button>
 
 <br/><br/>
 
diff --git a/tests/content/net/372/issue372-1.6.js b/tests/content/net/372/issue372-1.6.js
index 2c29d88e68..ae3689909b 100644
--- a/tests/content/net/372/issue372-1.6.js
+++ b/tests/content/net/372/issue372-1.6.js
@@ -10,7 +10,7 @@ function runTest(request)
                 classes: "netRow category-xhr hasHeaders loaded"
             };
 
-            // Asynchronously wait for the request beeing displayed.
+            // Asynchronously wait for the request being displayed.
             FBTest.waitForDisplayedElement("net", options, function(netRow)
             {
                 // Expand the test request with params
diff --git a/tests/content/net/5592/issue5592.js b/tests/content/net/5592/issue5592.js
index d282e01015..0ed960a3bc 100644
--- a/tests/content/net/5592/issue5592.js
+++ b/tests/content/net/5592/issue5592.js
@@ -57,7 +57,7 @@ function executeAndVerify(callback, target, actionID, expected)
         FBTest.executeContextMenuCommand(target, actionID);
     }
 
-    // Data can be copyied into the clipboard asynchronously,
+    // Data can be copied into the clipboard asynchronously,
     // so wait till they are available.
     FBTest.waitForClipboard(expected, executeContextMenuCommand, (text) =>
     {
diff --git a/tests/content/net/700/issue700-1.6.js b/tests/content/net/700/issue700-1.6.js
index 9bbc2971a9..8b1f9d34eb 100644
--- a/tests/content/net/700/issue700-1.6.js
+++ b/tests/content/net/700/issue700-1.6.js
@@ -14,7 +14,7 @@ function runTest()
                 classes: "netRow category-xhr hasHeaders loaded"
             };
 
-            // Asynchronously wait for the request beeing displayed.
+            // Asynchronously wait for the request being displayed.
             FBTest.waitForDisplayedElement("net", options, function(netRow)
             {
                 var panelNode = FBTest.getPanel("net").panelNode;
diff --git a/tests/content/net/activation/activation.js b/tests/content/net/activation/activation.js
index e5c5fc9fcd..193d13d836 100644
--- a/tests/content/net/activation/activation.js
+++ b/tests/content/net/activation/activation.js
@@ -61,7 +61,7 @@ function selectTabAndVerify(tab, callback)
         classes: "netRow category-xhr hasHeaders loaded"
     };
 
-    // Asynchronously wait for the request beeing displayed.
+    // Asynchronously wait for the request being displayed.
     FBTest.waitForDisplayedElement("net", options, function(netRow)
     {
         FBTest.ok(netRow, "There must be one xhr request.");
diff --git a/tests/content/net/listeners/netInfoBodyListener-1.6.js b/tests/content/net/listeners/netInfoBodyListener-1.6.js
index 2cced6d1f2..e2d1a3f594 100644
--- a/tests/content/net/listeners/netInfoBodyListener-1.6.js
+++ b/tests/content/net/listeners/netInfoBodyListener-1.6.js
@@ -12,7 +12,7 @@ function runTest()
                 classes: "netRow category-xhr hasHeaders loaded"
             };
 
-            // Asynchronously wait for the request beeing displayed.
+            // Asynchronously wait for the request being displayed.
             FBTest.waitForDisplayedElement("net", options, function(netRow)
             {
                 var panelNode = FBTest.getPanel("net").panelNode;
diff --git a/tests/content/script/3402/domplate.js b/tests/content/script/3402/domplate.js
index e92654657f..67caabe1f0 100644
--- a/tests/content/script/3402/domplate.js
+++ b/tests/content/script/3402/domplate.js
@@ -62,7 +62,7 @@ DomplateTag.prototype =
 {
     /*
      *  Initializer for DOM templates. Called to create new Functions objects like TR, TD, OBJLINK, etc. See defineTag
-     *  @param args keyword argments for the template, the {} brace stuff after the tag name, eg TR({...}, TD(...
+     *  @param args keyword arguments for the template, the {} brace stuff after the tag name, eg TR({...}, TD(...
      *  @param oldTag a nested tag, eg the TD tag in TR({...}, TD(...
      */
     merge: function(args, oldTag)
diff --git a/tests/content/script/4818/issue4818.html b/tests/content/script/4818/issue4818.html
index eda38f2b88..f2fcae653d 100644
--- a/tests/content/script/4818/issue4818.html
+++ b/tests/content/script/4818/issue4818.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Issue 4818: frame.eval fails for everthing but the newest frame of the stack</title>
+    <title>Issue 4818: frame.eval fails for everything but the newest frame of the stack</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link href="../../_common/testcase.css"
         type="text/css" rel="stylesheet"/>
@@ -22,7 +22,7 @@
 </script>
 <header>
     <h1><a href="http://code.google.com/p/fbug/issues/detail?id=4818">Issue 4818</a>:
-        frame.eval fails for everthing but the newest frame of the stack</h1>
+        frame.eval fails for everything but the newest frame of the stack</h1>
 </header>
 <div>
     <section id="description">
diff --git a/tests/content/script/breakpoints/7478/issue7478.js b/tests/content/script/breakpoints/7478/issue7478.js
index fe1605fb11..28f40263ad 100644
--- a/tests/content/script/breakpoints/7478/issue7478.js
+++ b/tests/content/script/breakpoints/7478/issue7478.js
@@ -26,7 +26,7 @@ function runTest()
                                 var conditionEditor = scriptPanel.
                                     panelNode.querySelector(".conditionEditor");
 
-                                FBTest.ok(conditionEditor, "The condtion editor should display to the user.");
+                                FBTest.ok(conditionEditor, "The condition editor should display to the user.");
                                 FBTest.testDone();
                             });
                         }
diff --git a/tests/content/search/6435/issue6435.html b/tests/content/search/6435/issue6435.html
index 0d03c8d827..773520ab7e 100644
--- a/tests/content/search/6435/issue6435.html
+++ b/tests/content/search/6435/issue6435.html
@@ -17,9 +17,9 @@ <h3>Steps to reproduce</h3>
             <li>Open Firebug, select the DOM panel</li>
             <li>Make sure 'Show DOM Properties' option is off.</li>
             <li>Use the search box to search in the panel</li>
-            <li>There should be 4 occurences of 'test' (case insensitive)</li>
-            <li>There should be 2 occurences of 'Test' (case sensitive)</li>
-            <li>There should be 2 occurences of '21' (case sensitive)</li>
+            <li>There should be 4 occurrences of 'test' (case insensitive)</li>
+            <li>There should be 2 occurrences of 'Test' (case sensitive)</li>
+            <li>There should be 2 occurrences of '21' (case sensitive)</li>
         </ol>
     </section>
     <footer>Jan Odvarko, &lt;odvarko@gmail.com&gt;</footer>
diff --git a/tests/content/search/6435/issue6435.js b/tests/content/search/6435/issue6435.js
index 41987c7ff3..6a05990d11 100644
--- a/tests/content/search/6435/issue6435.js
+++ b/tests/content/search/6435/issue6435.js
@@ -17,7 +17,7 @@ function runTest()
                 executeSearchTest("test", false, false, function(counter)
                 {
                     FBTest.compare(4, counter, "There must be precise number " +
-                         "of occurences (4) actual: " + counter);
+                         "of occurrences (4) actual: " + counter);
                     callback();
                 });
             });
@@ -28,7 +28,7 @@ function runTest()
                 executeSearchTest("test", false, true, function(counter)
                 {
                     FBTest.compare(2, counter, "There must be precise number " +
-                        "of occurences (2) actual: " + counter);
+                        "of occurrences (2) actual: " + counter);
                     callback();
                 });
             });
@@ -39,7 +39,7 @@ function runTest()
                 executeSearchTest("21", false, false, function(counter)
                 {
                     FBTest.compare(2, counter, "There must be precise number " +
-                        "of occurences (2) actual: " + counter);
+                        "of occurrences (2) actual: " + counter);
                     callback();
                 });
             });
@@ -71,7 +71,7 @@ function executeSearchTest(text, reverse, caseSensitive, callback)
 
         var match = sel.getRangeAt(0);
 
-        // OK, we have found the first occurence again, so finish the test.
+        // OK, we have found the first occurrence again, so finish the test.
         FBTest.sysout("search.match; ", match);
         if (firstMatch && (firstMatch.compareBoundaryPoints(Range.START_TO_START, match) ||
             firstMatch.compareBoundaryPoints(Range.END_TO_END, match)) == 0)
diff --git a/tests/content/search/6454/issue6454.js b/tests/content/search/6454/issue6454.js
index 6c499a1b2a..1202d75ed7 100644
--- a/tests/content/search/6454/issue6454.js
+++ b/tests/content/search/6454/issue6454.js
@@ -51,7 +51,7 @@ function executeSearchTest(text, reverse, caseSensitive, callback)
 
         var match = sel.getRangeAt(0);
 
-        // OK, we have found the first occurence again, so finish the test.
+        // OK, we have found the first occurrence again, so finish the test.
         FBTest.sysout("search.match; ", match);
         if (firstMatch && (firstMatch.compareBoundaryPoints(Range.START_TO_START, match) ||
             firstMatch.compareBoundaryPoints(Range.END_TO_END, match)) == 0)
diff --git a/tests/content/search/netPanelSearch.js b/tests/content/search/netPanelSearch.js
index 2c1e99af72..feb81d2738 100644
--- a/tests/content/search/netPanelSearch.js
+++ b/tests/content/search/netPanelSearch.js
@@ -82,7 +82,7 @@ function executeSearchTest(text, reverse, caseSensitive, responseBody, callback)
 
         var match = sel.getRangeAt(0);
 
-        // OK, we have found the first occurence again, so finish the test.
+        // OK, we have found the first occurrence again, so finish the test.
         FBTest.sysout("search.match; ", match);
         if (firstMatch && (firstMatch.compareBoundaryPoints(Range.START_TO_START, match) ||
             firstMatch.compareBoundaryPoints(Range.END_TO_END, match)) == 0)
diff --git a/tests/content/test-bot.html b/tests/content/test-bot.html
index 221c384714..cfbba44667 100644
--- a/tests/content/test-bot.html
+++ b/tests/content/test-bot.html
@@ -264,7 +264,7 @@
     {group: "script",             uri: "script/4213/issue4213.js",                desc: "Script panel's location button is not updated", testPage: "script/4213/issue4213.html"},
     //{group: "script",             uri: "script/4724/issue4724.js",                desc: "&quot;Disable Breakpoint&quot; is not checked on disabled breakpoints", testPage: "script/4724/issue4724.html"},
     {group: "script",             uri: "script/4816/issue4816.js",                desc: "Script panel claims No JavaScript when it means you're stopped on a breakpoint on some other tab", testPage: "script/4816/issue4816.html"},
-    {group: "script",             uri: "script/4818/issue4818.js",                desc: "frame.eval fails for everthing but the newest frame of the stack", testPage: "script/4818/issue4818.html"},
+    {group: "script",             uri: "script/4818/issue4818.js",                desc: "frame.eval fails for everything but the newest frame of the stack", testPage: "script/4818/issue4818.html"},
     //{group: "script",             uri: "script/4932/issue4932.js",                desc: "The Script panel shows No Javascript on this page even if they are scripts within an iframe", testPage: "script/4932/issue4932.html"},
     {group: "script/breakpoints", uri: "script/breakpoints/4854/issue4854.js",    desc: "Issue 4854: XHR breakpoints can't be removed from Breakpoints side panel", testPage: "script/breakpoints/4854/issue4854.html"},
     {group: "script/breakpoints", uri: "script/breakpoints/4889/issue4889.js",    desc: "Issue 4889: Folding for breakpoint categories", testPage: "script/breakpoints/4889/issue4889.html"},
diff --git a/trace/FBTrace/chrome/content/lib/domplate.js b/trace/FBTrace/chrome/content/lib/domplate.js
index 38a1143bb9..e06803128e 100644
--- a/trace/FBTrace/chrome/content/lib/domplate.js
+++ b/trace/FBTrace/chrome/content/lib/domplate.js
@@ -89,7 +89,7 @@ DomplateTag.prototype =
      * Initializer for DOM templates. Called to create new Functions objects like TR, TD,
      * OBJLINK, etc. See defineTag
      *
-     * @param args keyword argments for the template, the {} brace stuff after the tag name,
+     * @param args keyword arguments for the template, the {} brace stuff after the tag name,
      *      eg TR({...}, TD(...
      * @param oldTag a nested tag, eg the TD tag in TR({...}, TD(...
      */
@@ -751,7 +751,7 @@ DomplateLoop.prototype = copyObject(DomplateTag.prototype,
         var iterName;
         if (this.iter instanceof Parts)
         {
-            // We have a function with optional aruments or just one variable
+            // We have a function with optional arguments or just one variable
             var part = this.iter.parts[0];
             
             // Join our function arguments or variables
diff --git a/trace/FBTrace/modules/orion/orion.js b/trace/FBTrace/modules/orion/orion.js
index 06ad42195a..b6280192a2 100644
--- a/trace/FBTrace/modules/orion/orion.js
+++ b/trace/FBTrace/modules/orion/orion.js
@@ -4113,7 +4113,7 @@ define("orion/textview/textView", ['orion/textview/textModel', 'orion/textview/k
 		 * Executes the action handler associated with the given name.
 		 * <p>
 		 * The application defined action takes precedence over predefined actions unless
-		 * the <code>defaultAction</code> paramater is <code>true</code>.
+		 * the <code>defaultAction</code> parameter is <code>true</code>.
 		 * </p>
 		 * <p>
 		 * If the application defined action returns <code>false</code>, the text view predefined
@@ -7020,7 +7020,7 @@ define("orion/textview/textView", ['orion/textview/textModel', 'orion/textview/k
 			if (!isWebkit) {
 				/*
 				* Feature in IE and Firefox.  It is not possible to get the style of an
-				* element if it is not layed out because one of the ancestor has
+				* element if it is not laid out because one of the ancestor has
 				* style.display = none.  This means that the view cannot be created in this
 				* situations, since no measuring can be performed.  The fix is to listen
 				* for DOMAttrModified and create or destroy the view when the style.display
@@ -11281,7 +11281,7 @@ define("examples/textview/textStyler", ['orion/textview/annotations'], function(
 		];
 
 	// Scanner constants
-	var UNKOWN = 1;
+	var UNKNOWN = 1;
 	var KEYWORD = 2;
 	var STRING = 3;
 	var SINGLELINE_COMMENT = 4;
@@ -11365,7 +11365,7 @@ define("examples/textview/textStyler", ['orion/textview/annotations'], function(
 							}
 						}
 					}
-					return UNKOWN;
+					return UNKNOWN;
 			}
 		},
 		_read: function() {
@@ -11417,7 +11417,7 @@ define("examples/textview/textStyler", ['orion/textview/annotations'], function(
 							}
 						}
 						this._unread(c);
-						return UNKOWN;
+						return UNKNOWN;
 					case 39:	// SINGLE QUOTE -> char const
 						while(true) {
 							c = this._read();
@@ -11483,7 +11483,7 @@ define("examples/textview/textStyler", ['orion/textview/annotations'], function(
 						c = this._read();
 					} while(!(c === 32 || c === 9 || c === -1));
 					this._unread(c);
-					return UNKOWN;
+					return UNKNOWN;
 			}
 		}
 	};
@@ -11520,7 +11520,7 @@ define("examples/textview/textStyler", ['orion/textview/annotations'], function(
 							return HTML_MARKUP;
 						}
 					}
-					return UNKOWN;
+					return UNKNOWN;
 				case 64: // @
 					if (this._type === DOC_COMMENT) {
 						do {
@@ -11529,7 +11529,7 @@ define("examples/textview/textStyler", ['orion/textview/annotations'], function(
 						this._unread(c);
 						return DOC_TAG;
 					}
-					return UNKOWN;
+					return UNKNOWN;
 				case 84: // T
 					if ((c = this._read()) === 79) { // O
 						if ((c = this._read()) === 68) { // D
@@ -11555,7 +11555,7 @@ define("examples/textview/textStyler", ['orion/textview/annotations'], function(
 						c = this._read();
 					} while(!(c === 32 || c === 9 || c === -1 || c === 60 || c === 64 || c === 84));
 					this._unread(c);
-					return UNKOWN;
+					return UNKNOWN;
 			}
 		}
 	};
@@ -11573,7 +11573,7 @@ define("examples/textview/textStyler", ['orion/textview/annotations'], function(
 				case 39: // SINGLE QUOTE
 				case -1:
 					this._unread(c);
-					return UNKOWN;
+					return UNKNOWN;
 			}
 		}
 	};
diff --git a/trace/FBTrace/modules/orion/source-editor.jsm b/trace/FBTrace/modules/orion/source-editor.jsm
index 7877bcb460..2306391eb3 100644
--- a/trace/FBTrace/modules/orion/source-editor.jsm
+++ b/trace/FBTrace/modules/orion/source-editor.jsm
@@ -184,7 +184,7 @@ SourceEditor.EVENTS = {
    * The TextChanged event is fired when the editor content changes. The event
    * object properties:
    *   - start - the character offset in the document where the change has
-   *   occured.
+   *   occurred.
    *   - removedCharCount - the number of characters removed from the document.
    *   - addedCharCount - the number of characters added to the document.
    */